summaryrefslogtreecommitdiff
path: root/filter/source/config/tools/merge/FCFGMerge.cfg
diff options
context:
space:
mode:
authorPedro Giffuni <pfg@apache.org>2014-04-29 19:11:53 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-04-30 17:11:30 +0100
commit19c4d8d2fbe424aaa54f098bcc6ba8c9aeb1e403 (patch)
treeba981e0e7c59ab22371519378c2f77876bcae759 /filter/source/config/tools/merge/FCFGMerge.cfg
parentecec7cea259e7310cb6da33bea797c98a635a2b3 (diff)
Many spelling fixes: directories h* - p*.
Attempt to clean up most but certainly not all the spelling mistakes that found home in OpenOffice through decades. We could probably blame the international nature of the code but it is somewhat shameful that this wasn't done before. (cherry picked from commit 11a1ff6144521aeabb0c6db25c89a2ac31bedee0) Conflicts: external/libxmlsec/xmlsec1-customkeymanage.patch hwpfilter/source/hwpeq.cxx icc/README icu/createmak.pl idl/source/objects/object.cxx idlc/inc/idlc/errorhandler.hxx include/jvmfwk/framework.h include/oox/helper/propertyset.hxx instsetoo_native/inc_ure/windows/msi_templates/_Validat.idt javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/PrologueCtrl.java javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/LinuxInstaller.java javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/SolarisInstaller.java javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/LinuxHelper.java javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/ProductDescription.java javainstaller2/src/JavaSetup/org/openoffice/setup/Util/Controller.java javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ExecuteProcess.java javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java jurt/com/sun/star/comp/servicemanager/ServiceManager.java jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx jvmfwk/source/elements.cxx jvmfwk/source/elements.hxx l10ntools/inc/wtranode.hxx l10ntools/inc/wtratree.hxx l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/Convert.java l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/ConverterException.java l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/FileMaker.java l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/GSIWriter.java l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/GSIandSDFMerger.java l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/SDFReader.java l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/SDFWriter.java l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/XLIFFWriter.java l10ntools/scripts/localize.pl l10ntools/scripts/localize_old.pl l10ntools/source/cfgmerge.cxx l10ntools/source/export.cxx l10ntools/source/filter/merge/FCFGMerge.java l10ntools/source/filter/merge/Merger.java l10ntools/source/filter/utils/Cache.java l10ntools/source/filter/utils/ConfigHelper.java l10ntools/source/filter/utils/FileHelper.java l10ntools/source/filter/utils/XMLHelper.java l10ntools/source/merge.cxx l10ntools/source/tagtest.cxx l10ntools/source/xmlparse.cxx l10ntools/source/xrmmerge.cxx libtextcat/libtextcat-2.2.patch libxml2/libxml2-long-path.patch linguistic/inc/linguistic/misc.hxx linguistic/source/lngsvcmgr.cxx migrationanalysis/src/driver_docs/allstrings.ulf migrationanalysis/src/driver_docs/sources/AnalysisDriver.bas migrationanalysis/src/driver_docs/sources/CommonMigrationAnalyser.bas migrationanalysis/src/driver_docs/sources/word/MigrationAnalyser.cls migrationanalysis/src/msokill/msokill.cpp migrationanalysis/src/wizard/Wizard.frm odk/examples/DevelopersGuide/Accessibility/EventHandler.java odk/examples/DevelopersGuide/Accessibility/EventListenerProxy.java odk/examples/DevelopersGuide/Accessibility/GraphicalDisplay.java odk/examples/DevelopersGuide/Forms/DataAwareness.java odk/examples/DevelopersGuide/Forms/KeyGenerator.java odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Interceptor.java odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/NativeView.java odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OnewayExecutor.java odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusListener.java odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/ViewContainer.java odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/FilterOptions.java odk/examples/cpp/complextoolbarcontrols/Makefile odk/setsdkenv_windows.template offapi/com/sun/star/accessibility/AccessibleEventId.idl offapi/com/sun/star/accessibility/AccessibleEventObject.idl offapi/com/sun/star/accessibility/AccessibleRelationType.idl offapi/com/sun/star/accessibility/XAccessible.idl offapi/com/sun/star/accessibility/XAccessibleRelationSet.idl offapi/com/sun/star/accessibility/XAccessibleStateSet.idl offapi/com/sun/star/animations/Event.idl offapi/com/sun/star/animations/XAnimationNode.idl offapi/com/sun/star/awt/AccessibleListBoxList.idl offapi/com/sun/star/awt/XLayoutFlow.idl offapi/com/sun/star/awt/XMessageBoxFactory.idl offapi/com/sun/star/awt/XPopupMenu.idl offapi/com/sun/star/awt/grid/XGridColumn.idl offapi/com/sun/star/chart/ChartAxis.idl offapi/com/sun/star/chart2/data/TabularDataProviderArguments.idl offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl offapi/com/sun/star/configuration/AdministrationProvider.idl offapi/com/sun/star/configuration/ConfigurationRegistry.idl offapi/com/sun/star/configuration/backend/XBackendChangesNotifier.idl offapi/com/sun/star/datatransfer/XDataFormatTranslator.idl offapi/com/sun/star/datatransfer/clipboard/RenderingCapabilities.idl offapi/com/sun/star/deployment/InvalidRemovedParameterException.idl offapi/com/sun/star/document/DocumentInfo.idl offapi/com/sun/star/document/EmptyUndoStackException.idl offapi/com/sun/star/document/EventObject.idl offapi/com/sun/star/document/ExtendedTypeDetection.idl offapi/com/sun/star/document/ExtendedTypeDetectionFactory.idl offapi/com/sun/star/document/FilterFactory.idl offapi/com/sun/star/document/MediaDescriptor.idl offapi/com/sun/star/document/NoSuchFilterRequest.idl offapi/com/sun/star/document/OfficeDocument.idl offapi/com/sun/star/document/TypeDetection.idl offapi/com/sun/star/document/UndoContextNotClosedException.idl offapi/com/sun/star/document/XExtendedFilterDetection.idl offapi/com/sun/star/document/XFilter.idl offapi/com/sun/star/document/XInteractionFilterSelect.idl offapi/com/sun/star/document/XTypeDetection.idl offapi/com/sun/star/drawing/Hatch.idl offapi/com/sun/star/drawing/XDrawPages.idl offapi/com/sun/star/drawing/XShapeBinder.idl offapi/com/sun/star/drawing/framework/XConfigurationControllerRequestQueue.idl offapi/com/sun/star/drawing/framework/XRelocatableResource.idl offapi/com/sun/star/embed/ElementModes.idl offapi/com/sun/star/embed/EntryInitModes.idl offapi/com/sun/star/embed/Storage.idl offapi/com/sun/star/embed/StorageFactory.idl offapi/com/sun/star/embed/StorageStream.idl offapi/com/sun/star/embed/XCommonEmbedPersist.idl offapi/com/sun/star/embed/XEmbedObjectClipboardCreator.idl offapi/com/sun/star/embed/XEmbeddedClient.idl offapi/com/sun/star/embed/XInplaceClient.idl offapi/com/sun/star/embed/XInplaceObject.idl offapi/com/sun/star/embed/XInsertObjectDialog.idl offapi/com/sun/star/embed/XPersistanceHolder.idl offapi/com/sun/star/embed/XStorage.idl offapi/com/sun/star/embed/XTransactionBroadcaster.idl offapi/com/sun/star/embed/XTransactionListener.idl offapi/com/sun/star/form/FormComponents.idl offapi/com/sun/star/form/XSubmitListener.idl offapi/com/sun/star/form/binding/BindableDataAwareControlModel.idl offapi/com/sun/star/form/binding/BindableDatabaseListBox.idl offapi/com/sun/star/form/component/DatabaseComboBox.idl offapi/com/sun/star/form/component/DatabaseFormattedField.idl offapi/com/sun/star/form/component/DatabasePatternField.idl offapi/com/sun/star/form/component/DatabaseTextField.idl offapi/com/sun/star/form/component/GridControl.idl offapi/com/sun/star/frame/Components.idl offapi/com/sun/star/frame/ContentHandler.idl offapi/com/sun/star/frame/ContentHandlerFactory.idl offapi/com/sun/star/frame/Desktop.idl offapi/com/sun/star/frame/DispatchDescriptor.idl offapi/com/sun/star/frame/DispatchProvider.idl offapi/com/sun/star/frame/DispatchRecorder.idl offapi/com/sun/star/frame/Frame.idl offapi/com/sun/star/frame/FrameActionEvent.idl offapi/com/sun/star/frame/FrameLoaderFactory.idl offapi/com/sun/star/frame/ProtocolHandler.idl offapi/com/sun/star/frame/XControlNotificationListener.idl offapi/com/sun/star/frame/XDesktop.idl offapi/com/sun/star/frame/XDispatchRecorderSupplier.idl offapi/com/sun/star/frame/XDocumentTemplates.idl offapi/com/sun/star/frame/XFrame.idl offapi/com/sun/star/frame/XFrameLoader.idl offapi/com/sun/star/frame/XInterceptorInfo.idl offapi/com/sun/star/frame/XRecordableDispatch.idl offapi/com/sun/star/frame/XStatusbarController.idl offapi/com/sun/star/frame/XStorable2.idl offapi/com/sun/star/frame/XSynchronousDispatch.idl offapi/com/sun/star/frame/XTerminateListener2.idl offapi/com/sun/star/graphic/GraphicObject.idl offapi/com/sun/star/graphic/XGraphicObject.idl offapi/com/sun/star/inspection/XNumericControl.idl offapi/com/sun/star/inspection/XObjectInspectorModel.idl offapi/com/sun/star/inspection/XPropertyHandler.idl offapi/com/sun/star/installation/XProtocolHandlerCheck.idl offapi/com/sun/star/installation/protocols.idl offapi/com/sun/star/linguistic2/SpellFailure.idl offapi/com/sun/star/linguistic2/XLinguServiceManager.idl offapi/com/sun/star/mail/XMailServer.idl offapi/com/sun/star/mozilla/XPluginInstance.idl offapi/com/sun/star/mozilla/XPluginInstanceSyncPeer.idl offapi/com/sun/star/packages/zip/ZipIOException.idl offapi/com/sun/star/presentation/OutlineView.idl offapi/com/sun/star/presentation/XPresentation2.idl offapi/com/sun/star/presentation/XSlideShow.idl offapi/com/sun/star/presentation/XSlideShowController.idl offapi/com/sun/star/report/XFunction.idl offapi/com/sun/star/report/XFunctionsSupplier.idl offapi/com/sun/star/report/XReportComponent.idl offapi/com/sun/star/report/XReportDefinition.idl offapi/com/sun/star/report/meta/XFunctionManager.idl offapi/com/sun/star/resource/XStringResourcePersistence.idl offapi/com/sun/star/resource/XStringResourceWithLocation.idl offapi/com/sun/star/resource/XStringResourceWithStorage.idl offapi/com/sun/star/sdb/DataSettings.idl offapi/com/sun/star/sdb/ErrorCondition.idl offapi/com/sun/star/sdb/SQLContext.idl offapi/com/sun/star/sdb/Table.idl offapi/com/sun/star/sdb/XRowSetApproveListener.idl offapi/com/sun/star/sdb/application/XDatabaseDocumentUI.idl offapi/com/sun/star/sdb/tools/XConnectionTools.idl offapi/com/sun/star/sdbc/DataType.idl offapi/com/sun/star/sdbc/XDatabaseMetaData.idl offapi/com/sun/star/sdbcx/Descriptor.idl offapi/com/sun/star/security/DocumentSignatureInformation.idl offapi/com/sun/star/sheet/AccessibleSpreadsheetDocumentView.idl offapi/com/sun/star/sheet/AccessibleSpreadsheetPageView.idl offapi/com/sun/star/sheet/DatabaseRange.idl offapi/com/sun/star/smarttags/XSmartTagAction.idl offapi/com/sun/star/table/AccessibleTableView.idl offapi/com/sun/star/table/CellProperties.idl offapi/com/sun/star/table/CellRangeListSource.idl offapi/com/sun/star/table/CellValueBinding.idl offapi/com/sun/star/table/XMergeableCellRange.idl offapi/com/sun/star/task/DocumentPasswordRequest.idl offapi/com/sun/star/task/JobExecutor.idl offapi/com/sun/star/task/MasterPasswordRequest.idl offapi/com/sun/star/task/PasswordRequest.idl offapi/com/sun/star/task/XJob.idl offapi/com/sun/star/text/AccessiblePageView.idl offapi/com/sun/star/text/AccessibleTextDocumentView.idl offapi/com/sun/star/text/LineNumberingProperties.idl offapi/com/sun/star/text/NumberingRules.idl offapi/com/sun/star/text/XRelativeTextContentRemove.idl offapi/com/sun/star/text/textfield/Database.idl offapi/com/sun/star/text/textfield/SetExpression.idl offapi/com/sun/star/text/textfield/docinfo/Description.idl offapi/com/sun/star/text/textfield/docinfo/Info0.idl offapi/com/sun/star/text/textfield/docinfo/Info1.idl offapi/com/sun/star/text/textfield/docinfo/Info2.idl offapi/com/sun/star/text/textfield/docinfo/Info3.idl offapi/com/sun/star/text/textfield/docinfo/Keywords.idl offapi/com/sun/star/text/textfield/docinfo/Revision.idl offapi/com/sun/star/text/textfield/docinfo/Subject.idl offapi/com/sun/star/text/textfield/docinfo/Title.idl offapi/com/sun/star/ucb/CommandFailedException.idl offapi/com/sun/star/ucb/Content.idl offapi/com/sun/star/ucb/ContentAction.idl offapi/com/sun/star/ucb/FetchError.idl offapi/com/sun/star/ucb/FetchResult.idl offapi/com/sun/star/ucb/HierarchyDataSource.idl offapi/com/sun/star/ucb/InteractiveFileIOException.idl offapi/com/sun/star/ucb/SearchRecursion.idl offapi/com/sun/star/ucb/UniversalContentBroker.idl offapi/com/sun/star/ucb/XAnyCompare.idl offapi/com/sun/star/ucb/XCachedContentResultSetFactory.idl offapi/com/sun/star/ucb/XCachedDynamicResultSetFactory.idl offapi/com/sun/star/ucb/XContentIdentifierMapping.idl offapi/com/sun/star/ui/UIElementType.idl offapi/com/sun/star/ui/dialogs/FilePicker.idl offapi/com/sun/star/ui/dialogs/FolderPicker.idl offapi/com/sun/star/util/PathSubstitution.idl offapi/com/sun/star/util/XChangesNotifier.idl offapi/com/sun/star/util/XCloseBroadcaster.idl offapi/com/sun/star/util/XCloseListener.idl offapi/com/sun/star/util/XCloseable.idl offapi/com/sun/star/util/XStringSubstitution.idl offapi/com/sun/star/util/XTextSearch.idl offapi/com/sun/star/util/XURLTransformer.idl offapi/com/sun/star/xforms/XModel.idl offapi/com/sun/star/xml/sax/XFastAttributeList.idl offapi/com/sun/star/xml/sax/XFastParser.idl officecfg/registry/data/org/openoffice/Office/Labels.xcu officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu officecfg/registry/schema/org/openoffice/Office/Common.xcs officecfg/registry/schema/org/openoffice/Office/Embedding.xcs officecfg/registry/schema/org/openoffice/Office/ExtensionDependencies.xcs officecfg/registry/schema/org/openoffice/Office/ExtensionManager.xcs officecfg/registry/schema/org/openoffice/Office/Histories.xcs officecfg/registry/schema/org/openoffice/Office/OptionsDialog.xcs officecfg/registry/schema/org/openoffice/Office/Paths.xcs officecfg/registry/schema/org/openoffice/Office/PresenterScreen.xcs officecfg/registry/schema/org/openoffice/Office/TabBrowse.xcs officecfg/registry/schema/org/openoffice/Office/UI.xcs officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs officecfg/registry/schema/org/openoffice/Office/UI/WindowState.xcs officecfg/registry/schema/org/openoffice/Office/WebWizard.xcs officecfg/registry/schema/org/openoffice/Office/Writer.xcs officecfg/registry/schema/org/openoffice/Setup.xcs officecfg/registry/schema/org/openoffice/TypeDetection/Types.xcs oox/source/xls/sheetdatabuffer.cxx package/source/xstor/xstorage.cxx padmin/source/padialog.src postprocess/signing/signing.pl pyuno/source/module/pyuno_module.cxx Change-Id: I60c7b6d661ff803b5e9214ac7fefb32772ef19a7
Diffstat (limited to 'filter/source/config/tools/merge/FCFGMerge.cfg')
-rw-r--r--filter/source/config/tools/merge/FCFGMerge.cfg2
1 files changed, 1 insertions, 1 deletions
diff --git a/filter/source/config/tools/merge/FCFGMerge.cfg b/filter/source/config/tools/merge/FCFGMerge.cfg
index 834c7ac57bd6..fb32b058e2a8 100644
--- a/filter/source/config/tools/merge/FCFGMerge.cfg
+++ b/filter/source/config/tools/merge/FCFGMerge.cfg
@@ -88,7 +88,7 @@ subdir_contenthandlers = contenthandlers
#************************************************
# This delimiter is used to split every
# item list of the package configuration files
-# (which are temp. created by the make proccess)
+# (which are temp. created by the make process)
# into its tokens.
#
# [REQUIRED]