diff options
-rw-r--r-- | offapi/com/sun/star/sheet/DataBar.idl | 2 | ||||
-rw-r--r-- | offapi/type_reference/typelibrary_history.txt | 2 | ||||
-rw-r--r-- | officecfg/registry/data/org/openoffice/Office/TypeDetection.xcu | 2 | ||||
-rw-r--r-- | officecfg/registry/schema/org/openoffice/Office/Math.xcs | 2 | ||||
-rw-r--r-- | onlineupdate/source/libmar/verify/cryptox.c | 10 | ||||
-rw-r--r-- | onlineupdate/source/update/common/updatehelper.cxx | 2 | ||||
-rw-r--r-- | onlineupdate/source/update/inc/mozilla/UniquePtr.h | 2 | ||||
-rw-r--r-- | onlineupdate/source/update/updater/updater.cxx | 2 | ||||
-rw-r--r-- | oox/source/drawingml/chart/seriesconverter.cxx | 2 | ||||
-rw-r--r-- | oox/source/drawingml/shape.cxx | 2 | ||||
-rw-r--r-- | oox/source/export/chartexport.cxx | 2 | ||||
-rw-r--r-- | oox/source/ppt/pptfilterhelpers.cxx | 2 | ||||
-rw-r--r-- | oox/source/vml/vmlinputstream.cxx | 2 | ||||
-rw-r--r-- | package/qa/storages/Test15.java | 2 | ||||
-rw-r--r-- | package/source/xstor/owriteablestream.cxx | 2 |
15 files changed, 19 insertions, 19 deletions
diff --git a/offapi/com/sun/star/sheet/DataBar.idl b/offapi/com/sun/star/sheet/DataBar.idl index 3803dba661d6..6fbccb9dc11b 100644 --- a/offapi/com/sun/star/sheet/DataBar.idl +++ b/offapi/com/sun/star/sheet/DataBar.idl @@ -41,7 +41,7 @@ service DataBar [property] sequence<XDataBarEntry> DataBarEntries; /** - * Mimimum databar length in percent of cell width. + * Minimum databar length in percent of cell width. * * Allowed values are [0, 100) but smaller than MaximumLength. */ diff --git a/offapi/type_reference/typelibrary_history.txt b/offapi/type_reference/typelibrary_history.txt index 793a3bc892ec..7e6d197d6582 100644 --- a/offapi/type_reference/typelibrary_history.txt +++ b/offapi/type_reference/typelibrary_history.txt @@ -80,7 +80,7 @@ directory. We need only one reference per source stand. I have also removed the types_doc.rdb because all type info is already in the normal types.rdb, even the service nad singleton type info. - In the same step i have updated the reference type library with the rdb of + In the same step I have updated the reference type library with the rdb of OOo2.0.1 and have patched the following singleton types to ensure that we need only one type library: - com.sun.star.script.browse.theBrowseNodeFactory diff --git a/officecfg/registry/data/org/openoffice/Office/TypeDetection.xcu b/officecfg/registry/data/org/openoffice/Office/TypeDetection.xcu index b85b89e4618c..5f009f1d1b7b 100644 --- a/officecfg/registry/data/org/openoffice/Office/TypeDetection.xcu +++ b/officecfg/registry/data/org/openoffice/Office/TypeDetection.xcu @@ -19,7 +19,7 @@ <!DOCTYPE oor:component-data SYSTEM "../../../../component-update.dtd"> <oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:install="http://openoffice.org/2004/installation" oor:name="TypeDetection" oor:package="org.openoffice.Office"> <!-- - Attention: Please dont merge any changes into this file! Its deprecated for further versions. + Attention: Please don't merge any changes into this file! Its deprecated for further versions. Use the new configuration schema org.openoffice.TypeDetection/ and its related sub structures. Contact as96863 to get further information about this fact. --> diff --git a/officecfg/registry/schema/org/openoffice/Office/Math.xcs b/officecfg/registry/schema/org/openoffice/Office/Math.xcs index c4f71babe74e..3b05a12bce94 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Math.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Math.xcs @@ -307,7 +307,7 @@ <desc>Contains settings related to load and save operations.</desc> </info> <prop oor:name="IsSaveOnlyUsedSymbols" oor:type="xs:boolean" oor:nillable="false"> - <!-- UIHints: - Tools/Options - OpenOffice Maths - Settings --> + <!-- UIHints: - Tools/Options - LibreOffice Maths - Settings --> <info> <desc>When set only symbols used in the current formula will be saved. Otherwise all user defined symbols will be saved in each formula.</desc> <label>Save only used symbols.</label> diff --git a/onlineupdate/source/libmar/verify/cryptox.c b/onlineupdate/source/libmar/verify/cryptox.c index b1859b72c749..1de9891d5011 100644 --- a/onlineupdate/source/libmar/verify/cryptox.c +++ b/onlineupdate/source/libmar/verify/cryptox.c @@ -143,10 +143,10 @@ CyprtoAPI_VerifySignature(HCRYPTHASH *hash, /** * Obtains the public key for the passed in cert data * - * @param provider The cyrto provider - * @param certData Data of the certificate to extract the public key from - * @param sizeOfCertData The size of the certData buffer - * @param certStore Pointer to the handle of the certificate store to use + * @param provider The cryto provider + * @param certData Data of the certificate to extract the public key from + * @param sizeOfCertData The size of the certData buffer + * @param certStore Pointer to the handle of the certificate store to use * @param CryptoX_Success on success */ CryptoX_Result @@ -250,7 +250,7 @@ CryptoAPI_VerifyBegin(HCRYPTPROV provider, HCRYPTHASH* hash) /** * Updates a signature verification hash context * - * @param hash The hash context to udpate + * @param hash The hash context to update * @param buf The buffer to update the hash context with * @param len The size of the passed in buffer * @return CryptoX_Success on success, CryptoX_Error on error. diff --git a/onlineupdate/source/update/common/updatehelper.cxx b/onlineupdate/source/update/common/updatehelper.cxx index 5ffe261172d8..7ccc319d39f5 100644 --- a/onlineupdate/source/update/common/updatehelper.cxx +++ b/onlineupdate/source/update/common/updatehelper.cxx @@ -356,7 +356,7 @@ DWORD LaunchServiceSoftwareUpdateCommand(int argc, LPCWSTR* argv) { // The service command is the same as the updater.exe command line except - // it has 2 extra args: 1) The Path to udpater.exe, and 2) the command + // it has 2 extra args: 1) The Path to updater.exe, and 2) the command // being executed which is "software-update" LPCWSTR *updaterServiceArgv = new LPCWSTR[argc + 2]; updaterServiceArgv[0] = L"MozillaMaintenance"; diff --git a/onlineupdate/source/update/inc/mozilla/UniquePtr.h b/onlineupdate/source/update/inc/mozilla/UniquePtr.h index d58ffe335c53..28b5794e4469 100644 --- a/onlineupdate/source/update/inc/mozilla/UniquePtr.h +++ b/onlineupdate/source/update/inc/mozilla/UniquePtr.h @@ -626,7 +626,7 @@ struct UniqueSelector<T[N]> * * UniquePtr<char> p; * p = new char; // ERROR - * p.reset(new char); // works, but fugly + * p.reset(new char); // works, but ugly * p = MakeUnique<char>(); // preferred * * (And third, although not relevant to Mozilla: MakeUnique is exception-safe. diff --git a/onlineupdate/source/update/updater/updater.cxx b/onlineupdate/source/update/updater/updater.cxx index 67773bdce36d..3066b2b716d0 100644 --- a/onlineupdate/source/update/updater/updater.cxx +++ b/onlineupdate/source/update/updater/updater.cxx @@ -3039,7 +3039,7 @@ int NS_main(int argc, NS_tchar **argv) int retries = 1; DWORD lastWriteError = 0; do { - // By opening a file handle wihout FILE_SHARE_READ to the callback + // By opening a file handle without FILE_SHARE_READ to the callback // executable, the OS will prevent launching the process while it is // being updated. callbackFile = CreateFileW(targetPath, diff --git a/oox/source/drawingml/chart/seriesconverter.cxx b/oox/source/drawingml/chart/seriesconverter.cxx index 8e742399df31..7f10324c0dc2 100644 --- a/oox/source/drawingml/chart/seriesconverter.cxx +++ b/oox/source/drawingml/chart/seriesconverter.cxx @@ -49,7 +49,7 @@ using namespace ::com::sun::star::uno; namespace { -/** nastied-up sgn function - employs some gratuity around 0 - values +/** nested-up sgn function - employs some gratuity around 0 - values smaller than 0.33 are clamped to 0 */ int lclSgn( double nVal ) diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index ec57a0cf1b65..d1326f69f00c 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -1250,7 +1250,7 @@ OUString Shape::finalizeServiceName( XmlFilterBase& rFilter, const OUString& rSe // import and store the graphic if( !aGraphicPath.isEmpty() ) { - // Transfer shape's width and heightto graphicsfilter (can be used by WMF/EMF) + // Transfer shape's width and height to graphicsfilter (can be used by WMF/EMF) WMF_EXTERNALHEADER aExtHeader; aExtHeader.mapMode = 8; // MM_ANISOTROPIC aExtHeader.xExt = rShapeRect.Width; diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index 7cbd8a9cf8e5..954678756314 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -752,7 +752,7 @@ void ChartExport::exportChartSpace( Reference< css::chart::XChartDocument > xCha FSNS( XML_xmlns, XML_a ), "http://schemas.openxmlformats.org/drawingml/2006/main", FSNS( XML_xmlns, XML_r ), "http://schemas.openxmlformats.org/officeDocument/2006/relationships", FSEND ); - // TODO: get the correct editing lanauge + // TODO: get the correct editing language pFS->singleElement( FSNS( XML_c, XML_lang ), XML_val, "en-US", FSEND ); diff --git a/oox/source/ppt/pptfilterhelpers.cxx b/oox/source/ppt/pptfilterhelpers.cxx index 941c5487ce78..d51cfd01d69b 100644 --- a/oox/source/ppt/pptfilterhelpers.cxx +++ b/oox/source/ppt/pptfilterhelpers.cxx @@ -104,7 +104,7 @@ namespace oox { namespace ppt { do { - // copy the non matching inverval verbatim + // copy the non matching interval verbatim if(nIndex > nLastIndex) { sRes.append(rString.getStr() + nLastIndex, (nIndex - nLastIndex)); diff --git a/oox/source/vml/vmlinputstream.cxx b/oox/source/vml/vmlinputstream.cxx index 91af9e1cc031..080b4b56e536 100644 --- a/oox/source/vml/vmlinputstream.cxx +++ b/oox/source/vml/vmlinputstream.cxx @@ -211,7 +211,7 @@ bool lclProcessCharacters( OStringBuffer& rBuffer, const OString& rChars ) VML import filter implementation has to react on this case manually. A single space character following another character is stored - literally and must not be stipped away here. Example: The element + literally and must not be stripped away here. Example: The element <font>abc </font> contains the three letters a, b, and c, followed by a space character. diff --git a/package/qa/storages/Test15.java b/package/qa/storages/Test15.java index 3afe8dfc04bf..a5ac5d0ac75e 100644 --- a/package/qa/storages/Test15.java +++ b/package/qa/storages/Test15.java @@ -126,7 +126,7 @@ public class Test15 implements StorageTest { return false; // open a new substream hierarchically, set "MediaType" and "Compressed" properties to it, write some bytes - // and dont commit + // and don't commit if ( !m_aTestHelper.WBToSubstrOfEncrH( xTempFileStorage, aSubStream4Path, "MediaType2", true, pBytes1, true, false ) ) return false; diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx index 7b106217e4e8..1b8fac8c904e 100644 --- a/package/source/xstor/owriteablestream.cxx +++ b/package/source/xstor/owriteablestream.cxx @@ -1826,7 +1826,7 @@ void OWriteStream::CopyToStreamInternally_Impl( const uno::Reference< io::XStrea m_pImpl->AddLog( rException.Message ); m_pImpl->AddLog( "Quiet exception" ); - // TODO: set the stoream in invalid state or dispose + // TODO: set the stream in invalid state or dispose SAL_WARN( "package.xstor", "The stream become invalid during copiing!" ); throw uno::RuntimeException(); } |