diff options
author | Michael Meeks <michael.meeks@novell.com> | 2011-02-28 21:08:47 +0000 |
---|---|---|
committer | Michael Meeks <michael.meeks@novell.com> | 2011-02-28 21:08:47 +0000 |
commit | 1584bc5e14998ee79f36efc937ace76741c2b143 (patch) | |
tree | 9e7fe5c463a7f968d0b1010d177fd18882aca96f /shell | |
parent | 7bc42b864b22fd8e0b159dfec212abaf989ff9aa (diff) | |
parent | 03bbff18ffc56ba032c62125574cfe8e094d82a2 (diff) |
Merge remote branch 'stage/premerge/dev300_m98' into integration/dev300_m98
Conflicts:
avmedia/inc/helpids.hrc
avmedia/prj/build.lst
avmedia/source/quicktime/quicktimeuno.cxx
avmedia/source/viewer/mediawindow.cxx
avmedia/source/viewer/mediawindow_impl.cxx
avmedia/source/viewer/mediawindow_impl.hxx
avmedia/source/viewer/mediawindowbase_impl.cxx
avmedia/source/win/winuno.cxx
avmedia/source/xine/xineuno.cxx
basic/inc/basic/sbmod.hxx
basic/inc/basic/sbobjmod.hxx
basic/inc/basic/sbstar.hxx
basic/inc/basic/sbxdef.hxx
basic/inc/basic/sbxvar.hxx
basic/prj/build.lst
basic/source/basmgr/basicmanagerrepository.cxx
basic/source/basmgr/basmgr.cxx
basic/source/classes/eventatt.cxx
basic/source/classes/sb.cxx
basic/source/classes/sbunoobj.cxx
basic/source/classes/sbxmod.cxx
basic/source/comp/dim.cxx
basic/source/comp/sbcomp.cxx
basic/source/inc/namecont.hxx
basic/source/inc/runtime.hxx
basic/source/inc/sbtrace.hxx
basic/source/inc/sbunoobj.hxx
basic/source/runtime/dllmgr.cxx
basic/source/runtime/makefile.mk
basic/source/runtime/methods.cxx
basic/source/runtime/methods1.cxx
basic/source/runtime/runtime.cxx
basic/source/runtime/step0.cxx
basic/source/runtime/step2.cxx
basic/source/runtime/wnt-x86.asm
basic/source/runtime/wnt.asm
basic/source/sample/makefile.mk
basic/source/sbx/sbxcurr.cxx
basic/source/sbx/sbxobj.cxx
basic/source/sbx/sbxvals.cxx
basic/source/sbx/sbxvalue.cxx
basic/source/sbx/sbxvar.cxx
basic/source/uno/namecont.cxx
basic/source/uno/scriptcont.cxx
configmgr/inc/pch/precompiled_configmgr.cxx
configmgr/makefile.pmk
configmgr/prj/build.lst
configmgr/prj/d.lst
configmgr/qa/unit/test.cxx
configmgr/qa/unit/urebootstrap.ini
configmgr/qa/unit/version.map
configmgr/source/README
configmgr/source/access.cxx
configmgr/source/access.hxx
configmgr/source/additions.hxx
configmgr/source/broadcaster.cxx
configmgr/source/broadcaster.hxx
configmgr/source/childaccess.cxx
configmgr/source/childaccess.hxx
configmgr/source/components.cxx
configmgr/source/components.hxx
configmgr/source/configurationprovider.cxx
configmgr/source/configurationprovider.hxx
configmgr/source/configurationregistry.cxx
configmgr/source/configurationregistry.hxx
configmgr/source/data.cxx
configmgr/source/data.hxx
configmgr/source/defaultprovider.cxx
configmgr/source/defaultprovider.hxx
configmgr/source/groupnode.hxx
configmgr/source/inc/utility.hxx
configmgr/source/localizedpropertynode.cxx
configmgr/source/localizedvaluenode.hxx
configmgr/source/lock.cxx
configmgr/source/lock.hxx
configmgr/source/makefile.mk
configmgr/source/modifications.cxx
configmgr/source/modifications.hxx
configmgr/source/node.cxx
configmgr/source/node.hxx
configmgr/source/nodemap.cxx
configmgr/source/nodemap.hxx
configmgr/source/parsemanager.cxx
configmgr/source/parsemanager.hxx
configmgr/source/parser.hxx
configmgr/source/partial.cxx
configmgr/source/partial.hxx
configmgr/source/path.hxx
configmgr/source/propertynode.cxx
configmgr/source/propertynode.hxx
configmgr/source/rootaccess.cxx
configmgr/source/rootaccess.hxx
configmgr/source/services.cxx
configmgr/source/setnode.cxx
configmgr/source/span.hxx
configmgr/source/type.cxx
configmgr/source/type.hxx
configmgr/source/update.cxx
configmgr/source/update.hxx
configmgr/source/valueparser.cxx
configmgr/source/valueparser.hxx
configmgr/source/writemodfile.cxx
configmgr/source/writemodfile.hxx
configmgr/source/xcdparser.cxx
configmgr/source/xcdparser.hxx
configmgr/source/xcsparser.cxx
configmgr/source/xcsparser.hxx
configmgr/source/xcuparser.cxx
configmgr/source/xcuparser.hxx
configmgr/source/xmldata.cxx
configmgr/source/xmldata.hxx
configmgr2/inc/makefile.mk
configmgr2/inc/pch/precompiled_configmgr.cxx
configmgr2/inc/pch/precompiled_configmgr.hxx
configmgr2/source/configurationprovider.hxx
configmgr2/source/defaultprovider.hxx
configmgr2/source/groupnode.hxx
configmgr2/source/localizedpropertyvaluenode.hxx
configmgr2/source/lock.cxx
configmgr2/source/lock.hxx
configmgr2/source/node.cxx
configmgr2/source/nodemap.hxx
configmgr2/source/propertynode.cxx
configmgr2/source/type.hxx
configmgr2/source/version.map
connectivity/inc/connectivity/BlobHelper.hxx
connectivity/inc/connectivity/SQLStatementHelper.hxx
connectivity/prj/build.lst
connectivity/prj/d.lst
connectivity/source/commontools/BlobHelper.cxx
connectivity/source/commontools/FValue.cxx
connectivity/source/commontools/TColumnsHelper.cxx
connectivity/source/commontools/TIndexes.cxx
connectivity/source/commontools/TTableHelper.cxx
connectivity/source/commontools/dbtools.cxx
connectivity/source/commontools/dbtools2.cxx
connectivity/source/commontools/formattedcolumnvalue.cxx
connectivity/source/cpool/ZConnectionPool.cxx
connectivity/source/cpool/ZConnectionPool.hxx
connectivity/source/cpool/Zregistration.cxx
connectivity/source/cpool/makefile.mk
connectivity/source/dbtools/makefile.mk
connectivity/source/drivers/adabas/Bservices.cxx
connectivity/source/drivers/adabas/makefile.mk
connectivity/source/drivers/ado/Aservices.cxx
connectivity/source/drivers/ado/makefile.mk
connectivity/source/drivers/calc/Cservices.cxx
connectivity/source/drivers/calc/makefile.mk
connectivity/source/drivers/dbase/Dservices.cxx
connectivity/source/drivers/dbase/makefile.mk
connectivity/source/drivers/evoab/LColumns.cxx
connectivity/source/drivers/evoab/LFolderList.cxx
connectivity/source/drivers/evoab/LServices.cxx
connectivity/source/drivers/evoab/LTable.cxx
connectivity/source/drivers/evoab/makefile.mk
connectivity/source/drivers/evoab2/NServices.cxx
connectivity/source/drivers/evoab2/makefile.mk
connectivity/source/drivers/file/FResultSet.cxx
connectivity/source/drivers/file/FStatement.cxx
connectivity/source/drivers/file/makefile.mk
connectivity/source/drivers/flat/Eservices.cxx
connectivity/source/drivers/flat/makefile.mk
connectivity/source/drivers/hsqldb/HDriver.cxx
connectivity/source/drivers/hsqldb/Hservices.cxx
connectivity/source/drivers/hsqldb/makefile.mk
connectivity/source/drivers/jdbc/Boolean.cxx
connectivity/source/drivers/jdbc/Timestamp.cxx
connectivity/source/drivers/jdbc/jservices.cxx
connectivity/source/drivers/jdbc/makefile.mk
connectivity/source/drivers/jdbc/tools.cxx
connectivity/source/drivers/kab/KServices.cxx
connectivity/source/drivers/kab/kcondition.hxx
connectivity/source/drivers/macab/MacabConnection.cxx
connectivity/source/drivers/macab/MacabServices.cxx
connectivity/source/drivers/mozab/MResultSet.cxx
connectivity/source/drivers/mozab/MResultSet.hxx
connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
connectivity/source/drivers/mozab/bootstrap/makefile.mk
connectivity/source/drivers/mozab/makefile.mk
connectivity/source/drivers/mozab/makefile_mozab.mk
connectivity/source/drivers/mozab/mozillasrc/makefile.mk
connectivity/source/drivers/mysql/YTables.cxx
connectivity/source/drivers/mysql/Yservices.cxx
connectivity/source/drivers/mysql/makefile.mk
connectivity/source/drivers/odbc/OFunctions.cxx
connectivity/source/drivers/odbc/makefile.mk
connectivity/source/drivers/odbc/oservices.cxx
connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
connectivity/source/drivers/odbcbase/makefile.mk
connectivity/source/inc/adabas/BResultSet.hxx
connectivity/source/inc/adabas/BStatement.hxx
connectivity/source/inc/dbase/DIndexPage.hxx
connectivity/source/inc/java/sql/Timestamp.hxx
connectivity/source/inc/java/tools.hxx
connectivity/source/manager/mregistration.cxx
connectivity/source/parse/PColumn.cxx
connectivity/source/parse/makefile.mk
connectivity/source/parse/sqliterator.cxx
connectivity/source/parse/sqlnode.cxx
connectivity/source/simpledbt/makefile.mk
connectivity/workben/iniParser/makefile.mk
connectivity/workben/little/makefile.mk
connectivity/workben/testmoz/makefile.mk
desktop/inc/app.hxx
desktop/inc/migration.hxx
desktop/prj/build.lst
desktop/qa/deployment_misc/makefile.mk
desktop/qa/deployment_misc/test_dp_version.cxx
desktop/scripts/soffice.sh
desktop/scripts/unopkg.sh
desktop/source/app/app.cxx
desktop/source/app/appfirststart.cxx
desktop/source/app/check_ext_deps.cxx
desktop/source/app/cmdlineargs.cxx
desktop/source/app/cmdlineargs.hxx
desktop/source/app/langselect.cxx
desktop/source/app/makefile.mk
desktop/source/app/officeipcthread.cxx
desktop/source/app/userinstall.cxx
desktop/source/deployment/dp_services.cxx
desktop/source/deployment/dp_xml.cxx
desktop/source/deployment/gui/dp_gui.hrc
desktop/source/deployment/gui/dp_gui_dialog.src
desktop/source/deployment/gui/dp_gui_dialog2.cxx
desktop/source/deployment/gui/dp_gui_dialog2.src
desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
desktop/source/deployment/gui/dp_gui_extlistbox.cxx
desktop/source/deployment/gui/dp_gui_extlistbox.hxx
desktop/source/deployment/gui/dp_gui_system.cxx
desktop/source/deployment/gui/dp_gui_system.hxx
desktop/source/deployment/gui/dp_gui_updatedata.hxx
desktop/source/deployment/gui/dp_gui_updatedialog.cxx
desktop/source/deployment/gui/dp_gui_updatedialog.hxx
desktop/source/deployment/gui/license_dialog.cxx
desktop/source/deployment/inc/dp_update.hxx
desktop/source/deployment/manager/dp_commandenvironments.cxx
desktop/source/deployment/manager/dp_commandenvironments.hxx
desktop/source/deployment/manager/dp_extensionmanager.cxx
desktop/source/deployment/manager/dp_extensionmanager.hxx
desktop/source/deployment/manager/dp_informationprovider.cxx
desktop/source/deployment/manager/dp_manager.cxx
desktop/source/deployment/manager/dp_properties.cxx
desktop/source/deployment/manager/dp_properties.hxx
desktop/source/deployment/migration/makefile.mk
desktop/source/deployment/misc/dp_dependencies.cxx
desktop/source/deployment/misc/dp_descriptioninfoset.cxx
desktop/source/deployment/misc/dp_misc.cxx
desktop/source/deployment/misc/dp_ucb.cxx
desktop/source/deployment/misc/dp_update.cxx
desktop/source/deployment/registry/component/dp_compbackenddb.cxx
desktop/source/deployment/registry/component/dp_compbackenddb.hxx
desktop/source/deployment/registry/component/dp_component.cxx
desktop/source/deployment/registry/configuration/dp_configuration.cxx
desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx
desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx
desktop/source/deployment/registry/dp_backend.cxx
desktop/source/deployment/registry/dp_backenddb.cxx
desktop/source/deployment/registry/dp_registry.cxx
desktop/source/deployment/registry/executable/dp_executable.cxx
desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx
desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx
desktop/source/deployment/registry/help/dp_help.cxx
desktop/source/deployment/registry/help/dp_helpbackenddb.cxx
desktop/source/deployment/registry/help/dp_helpbackenddb.hxx
desktop/source/deployment/registry/inc/dp_backend.h
desktop/source/deployment/registry/inc/dp_backenddb.hxx
desktop/source/deployment/registry/package/dp_extbackenddb.cxx
desktop/source/deployment/registry/package/dp_extbackenddb.hxx
desktop/source/deployment/registry/package/dp_package.cxx
desktop/source/deployment/registry/script/dp_script.cxx
desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx
desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx
desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
desktop/source/inc/helpid.hrc
desktop/source/migration/cfgfilter.cxx
desktop/source/migration/makefile.mk
desktop/source/migration/migration.cxx
desktop/source/migration/migration.hxx
desktop/source/migration/migration_impl.hxx
desktop/source/migration/pages.cxx
desktop/source/migration/pages.hxx
desktop/source/migration/services/cexports.cxx
desktop/source/migration/services/cexportsoo3.cxx
desktop/source/migration/services/makefile.mk
desktop/source/migration/services/migrationoo3.map
desktop/source/migration/services/oo3extensionmigration.cxx
desktop/source/migration/services/oo3extensionmigration.hxx
desktop/source/migration/wizard.cxx
desktop/source/migration/wizard.hrc
desktop/source/migration/wizard.hxx
desktop/source/migration/wizard.src
desktop/source/pagein/makefile.mk
desktop/source/pkgchk/unopkg/unopkg_app.cxx
desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
desktop/source/pkgchk/unopkg/unopkg_misc.cxx
desktop/source/pkgchk/unopkg/unopkg_shared.h
desktop/source/so_comp/oemjob.cxx
desktop/source/so_comp/services.cxx
desktop/source/splash/firststart.cxx
desktop/source/splash/firststart.hxx
desktop/source/splash/makefile.mk
desktop/source/splash/services_spl.cxx
desktop/source/splash/splash.cxx
desktop/test/deployment/boxt/Addons.xcu
desktop/test/deployment/boxt/boxt.cxx
desktop/test/deployment/boxt/makefile.mk
desktop/unx/splash/exports.map
desktop/util/makefile.mk
desktop/util/ooverinfo.rc
desktop/util/ooverinfo2.rc
desktop/util/verinfo.rc
desktop/win32/source/applauncher/ooo/verinfo.rc
desktop/win32/source/applauncher/verinfo.rc
desktop/win32/source/officeloader/officeloader.cxx
desktop/win32/source/rebase/rebase.cxx
desktop/win32/source/rebase/rebasegui.cxx
desktop/win32/source/setup/makefile.mk
desktop/zipintro/makefile.mk
drawinglayer/inc/drawinglayer/attribute/fillgradientattribute.hxx
drawinglayer/inc/drawinglayer/attribute/fillhatchattribute.hxx
drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx
drawinglayer/inc/drawinglayer/attribute/sdrfillattribute.hxx
drawinglayer/inc/drawinglayer/attribute/sdrlightattribute3d.hxx
drawinglayer/inc/drawinglayer/attribute/sdrlightingattribute3d.hxx
drawinglayer/inc/drawinglayer/attribute/sdrlineattribute.hxx
drawinglayer/inc/drawinglayer/attribute/sdrlinestartendattribute.hxx
drawinglayer/inc/drawinglayer/attribute/sdrobjectattribute3d.hxx
drawinglayer/inc/drawinglayer/attribute/sdrsceneattribute3d.hxx
drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx
drawinglayer/inc/drawinglayer/primitive2d/alphaprimitive2d.hxx
drawinglayer/inc/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx
drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
drawinglayer/inc/drawinglayer/primitive2d/epsprimitive2d.hxx
drawinglayer/inc/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx
drawinglayer/inc/drawinglayer/primitive2d/textenumsprimitive2d.hxx
drawinglayer/inc/drawinglayer/primitive2d/textlineprimitive2d.hxx
drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx
drawinglayer/inc/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx
drawinglayer/inc/drawinglayer/primitive2d/transparenceprimitive2d.hxx
drawinglayer/inc/drawinglayer/primitive2d/unifiedalphaprimitive2d.hxx
drawinglayer/inc/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx
drawinglayer/inc/drawinglayer/primitive2d/wallpaperprimitive2d.hxx
drawinglayer/inc/drawinglayer/processor3d/cutfindprocessor3d.hxx
drawinglayer/source/attribute/fillbitmapattribute.cxx
drawinglayer/source/attribute/fillgradientattribute.cxx
drawinglayer/source/attribute/fillhatchattribute.cxx
drawinglayer/source/attribute/fontattribute.cxx
drawinglayer/source/attribute/makefile.mk
drawinglayer/source/attribute/sdrfillattribute.cxx
drawinglayer/source/attribute/sdrlightattribute3d.cxx
drawinglayer/source/attribute/sdrlightingattribute3d.cxx
drawinglayer/source/attribute/sdrlineattribute.cxx
drawinglayer/source/attribute/sdrlinestartendattribute.cxx
drawinglayer/source/attribute/sdrobjectattribute3d.cxx
drawinglayer/source/attribute/sdrsceneattribute3d.cxx
drawinglayer/source/attribute/sdrshadowattribute.cxx
drawinglayer/source/attribute/strokeattribute.cxx
drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx
drawinglayer/source/primitive2d/epsprimitive2d.cxx
drawinglayer/source/primitive2d/makefile.mk
drawinglayer/source/primitive2d/sdrdecompositiontools2d.cxx
drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx
drawinglayer/source/primitive2d/textenumsprimitive2d.cxx
drawinglayer/source/primitive2d/textlayoutdevice.cxx
drawinglayer/source/primitive2d/textlineprimitive2d.cxx
drawinglayer/source/primitive2d/textprimitive2d.cxx
drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx
drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx
drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx
drawinglayer/source/primitive3d/makefile.mk
drawinglayer/source/processor2d/canvasprocessor.cxx
drawinglayer/source/processor3d/cutfindprocessor3d.cxx
drawinglayer/source/processor3d/makefile.mk
drawinglayer/util/makefile.mk
editeng/inc/editeng.hrc
editeng/inc/editeng/AccessibleContextBase.hxx
editeng/inc/editeng/AccessibleStaticTextBase.hxx
editeng/inc/editeng/acorrcfg.hxx
editeng/inc/editeng/borderline.hxx
editeng/inc/editeng/boxitem.hxx
editeng/inc/editeng/editeng.hxx
editeng/inc/editeng/editengdllapi.h
editeng/inc/editeng/editengdllapi.h.orig
editeng/inc/editeng/editerr.hxx
editeng/inc/editeng/editids.hrc
editeng/inc/editeng/editrids.hrc
editeng/inc/editeng/editview.hxx
editeng/inc/editeng/edtdlg.hxx
editeng/inc/editeng/eedata.hxx
editeng/inc/editeng/eeitem.hxx
editeng/inc/editeng/eerdll.hxx
editeng/inc/editeng/forbiddencharacterstable.hxx
editeng/inc/editeng/frmdir.hxx
editeng/inc/editeng/measfld.hxx
editeng/inc/editeng/memberids.hrc
editeng/inc/editeng/nhypitem.hxx
editeng/inc/editeng/nlbkitem.hxx
editeng/inc/editeng/numitem.hxx
editeng/inc/editeng/outliner.hxx
editeng/inc/editeng/paragraphdata.hxx
editeng/inc/editeng/svxacorr.hxx
editeng/inc/editeng/svxfont.hxx
editeng/inc/editeng/svxrtf.hxx
editeng/inc/editeng/unoedsrc.hxx
editeng/inc/editeng/unoipset.hxx
editeng/inc/editeng/unonrule.hxx
editeng/inc/editxml.hxx
editeng/inc/helpid.hrc
editeng/inc/makefile.mk
editeng/inc/pch/precompiled_editeng.cxx
editeng/inc/pch/precompiled_editeng.hxx
editeng/source/accessibility/AccessibleContextBase.cxx
editeng/source/accessibility/AccessibleEditableTextPara.cxx
editeng/source/accessibility/AccessibleHyperlink.cxx
editeng/source/accessibility/AccessibleHyperlink.hxx
editeng/source/accessibility/accessibility.src
editeng/source/accessibility/makefile.mk
editeng/source/editeng/editattr.cxx
editeng/source/editeng/editdoc.cxx
editeng/source/editeng/editdoc.hxx
editeng/source/editeng/editeng.cxx
editeng/source/editeng/editview.cxx
editeng/source/editeng/eeobj.cxx
editeng/source/editeng/eerdll.cxx
editeng/source/editeng/eerdll2.hxx
editeng/source/editeng/impedit.cxx
editeng/source/editeng/impedit.hxx
editeng/source/editeng/impedit2.cxx
editeng/source/editeng/impedit3.cxx
editeng/source/editeng/impedit4.cxx
editeng/source/items/frmitems.cxx
editeng/source/items/itemtype.cxx
editeng/source/items/makefile.mk
editeng/source/items/numitem.cxx
editeng/source/items/svdfield.cxx
editeng/source/items/svxitems.src
editeng/source/misc/edtdlg.cxx
editeng/source/misc/hangulhanja.cxx
editeng/source/misc/makefile.mk
editeng/source/misc/svxacorr.cxx
editeng/source/misc/swafopt.cxx
editeng/source/outliner/makefile.mk
editeng/source/outliner/outl_pch.hxx
editeng/source/outliner/outleeng.hxx
editeng/source/outliner/outlin2.cxx
editeng/source/outliner/outliner.cxx
editeng/source/outliner/outliner.src
editeng/source/outliner/outlvw.cxx
editeng/source/rtf/makefile.mk
editeng/source/rtf/rtfitem.cxx
editeng/source/rtf/svxrtf.cxx
editeng/source/uno/UnoForbiddenCharsTable.cxx
editeng/source/uno/makefile.mk
editeng/source/uno/unofdesc.cxx
editeng/source/uno/unofield.cxx
editeng/source/uno/unoipset.cxx
editeng/source/uno/unonrule.cxx
editeng/source/uno/unotext.cxx
editeng/util/hidother.src
editeng/util/makefile.mk
editeng/util/makefile.pmk
embeddedobj/prj/build.lst
embeddedobj/source/commonembedding/miscobj.cxx
embeddedobj/source/commonembedding/persistence.cxx
embeddedobj/source/msole/graphconvert.cxx
embeddedobj/source/msole/makefile.mk
embeddedobj/source/msole/olecomponent.cxx
eventattacher/prj/build.lst
fileaccess/source/FileAccess.cxx
formula/inc/formula/FormulaOpCodeMapperObj.hxx
formula/inc/formula/funcutl.hxx
formula/inc/formula/intruref.hxx
formula/inc/helpids.hrc
formula/source/ui/dlg/formdlgs.hrc
formula/source/ui/dlg/formdlgs.src
formula/source/ui/dlg/formula.cxx
formula/source/ui/dlg/funcutl.cxx
formula/source/ui/dlg/parawin.cxx
formula/source/ui/dlg/parawin.hrc
formula/source/ui/dlg/parawin.src
formula/source/ui/dlg/structpg.cxx
formula/source/ui/inc/ForResId.hrc
formula/source/ui/resource/ModuleHelper.cxx
formula/util/makefile.mk
fpicker/prj/d.lst
fpicker/source/aqua/FPentry.cxx
fpicker/source/aqua/NSURL_OOoAdditions.hxx
fpicker/source/generic/makefile.mk
fpicker/source/odma/exports.map
fpicker/source/office/OfficeControlAccess.cxx
fpicker/source/office/iodlg.cxx
fpicker/source/office/iodlg.src
fpicker/source/office/iodlgimp.cxx
fpicker/source/unx/gnome/FPentry.cxx
fpicker/source/unx/gnome/SalGtkFilePicker.cxx
fpicker/source/unx/gnome/SalGtkPicker.cxx
fpicker/source/unx/kde/kdemodalityfilter.cxx
fpicker/source/unx/kde/kdemodalityfilter.hxx
fpicker/source/unx/kde4/KDE4FPEntry.cxx
fpicker/source/unx/kde4/KDE4FilePicker.cxx
fpicker/source/unx/kde_unx/FPServiceInfo.hxx
fpicker/source/unx/kde_unx/makefile.mk
fpicker/source/win32/filepicker/FPentry.cxx
fpicker/source/win32/filepicker/SolarMutex.cxx
fpicker/source/win32/filepicker/SolarMutex.hxx
fpicker/test/makefile.mk
framework/Package_dtd.mk
framework/Package_uiconfig.mk
framework/inc/classes/menumanager.hxx
framework/inc/classes/resource.hrc
framework/inc/dispatch/interaction.hxx
framework/inc/dispatchcommands.h
framework/inc/framework.hrc
framework/inc/framework/actiontriggerhelper.hxx
framework/inc/framework/addonmenu.hxx
framework/inc/framework/addonsoptions.hxx
framework/inc/framework/bmkmenu.hxx
framework/inc/framework/imageproducer.hxx
framework/inc/framework/imagesconfiguration.hxx
framework/inc/framework/preventduplicateinteraction.hxx
framework/inc/framework/sfxhelperfunctions.hxx
framework/inc/framework/titlehelper.hxx
framework/inc/framework/toolboxconfiguration.hxx
framework/inc/helper/ilayoutnotifications.hxx
framework/inc/helper/mischelper.hxx
framework/inc/helper/titlebarupdate.hxx
framework/inc/helper/uiconfigelementwrapperbase.hxx
framework/inc/helper/uielementwrapperbase.hxx
framework/inc/helpid.hrc
framework/inc/macros/registration.hxx
framework/inc/makefile.mk
framework/inc/mediadescriptor.h
framework/inc/pch/precompiled_framework.hxx
framework/inc/properties.h
framework/inc/services.h
framework/inc/services/layoutmanager.hxx
framework/inc/services/pluginframe.hxx
framework/inc/threadhelp/lockhelper.hxx
framework/inc/uielement/newmenucontroller.hxx
framework/inc/uielement/popupmenucontroller.hxx
framework/inc/uielement/toolbarmanager.hxx
framework/inc/xml/eventsdocumenthandler.hxx
framework/inc/xml/statusbarconfiguration.hxx
framework/inc/xml/statusbardocumenthandler.hxx
framework/inc/xml/toolboxconfiguration.hxx
framework/inc/xml/toolboxconfigurationdefines.hxx
framework/prj/build.lst
framework/prj/d.lst
framework/qa/complex/ModuleManager/makefile.mk
framework/qa/complex/XUserInputInterception/makefile.mk
framework/qa/complex/accelerators/helper/makefile.mk
framework/qa/complex/accelerators/makefile.mk
framework/qa/complex/api_internal/makefile.mk
framework/qa/complex/broken_document/makefile.mk
framework/qa/complex/contextMenuInterceptor/makefile.mk
framework/qa/complex/desktop/makefile.mk
framework/qa/complex/dispatches/helper/makefile.mk
framework/qa/complex/dispatches/makefile.mk
framework/qa/complex/disposing/makefile.mk
framework/qa/complex/framework/autosave/makefile.mk
framework/qa/complex/framework/recovery/makefile.mk
framework/qa/complex/imageManager/_XInitialization.java
framework/qa/complex/imageManager/interfaces/makefile.mk
framework/qa/complex/imageManager/makefile.mk
framework/qa/complex/loadAllDocuments/helper/makefile.mk
framework/qa/complex/loadAllDocuments/makefile.mk
framework/qa/complex/path_settings/makefile.mk
framework/qa/complex/path_substitution/makefile.mk
framework/qa/complex/sequence/CheckSequenceOfEnum.java
framework/qa/complex/sequence/makefile.mk
framework/source/accelerators/acceleratorconfiguration.cxx
framework/source/accelerators/makefile.mk
framework/source/application/makefile.mk
framework/source/classes/makefile.mk
framework/source/classes/menumanager.cxx
framework/source/classes/resource.src
framework/source/constant/makefile.mk
framework/source/dispatch/closedispatcher.cxx
framework/source/dispatch/interaction.cxx
framework/source/dispatch/makefile.mk
framework/source/dispatch/startmoduledispatcher.cxx
framework/source/fwe/classes/addonsoptions.cxx
framework/source/fwe/classes/bmkmenu.cxx
framework/source/fwe/classes/sfxhelperfunctions.cxx
framework/source/fwe/helper/actiontriggerhelper.cxx
framework/source/fwe/helper/imageproducer.cxx
framework/source/fwe/xml/menuconfiguration.cxx
framework/source/fwe/xml/menudocumenthandler.cxx
framework/source/fwe/xml/toolboxdocumenthandler.cxx
framework/source/helper/makefile.mk
framework/source/helper/mischelper.cxx
framework/source/helper/statusindicatorfactory.cxx
framework/source/helper/vclstatusindicator.cxx
framework/source/interaction/makefile.mk
framework/source/jobs/jobdata.cxx
framework/source/jobs/makefile.mk
framework/source/layoutmanager/layoutmanager.cxx
framework/source/layoutmanager/makefile.mk
framework/source/layoutmanager/panel.cxx
framework/source/layoutmanager/panel.hxx
framework/source/loadenv/loadenv.cxx
framework/source/loadenv/makefile.mk
framework/source/register/makefile.mk
framework/source/register/registerservices.cxx
framework/source/register/registertemp.cxx
framework/source/services/autorecovery.cxx
framework/source/services/backingcomp.cxx
framework/source/services/backingwindow.cxx
framework/source/services/fwk_services.src
framework/source/services/makefile.mk
framework/source/services/menudocumenthandler.cxx
framework/source/services/sessionlistener.cxx
framework/source/tabwin/makefile.mk
framework/source/threadhelp/makefile.mk
framework/source/uiconfiguration/makefile.mk
framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
framework/source/uiconfiguration/uiconfigurationmanager.cxx
framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
framework/source/uielement/addonstoolbarmanager.cxx
framework/source/uielement/controlmenucontroller.cxx
framework/source/uielement/fontmenucontroller.cxx
framework/source/uielement/fontsizemenucontroller.cxx
framework/source/uielement/generictoolbarcontroller.cxx
framework/source/uielement/headermenucontroller.cxx
framework/source/uielement/imagebuttontoolbarcontroller.cxx
framework/source/uielement/langselectionmenucontroller.cxx
framework/source/uielement/langselectionstatusbarcontroller.cxx
framework/source/uielement/logoimagestatusbarcontroller.cxx
framework/source/uielement/logotextstatusbarcontroller.cxx
framework/source/uielement/macrosmenucontroller.cxx
framework/source/uielement/makefile.mk
framework/source/uielement/menubarmanager.cxx
framework/source/uielement/newmenucontroller.cxx
framework/source/uielement/objectmenucontroller.cxx
framework/source/uielement/popupmenucontroller.cxx
framework/source/uielement/recentfilesmenucontroller.cxx
framework/source/uielement/simpletextstatusbarcontroller.cxx
framework/source/uielement/togglebuttontoolbarcontroller.cxx
framework/source/uielement/toolbarmanager.cxx
framework/source/uielement/toolbarsmenucontroller.cxx
framework/source/uifactory/makefile.mk
framework/source/xml/makefile.mk
framework/test/makefile.mk
framework/test/threadtest/makefile.mk
framework/test/typecfg/makefile.mk
framework/util/guiapps/makefile.mk
framework/util/makefile.mk
idl/inc/attrib.hxx
idl/inc/basobj.hxx
idl/inc/command.hxx
idl/inc/hash.hxx
idl/inc/module.hxx
idl/inc/object.hxx
idl/source/cmptools/hash.cxx
idl/source/objects/basobj.cxx
idl/source/objects/module.cxx
idl/source/objects/object.cxx
idl/source/objects/slot.cxx
idl/source/objects/types.cxx
idl/source/prj/command.cxx
idl/source/prj/database.cxx
linguistic/prj/build.lst
linguistic/source/convdic.cxx
linguistic/source/convdiclist.cxx
linguistic/source/defs.hxx
linguistic/source/dicimp.cxx
linguistic/source/dicimp.hxx
linguistic/source/gciterator.cxx
linguistic/source/hyphdsp.cxx
linguistic/source/lngopt.hxx
linguistic/source/lngsvcmgr.hxx
linguistic/source/makefile.mk
linguistic/source/misc.cxx
linguistic/workben/makefile.mk
linguistic/workben/sprophelp.cxx
officecfg/registry/data/org/openoffice/Interaction.xcu
officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
officecfg/registry/data/org/openoffice/Office/Common.xcu
officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
officecfg/registry/data/org/openoffice/Office/Recovery.xcu
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
officecfg/registry/data/org/openoffice/Office/Writer.xcu
officecfg/registry/data/org/openoffice/Office/makefile.mk
officecfg/registry/data/org/openoffice/Setup.xcu
officecfg/registry/data/org/openoffice/System.xcu
officecfg/registry/data/org/openoffice/VCL.xcu
officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
officecfg/registry/schema/org/openoffice/Office/Common.xcs
officecfg/registry/schema/org/openoffice/Office/Impress.xcs
officecfg/registry/schema/org/openoffice/Office/Writer.xcs
officecfg/util/makefile.mk
oovbaapi/ooo/vba/Globals.idl
oovbaapi/ooo/vba/XApplicationBase.idl
oovbaapi/ooo/vba/XDialogBase.idl
oovbaapi/ooo/vba/XDocumentBase.idl
oovbaapi/ooo/vba/XGlobals.idl
oovbaapi/ooo/vba/XPageSetupBase.idl
oovbaapi/ooo/vba/XVBAAppService.idl
oovbaapi/ooo/vba/excel/SheetObject.idl
oovbaapi/ooo/vba/excel/SheetObjects.idl
oovbaapi/ooo/vba/excel/XApplication.idl
oovbaapi/ooo/vba/excel/XGlobals.idl
oovbaapi/ooo/vba/excel/XHyperlinks.idl
oovbaapi/ooo/vba/excel/XMenuItems.idl
oovbaapi/ooo/vba/excel/XMenus.idl
oovbaapi/ooo/vba/excel/XRange.idl
oovbaapi/ooo/vba/excel/XWorkbook.idl
oovbaapi/ooo/vba/excel/XWorkbooks.idl
oovbaapi/ooo/vba/excel/XWorksheet.idl
oovbaapi/ooo/vba/excel/makefile.mk
oovbaapi/ooo/vba/makefile.mk
oovbaapi/ooo/vba/msforms/MSFormReturnTypes.idl
oovbaapi/ooo/vba/msforms/XCheckBox.idl
oovbaapi/ooo/vba/msforms/XControl.idl
oovbaapi/ooo/vba/msforms/XShapeRange.idl
oovbaapi/ooo/vba/msforms/makefile.mk
oovbaapi/ooo/vba/word/XApplication.idl
oovbaapi/ooo/vba/word/XDialogs.idl
oovbaapi/ooo/vba/word/XDocument.idl
oovbaapi/ooo/vba/word/XField.idl
oovbaapi/ooo/vba/word/XFont.idl
oovbaapi/ooo/vba/word/XFormFields.idl
oovbaapi/ooo/vba/word/XGlobals.idl
oovbaapi/ooo/vba/word/XListGalleries.idl
oovbaapi/ooo/vba/word/XListLevel.idl
oovbaapi/ooo/vba/word/XParagraph.idl
oovbaapi/ooo/vba/word/XRange.idl
oovbaapi/ooo/vba/word/XRange.idl.orig
oovbaapi/ooo/vba/word/XReplacement.idl
oovbaapi/ooo/vba/word/XRows.idl
oovbaapi/ooo/vba/word/XSection.idl
oovbaapi/ooo/vba/word/XSelection.idl
oovbaapi/ooo/vba/word/XStyle.idl
oovbaapi/ooo/vba/word/XTabStop.idl
oovbaapi/ooo/vba/word/XTable.idl
oovbaapi/ooo/vba/word/XTableOfContents.idl
oovbaapi/ooo/vba/word/XTables.idl
oovbaapi/ooo/vba/word/XTemplate.idl
oovbaapi/ooo/vba/word/XWindow.idl
oovbaapi/ooo/vba/word/XWindow.idl~LO-BASE-INTEGRATION-DEV300_m98
oovbaapi/ooo/vba/word/XWrapFormat.idl.orig
oovbaapi/ooo/vba/word/makefile.mk
oovbaapi/ooo/vba/word/makefile.mk.orig
oovbaapi/util/makefile.mk
readlicense_oo/docs/readme/readme.xrm
readlicense_oo/source/license/license_en-US.html
readlicense_oo/source/license/license_en-US.rtf
readlicense_oo/source/license/license_en-US.txt
readlicense_oo/util/makefile.pmk
sandbox/util/delzip
scripting/prj/build.lst
scripting/prj/d.lst
scripting/source/basprov/basprov.cxx
scripting/source/basprov/basscript.cxx
scripting/source/basprov/basscript.hxx
scripting/source/dlgprov/dlgevtatt.cxx
scripting/source/dlgprov/dlgevtatt.hxx
scripting/source/dlgprov/dlgprov.cxx
scripting/source/dlgprov/dlgprov.hxx
scripting/source/dlgprov/makefile.mk
scripting/source/provider/ActiveMSPList.cxx
scripting/source/pyprov/delzip
scripting/source/pyprov/mailmerge.py
scripting/source/pyprov/makefile.mk
scripting/source/vbaevents/eventhelper.cxx
scripting/source/vbaevents/makefile.mk
scripting/source/vbaevents/service.cxx
scripting/util/provider/beanshell/delzip
sfx2/Module_sfx2.mk
sfx2/inc/about.hxx
sfx2/inc/arrdecl.hxx
sfx2/inc/brokenpackageint.hxx
sfx2/inc/docvor.hxx
sfx2/inc/frmload.hxx
sfx2/inc/fwkhelper.hxx
sfx2/inc/pch/precompiled_sfx2.hxx
sfx2/inc/sfx2/app.hxx
sfx2/inc/sfx2/basmgr.hxx
sfx2/inc/sfx2/childwin.hxx
sfx2/inc/sfx2/dinfdlg.hxx
sfx2/inc/sfx2/docfac.hxx
sfx2/inc/sfx2/docfile.hxx
sfx2/inc/sfx2/docfilt.hxx
sfx2/inc/sfx2/docinsert.hxx
sfx2/inc/sfx2/evntconf.hxx
sfx2/inc/sfx2/frame.hxx
sfx2/inc/sfx2/imagemgr.hxx
sfx2/inc/sfx2/imgmgr.hxx
sfx2/inc/sfx2/linkmgr.hxx
sfx2/inc/sfx2/macropg.hxx
sfx2/inc/sfx2/mailmodelapi.hxx
sfx2/inc/sfx2/mnuitem.hxx
sfx2/inc/sfx2/mnumgr.hxx
sfx2/inc/sfx2/module.hxx
sfx2/inc/sfx2/new.hxx
sfx2/inc/sfx2/objsh.hxx
sfx2/inc/sfx2/passwd.hxx
sfx2/inc/sfx2/prnmon.hxx
sfx2/inc/sfx2/securitypage.hxx
sfx2/inc/sfx2/sfx.hrc
sfx2/inc/sfx2/sfxbasecontroller.hxx
sfx2/inc/sfx2/sfxbasemodel.hxx
sfx2/inc/sfx2/sfxhelp.hxx
sfx2/inc/sfx2/sfxresid.hxx
sfx2/inc/sfx2/sfxsids.hrc
sfx2/inc/sfx2/sfxuno.hxx
sfx2/inc/sfx2/styfitem.hxx
sfx2/inc/sfx2/taskpane.hxx
sfx2/inc/sfx2/tbxctrl.hxx
sfx2/inc/sfx2/titledockwin.hxx
sfx2/inc/sfx2/viewfac.hxx
sfx2/inc/sfx2/viewfrm.hxx
sfx2/inc/sfx2/viewsh.hxx
sfx2/prj/build.lst
sfx2/prj/d.lst
sfx2/qa/complex/CheckGlobalEventBroadcaster_writer1.java
sfx2/qa/complex/DocHelper/makefile.mk
sfx2/qa/complex/docinfo/makefile.mk
sfx2/qa/complex/framework/DocumentMetadataAccessTest.java
sfx2/qa/complex/framework/DocumentPropertiesTest.java
sfx2/qa/complex/makefile.mk
sfx2/qa/complex/standalonedocumentinfo/makefile.mk
sfx2/qa/cppunit/makefile.mk
sfx2/qa/cppunit/test_metadatable.cxx
sfx2/qa/cppunit/version.map
sfx2/sdi/sfx.sdi
sfx2/source/appl/app.cxx
sfx2/source/appl/app.hrc
sfx2/source/appl/app.src
sfx2/source/appl/appbas.cxx
sfx2/source/appl/appcfg.cxx
sfx2/source/appl/appchild.cxx
sfx2/source/appl/appdata.cxx
sfx2/source/appl/appdde.cxx
sfx2/source/appl/appinit.cxx
sfx2/source/appl/appmisc.cxx
sfx2/source/appl/appopen.cxx
sfx2/source/appl/appquit.cxx
sfx2/source/appl/appserv.cxx
sfx2/source/appl/appuno.cxx
sfx2/source/appl/childwin.cxx
sfx2/source/appl/fileobj.cxx
sfx2/source/appl/helpinterceptor.cxx
sfx2/source/appl/helpinterceptor.hxx
sfx2/source/appl/imagemgr.cxx
sfx2/source/appl/imestatuswindow.cxx
sfx2/source/appl/impldde.cxx
sfx2/source/appl/linkmgr2.cxx
sfx2/source/appl/makefile.mk
sfx2/source/appl/module.cxx
sfx2/source/appl/newhelp.cxx
sfx2/source/appl/newhelp.src
sfx2/source/appl/opengrf.cxx
sfx2/source/appl/sfxhelp.cxx
sfx2/source/appl/shutdownicon.cxx
sfx2/source/appl/shutdowniconunx.cxx
sfx2/source/appl/shutdowniconw32.cxx
sfx2/source/appl/workwin.cxx
sfx2/source/bastyp/fltfnc.cxx
sfx2/source/bastyp/frmhtmlw.cxx
sfx2/source/bastyp/helper.cxx
sfx2/source/bastyp/progress.cxx
sfx2/source/bastyp/sfxhtml.cxx
sfx2/source/config/config.src
sfx2/source/config/evntconf.cxx
sfx2/source/control/ctrlitem.cxx
sfx2/source/control/dispatch.cxx
sfx2/source/control/macrconf.cxx
sfx2/source/control/minfitem.cxx
sfx2/source/control/msg.cxx
sfx2/source/control/request.cxx
sfx2/source/control/shell.cxx
sfx2/source/dialog/about.cxx
sfx2/source/dialog/basedlgs.cxx
sfx2/source/dialog/dialog.hrc
sfx2/source/dialog/dinfdlg.cxx
sfx2/source/dialog/dinfdlg.src
sfx2/source/dialog/dinfedt.cxx
sfx2/source/dialog/dockwin.cxx
sfx2/source/dialog/filedlghelper.cxx
sfx2/source/dialog/mailmodel.cxx
sfx2/source/dialog/mailmodelapi.cxx
sfx2/source/dialog/makefile.mk
sfx2/source/dialog/mgetempl.cxx
sfx2/source/dialog/newstyle.cxx
sfx2/source/dialog/passwd.cxx
sfx2/source/dialog/passwd.hrc
sfx2/source/dialog/securitypage.cxx
sfx2/source/dialog/securitypage.src
sfx2/source/dialog/sfxdlg.cxx
sfx2/source/dialog/splitwin.cxx
sfx2/source/dialog/styfitem.cxx
sfx2/source/dialog/styledlg.cxx
sfx2/source/dialog/tabdlg.cxx
sfx2/source/dialog/taskpane.cxx
sfx2/source/dialog/taskpane.src
sfx2/source/dialog/templdlg.cxx
sfx2/source/dialog/templdlg.src
sfx2/source/dialog/titledockwin.cxx
sfx2/source/dialog/titledockwin.src
sfx2/source/dialog/tplpitem.cxx
sfx2/source/dialog/versdlg.cxx
sfx2/source/doc/Metadatable.cxx
sfx2/source/doc/QuerySaveDocument.cxx
sfx2/source/doc/SfxDocumentMetaData.cxx
sfx2/source/doc/applet.cxx
sfx2/source/doc/doc.src
sfx2/source/doc/docfac.cxx
sfx2/source/doc/docfile.cxx
sfx2/source/doc/docinsert.cxx
sfx2/source/doc/docmacromode.cxx
sfx2/source/doc/doctdlg.cxx
sfx2/source/doc/doctempl.cxx
sfx2/source/doc/doctemplates.cxx
sfx2/source/doc/docvor.cxx
sfx2/source/doc/frmdescr.cxx
sfx2/source/doc/guisaveas.cxx
sfx2/source/doc/makefile.mk
sfx2/source/doc/new.cxx
sfx2/source/doc/objcont.cxx
sfx2/source/doc/objmisc.cxx
sfx2/source/doc/objserv.cxx
sfx2/source/doc/objstor.cxx
sfx2/source/doc/objuno.cxx
sfx2/source/doc/objxtor.cxx
sfx2/source/doc/printhelper.cxx
sfx2/source/doc/sfxacldetect.cxx
sfx2/source/doc/sfxbasemodel.cxx
sfx2/source/doc/sfxmodelfactory.cxx
sfx2/source/doc/syspath.cxx
sfx2/source/doc/syspath.hxx
sfx2/source/doc/syspathw32.cxx
sfx2/source/inc/applet.hxx
sfx2/source/inc/fltoptint.hxx
sfx2/source/inc/helpid.hrc
sfx2/source/inc/sfxlocal.hrc
sfx2/source/inc/speakerdlg.hxx
sfx2/source/inc/templdgi.hxx
sfx2/source/inc/virtmenu.hxx
sfx2/source/inet/inettbc.cxx
sfx2/source/layout/makefile.mk
sfx2/source/menu/mnuitem.cxx
sfx2/source/menu/mnumgr.cxx
sfx2/source/menu/objmnctl.cxx
sfx2/source/menu/thessubmenu.cxx
sfx2/source/menu/thessubmenu.hxx
sfx2/source/menu/virtmenu.cxx
sfx2/source/notify/makefile.mk
sfx2/source/statbar/makefile.mk
sfx2/source/statbar/stbitem.cxx
sfx2/source/toolbox/imgmgr.cxx
sfx2/source/toolbox/tbxitem.cxx
sfx2/source/view/frame.cxx
sfx2/source/view/frame2.cxx
sfx2/source/view/frmload.cxx
sfx2/source/view/impviewframe.hxx
sfx2/source/view/makefile.mk
sfx2/source/view/printer.cxx
sfx2/source/view/prnmon.cxx
sfx2/source/view/sfxbasecontroller.cxx
sfx2/source/view/viewfac.cxx
sfx2/source/view/viewfrm.cxx
sfx2/source/view/viewfrm2.cxx
sfx2/source/view/viewimp.hxx
sfx2/source/view/viewprn.cxx
sfx2/source/view/viewsh.cxx
sfx2/util/hidother.src
sfx2/util/makefile.mk
sfx2/workben/custompanel/ctp_factory.cxx
sfx2/workben/custompanel/ctp_factory.hxx
sfx2/workben/custompanel/ctp_panel.cxx
sfx2/workben/custompanel/ctp_panel.hxx
sfx2/workben/custompanel/ctp_services.cxx
shell/inc/internal/propertyhdl.hxx
shell/inc/internal/stream_helper.hxx
shell/inc/internal/stream_helper.hxx~HEAD
shell/inc/internal/stream_helper.hxx~LO-BASE-INTEGRATION-DEV300_m98
shell/inc/internal/utilities.hxx
shell/inc/kde_headers.h
shell/prj/build.lst
shell/prj/d.lst
shell/qa/recent_docs.cxx
shell/source/backends/desktopbe/desktopbackend.cxx
shell/source/backends/desktopbe/desktopbe1-ucd.txt
shell/source/backends/desktopbe/makefile.mk
shell/source/backends/gconfbe/gconfaccess.cxx
shell/source/backends/gconfbe/gconfaccess.cxx.orig
shell/source/backends/gconfbe/gconfaccess.hxx
shell/source/backends/gconfbe/gconfbackend.cxx
shell/source/backends/gconfbe/makefile.mk
shell/source/backends/kde4be/kde4access.cxx
shell/source/backends/kde4be/kde4access.hxx
shell/source/backends/kde4be/kde4backend.cxx
shell/source/backends/kdebe/kdeaccess.cxx
shell/source/backends/kdebe/kdeaccess.hxx
shell/source/backends/kdebe/kdebackend.cxx
shell/source/backends/localebe/localebackend.cxx
shell/source/backends/localebe/localebecdef.cxx
shell/source/backends/localebe/makefile.mk
shell/source/backends/macbe/macbackend.cxx
shell/source/backends/macbe/macbecdef.cxx
shell/source/backends/macbe/makefile.mk
shell/source/backends/wininetbe/makefile.mk
shell/source/backends/wininetbe/wininetbackend.cxx
shell/source/backends/wininetbe/wininetbecdef.cxx
shell/source/win32/SysShentry.cxx
shell/source/win32/makefile.mk
shell/source/win32/shlxthandler/makefile.mk
shell/source/win32/shlxthandler/ooofilt/makefile.mk
shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx
shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
shell/source/win32/shlxthandler/prophdl/makefile.mk
shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
shell/source/win32/shlxthandler/propsheets/propsheets.cxx
shell/source/win32/simplemail/smplmailentry.cxx
svx/inc/dlgutil.hxx
svx/inc/eerdll.hxx
svx/inc/extrusiondepthdialog.hxx
svx/inc/float3d.hrc
svx/inc/fmhelp.hrc
svx/inc/fontworkgallery.hrc
svx/inc/fontworkgallery.hxx
svx/inc/gallery.hrc
svx/inc/gallery.hxx
svx/inc/globlac.hrc
svx/inc/globlmn_tmpl.hrc
svx/inc/helpid.hrc
svx/inc/hlmarkwn_def.hxx
svx/inc/optspell.hrc
svx/inc/pch/precompiled_svx.hxx
svx/inc/svx/bmpmask.hxx
svx/inc/svx/dialogs.hrc
svx/inc/svx/dlgutil.hxx
svx/inc/svx/eedata.hxx
svx/inc/svx/exthelpid.hrc.orig
svx/inc/svx/extrusioncolorcontrol.hxx
svx/inc/svx/float3d.hxx
svx/inc/svx/fmgridcl.hxx
svx/inc/svx/fmresids.hrc
svx/inc/svx/fmsrcimp.hxx
svx/inc/svx/fmtools.hxx
svx/inc/svx/fontwork.hxx
svx/inc/svx/frmdir.hxx
svx/inc/svx/gallery1.hxx
svx/inc/svx/galmisc.hxx
svx/inc/svx/galtheme.hxx
svx/inc/svx/gridctrl.hxx
svx/inc/svx/htmlmode.hxx
svx/inc/svx/htmlmode.hxx.orig
svx/inc/svx/imapdlg.hxx
svx/inc/svx/itemwin.hxx
svx/inc/svx/langbox.hxx
svx/inc/svx/lathe3d.hxx
svx/inc/svx/linkwarn.hxx
svx/inc/svx/msdffdef.hxx
svx/inc/svx/obj3d.hxx
svx/inc/svx/paragraphdata.hxx
svx/inc/svx/polygn3d.hxx
svx/inc/svx/scene3d.hxx
svx/inc/svx/sdr/attribute/sdrfilltextattribute.hxx
svx/inc/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx
svx/inc/svx/sdr/attribute/sdrlineshadowtextattribute.hxx
svx/inc/svx/sdr/attribute/sdrshadowtextattribute.hxx
svx/inc/svx/sdr/attribute/sdrtextattribute.hxx
svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx
svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx
svx/inc/svx/sdr/properties/oleproperties.hxx
svx/inc/svx/sdrobjectfilter.hxx
svx/inc/svx/sdrobjectfilter.hxx.orig
svx/inc/svx/svdattr.hxx
svx/inc/svx/svdhdl.hxx
svx/inc/svx/svdpage.hxx
svx/inc/svx/svdstr.hrc
svx/inc/svx/svdundo.hxx
svx/inc/svx/svxdlg.hxx
svx/inc/svx/svxerr.hxx
svx/inc/svx/svxitems.hrc
svx/inc/svx/tabarea.hxx
svx/inc/svx/tabline.hxx
svx/inc/svx/unopage.hxx
svx/inc/svx/unoprov.hxx
svx/inc/svx/viewlayoutitem.hxx
svx/inc/svx/xbitmap.hxx
svx/inc/svx/xsetit.hxx
svx/inc/svx/zoomitem.hxx
svx/inc/svx/zoomslideritem.hxx
svx/inc/tbunosearchcontrollers.hxx
svx/inc/xpolyimp.hxx
svx/inc/zoom_def.hxx
svx/prj/build.lst
svx/prj/d.lst
svx/prj/target_module_svx.mk.orig
svx/qa/unoapi/knownissues.xcl
svx/sdi/makefile.mk
svx/source/accessibility/AccessibleShape.cxx
svx/source/accessibility/DescriptionGenerator.cxx
svx/source/accessibility/makefile.mk
svx/source/core/coreservices.cxx
svx/source/core/makefile.mk
svx/source/cui/bbdlg.hxx
svx/source/cui/dbregisterednamesconfig.hxx
svx/source/cui/insrc.hxx
svx/source/cui/newtabledlg.hxx
svx/source/cui/showcols.hxx
svx/source/customshapes/EnhancedCustomShape2d.cxx
svx/source/customshapes/EnhancedCustomShapeEngine.cxx
svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
svx/source/customshapes/tbxcustomshapes.cxx
svx/source/dialog/_bmpmask.cxx
svx/source/dialog/_contdlg.cxx
svx/source/dialog/bmpmask.hrc
svx/source/dialog/bmpmask.src
svx/source/dialog/contdlg.hrc
svx/source/dialog/contdlg.src
svx/source/dialog/contimp.hxx
svx/source/dialog/ctredlin.cxx
svx/source/dialog/ctredlin.hrc
svx/source/dialog/ctredlin.src
svx/source/dialog/databaseregistrationui.cxx
svx/source/dialog/dlgutil.cxx
svx/source/dialog/docrecovery.cxx
svx/source/dialog/docrecovery.hrc
svx/source/dialog/docrecovery.src
svx/source/dialog/fontwork.cxx
svx/source/dialog/fontwork.hrc
svx/source/dialog/fontwork.src
svx/source/dialog/framelink.cxx
svx/source/dialog/frmsel.cxx
svx/source/dialog/grfflt.cxx
svx/source/dialog/hdft.cxx
svx/source/dialog/hyperdlg.cxx
svx/source/dialog/hyprlink.cxx
svx/source/dialog/imapdlg.cxx
svx/source/dialog/imapdlg.hrc
svx/source/dialog/imapdlg.src
svx/source/dialog/imapwnd.cxx
svx/source/dialog/langbox.cxx
svx/source/dialog/langbox.src
svx/source/dialog/makefile.mk
svx/source/dialog/orienthelper.cxx
svx/source/dialog/prtqry.cxx
svx/source/dialog/rlrcitem.cxx
svx/source/dialog/sdstring.src
svx/source/dialog/srchctrl.cxx
svx/source/dialog/srchdlg.cxx
svx/source/dialog/svxbmpnumvalueset.cxx
svx/source/dialog/svxdlg.cxx
svx/source/dialog/svxruler.cxx
svx/source/engine3d/float3d.cxx
svx/source/engine3d/float3d.src
svx/source/engine3d/makefile.mk
svx/source/engine3d/polysc3d.cxx
svx/source/fmcomp/fmgridcl.cxx
svx/source/fmcomp/fmgridif.cxx
svx/source/fmcomp/gridcell.cxx
svx/source/fmcomp/gridctrl.cxx
svx/source/fmcomp/makefile.mk
svx/source/form/ParseContext.cxx
svx/source/form/datanavi.cxx
svx/source/form/datanavi.src
svx/source/form/filtnav.cxx
svx/source/form/fmPropBrw.cxx
svx/source/form/fmexch.cxx
svx/source/form/fmexpl.cxx
svx/source/form/fmexpl.src
svx/source/form/fmobj.cxx
svx/source/form/fmobjfac.cxx
svx/source/form/fmpage.cxx
svx/source/form/fmscriptingenv.cxx
svx/source/form/fmshell.cxx
svx/source/form/fmshimp.cxx
svx/source/form/fmsrccfg.cxx
svx/source/form/fmsrcimp.cxx
svx/source/form/fmtextcontroldialogs.cxx
svx/source/form/fmundo.cxx
svx/source/form/fmvwimp.cxx
svx/source/form/formcontroller.cxx
svx/source/form/formdispatchinterceptor.cxx
svx/source/form/legacyformcontroller.cxx
svx/source/form/makefile.mk
svx/source/form/navigatortree.cxx
svx/source/form/navigatortreemodel.cxx
svx/source/form/tabwin.cxx
svx/source/form/tbxform.cxx
svx/source/form/typemap.cxx
svx/source/gallery2/galbrws1.cxx
svx/source/gallery2/galbrws2.cxx
svx/source/gallery2/galctrl.cxx
svx/source/gallery2/galexpl.cxx
svx/source/gallery2/gallery.src
svx/source/gallery2/gallery1.cxx
svx/source/gallery2/galmisc.cxx
svx/source/gallery2/galtheme.cxx
svx/source/gallery2/makefile.mk
svx/source/gengal/gengal.cxx
svx/source/inc/datanavi.hrc
svx/source/inc/datanavi.hxx
svx/source/inc/docrecovery.hxx
svx/source/inc/fmexpl.hxx
svx/source/inc/fmgroup.hxx
svx/source/inc/fmshimp.hxx
svx/source/inc/fmvwimp.hxx
svx/source/inc/formcontroller.hxx
svx/source/inc/formdispatchinterceptor.hxx
svx/source/inc/frmselimpl.hxx
svx/source/inc/svdoimp.hxx
svx/source/intro/iso.src
svx/source/intro/ooo.src
svx/source/items/SmartTagItem.cxx
svx/source/items/clipfmtitem.cxx
svx/source/items/makefile.mk
svx/source/items/postattr.cxx
svx/source/items/rotmodit.cxx
svx/source/items/svxitems.src
svx/source/outliner/makefile.mk
svx/source/outliner/outliner.hrc
svx/source/outliner/outliner.src
svx/source/sdr/attribute/makefile.mk
svx/source/sdr/attribute/sdrfilltextattribute.cxx
svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx
svx/source/sdr/attribute/sdrlinefillshadowtextattribute.cxx
svx/source/sdr/attribute/sdrlineshadowtextattribute.cxx
svx/source/sdr/attribute/sdrshadowtextattribute.cxx
svx/source/sdr/attribute/sdrtextattribute.cxx
svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
svx/source/sdr/contact/viewcontactofsdrole2obj.cxx
svx/source/sdr/contact/viewcontactofsdrpage.cxx
svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx
svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
svx/source/sdr/properties/makefile.mk
svx/source/sdr/properties/oleproperties.cxx
svx/source/src/app.src
svx/source/stbctrls/insctrl.cxx
svx/source/stbctrls/makefile.mk
svx/source/stbctrls/modctrl.cxx
svx/source/stbctrls/selctrl.cxx
svx/source/stbctrls/stbctrls.src
svx/source/stbctrls/xmlsecctrl.cxx
svx/source/stbctrls/zoomctrl.cxx
svx/source/stbctrls/zoomsliderctrl.cxx
svx/source/svdraw/svdcrtmt.hxx
svx/source/svdraw/svdedtv1.cxx
svx/source/svdraw/svdedtv2.cxx
svx/source/svdraw/svdedxv.cxx
svx/source/svdraw/svdetc.cxx
svx/source/svdraw/svdfmtf.cxx
svx/source/svdraw/svdhdl.cxx
svx/source/svdraw/svdibrow.cxx
svx/source/svdraw/svdmodel.cxx
svx/source/svdraw/svdoashp.cxx
svx/source/svdraw/svdoattr.cxx
svx/source/svdraw/svdobj.cxx
svx/source/svdraw/svdocirc.cxx
svx/source/svdraw/svdoedge.cxx
svx/source/svdraw/svdograf.cxx
svx/source/svdraw/svdoimp.cxx
svx/source/svdraw/svdomeas.cxx
svx/source/svdraw/svdoole2.cxx
svx/source/svdraw/svdotext.cxx
svx/source/svdraw/svdotextpathdecomposition.cxx
svx/source/svdraw/svdotxtr.cxx
svx/source/svdraw/svdpntv.cxx
svx/source/svdraw/svdscrol.hxx
svx/source/svdraw/svdstr.src
svx/source/svdraw/svdviter.cxx
svx/source/svdraw/svdxcgv.cxx
svx/source/table/celleditsource.cxx
svx/source/table/svdotable.cxx
svx/source/table/tablecontroller.cxx
svx/source/tbxctrls/colrctrl.cxx
svx/source/tbxctrls/extrusioncontrols.cxx
svx/source/tbxctrls/extrusioncontrols.hrc
svx/source/tbxctrls/extrusioncontrols.hxx
svx/source/tbxctrls/extrusioncontrols.src
svx/source/tbxctrls/fontworkgallery.cxx
svx/source/tbxctrls/fontworkgallery.src
svx/source/tbxctrls/grafctrl.cxx
svx/source/tbxctrls/itemwin.cxx
svx/source/tbxctrls/layctrl.cxx
svx/source/tbxctrls/lboxctrl.cxx
svx/source/tbxctrls/makefile.mk
svx/source/tbxctrls/tbcontrl.cxx
svx/source/tbxctrls/tbcontrl.src
svx/source/tbxctrls/tbunosearchcontrollers.cxx
svx/source/tbxctrls/tbunosearchcontrollers.src.orig
svx/source/tbxctrls/tbxalign.cxx
svx/source/tbxctrls/tbxcolorupdate.cxx
svx/source/tbxctrls/tbxdraw.src
svx/source/tbxctrls/verttexttbxctrl.cxx
svx/source/toolbars/extrusionbar.cxx
svx/source/toolbars/fontworkbar.cxx
svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
svx/source/unodraw/UnoGraphicExporter.cxx
svx/source/unodraw/UnoNamespaceMap.cxx
svx/source/unodraw/XPropertyTable.cxx
svx/source/unodraw/makefile.mk
svx/source/unodraw/unobtabl.cxx
svx/source/unodraw/unoctabl.cxx
svx/source/unodraw/unomod.cxx
svx/source/unodraw/unopage.cxx
svx/source/unodraw/unoprov.cxx
svx/source/unodraw/unoshap3.cxx
svx/source/unodraw/unoshape.cxx
svx/source/unodraw/unoshtxt.cxx
svx/source/unogallery/unogalitem.cxx
svx/source/unogallery/unogaltheme.cxx
svx/source/unogallery/unogalthemeprovider.cxx
svx/source/xml/makefile.mk
svx/source/xml/xmlgrhlp.cxx
svx/source/xoutdev/_xoutbmp.cxx
svx/source/xoutdev/_xpoly.cxx
svx/source/xoutdev/xattr.cxx
svx/source/xoutdev/xexch.cxx
svx/source/xoutdev/xtablend.cxx
svx/util/hidother.src
svx/util/makefile.mk
svx/workben/edittest.cxx
svx/workben/msview/makefile.mk
sysui/desktop/debian/makefile.mk
sysui/desktop/icons/database.ico
sysui/desktop/icons/drawing-template.ico
sysui/desktop/icons/drawing.ico
sysui/desktop/icons/empty-document.ico
sysui/desktop/icons/empty-template.ico
sysui/desktop/icons/formula.ico
sysui/desktop/icons/makefile.mk
sysui/desktop/icons/master-document.ico
sysui/desktop/icons/oasis-database.ico
sysui/desktop/icons/oasis-drawing-template.ico
sysui/desktop/icons/oasis-drawing.ico
sysui/desktop/icons/oasis-empty-document.ico
sysui/desktop/icons/oasis-empty-template.ico
sysui/desktop/icons/oasis-formula.ico
sysui/desktop/icons/oasis-master-document.ico
sysui/desktop/icons/oasis-presentation-template.ico
sysui/desktop/icons/oasis-presentation.ico
sysui/desktop/icons/oasis-spreadsheet-template.ico
sysui/desktop/icons/oasis-spreadsheet.ico
sysui/desktop/icons/oasis-text-template.ico
sysui/desktop/icons/oasis-text.ico
sysui/desktop/icons/oasis-web-template.ico
sysui/desktop/icons/ooo3_open.ico
sysui/desktop/icons/presentation-template.ico
sysui/desktop/icons/presentation.ico
sysui/desktop/icons/spreadsheet-template.ico
sysui/desktop/icons/spreadsheet.ico
sysui/desktop/icons/text-template.ico
sysui/desktop/icons/text.ico
sysui/desktop/macosx/makefile.mk
sysui/desktop/menus/javafilter.desktop
sysui/desktop/menus/startcenter.desktop
sysui/desktop/productversion.mk
sysui/desktop/share/launcher_comment.ulf
sysui/desktop/share/makefile.mk
sysui/desktop/slackware/makefile.mk
sysui/desktop/solaris/makefile.mk
sysui/desktop/util/makefile.mk
ucb/prj/build.lst
ucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java
ucb/qa/complex/tdoc/TestDocument.java
ucb/qa/complex/tdoc/makefile.mk
ucb/qa/complex/ucb/makefile.mk
ucb/source/cacher/cacheserv.cxx
ucb/source/core/makefile.mk
ucb/source/core/ucb.cxx
ucb/source/core/ucbcmds.cxx
ucb/source/core/ucbserv.cxx
ucb/source/core/ucbstore.cxx
ucb/source/core/ucbstore.hxx
ucb/source/sorter/sortmain.cxx
ucb/source/ucp/ext/makefile.mk
ucb/source/ucp/ext/ucpext_content.cxx
ucb/source/ucp/ext/ucpext_content.hxx
ucb/source/ucp/ext/ucpext_datasupplier.cxx
ucb/source/ucp/ext/ucpext_datasupplier.hxx
ucb/source/ucp/ext/ucpext_provider.cxx
ucb/source/ucp/ext/ucpext_provider.hxx
ucb/source/ucp/ext/ucpext_resultset.cxx
ucb/source/ucp/ext/ucpext_resultset.hxx
ucb/source/ucp/ext/ucpext_services.cxx
ucb/source/ucp/file/bc.cxx
ucb/source/ucp/file/prov.cxx
ucb/source/ucp/file/shell.cxx
ucb/source/ucp/ftp/ftpcontent.cxx
ucb/source/ucp/ftp/ftpservices.cxx
ucb/source/ucp/gio/gio_content.cxx
ucb/source/ucp/gio/gio_datasupplier.cxx
ucb/source/ucp/gio/gio_provider.cxx
ucb/source/ucp/gvfs/gvfs_content.cxx
ucb/source/ucp/gvfs/gvfs_provider.cxx
ucb/source/ucp/gvfs/makefile.mk
ucb/source/ucp/hierarchy/hierarchycontent.cxx
ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx
ucb/source/ucp/hierarchy/hierarchyservices.cxx
ucb/source/ucp/odma/makefile.mk
ucb/source/ucp/odma/odma_content.cxx
ucb/source/ucp/odma/odma_lib.cxx
ucb/source/ucp/odma/odma_services.cxx
ucb/source/ucp/package/makefile.mk
ucb/source/ucp/package/pkgcontent.cxx
ucb/source/ucp/package/pkgcontentcaps.cxx
ucb/source/ucp/package/pkgservices.cxx
ucb/source/ucp/tdoc/tdoc_content.cxx
ucb/source/ucp/tdoc/tdoc_contentcaps.cxx
ucb/source/ucp/tdoc/tdoc_services.cxx
ucb/source/ucp/tdoc/ucptdoc1.component.orig
ucb/source/ucp/webdav/DAVResourceAccess.cxx
ucb/source/ucp/webdav/DAVSession.hxx
ucb/source/ucp/webdav/LinkSequence.cxx
ucb/source/ucp/webdav/LockEntrySequence.cxx
ucb/source/ucp/webdav/LockSequence.cxx
ucb/source/ucp/webdav/NeonHeadRequest.cxx
ucb/source/ucp/webdav/NeonLockStore.cxx
ucb/source/ucp/webdav/NeonLockStore.hxx
ucb/source/ucp/webdav/NeonPropFindRequest.cxx
ucb/source/ucp/webdav/NeonSession.cxx
ucb/source/ucp/webdav/NeonSession.hxx
ucb/source/ucp/webdav/NeonUri.cxx
ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx
ucb/source/ucp/webdav/makefile.mk
ucb/source/ucp/webdav/webdavcontent.cxx
ucb/source/ucp/webdav/webdavcontentcaps.cxx
ucb/source/ucp/webdav/webdavservices.cxx
ucb/workben/ucb/makefile.mk
uui/prj/build.lst
uui/source/getcontinuations.hxx
uui/source/iahndl-authentication.cxx
uui/source/iahndl-cookies.cxx
uui/source/iahndl-errorhandler.cxx
uui/source/iahndl-filter.cxx
uui/source/iahndl-ioexceptions.cxx
uui/source/iahndl-locking.cxx
uui/source/iahndl-ssl.cxx
uui/source/iahndl.cxx
uui/source/iahndl.hxx
uui/source/ids.hrc
uui/source/logindlg.src
uui/source/loginerr.hxx
uui/source/makefile.mk
uui/source/nameclashdlg.hrc
uui/source/nameclashdlg.hxx
uui/source/passcrtdlg.cxx
uui/source/passcrtdlg.hrc
uui/source/passcrtdlg.src
uui/source/passwordcontainer.cxx
uui/source/passwordcontainer.hxx
uui/source/passworddlg.cxx
uui/source/passworddlg.hxx
uui/source/passworddlg.src
uui/source/services.cxx
uui/source/sslwarndlg.src
uui/util/uui.component
vbahelper/inc/vbahelper/vbadialogbase.hxx
vbahelper/inc/vbahelper/vbadialogsbase.hxx
vbahelper/inc/vbahelper/vbadllapi.h
vbahelper/inc/vbahelper/vbadocumentsbase.hxx
vbahelper/inc/vbahelper/vbaeventshelperbase.hxx
vbahelper/inc/vbahelper/vbahelper.hxx
vbahelper/inc/vbahelper/vbapropvalue.hxx
vbahelper/prj/build.lst
vbahelper/prj/d.lst
vbahelper/source/msforms/makefile.mk
vbahelper/source/msforms/vbacheckbox.hxx
vbahelper/source/msforms/vbaimage.cxx
vbahelper/source/msforms/vbaimage.hxx
vbahelper/source/msforms/vbamultipage.cxx
vbahelper/source/msforms/vbamultipage.hxx
vbahelper/source/msforms/vbasystemaxcontrol.cxx
vbahelper/source/msforms/vbasystemaxcontrol.hxx
vbahelper/source/msforms/vbauserform.cxx
vbahelper/source/vbahelper/makefile.mk
vbahelper/source/vbahelper/vbaapplicationbase.cxx
vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
vbahelper/source/vbahelper/vbadialogbase.cxx
vbahelper/source/vbahelper/vbadocumentbase.cxx
vbahelper/source/vbahelper/vbadocumentsbase.cxx
vbahelper/source/vbahelper/vbaeventshelperbase.cxx
vbahelper/source/vbahelper/vbahelper.cxx
vbahelper/util/makefile.mk
xmlhelp/prj/build.lst
xmlhelp/prj/d.lst
xmlhelp/source/com/sun/star/help/LuceneHelpWrapper.component
xmlhelp/source/com/sun/star/help/makefile.mk
xmlhelp/source/cxxhelp/provider/databases.cxx
xmlhelp/source/cxxhelp/provider/provider.cxx
xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
xmlhelp/source/cxxhelp/provider/services.cxx
xmlhelp/source/cxxhelp/provider/urlparameter.cxx
xmlhelp/source/cxxhelp/provider/urlparameter.hxx
xmlhelp/source/cxxhelp/test/makefile.mk
xmlhelp/source/treeview/makefile.mk
xmlhelp/source/treeview/tvfactory.cxx
xmlhelp/source/treeview/tvread.cxx
xmlhelp/util/makefile.mk
xmlhelp/util/ucpchelp1.component
xmloff/Makefile
xmloff/Module_xmloff.mk
xmloff/inc/forms/form_handler_factory.hxx
xmloff/inc/forms/property_ids.hxx
xmloff/inc/functional.hxx
xmloff/inc/makefile.mk
xmloff/inc/xmloff/XMLSettingsExportContext.hxx
xmloff/inc/xmloff/functional.hxx
xmloff/inc/xmloff/shapeimport.hxx
xmloff/inc/xmloff/styleexp.hxx
xmloff/inc/xmloff/txtimp.hxx
xmloff/inc/xmloff/xmlexp.hxx
xmloff/inc/xmloff/xmlkywd.hxx
xmloff/inc/xmloff/xmltoken.hxx
xmloff/prj/build.lst
xmloff/prj/d.lst
xmloff/prj/makefile.mk
xmloff/source/chart/SchXMLExport.cxx
xmloff/source/chart/SchXMLPlotAreaContext.cxx
xmloff/source/chart/SchXMLSeries2Context.cxx
xmloff/source/chart/SchXMLTableContext.cxx
xmloff/source/chart/SchXMLTextListContext.cxx
xmloff/source/chart/SchXMLTextListContext.hxx
xmloff/source/chart/makefile.mk
xmloff/source/core/RDFaExportHelper.cxx
xmloff/source/core/SettingsExportHelper.cxx
xmloff/source/core/i18nmap.cxx
xmloff/source/core/makefile.mk
xmloff/source/core/xmlexp.cxx
xmloff/source/core/xmlimp.cxx
xmloff/source/core/xmlkywd.cxx
xmloff/source/core/xmltoken.cxx
xmloff/source/draw/XMLReplacementImageContext.cxx
xmloff/source/draw/makefile.mk
xmloff/source/draw/sdxmlexp.cxx
xmloff/source/draw/sdxmlexp_impl.hxx
xmloff/source/draw/ximp3dscene.cxx
xmloff/source/draw/ximpshap.cxx
xmloff/source/draw/ximpstyl.cxx
xmloff/source/draw/ximpstyl.hxx
xmloff/source/forms/elementimport.cxx
xmloff/source/forms/handler/property_handler_base.cxx
xmloff/source/forms/handler/property_handler_base.hxx
xmloff/source/forms/makefile.mk
xmloff/source/forms/property_group.hxx
xmloff/source/forms/propertyimport.cxx
xmloff/source/meta/makefile.mk
xmloff/source/script/makefile.mk
xmloff/source/style/PageHeaderFooterContext.cxx
xmloff/source/style/PageMasterStyleMap.cxx
xmloff/source/style/XMLFontAutoStylePool.cxx
xmloff/source/style/bordrhdl.cxx
xmloff/source/style/fonthdl.hxx
xmloff/source/style/impastp1.cxx
xmloff/source/style/impastp3.cxx
xmloff/source/style/impastp4.cxx
xmloff/source/style/impastpl.hxx
xmloff/source/style/makefile.mk
xmloff/source/style/prstylei.cxx
xmloff/source/style/styleexp.cxx
xmloff/source/style/xmlimppr.cxx
xmloff/source/style/xmlnume.cxx
xmloff/source/style/xmlnumi.cxx
xmloff/source/style/xmlstyle.cxx
xmloff/source/table/makefile.mk
xmloff/source/table/tabledesignsimporter.cxx
xmloff/source/text/XMLIndexTOCContext.cxx
xmloff/source/text/XMLPropertyBackpatcher.cxx
xmloff/source/text/XMLTextFrameContext.cxx
xmloff/source/text/XMLTextMarkImportContext.cxx
xmloff/source/text/XMLTextNumRuleInfo.cxx
xmloff/source/text/XMLTextShapeStyleContext.cxx
xmloff/source/text/makefile.mk
xmloff/source/text/txtimp.cxx
xmloff/source/text/txtparae.cxx
xmloff/source/text/txtstyle.cxx
xmloff/source/text/txtstyli.cxx
xmloff/source/transform/ChartOOoTContext.cxx
xmloff/source/transform/EventOOoTContext.cxx
xmloff/source/transform/TransformerBase.cxx
xmloff/source/transform/makefile.mk
xmloff/source/xforms/makefile.mk
xmloff/util/makefile.mk
xmlscript/inc/xmlscript/xmldlg_imexp.hxx
xmlscript/source/xmldlg_imexp/exp_share.hxx
xmlscript/source/xmldlg_imexp/imp_share.hxx
xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
xmlscript/util/makefile.mk
Diffstat (limited to 'shell')
74 files changed, 637 insertions, 353 deletions
diff --git a/shell/inc/internal/metainforeader.hxx b/shell/inc/internal/metainforeader.hxx index aad1437e09..aad1437e09 100644..100755 --- a/shell/inc/internal/metainforeader.hxx +++ b/shell/inc/internal/metainforeader.hxx diff --git a/shell/inc/internal/propertyhdl.hxx b/shell/inc/internal/propertyhdl.hxx index 842d6dabd4..11bea0a8fa 100644 --- a/shell/inc/internal/propertyhdl.hxx +++ b/shell/inc/internal/propertyhdl.hxx @@ -123,4 +123,4 @@ private: #endif -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file diff --git a/shell/inc/internal/shlxthdl.hxx b/shell/inc/internal/shlxthdl.hxx index 3b15cbcf78..3b15cbcf78 100644..100755 --- a/shell/inc/internal/shlxthdl.hxx +++ b/shell/inc/internal/shlxthdl.hxx diff --git a/shell/inc/internal/stream_helper.hxx b/shell/inc/internal/stream_helper.hxx~LO-BASE-INTEGRATION-DEV300_m98 index 41a328b71d..41a328b71d 100644 --- a/shell/inc/internal/stream_helper.hxx +++ b/shell/inc/internal/stream_helper.hxx~LO-BASE-INTEGRATION-DEV300_m98 diff --git a/shell/inc/internal/utilities.hxx b/shell/inc/internal/utilities.hxx index f5b581ef7b..4c8f32f672 100644..100755 --- a/shell/inc/internal/utilities.hxx +++ b/shell/inc/internal/utilities.hxx @@ -85,6 +85,12 @@ bool HasOnlySpaces(const std::wstring& String); Windows Locale Identifier corresponding to input LocaleSet. */ +//--------------------------------- +/** Convert a long path name using Windows api call GetShortPathName +*/ +std::wstring getShortPathName( const std::wstring& aLongName ); + + #ifndef OS2 LCID LocaleSetToLCID( const LocaleSet_t & Locale ); #endif @@ -107,7 +113,6 @@ static inline void OutputDebugStringFormat( LPCSTR, ... ) #endif //---------------------------------------------------------- - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/inc/kde_headers.h b/shell/inc/kde_headers.h index 797a12f7d7..5a2775eb04 100644 --- a/shell/inc/kde_headers.h +++ b/shell/inc/kde_headers.h @@ -31,7 +31,6 @@ /* ********* Suppress warnings if needed */ #include "sal/config.h" - #include <cstddef> #if defined __GNUC__ diff --git a/shell/inc/makefile.mk b/shell/inc/makefile.mk index c297cb4f77..3f56081d4d 100644 --- a/shell/inc/makefile.mk +++ b/shell/inc/makefile.mk @@ -40,8 +40,8 @@ TARGET=inc .IF "$(ENABLE_PCH)"!="" ALLTAR : \ - $(SLO)$/precompiled.pch \ - $(SLO)$/precompiled_ex.pch - + $(SLO)$/precompiled.pch \ + $(SLO)$/precompiled_ex.pch + .ENDIF # "$(ENABLE_PCH)"!="" diff --git a/shell/prj/build.lst b/shell/prj/build.lst index 9a5bf35dde..ad157a677b 100755 --- a/shell/prj/build.lst +++ b/shell/prj/build.lst @@ -1,4 +1,4 @@ -sl shell : l10n offuh rdbmaker tools sal EXPAT:expat NULL +sl shell : l10n offuh rdbmaker tools sal EXPAT:expat LIBXSLT:libxslt NULL sl shell\inc nmake - all sl_inc NULL sl shell\source\win32 nmake - w sl_win32 sl_inc NULL sl shell\source\win32\simplemail nmake - w sl_win32_simplemail sl_inc NULL diff --git a/shell/prj/d.lst b/shell/prj/d.lst index ea8be0bbaf..cc32cfd9c6 100644 --- a/shell/prj/d.lst +++ b/shell/prj/d.lst @@ -10,6 +10,7 @@ ..\%__SRC%\bin\x64\propertyhdl.dll %_DEST%\bin%_EXT%\propertyhdl_x64.dll ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a +..\%__SRC%\misc\cmdmail.component %_DEST%\xml%_EXT%\cmdmail.component ..\%__SRC%\bin\open-url %_DEST%\bin%_EXT%\open-url ..\%__SRC%\bin\cde-open-url %_DEST%\bin%_EXT%\cde-open-url @@ -23,3 +24,13 @@ ..\%__SRC%\misc\*-ucd.txt %_DEST%\bin%_EXT%\*-ucd.txt ..\inc\kde_headers.h %_DEST%\inc%_EXT%\shell\kde_headers.h +..\%__SRC%\misc\desktopbe1.component %_DEST%\xml%_EXT%\desktopbe1.component +..\%__SRC%\misc\gconfbe1.component %_DEST%\xml%_EXT%\gconfbe1.component +..\%__SRC%\misc\kde4be1.component %_DEST%\xml%_EXT%\kde4be1.component +..\%__SRC%\misc\kdebe1.component %_DEST%\xml%_EXT%\kdebe1.component +..\inc\kde_headers.h %_DEST%\inc%_EXT%\shell\kde_headers.h +..\%__SRC%\misc\localebe1.component %_DEST%\xml%_EXT%\localebe1.component +..\%__SRC%\misc\macbe1.component %_DEST%\xml%_EXT%\macbe1.component +..\%__SRC%\misc\smplmail.component %_DEST%\xml%_EXT%\smplmail.component +..\%__SRC%\misc\syssh.component %_DEST%\xml%_EXT%\syssh.component +..\%__SRC%\misc\wininetbe1.component %_DEST%\xml%_EXT%\wininetbe1.component diff --git a/shell/qa/makefile.mk b/shell/qa/makefile.mk index cc91a6b1ad..290798bab1 100755 --- a/shell/qa/makefile.mk +++ b/shell/qa/makefile.mk @@ -28,8 +28,6 @@ PRJ=.. PRJNAME=shell TARGET=qa -# this is removed at the moment because we need some enhancements -# TESTDIR=TRUE ENABLE_EXCEPTIONS=TRUE diff --git a/shell/source/all/zipfile/makefile.mk b/shell/source/all/zipfile/makefile.mk index 4e0af28910..18aa943ffe 100644 --- a/shell/source/all/zipfile/makefile.mk +++ b/shell/source/all/zipfile/makefile.mk @@ -44,8 +44,8 @@ SLOFILES=$(SLO)$/zipfile.obj\ $(SLO)$/zipexcptn.obj SLOFILES_X64=$(SLO_X64)$/zipfile.obj\ - $(SLO_X64)$/zipexcptn.obj - + $(SLO_X64)$/zipexcptn.obj + # --- Targets ------------------------------------------------------ .INCLUDE : set_wntx64.mk diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx index faf31f9d7c..a54f651a0b 100644 --- a/shell/source/backends/desktopbe/desktopbackend.cxx +++ b/shell/source/backends/desktopbe/desktopbackend.cxx @@ -283,11 +283,4 @@ component_getImplementationEnvironment( { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void * pServiceManager, void * pRegistryKey) -{ - return component_writeInfoHelper(pServiceManager, pRegistryKey, services); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/source/backends/desktopbe/desktopbe1-ucd.txt b/shell/source/backends/desktopbe/desktopbe1-ucd.txt deleted file mode 100644 index fd874a82ea..0000000000 --- a/shell/source/backends/desktopbe/desktopbe1-ucd.txt +++ /dev/null @@ -1,6 +0,0 @@ -[ComponentDescriptor] -ImplementationName=com.sun.star.comp.configuration.backend.DesktopBackend -ComponentName=desktopbe1.uno.so -LoaderName=com.sun.star.loader.SharedLibrary -[SupportedServices] -com.sun.star.configuration.backend.DesktopBackend diff --git a/shell/source/backends/desktopbe/desktopbe1.component b/shell/source/backends/desktopbe/desktopbe1.component new file mode 100644 index 0000000000..9ef1421076 --- /dev/null +++ b/shell/source/backends/desktopbe/desktopbe1.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.configuration.backend.DesktopBackend"> + <service name="com.sun.star.configuration.backend.DesktopBackend"/> + </implementation> +</component> diff --git a/shell/source/backends/desktopbe/makefile.mk b/shell/source/backends/desktopbe/makefile.mk index 29260821d5..66ad8cf99e 100644 --- a/shell/source/backends/desktopbe/makefile.mk +++ b/shell/source/backends/desktopbe/makefile.mk @@ -48,6 +48,12 @@ SHL1TARGET = desktopbe1.uno SHL1USE_EXPORTS = name DEF1NAME = $(SHL1TARGET) -UNIXTEXT = $(MISC)/desktopbe1-ucd.txt - .INCLUDE: target.mk + +ALLTAR : $(MISC)/desktopbe1.component + +$(MISC)/desktopbe1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + desktopbe1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt desktopbe1.component diff --git a/shell/source/backends/gconfbe/gconfbackend.cxx b/shell/source/backends/gconfbe/gconfbackend.cxx index 70e39f3987..fd0013c3a5 100644 --- a/shell/source/backends/gconfbe/gconfbackend.cxx +++ b/shell/source/backends/gconfbe/gconfbackend.cxx @@ -235,10 +235,4 @@ component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void * pServiceManager, void * pRegistryKey) -{ - return component_writeInfoHelper(pServiceManager, pRegistryKey, services); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/source/backends/gconfbe/gconfbe1-ucd.txt b/shell/source/backends/gconfbe/gconfbe1-ucd.txt deleted file mode 100644 index daa5444ff0..0000000000 --- a/shell/source/backends/gconfbe/gconfbe1-ucd.txt +++ /dev/null @@ -1,6 +0,0 @@ -[ComponentDescriptor] -ImplementationName=com.sun.star.comp.configuration.backend.GconfBackend -ComponentName=gconfbe1.uno.so -LoaderName=com.sun.star.loader.SharedLibrary -[SupportedServices] -com.sun.star.configuration.backend.GconfBackend diff --git a/shell/source/backends/gconfbe/gconfbe1.component b/shell/source/backends/gconfbe/gconfbe1.component new file mode 100644 index 0000000000..7638e05b54 --- /dev/null +++ b/shell/source/backends/gconfbe/gconfbe1.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.configuration.backend.GconfBackend"> + <service name="com.sun.star.configuration.backend.GconfBackend"/> + </implementation> +</component> diff --git a/shell/source/backends/gconfbe/makefile.mk b/shell/source/backends/gconfbe/makefile.mk index a8d9b23aa9..9e77a0867a 100644 --- a/shell/source/backends/gconfbe/makefile.mk +++ b/shell/source/backends/gconfbe/makefile.mk @@ -39,7 +39,6 @@ VISIBILITY_HIDDEN=TRUE # no "lib" prefix DLLPRE = -UCDSRCEXT = txt .IF "$(ENABLE_LOCKDOWN)" == "YES" CFLAGS+=-DENABLE_LOCKDOWN @@ -89,8 +88,10 @@ DEF1NAME=$(SHL1TARGET) .INCLUDE : target.mk -ALLTAR : $(MISC)/$(TARGET)1-ucd.txt - -$(MISC)/$(TARGET)1-ucd.txt : $$(@:b).$(UCDSRCEXT) - cat $< | tr -d "\015" > $@ +ALLTAR : $(MISC)/gconfbe1.component +$(MISC)/gconfbe1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + gconfbe1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt gconfbe1.component diff --git a/shell/source/backends/kde4be/kde4access.cxx b/shell/source/backends/kde4be/kde4access.cxx index 03ffb03ed2..5356f6e0bc 100644 --- a/shell/source/backends/kde4be/kde4access.cxx +++ b/shell/source/backends/kde4be/kde4access.cxx @@ -318,5 +318,4 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) { } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/source/backends/kde4be/kde4backend.cxx b/shell/source/backends/kde4be/kde4backend.cxx index 7206191034..6c4e0932c9 100644 --- a/shell/source/backends/kde4be/kde4backend.cxx +++ b/shell/source/backends/kde4be/kde4backend.cxx @@ -251,11 +251,3 @@ component_getImplementationEnvironment( { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void * pServiceManager, void * pRegistryKey) -{ - return component_writeInfoHelper(pServiceManager, pRegistryKey, services); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/source/backends/kde4be/kde4be1-ucd.txt b/shell/source/backends/kde4be/kde4be1-ucd.txt deleted file mode 100644 index 9671199b26..0000000000 --- a/shell/source/backends/kde4be/kde4be1-ucd.txt +++ /dev/null @@ -1,6 +0,0 @@ -[ComponentDescriptor] -ImplementationName=com.sun.star.comp.configuration.backend.KDE4Backend -ComponentName=kde4be1.uno.so -LoaderName=com.sun.star.loader.SharedLibrary -[SupportedServices] -com.sun.star.configuration.backend.KDE4Backend diff --git a/shell/source/backends/kde4be/kde4be1.component b/shell/source/backends/kde4be/kde4be1.component new file mode 100644 index 0000000000..8ea7ae1210 --- /dev/null +++ b/shell/source/backends/kde4be/kde4be1.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.configuration.backend.KDE4Backend"> + <service name="com.sun.star.configuration.backend.KDE4Backend"/> + </implementation> +</component> diff --git a/shell/source/backends/kde4be/makefile.mk b/shell/source/backends/kde4be/makefile.mk index 1f9093a95a..477e47ca61 100644 --- a/shell/source/backends/kde4be/makefile.mk +++ b/shell/source/backends/kde4be/makefile.mk @@ -44,8 +44,6 @@ VISIBILITY_HIDDEN=TRUE CFLAGSCXX+=-Wno-shadow .ENDIF -UNIXTEXT=$(MISC)/$(TARGET)1-ucd.txt - # no "lib" prefix DLLPRE = @@ -79,3 +77,11 @@ DEF1NAME=$(SHL1TARGET) # --- Targets --- .INCLUDE : target.mk + +ALLTAR : $(MISC)/kde4be1.component + +$(MISC)/kde4be1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + kde4be1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt kde4be1.component diff --git a/shell/source/backends/kdebe/kdeaccess.cxx b/shell/source/backends/kdebe/kdeaccess.cxx index 22f110be96..618d74b5ea 100644 --- a/shell/source/backends/kdebe/kdeaccess.cxx +++ b/shell/source/backends/kdebe/kdeaccess.cxx @@ -1,4 +1,3 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -314,5 +313,3 @@ css::beans::Optional< css::uno::Any > getValue(rtl::OUString const & id) { } } - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/source/backends/kdebe/kdebackend.cxx b/shell/source/backends/kdebe/kdebackend.cxx index f13247ea2f..c56cbbc19a 100644 --- a/shell/source/backends/kdebe/kdebackend.cxx +++ b/shell/source/backends/kdebe/kdebackend.cxx @@ -251,11 +251,3 @@ component_getImplementationEnvironment( { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - -extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( - void * pServiceManager, void * pRegistryKey) -{ - return component_writeInfoHelper(pServiceManager, pRegistryKey, services); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/source/backends/kdebe/kdebe1-ucd.txt b/shell/source/backends/kdebe/kdebe1-ucd.txt deleted file mode 100644 index adf7e17431..0000000000 --- a/shell/source/backends/kdebe/kdebe1-ucd.txt +++ /dev/null @@ -1,6 +0,0 @@ -[ComponentDescriptor] -ImplementationName=com.sun.star.comp.configuration.backend.KDEBackend -ComponentName=kdebe1.uno.so -LoaderName=com.sun.star.loader.SharedLibrary -[SupportedServices] -com.sun.star.configuration.backend.KDEBackend diff --git a/shell/source/backends/kdebe/kdebe1.component b/shell/source/backends/kdebe/kdebe1.component new file mode 100644 index 0000000000..393fbc80d5 --- /dev/null +++ b/shell/source/backends/kdebe/kdebe1.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.configuration.backend.KDEBackend"> + <service name="com.sun.star.configuration.backend.KDEBackend"/> + </implementation> +</component> diff --git a/shell/source/backends/kdebe/makefile.mk b/shell/source/backends/kdebe/makefile.mk index 31bf77b47b..b1b12ad3c6 100644 --- a/shell/source/backends/kdebe/makefile.mk +++ b/shell/source/backends/kdebe/makefile.mk @@ -44,8 +44,6 @@ VISIBILITY_HIDDEN=TRUE CFLAGSCXX+=-Wno-shadow .ENDIF -UNIXTEXT=$(MISC)/$(TARGET)1-ucd.txt - # no "lib" prefix DLLPRE = @@ -79,3 +77,11 @@ DEF1NAME=$(SHL1TARGET) # --- Targets --- .INCLUDE : target.mk + +ALLTAR : $(MISC)/kdebe1.component + +$(MISC)/kdebe1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + kdebe1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt kdebe1.component diff --git a/shell/source/backends/localebe/localebe1.component b/shell/source/backends/localebe/localebe1.component new file mode 100644 index 0000000000..7236a61982 --- /dev/null +++ b/shell/source/backends/localebe/localebe1.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.configuration.backend.LocaleBackend"> + <service name="com.sun.star.configuration.backend.LocaleBackend"/> + </implementation> +</component> diff --git a/shell/source/backends/localebe/localebecdef.cxx b/shell/source/backends/localebe/localebecdef.cxx index d554a308d4..6afbaf4c62 100644 --- a/shell/source/backends/localebe/localebecdef.cxx +++ b/shell/source/backends/localebe/localebecdef.cxx @@ -71,13 +71,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( //------------------------------------------------------------------------------ -extern "C" sal_Bool SAL_CALL component_writeInfo(void * pServiceManager, void *pRegistryKey) { - return cppu::component_writeInfoHelper( - pServiceManager, pRegistryKey, kImplementations_entries); -} - -//------------------------------------------------------------------------------ - extern "C" void *component_getFactory( const sal_Char *aImplementationName, void *aServiceManager, void *aRegistryKey) { diff --git a/shell/source/backends/localebe/makefile.mk b/shell/source/backends/localebe/makefile.mk index bd12bcdb28..28a929ead0 100644 --- a/shell/source/backends/localebe/makefile.mk +++ b/shell/source/backends/localebe/makefile.mk @@ -44,7 +44,7 @@ DLLPRE = # --- Files --- SLOFILES=\ - $(SLO)$/localebecdef.obj \ + $(SLO)$/localebecdef.obj \ $(SLO)$/localebackend.obj SHL1TARGET=$(TARGET)1.uno @@ -70,3 +70,11 @@ DEF1NAME=$(SHL1TARGET) .INCLUDE : target.mk + +ALLTAR : $(MISC)/localebe1.component + +$(MISC)/localebe1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + localebe1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt localebe1.component diff --git a/shell/source/backends/macbe/macbe1.component b/shell/source/backends/macbe/macbe1.component new file mode 100644 index 0000000000..10bac2e2b6 --- /dev/null +++ b/shell/source/backends/macbe/macbe1.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.configuration.backend.MacOSXBackend"> + <service name="com.sun.star.configuration.backend.MacOSXBackend"/> + </implementation> +</component> diff --git a/shell/source/backends/macbe/macbecdef.cxx b/shell/source/backends/macbe/macbecdef.cxx index 1c130be5f0..8789d228e0 100644 --- a/shell/source/backends/macbe/macbecdef.cxx +++ b/shell/source/backends/macbe/macbecdef.cxx @@ -72,13 +72,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( //------------------------------------------------------------------------------ -extern "C" sal_Bool SAL_CALL component_writeInfo(void * pServiceManager, void *pRegistryKey) { - return cppu::component_writeInfoHelper( - pServiceManager, pRegistryKey, kImplementations_entries); -} - -//------------------------------------------------------------------------------ - extern "C" void *component_getFactory( const sal_Char *aImplementationName, void *aServiceManager, void *aRegistryKey) { diff --git a/shell/source/backends/macbe/makefile.mk b/shell/source/backends/macbe/makefile.mk index c3a58ec9f5..7785ca1ae5 100644 --- a/shell/source/backends/macbe/makefile.mk +++ b/shell/source/backends/macbe/makefile.mk @@ -46,7 +46,7 @@ DLLPRE = .IF "$(OS)" != "MACOSX" dummy: - @echo "Nothing to build for OS $(OS)." + @echo "Nothing to build for OS $(OS)." .ELSE @@ -65,7 +65,7 @@ SHL1STDLIBS= \ $(CPPUHELPERLIB) \ $(CPPULIB) \ $(SALLIB) \ - -framework Cocoa -framework SystemConfiguration + -framework Cocoa -framework SystemConfiguration SHL1VERSIONMAP=$(SOLARENV)/src/component.map SHL1DEF=$(MISC)$/$(SHL1TARGET).def @@ -76,3 +76,11 @@ DEF1NAME=$(SHL1TARGET) .INCLUDE : target.mk .ENDIF # "$(OS)" != "MACOSX" + +ALLTAR : $(MISC)/macbe1.component + +$(MISC)/macbe1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + macbe1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt macbe1.component diff --git a/shell/source/backends/wininetbe/makefile.mk b/shell/source/backends/wininetbe/makefile.mk index 9f79fa706f..7d8a6be14b 100644 --- a/shell/source/backends/wininetbe/makefile.mk +++ b/shell/source/backends/wininetbe/makefile.mk @@ -66,3 +66,11 @@ DEF1NAME=$(SHL1TARGET) .INCLUDE : target.mk + +ALLTAR : $(MISC)/wininetbe1.component + +$(MISC)/wininetbe1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + wininetbe1.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt wininetbe1.component diff --git a/shell/source/backends/wininetbe/wininetbackend.cxx b/shell/source/backends/wininetbe/wininetbackend.cxx index 5a32183c01..51431464bf 100644 --- a/shell/source/backends/wininetbe/wininetbackend.cxx +++ b/shell/source/backends/wininetbe/wininetbackend.cxx @@ -403,4 +403,4 @@ uno::Sequence<rtl::OUString> SAL_CALL WinInetBackend::getSupportedServiceNames(v return getBackendServiceNames() ; } -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file diff --git a/shell/source/backends/wininetbe/wininetbe1.component b/shell/source/backends/wininetbe/wininetbe1.component new file mode 100644 index 0000000000..d8930280fb --- /dev/null +++ b/shell/source/backends/wininetbe/wininetbe1.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.configuration.backend.WinInetBackend"> + <service name="com.sun.star.configuration.backend.WinInetBackend"/> + </implementation> +</component> diff --git a/shell/source/backends/wininetbe/wininetbecdef.cxx b/shell/source/backends/wininetbe/wininetbecdef.cxx index 103fdef325..2d043c7ca6 100644 --- a/shell/source/backends/wininetbe/wininetbecdef.cxx +++ b/shell/source/backends/wininetbe/wininetbecdef.cxx @@ -72,13 +72,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( //------------------------------------------------------------------------------ -extern "C" sal_Bool SAL_CALL component_writeInfo(void * pServiceManager, void *pRegistryKey) { - return cppu::component_writeInfoHelper( - pServiceManager, pRegistryKey, kImplementations_entries); -} - -//------------------------------------------------------------------------------ - extern "C" void *component_getFactory( const sal_Char *aImplementationName, void *aServiceManager, void *aRegistryKey) { diff --git a/shell/source/cmdmail/cmdmail.component b/shell/source/cmdmail/cmdmail.component new file mode 100644 index 0000000000..7e56741d16 --- /dev/null +++ b/shell/source/cmdmail/cmdmail.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.system.SimpleCommandMail"> + <service name="com.sun.star.system.SimpleCommandMail"/> + </implementation> +</component> diff --git a/shell/source/cmdmail/cmdmailentry.cxx b/shell/source/cmdmail/cmdmailentry.cxx index 036d15763e..3bb7f4fced 100644 --- a/shell/source/cmdmail/cmdmailentry.cxx +++ b/shell/source/cmdmail/cmdmailentry.cxx @@ -55,7 +55,6 @@ using com::sun::star::system::XSimpleMailClientSupplier; #define COMP_SERVICE_NAME "com.sun.star.system.SimpleCommandMail" #define COMP_IMPL_NAME "com.sun.star.comp.system.SimpleCommandMail" -#define COMP_REGKEY_NAME "/com.sun.star.comp.system.SimpleCommandMail/UNO/SERVICES/com.sun.star.system.SimpleCommandMail" //----------------------------------------------------------------------- // @@ -86,29 +85,6 @@ void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -//----------------------------------------------------------------------- -// -//----------------------------------------------------------------------- - -sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey ) -{ - if ( pRegistryKey ) - { - try - { - Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) ); - pXNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( COMP_REGKEY_NAME ) ) ); - return sal_True; - } - catch( InvalidRegistryException& ) - { - OSL_ENSURE(sal_False, "InvalidRegistryException caught"); - } - } - - return sal_False; -} - //---------------------------------------------------------------------- // component_getFactory //---------------------------------------------------------------------- diff --git a/shell/source/cmdmail/exports.dxp b/shell/source/cmdmail/exports.dxp index 028ac41759..f0e1c69934 100644 --- a/shell/source/cmdmail/exports.dxp +++ b/shell/source/cmdmail/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/shell/source/cmdmail/makefile.mk b/shell/source/cmdmail/makefile.mk index 5781afe8f5..e563df9b7e 100644 --- a/shell/source/cmdmail/makefile.mk +++ b/shell/source/cmdmail/makefile.mk @@ -45,13 +45,13 @@ SLOFILES= \ $(SLO)$/cmdmailmsg.obj \ $(SLO)$/cmdmailentry.obj SHL1OBJS=$(SLOFILES) - + SHL1TARGET=$(TARGET).uno SHL1IMPLIB=i$(TARGET) SHL1STDLIBS=$(CPPULIB)\ - $(CPPUHELPERLIB)\ - $(SALLIB) + $(CPPUHELPERLIB)\ + $(SALLIB) SHL1VERSIONMAP=$(SOLARENV)/src/component.map SHL1DEF=$(MISC)$/$(SHL1TARGET).def @@ -62,3 +62,10 @@ DEF1NAME=$(SHL1TARGET) .INCLUDE : target.mk +ALLTAR : $(MISC)/cmdmail.component + +$(MISC)/cmdmail.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + cmdmail.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt cmdmail.component diff --git a/shell/source/tools/lngconvex/makefile.mk b/shell/source/tools/lngconvex/makefile.mk index da28e5ff68..379de2dc8e 100644 --- a/shell/source/tools/lngconvex/makefile.mk +++ b/shell/source/tools/lngconvex/makefile.mk @@ -47,19 +47,19 @@ CFLAGS+=-Ob0 -D_NTSDK APP1TARGET=$(TARGET) APP1OBJS=$(OBJ)$/$(TARGET).obj\ - $(OBJ)$/cmdline.obj + $(OBJ)$/cmdline.obj # need msvcprt.lib for bad_cast exception # symbols if we compiler with exceptions # only valid for a tool like this APP1STDLIBS= $(SALLIB)\ - $(TOOLSLIB)\ + $(TOOLSLIB)\ $(I18NISOLANGLIB) .IF "$(COM)"!="GCC" -APP1STDLIBS+= $(TOOLSLIBST) \ - msvcprt.lib +APP1STDLIBS+= msvcprt.lib +#$(TOOLSLIBST) .ENDIF # --- Targets ------------------------------------------------------ diff --git a/shell/source/unix/exec/makefile.mk b/shell/source/unix/exec/makefile.mk index 4bf77436f6..f0247eb070 100644 --- a/shell/source/unix/exec/makefile.mk +++ b/shell/source/unix/exec/makefile.mk @@ -48,7 +48,7 @@ SLOFILES=$(SLO)$/shellexec.obj\ $(SLO)$/shellexecentry.obj SHL1OBJS=$(SLOFILES) - + SHL1TARGET=syssh.uno .IF "$(GUI)" == "OS2" SHL1IMPLIB=i$(TARGET) @@ -59,10 +59,10 @@ SHL1IMPLIB= SHL1VERSIONMAP=$(SOLARENV)/src/component.map SHL1DEF=$(MISC)$/$(SHL1TARGET).def DEF1NAME=$(SHL1TARGET) - + SHL1STDLIBS=$(CPPULIB)\ - $(CPPUHELPERLIB)\ - $(SALLIB) + $(CPPUHELPERLIB)\ + $(SALLIB) SHL1LIBS= SHL1DEPN= @@ -71,8 +71,8 @@ SHL1DEPN= APP1TARGET=$(TESTAPP1) APP1STDLIBS= $(SHL1STDLIBS) APP1OBJS= \ - $(SLO)$/shellexec.obj \ - $(SLO)$/$(APP1TARGET).obj + $(SLO)$/shellexec.obj \ + $(SLO)$/$(APP1TARGET).obj .ENDIF # "$(test)" != "" @@ -83,8 +83,16 @@ APP1OBJS= \ run_test : $(BIN)$/$(TESTAPP1).sh dmake test=t - $(BIN)$/$(TESTAPP1) urltest.txt + $(BIN)$/$(TESTAPP1) urltest.txt $(BIN)$/$(TESTAPP1).sh : $$(@:f) - $(COPY) $< $@ - -chmod +x $@ + $(COPY) $< $@ + -chmod +x $@ + +ALLTAR : $(MISC)/syssh.component + +$(MISC)/syssh.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + syssh.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt syssh.component diff --git a/shell/source/unix/exec/shellexecentry.cxx b/shell/source/unix/exec/shellexecentry.cxx index f77da88986..a9c3d5b828 100644 --- a/shell/source/unix/exec/shellexecentry.cxx +++ b/shell/source/unix/exec/shellexecentry.cxx @@ -84,29 +84,6 @@ void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -//----------------------------------------------------------------------- -// component_writeInfo -//----------------------------------------------------------------------- - -sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey ) -{ - if (pRegistryKey) - { - try - { - Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) ); - pXNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( SHELLEXEC_REGKEY_NAME ) ) ); - return sal_True; - } - catch( InvalidRegistryException& ) - { - OSL_ENSURE(sal_False, "InvalidRegistryException caught"); - } - } - - return sal_False; -} - //---------------------------------------------------------------------- // component_getFactory //---------------------------------------------------------------------- diff --git a/shell/source/unix/exec/syssh.component b/shell/source/unix/exec/syssh.component new file mode 100644 index 0000000000..030240dff3 --- /dev/null +++ b/shell/source/unix/exec/syssh.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.system.SystemShellExecute"> + <service name="com.sun.star.system.SystemShellExecute"/> + </implementation> +</component> diff --git a/shell/source/unix/misc/makefile.mk b/shell/source/unix/misc/makefile.mk index c4f3d9c495..d46f23a5ca 100644 --- a/shell/source/unix/misc/makefile.mk +++ b/shell/source/unix/misc/makefile.mk @@ -41,24 +41,24 @@ LIBSALCPPRT=$(0) # --- Files -------------------------------------------------------- SCRIPTFILES = \ - $(BIN)$/senddoc \ - $(BIN)$/open-url \ - $(BIN)$/cde-open-url \ - $(BIN)$/gnome-open-url \ - $(BIN)$/kde-open-url + $(BIN)$/senddoc \ + $(BIN)$/open-url \ + $(BIN)$/cde-open-url \ + $(BIN)$/gnome-open-url \ + $(BIN)$/kde-open-url .IF "$(GUI)" == "OS2" APP1TARGET = open-url APP1OBJS = \ - $(OBJ)$/open-url.obj \ - open-url.def + $(OBJ)$/open-url.obj \ + open-url.def APP1LIBS = APP2TARGET = senddoc APP2OBJS = \ - $(OBJ)$/senddoc.obj \ - senddoc.def + $(OBJ)$/senddoc.obj \ + senddoc.def APP2LIBS = APP2STDLIBS = @@ -66,7 +66,7 @@ APP2STDLIBS = APP1TARGET = gnome-open-url.bin APP1OBJS = \ - $(OBJ)$/gnome-open-url.obj + $(OBJ)$/gnome-open-url.obj APP1LIBS = .IF "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD" && "$(OS)"!="OPENBSD" APP1STDLIBS=-ldl @@ -87,4 +87,4 @@ OBJFILES = $(APP1OBJS) $(APP2OBJS) ALLTAR : $(SCRIPTFILES) $(AWKFILES) $(SCRIPTFILES) : $$(@:f:+".sh") - @tr -d "\015" < $(@:f:+".sh") > $@ + @tr -d "\015" < $(@:f:+".sh") > $@ diff --git a/shell/source/unix/sysshell/makefile.mk b/shell/source/unix/sysshell/makefile.mk index 3d8a55d437..a7307adc9d 100644 --- a/shell/source/unix/sysshell/makefile.mk +++ b/shell/source/unix/sysshell/makefile.mk @@ -58,7 +58,7 @@ DEF1NAME= $(SHL1TARGET) .ENDIF SHL1STDLIBS=$(EXPATASCII3RDLIB)\ - $(SALLIB) + $(SALLIB) SHL1LIBS=$(SLB)$/xmlparser.lib SHL1OBJS=$(SLOFILES) @@ -67,7 +67,7 @@ SHL1VERSIONMAP=recfile.map .ELSE dummy: - @echo "Nothing to build for MACOSX" + @echo "Nothing to build for MACOSX" .ENDIF # MACOSX # --- Targets ------------------------------------------------------ diff --git a/shell/source/win32/SysShentry.cxx b/shell/source/win32/SysShentry.cxx index f598ff28da..ea0e547475 100644 --- a/shell/source/win32/SysShentry.cxx +++ b/shell/source/win32/SysShentry.cxx @@ -86,32 +86,6 @@ void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ":affine"; } -//----------------------------------------------------------------------- -// -//----------------------------------------------------------------------- - -sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey ) -{ - sal_Bool bRetVal = sal_True; - - if ( pRegistryKey ) - { - try - { - Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) ); - pXNewKey->createKey( - OUString(RTL_CONSTASCII_USTRINGPARAM( SYSSHEXEC_REGKEY_NAME )) ); - } - catch( InvalidRegistryException& ) - { - OSL_ENSURE(sal_False, "InvalidRegistryException caught"); - bRetVal = sal_False; - } - } - - return bRetVal; -} - //---------------------------------------------------------------------- // component_getFactory // returns a factory to create XFilePicker-Services diff --git a/shell/source/win32/exports.dxp b/shell/source/win32/exports.dxp index 028ac41759..f0e1c69934 100644 --- a/shell/source/win32/exports.dxp +++ b/shell/source/win32/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/shell/source/win32/makefile.mk b/shell/source/win32/makefile.mk index 9a9564ed76..f560f940ff 100644 --- a/shell/source/win32/makefile.mk +++ b/shell/source/win32/makefile.mk @@ -39,17 +39,17 @@ COMP1TYPELIST=$(TARGET) # --- Files -------------------------------------------------------- SLOFILES=$(SLO)$/SysShentry.obj\ - $(SLO)$/SysShExec.obj + $(SLO)$/SysShExec.obj SHL1TARGET=$(TARGET).uno SHL1STDLIBS=$(CPPULIB)\ - $(CPPUHELPERLIB)\ - $(SALLIB)\ - $(UWINAPILIB) \ - $(ADVAPI32LIB) \ - $(OLE32LIB) \ - $(SHELL32LIB) + $(CPPUHELPERLIB)\ + $(SALLIB)\ + $(UWINAPILIB) \ + $(ADVAPI32LIB) \ + $(OLE32LIB) \ + $(SHELL32LIB) SHL1DEPN= SHL1IMPLIB=i$(SHL1TARGET) @@ -67,3 +67,10 @@ DEF1EXPORTFILE= exports.dxp INCLUDE!:=$(subst,/stl, $(INCLUDE)) .EXPORT : INCLUDE +ALLTAR : $(MISC)/syssh.component + +$(MISC)/syssh.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + syssh.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt syssh.component diff --git a/shell/source/win32/shlxthandler/classfactory.cxx b/shell/source/win32/shlxthandler/classfactory.cxx index 3c7dcc1369..3c7dcc1369 100644..100755 --- a/shell/source/win32/shlxthandler/classfactory.cxx +++ b/shell/source/win32/shlxthandler/classfactory.cxx diff --git a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx index 10bf0793aa..643ba26338 100644..100755 --- a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx +++ b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx @@ -154,14 +154,15 @@ HRESULT STDMETHODCALLTYPE CColumnInfo::GetColumnInfo(DWORD dwIndex, SHCOLUMNINFO // //----------------------------- - HRESULT STDMETHODCALLTYPE CColumnInfo::GetItemData(LPCSHCOLUMNID pscid, LPCSHCOLUMNDATA pscd, VARIANT *pvarData) +HRESULT STDMETHODCALLTYPE CColumnInfo::GetItemData(LPCSHCOLUMNID pscid, LPCSHCOLUMNDATA pscd, VARIANT *pvarData) { if (IsOOFileExtension(pscd->pwszExt)) { try { + std::wstring fname = getShortPathName( std::wstring( pscd->wszFile ) ); - CMetaInfoReader meta_info_accessor(WStringToString(pscd->wszFile)); + CMetaInfoReader meta_info_accessor(WStringToString(fname)); VariantClear(pvarData); diff --git a/shell/source/win32/shlxthandler/infotips/infotips.cxx b/shell/source/win32/shlxthandler/infotips/infotips.cxx index b5a2e24ca1..73eea7c1b5 100644..100755 --- a/shell/source/win32/shlxthandler/infotips/infotips.cxx +++ b/shell/source/win32/shlxthandler/infotips/infotips.cxx @@ -353,14 +353,16 @@ HRESULT STDMETHODCALLTYPE CInfoTip::Load(LPCOLESTR pszFileName, DWORD /*dwMode*/ std::wstring::iterator end = fname.end(); m_FileNameOnly = std::wstring(begin, end); - + + fname = getShortPathName( fname ); + std::string fnameA = WStringToString(fname); // #115531# // ZeroMemory because strncpy doesn't '\0'-terminates the destination // string; reserve the last place in the buffer for the final '\0' // that's why '(sizeof(m_szFileName) - 1)' - ZeroMemory(m_szFileName, sizeof(m_szFileName)); + ZeroMemory(m_szFileName, sizeof(m_szFileName)); strncpy(m_szFileName, fnameA.c_str(), (sizeof(m_szFileName) - 1)); return S_OK; diff --git a/shell/source/win32/shlxthandler/ooofilt/makefile.mk b/shell/source/win32/shlxthandler/ooofilt/makefile.mk index 9111069ab8..37564b5542 100644 --- a/shell/source/win32/shlxthandler/ooofilt/makefile.mk +++ b/shell/source/win32/shlxthandler/ooofilt/makefile.mk @@ -83,7 +83,6 @@ SHL1STDLIBS+=msvcrt.lib .ENDIF .ENDIF - # $(LIBSTLPORTST) SHL1LIBS+=$(SLB)$/util.lib\ @@ -117,11 +116,11 @@ SHL1STDLIBS_X64+=$(OLE32LIB_X64)\ $(ADVAPI32LIB_X64)\ $(COMCTL32LIB_X64)\ $(UUIDLIB_X64)\ - $(USER32LIB_X64) \ + $(USER32LIB_X64) \ $(SHELL32LIB_X64)\ $(KERNEL32LIB_X64)\ - $(MSVCPRT_X64) \ - $(MSVCRT_X64) \ + $(MSVCPRT_X64) \ + $(MSVCRT_X64) \ $(OLDNAMESLIB_X64) SHL1LIBS_X64+=$(SLB_X64)$/util.lib\ diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx index 9762516e4b..c879db7e5c 100644..100755 --- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx +++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx @@ -657,7 +657,8 @@ SCODE STDMETHODCALLTYPE COooFilter::IsDirty() SCODE STDMETHODCALLTYPE COooFilter::Load(LPCWSTR pszFileName, DWORD /*dwMode*/) { // Load just sets the filename for GetChunk to read and ignores the mode - m_pwszFileName = pszFileName; + m_pwszFileName = getShortPathName( pszFileName ); + // Open the file previously specified in call to IPersistFile::Load and get content. try { diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx index 78811f3694..78811f3694 100644..100755 --- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx +++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx diff --git a/shell/source/win32/shlxthandler/prophdl/makefile.mk b/shell/source/win32/shlxthandler/prophdl/makefile.mk index dc6d0e1590..780421f226 100644 --- a/shell/source/win32/shlxthandler/prophdl/makefile.mk +++ b/shell/source/win32/shlxthandler/prophdl/makefile.mk @@ -119,10 +119,10 @@ SHL1STDLIBS_X64+=\ $(GDI32LIB_X64)\ $(USER32LIB_X64) \ $(GDIPLUSLIB_X64) \ - $(MSVCRT_X64) \ - $(MSVCPRT_X64) \ - $(OLDNAMESLIB_X64)\ - $(PROPSYSLIB_X64) + $(MSVCRT_X64) \ + $(MSVCPRT_X64) \ + $(OLDNAMESLIB_X64)\ + $(PROPSYSLIB_X64) SHL1LIBS_X64+=$(SLB_X64)$/util.lib\ $(SLB_X64)$/ooofilereader.lib diff --git a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx index 3563d725a8..d5807b6bad 100644 --- a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx +++ b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx @@ -239,14 +239,14 @@ HRESULT STDMETHODCALLTYPE CPropertyHdl::Initialize( IStream *pStream, DWORD grfM try { pMetaInfoReader = new CMetaInfoReader( (void*)pStream, &z_filefunc ); + LoadProperties( pMetaInfoReader ); + delete pMetaInfoReader; } catch (const std::exception& e) { OutputDebugStringFormat( "CPropertyHdl::Initialize: Caught exception [%s]", e.what() ); return E_FAIL; } - - LoadProperties( pMetaInfoReader ); /* // load extended properties and search content _LoadExtendedProperties(); diff --git a/shell/source/win32/shlxthandler/propsheets/makefile.mk b/shell/source/win32/shlxthandler/propsheets/makefile.mk index 55a31c9c59..8d1ecffc26 100644 --- a/shell/source/win32/shlxthandler/propsheets/makefile.mk +++ b/shell/source/win32/shlxthandler/propsheets/makefile.mk @@ -47,13 +47,13 @@ CDEFS_X64+=-D_WIN32_WINNT=0x0501 -D_WIN32_IE=0x501 # --- Files -------------------------------------------------------- SLOFILES=$(SLO)$/propsheets.obj\ - $(SLO)$/listviewbuilder.obj\ - $(SLO)$/document_statistic.obj + $(SLO)$/listviewbuilder.obj\ + $(SLO)$/document_statistic.obj .IF "$(BUILD_X64)"!="" SLOFILES_X64=$(SLO_X64)$/propsheets.obj\ - $(SLO_X64)$/listviewbuilder.obj\ - $(SLO_X64)$/document_statistic.obj + $(SLO_X64)$/listviewbuilder.obj\ + $(SLO_X64)$/document_statistic.obj .ENDIF # "$(BUILD_X64)"!="" # --- Targets ------------------------------------------------------ diff --git a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx index 648c91c3b0..fe9e713a5b 100644..100755 --- a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx +++ b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx @@ -156,13 +156,26 @@ HRESULT STDMETHODCALLTYPE CPropertySheet::Initialize( NULL, 0))) { - DragQueryFileA( - reinterpret_cast<HDROP>(medium.hGlobal), - 0, - m_szFileName, - sizeof(m_szFileName)); - - hr = S_OK; + UINT size = DragQueryFile( reinterpret_cast<HDROP>(medium.hGlobal), 0, 0, 0 ); + if ( size != 0 ) + { + TCHAR * buffer = new TCHAR[ size + 1 ]; + UINT result_size = DragQueryFile( reinterpret_cast<HDROP>(medium.hGlobal), + 0, buffer, size + 1 ); + if ( result_size != 0 ) + { + std::wstring fname = getShortPathName( buffer ); + std::string fnameA = WStringToString( fname ); + ZeroMemory( m_szFileName, sizeof( m_szFileName ) ); + strncpy( m_szFileName, fnameA.c_str(), ( sizeof( m_szFileName ) - 1 ) ); + hr = S_OK; + } + else + hr = E_INVALIDARG; + delete [] buffer; + } + else + hr = E_INVALIDARG; } else hr = E_INVALIDARG; @@ -319,48 +332,54 @@ BOOL CALLBACK CPropertySheet::PropPageStatisticsProc(HWND hwnd, UINT uiMsg, WPAR //################################## void CPropertySheet::InitPropPageSummary(HWND hwnd, LPPROPSHEETPAGE /*lppsp*/) { - CMetaInfoReader metaInfo(m_szFileName); - - SetWindowText(GetDlgItem(hwnd,IDC_TITLE), metaInfo.getTagData( META_INFO_TITLE ).c_str() ); - SetWindowText(GetDlgItem(hwnd,IDC_AUTHOR), metaInfo.getTagData( META_INFO_AUTHOR ).c_str() ); - SetWindowText(GetDlgItem(hwnd,IDC_SUBJECT), metaInfo.getTagData( META_INFO_SUBJECT ).c_str() ); - SetWindowText(GetDlgItem(hwnd,IDC_KEYWORDS), metaInfo.getTagData( META_INFO_KEYWORDS ).c_str() ); - - // comments read from meta.xml use "\n" for return, but this will not displayable in Edit control, add - // "\r" before "\n" to form "\r\n" in order to display return in Edit control. - std::wstring tempStr = metaInfo.getTagData( META_INFO_DESCRIPTION ).c_str(); - std::wstring::size_type itor = tempStr.find ( L"\n" , 0 ); - while (itor != std::wstring::npos) + try + { + CMetaInfoReader metaInfo(m_szFileName); + + SetWindowText(GetDlgItem(hwnd,IDC_TITLE), metaInfo.getTagData( META_INFO_TITLE ).c_str() ); + SetWindowText(GetDlgItem(hwnd,IDC_AUTHOR), metaInfo.getTagData( META_INFO_AUTHOR ).c_str() ); + SetWindowText(GetDlgItem(hwnd,IDC_SUBJECT), metaInfo.getTagData( META_INFO_SUBJECT ).c_str() ); + SetWindowText(GetDlgItem(hwnd,IDC_KEYWORDS), metaInfo.getTagData( META_INFO_KEYWORDS ).c_str() ); + + // comments read from meta.xml use "\n" for return, but this will not displayable in Edit control, add + // "\r" before "\n" to form "\r\n" in order to display return in Edit control. + std::wstring tempStr = metaInfo.getTagData( META_INFO_DESCRIPTION ).c_str(); + std::wstring::size_type itor = tempStr.find ( L"\n" , 0 ); + while (itor != std::wstring::npos) + { + tempStr.insert(itor, L"\r"); + itor = tempStr.find(L"\n", itor + 2); + } + SetWindowText(GetDlgItem(hwnd,IDC_COMMENTS), tempStr.c_str()); + } + catch (const std::exception&) { - tempStr.insert(itor, L"\r"); - itor = tempStr.find(L"\n", itor + 2); } - SetWindowText(GetDlgItem(hwnd,IDC_COMMENTS), tempStr.c_str()); - } //--------------------------------- /** */ void CPropertySheet::InitPropPageStatistics(HWND hwnd, LPPROPSHEETPAGE /*lppsp*/) -{ - CMetaInfoReader metaInfo(m_szFileName); - - document_statistic_reader_ptr doc_stat_reader = create_document_statistic_reader(m_szFileName, &metaInfo); - - statistic_group_list_t sgl; - doc_stat_reader->read(&sgl); - - list_view_builder_ptr lv_builder = create_list_view_builder( - GetDlgItem(hwnd, IDC_STATISTICSLIST), - GetResString(IDS_PROPERTY), - GetResString(IDS_PROPERTY_VALUE)); - - lv_builder->build(sgl); - -} +{ + try + { + CMetaInfoReader metaInfo(m_szFileName); + document_statistic_reader_ptr doc_stat_reader = create_document_statistic_reader(m_szFileName, &metaInfo); + statistic_group_list_t sgl; + doc_stat_reader->read(&sgl); + list_view_builder_ptr lv_builder = create_list_view_builder( + GetDlgItem(hwnd, IDC_STATISTICSLIST), + GetResString(IDS_PROPERTY), + GetResString(IDS_PROPERTY_VALUE)); + lv_builder->build(sgl); + } + catch (const std::exception&) + { + } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/source/win32/shlxthandler/shlxthdl.cxx b/shell/source/win32/shlxthandler/shlxthdl.cxx index 1f6e3017d2..1f6e3017d2 100644..100755 --- a/shell/source/win32/shlxthandler/shlxthdl.cxx +++ b/shell/source/win32/shlxthandler/shlxthdl.cxx diff --git a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx index 02975b1dc2..b623e59047 100644..100755 --- a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx +++ b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx @@ -366,7 +366,8 @@ HRESULT STDMETHODCALLTYPE CThumbviewer::Extract(HBITMAP *phBmpImage) try { - std::auto_ptr<ZipFile> zipfile(new ZipFile(WStringToString(filename_))); + std::wstring fname = getShortPathName( filename_ ); + std::auto_ptr<ZipFile> zipfile( new ZipFile( WStringToString( fname ) ) ); if (zipfile->HasContent(THUMBNAIL_CONTENT)) { diff --git a/shell/source/win32/shlxthandler/util/fileextensions.cxx b/shell/source/win32/shlxthandler/util/fileextensions.cxx index db32e7b0b9..3e29ae80a6 100644..100755 --- a/shell/source/win32/shlxthandler/util/fileextensions.cxx +++ b/shell/source/win32/shlxthandler/util/fileextensions.cxx @@ -28,6 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_shell.hxx" +#include "algorithm" #include "internal/fileextensions.hxx" #include <sal/macros.h> @@ -89,10 +90,18 @@ std::string get_file_name_extension(const std::string& file_name) /** Return the type of a file */ +char easytolower( char in ) +{ + if( in<='Z' && in>='A' ) + return in-('Z'-'z'); + return in; +} + File_Type_t get_file_type(const std::string& file_name) { std::string fext = get_file_name_extension(file_name); - + std::transform(fext.begin(), fext.end(), fext.begin(), easytolower); + if (std::string::npos != WRITER_FILE_EXTENSIONS.find(fext)) return WRITER; else if (std::string::npos != CALC_FILE_EXTENSIONS.find(fext)) diff --git a/shell/source/win32/shlxthandler/util/makefile.mk b/shell/source/win32/shlxthandler/util/makefile.mk index 8ccf50602f..7fc1416bac 100644 --- a/shell/source/win32/shlxthandler/util/makefile.mk +++ b/shell/source/win32/shlxthandler/util/makefile.mk @@ -47,16 +47,16 @@ CDEFS_X64+=-D_WIN32_IE=0x501 # --- Files -------------------------------------------------------- SLOFILES=$(SLO)$/dbgmacros.obj\ - $(SLO)$/fileextensions.obj\ - $(SLO)$/registry.obj\ - $(SLO)$/utilities.obj\ - $(SLO)$/iso8601_converter.obj + $(SLO)$/fileextensions.obj\ + $(SLO)$/registry.obj\ + $(SLO)$/utilities.obj\ + $(SLO)$/iso8601_converter.obj SLOFILES_X64=$(SLO_X64)$/dbgmacros.obj\ - $(SLO_X64)$/fileextensions.obj\ - $(SLO_X64)$/registry.obj\ - $(SLO_X64)$/utilities.obj\ - $(SLO_X64)$/iso8601_converter.obj + $(SLO_X64)$/fileextensions.obj\ + $(SLO_X64)$/registry.obj\ + $(SLO_X64)$/utilities.obj\ + $(SLO_X64)$/iso8601_converter.obj # --- Targets ------------------------------------------------------ diff --git a/shell/source/win32/shlxthandler/util/utilities.cxx b/shell/source/win32/shlxthandler/util/utilities.cxx index 626fc80a6a..703d448192 100644..100755 --- a/shell/source/win32/shlxthandler/util/utilities.cxx +++ b/shell/source/win32/shlxthandler/util/utilities.cxx @@ -149,6 +149,28 @@ bool HasOnlySpaces(const std::wstring& String) return true; } +//--------------------------------- +/** helper function to convert windows pathes to short form. + @returns + shortend path. +*/ + +std::wstring getShortPathName( const std::wstring& aLongName ) +{ + std::wstring shortName = aLongName; + long length = GetShortPathName( aLongName.c_str(), NULL, 0 ); + + if ( length != 0 ) + { + TCHAR* buffer = new TCHAR[ length+1 ]; + length = GetShortPathName( aLongName.c_str(), buffer, length ); + if ( length != 0 ) + shortName = std::wstring( buffer ); + delete [] buffer; + } + return shortName; +} + /** convert LocaleSet pair into Microsoft List of Locale ID (LCID) according to ISO-639 and ISO-3166. http://etext.lib.virginia.edu/tei/iso639.html diff --git a/shell/source/win32/simplemail/exports.dxp b/shell/source/win32/simplemail/exports.dxp index 028ac41759..f0e1c69934 100644 --- a/shell/source/win32/simplemail/exports.dxp +++ b/shell/source/win32/simplemail/exports.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/shell/source/win32/simplemail/makefile.mk b/shell/source/win32/simplemail/makefile.mk index 84a209e4c0..50f2b467d9 100644 --- a/shell/source/win32/simplemail/makefile.mk +++ b/shell/source/win32/simplemail/makefile.mk @@ -39,17 +39,17 @@ COMP1TYPELIST=$(TARGET) # --- Files -------------------------------------------------------- SLOFILES=$(SLO)$/smplmailentry.obj\ - $(SLO)$/smplmailmsg.obj\ - $(SLO)$/smplmailclient.obj\ - $(SLO)$/smplmailsuppl.obj\ - $(SLO)$/simplemapi.obj - + $(SLO)$/smplmailmsg.obj\ + $(SLO)$/smplmailclient.obj\ + $(SLO)$/smplmailsuppl.obj\ + $(SLO)$/simplemapi.obj + SHL1TARGET=$(TARGET).uno SHL1STDLIBS=$(CPPULIB)\ - $(CPPUHELPERLIB)\ - $(SALLIB)\ - $(ADVAPI32LIB) + $(CPPUHELPERLIB)\ + $(SALLIB)\ + $(ADVAPI32LIB) SHL1IMPLIB=i$(SHL1TARGET) @@ -77,3 +77,11 @@ APP1DEF=$(MISC)$/$(APP1TARGET).def .INCLUDE : target.mk + +ALLTAR : $(MISC)/smplmail.component + +$(MISC)/smplmail.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ + smplmail.component + $(XSLTPROC) --nonet --stringparam uri \ + '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ + $(SOLARENV)/bin/createcomponent.xslt smplmail.component diff --git a/shell/source/win32/simplemail/senddoc.cxx b/shell/source/win32/simplemail/senddoc.cxx index 93e6d36acf..8097c70ab3 100644 --- a/shell/source/win32/simplemail/senddoc.cxx +++ b/shell/source/win32/simplemail/senddoc.cxx @@ -183,7 +183,7 @@ void initMapiMessage( } pMapiMessage->lpszNoteText = (gBody.length() ? const_cast<char*>(gBody.c_str()) : NULL); pMapiMessage->lpOriginator = aMapiOriginator; - pMapiMessage->lpRecips = &aMapiRecipientList[0]; + pMapiMessage->lpRecips = aMapiRecipientList.size() ? &aMapiRecipientList[0] : 0; pMapiMessage->nRecipCount = aMapiRecipientList.size(); pMapiMessage->lpFiles = &aMapiAttachmentList[0]; pMapiMessage->nFileCount = aMapiAttachmentList.size(); diff --git a/shell/source/win32/simplemail/smplmail.component b/shell/source/win32/simplemail/smplmail.component new file mode 100644 index 0000000000..59246c6d15 --- /dev/null +++ b/shell/source/win32/simplemail/smplmail.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* 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. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.system.SimpleSystemMail"> + <service name="com.sun.star.system.SimpleSystemMail"/> + </implementation> +</component> diff --git a/shell/source/win32/simplemail/smplmailentry.cxx b/shell/source/win32/simplemail/smplmailentry.cxx index 6244fb98c6..b3dbaed324 100644 --- a/shell/source/win32/simplemail/smplmailentry.cxx +++ b/shell/source/win32/simplemail/smplmailentry.cxx @@ -86,32 +86,6 @@ void SAL_CALL component_getImplementationEnvironment( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -//----------------------------------------------------------------------- -// -//----------------------------------------------------------------------- - -sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey ) -{ - sal_Bool bRetVal = sal_True; - - if ( pRegistryKey ) - { - try - { - Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) ); - pXNewKey->createKey( - OUString(RTL_CONSTASCII_USTRINGPARAM( COMP_REGKEY_NAME )) ); - } - catch( InvalidRegistryException& ) - { - OSL_ENSURE(sal_False, "InvalidRegistryException caught"); - bRetVal = sal_False; - } - } - - return bRetVal; -} - //---------------------------------------------------------------------- // component_getFactory // returns a factory to create XFilePicker-Services diff --git a/shell/source/backends/kdebe/kdeaccess.hxx b/shell/source/win32/syssh.component index 76a4b85447..1e783f5221 100644 --- a/shell/source/backends/kdebe/kdeaccess.hxx +++ b/shell/source/win32/syssh.component @@ -1,5 +1,5 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -24,27 +24,11 @@ * <http://www.openoffice.org/license.html> * for a copy of the LGPLv3 License. * -************************************************************************/ +**********************************************************************--> -#ifndef INCLUDED_SHELL_SOURCE_BACKENDS_KDEBE_KDEACCESS_HXX -#define INCLUDED_SHELL_SOURCE_BACKENDS_KDEBE_KDEACCESS_HXX - -#include "sal/config.h" - -#include "com/sun/star/beans/Optional.hpp" - -namespace com { namespace sun { namespace star { namespace uno { - class Any; -} } } } -namespace rtl { class OUString; } - -namespace kdeaccess { - -com::sun::star::beans::Optional< com::sun::star::uno::Any > getValue( - rtl::OUString const & id); - -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.system.SystemShellExecute"> + <service name="com.sun.star.system.SystemShellExecute"/> + </implementation> +</component> diff --git a/shell/source/win32/workbench/makefile.mk b/shell/source/win32/workbench/makefile.mk index 9d9c7945b9..6b33498371 100644 --- a/shell/source/win32/workbench/makefile.mk +++ b/shell/source/win32/workbench/makefile.mk @@ -49,15 +49,15 @@ OBJFILES3=$(OBJ)$/TestProxySet.obj OBJFILES4=$(OBJ)$/Testfopen.obj OBJFILES=$(OBJFILES1)\ - $(OBJFILES2) + $(OBJFILES2) APP1TARGET=$(TARGET) APP1OBJS=$(OBJFILES1) APP1STDLIBS+= $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(SALLIB) \ - $(USER32LIB) + $(CPPUHELPERLIB) \ + $(SALLIB) \ + $(USER32LIB) APP1DEF= $(MISC)$/$(APP1TARGET).def @@ -68,9 +68,9 @@ APP2TARGET=$(TARGET1) APP2OBJS=$(OBJFILES2) APP2STDLIBS+= $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(SALLIB) \ - $(USER32LIB) + $(CPPUHELPERLIB) \ + $(SALLIB) \ + $(USER32LIB) APP2DEF= $(MISC)$/$(APP2TARGET).def @@ -80,8 +80,8 @@ APP3TARGET=$(TARGET2) APP3OBJS=$(OBJFILES3) APP3STDLIBS+= $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(SALLIB) + $(CPPUHELPERLIB) \ + $(SALLIB) APP3DEF= $(MISC)$/$(APP3TARGET).def |