diff options
-rw-r--r-- | desktop/test/deployment/locationtest/LocationTest.java | 4 | ||||
-rw-r--r-- | desktop/test/deployment/update/updateinfocreation/build/TestExtension.java | 4 | ||||
-rw-r--r-- | filter/source/config/cache/filtercache.cxx | 4 | ||||
-rw-r--r-- | framework/source/inc/accelerators/presethandler.hxx | 2 | ||||
-rw-r--r-- | onlineupdate/source/service/serviceinstall.cxx | 2 | ||||
-rw-r--r-- | onlineupdate/source/service/workmonitor.cxx | 2 | ||||
-rw-r--r-- | onlineupdate/source/update/updater/updater.cxx | 16 | ||||
-rw-r--r-- | reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java | 4 | ||||
-rw-r--r-- | sc/inc/chgtrack.hxx | 2 | ||||
-rw-r--r-- | sc/inc/document.hxx | 2 | ||||
-rw-r--r-- | sc/inc/drwlayer.hxx | 2 | ||||
-rw-r--r-- | sc/inc/orcusxml.hxx | 2 | ||||
-rw-r--r-- | sc/inc/scfuncs.hrc | 2 | ||||
-rw-r--r-- | sc/inc/sheetevents.hxx | 2 |
14 files changed, 25 insertions, 25 deletions
diff --git a/desktop/test/deployment/locationtest/LocationTest.java b/desktop/test/deployment/locationtest/LocationTest.java index a2d99170d678..ca70b5a1e9f4 100644 --- a/desktop/test/deployment/locationtest/LocationTest.java +++ b/desktop/test/deployment/locationtest/LocationTest.java @@ -148,8 +148,8 @@ public class LocationTest { */ public void initialize( Object[] object ) throws com.sun.star.uno.Exception { - /* The component describes what arguments its expected and in which - * order!At this point you can read the objects and can initialize + /* The component describes what arguments are expected and in which + * order! At this point you can read the objects and initialize * your component using these objects. */ } diff --git a/desktop/test/deployment/update/updateinfocreation/build/TestExtension.java b/desktop/test/deployment/update/updateinfocreation/build/TestExtension.java index 84908f0180c3..8d48a30c8178 100644 --- a/desktop/test/deployment/update/updateinfocreation/build/TestExtension.java +++ b/desktop/test/deployment/update/updateinfocreation/build/TestExtension.java @@ -147,8 +147,8 @@ public class TestExtension { */ public void initialize( Object[] object ) throws com.sun.star.uno.Exception { - /* The component describes what arguments its expected and in which - * order!At this point you can read the objects and can initialize + /* The component describes what arguments are expected and in which + * order! At this point you can read the objects and initialize * your component using these objects. */ } diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index 8b620cacf438..aef53ed3db60 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -2049,8 +2049,8 @@ void FilterCache::impl_interpretDataVal4Filter(const OUString& sValue, void FilterCache::impl_readOldFormat() { // Attention: Opening/Reading of this old configuration format has to be handled gracefully. - // Its optional and should not disturb our normal work! - // E.g. we must check, if the package exists ... + // It's optional and should not disturb our normal work! + // E.g. we must check, if the package exists... try { css::uno::Reference< css::uno::XInterface > xInt = impl_openConfig(E_PROVIDER_OLD); diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx index 509908a2546d..072011b1de06 100644 --- a/framework/source/inc/accelerators/presethandler.hxx +++ b/framework/source/inc/accelerators/presethandler.hxx @@ -338,7 +338,7 @@ class PresetHandler @param sPath the configuration path, which should be opened. - Its further used as out parameter too, so we can return the localized + It's further used as out parameter too, so we can return the localized path! @param eMode diff --git a/onlineupdate/source/service/serviceinstall.cxx b/onlineupdate/source/service/serviceinstall.cxx index edff2e3c2794..7d53d25cbd6b 100644 --- a/onlineupdate/source/service/serviceinstall.cxx +++ b/onlineupdate/source/service/serviceinstall.cxx @@ -75,7 +75,7 @@ ReadMaintenanceServiceStrings(LPCWSTR path, { // Read in the maintenance service description string if specified. const unsigned int kNumStrings = 1; - // TODO: moggi: needs adaption for LibreOffice + // TODO: moggi: needs adaptation for LibreOffice const char *kServiceKeys = "MozillaMaintenanceDescription\0"; char serviceStrings[kNumStrings][MAX_TEXT_LEN]; int result = ReadStrings(path, kServiceKeys, diff --git a/onlineupdate/source/service/workmonitor.cxx b/onlineupdate/source/service/workmonitor.cxx index 05cf2481e7ce..6228b1e6c53f 100644 --- a/onlineupdate/source/service/workmonitor.cxx +++ b/onlineupdate/source/service/workmonitor.cxx @@ -702,7 +702,7 @@ ExecuteServiceCommand(int argc, LPWSTR *argv) { // Use the passed in command line arguments for the update, except for the - // path to updater.exe. We copy updater.exe to a the directory of the + // path to updater.exe. We copy updater.exe to the directory of the // MozillaMaintenance service so that a low integrity process cannot // replace the updater.exe at any point and use that for the update. // It also makes DLL injection attacks harder. diff --git a/onlineupdate/source/update/updater/updater.cxx b/onlineupdate/source/update/updater/updater.cxx index 1166501f575e..05515bef3d35 100644 --- a/onlineupdate/source/update/updater/updater.cxx +++ b/onlineupdate/source/update/updater/updater.cxx @@ -301,7 +301,7 @@ EnvHasValue(const char *name) #endif /** - * Coverts a relative update path to a absolute path related to the working + * Converts a relative update path to an absolute path related to the working * or install directory. Allocates a new NS_tchar[] based path! * * @param relpath @@ -2011,7 +2011,7 @@ LaunchWinPostProcess(const WCHAR *installationDir, WCHAR workingDirectory[MAX_PATH + 1] = { L'\0' }; wcsncpy(workingDirectory, installationDir, MAX_PATH); - // TODO: moggi: needs adaption for LibreOffice + // TODO: moggi: needs adaptation for LibreOffice // Most likely we don't have the helper method yet. Check if we really need it. // Launch helper.exe to perform post processing (e.g. registry and log file @@ -2561,7 +2561,7 @@ WaitForServiceFinishThread(void* /*param*/) static int ReadMARChannelIDs(const NS_tchar *path, MARChannelStringTable *results) { - // TODO: moggi: needs adaption for LibreOffice + // TODO: moggi: needs adaptation for LibreOffice // Check where this function gets its parameters from const unsigned int kNumStrings = 1; const char *kUpdaterKeys = "ACCEPTED_MAR_CHANNEL_IDS\0"; @@ -2672,7 +2672,7 @@ CheckSignature(ArchiveReader& archiveReader) { NS_tchar updateSettingsPath[MAX_TEXT_LEN]; - // TODO: moggi: needs adaption for LibreOffice + // TODO: moggi: needs adaptation for LibreOffice // These paths need to be adapted for us. int nWrittenBytes = NS_tsnprintf(updateSettingsPath, sizeof(updateSettingsPath) / sizeof(updateSettingsPath[0]), @@ -2899,7 +2899,7 @@ int NS_main(int argc, NS_tchar **argv) const int callbackIndex = 6; #ifdef MACOSX - // TODO: moggi: needs adaption for LibreOffice + // TODO: moggi: needs adaptation for LibreOffice bool isElevated = strstr(argv[0], "/Library/PrivilegedHelperTools/org.mozilla.updater") != 0; if (isElevated) @@ -2995,7 +2995,7 @@ int NS_main(int argc, NS_tchar **argv) // Remove everything except close window from the context menu { - // TODO: moggi: needs adaption for LibreOffice + // TODO: moggi: needs adaptation for LibreOffice HKEY hkApp = nullptr; RegCreateKeyExW(HKEY_CURRENT_USER, L"Software\\Classes\\Applications", 0, nullptr, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, nullptr, @@ -3318,7 +3318,7 @@ int NS_main(int argc, NS_tchar **argv) if (useService) { WCHAR maintenanceServiceKey[MAX_PATH + 1]; - // TODO: moggi: needs adaption for LibreOffice + // TODO: moggi: needs adaptation for LibreOffice // Most likely the registry part is not correct yet if (CalculateRegistryPathFromFilePath(gInstallDirPath, maintenanceServiceKey)) @@ -4462,7 +4462,7 @@ int DoUpdate(ArchiveReader& archiveReader) ensure_parent_dir(manifest); // extract the manifest - // TODO: moggi: needs adaption for LibreOffice + // TODO: moggi: needs adaptation for LibreOffice // Why would we need the manifest? Even if we need it why would we need 2? int rv = archiveReader.ExtractFile("updatev3.manifest", manifest); if (rv) diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java b/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java index 4c799cd27326..54694fd619ab 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java @@ -118,8 +118,8 @@ public class SOReportJobFactory public void initialize(final Object[] object) throws com.sun.star.uno.Exception { - /* The component describes what arguments its expected and in which - * order!At this point you can read the objects and can initialize + /* The component describes what arguments are expected and in which + * order! At this point you can read the objects and initialize * your component using these objects. */ } diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx index a1bb011b9769..9c8cc6ab4b5c 100644 --- a/sc/inc/chgtrack.hxx +++ b/sc/inc/chgtrack.hxx @@ -920,7 +920,7 @@ class SAL_DLLPUBLIC_RTTI ScChangeTrack : public utl::ConfigurationListener void Remove( ScChangeAction* ); void MasterLinks( ScChangeAction* ); - // Content on top an Position + // Content on top at Position ScChangeActionContent* SearchContentAt( const ScBigAddress&, const ScChangeAction* pButNotThis ) const; void DeleteGeneratedDelContent( diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index bebbd4fafb9a..111170d97318 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -723,7 +723,7 @@ public: @param rpRangeData On entry, the pointer to the original named expression/range. - On return TRUE, the pointer to the new copied name, or nullptr if hit shappened. + On return TRUE, the pointer to the new copied name, or nullptr if hits happened. @param rNewPos New position of formula cell if called for that, else new base diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx index 9f8268be03b8..4bb4a759b241 100644 --- a/sc/inc/drwlayer.hxx +++ b/sc/inc/drwlayer.hxx @@ -193,7 +193,7 @@ public: bool HasObjectsAnchoredInRange(const ScRange& rRange); void MoveObject(SdrObject* pObj, const ScAddress& rNewPosition); - // positions for detektive lines + // positions for detective lines static ScDrawObjData* GetObjData( SdrObject* pObj, bool bCreate=false ); static ScDrawObjData* GetNonRotatedObjData( SdrObject* pObj, bool bCreate=false ); diff --git a/sc/inc/orcusxml.hxx b/sc/inc/orcusxml.hxx index f0f155882c3e..ced991e51ded 100644 --- a/sc/inc/orcusxml.hxx +++ b/sc/inc/orcusxml.hxx @@ -48,7 +48,7 @@ struct ScOrcusXMLTreeParam /** * Store all custom data instances since the tree control doesn't manage - * the life cycle of user datas. + * the life cycle of user data. */ UserDataStoreType m_UserDataStore; diff --git a/sc/inc/scfuncs.hrc b/sc/inc/scfuncs.hrc index e17eb9250c65..836ceb418d72 100644 --- a/sc/inc/scfuncs.hrc +++ b/sc/inc/scfuncs.hrc @@ -4036,7 +4036,7 @@ const char* SC_OPCODE_COLOR_ARY[] = const char* SC_OPCODE_WEBSERVICE_ARY[] = { - NC_("SC_OPCODE_WEBSERVICE", "Get some webcontent from an URI."), + NC_("SC_OPCODE_WEBSERVICE", "Get some webcontent from a URI."), NC_("SC_OPCODE_WEBSERVICE", "URI"), NC_("SC_OPCODE_WEBSERVICE", "URI of the webservice") }; diff --git a/sc/inc/sheetevents.hxx b/sc/inc/sheetevents.hxx index 64dd3e498592..e205ed1d801e 100644 --- a/sc/inc/sheetevents.hxx +++ b/sc/inc/sheetevents.hxx @@ -27,7 +27,7 @@ namespace boost { template <class T> class optional; } enum class ScSheetEventId { FOCUS, UNFOCUS, SELECT, DOUBLECLICK, RIGHTCLICK, CHANGE, CALCULATE, COUNT, - NOTFOUND = -1 // used as a an error return value + NOTFOUND = -1 // used as an error return value }; class ScSheetEvents |