diff options
author | Tor Lillqvist <tml@iki.fi> | 2013-05-15 10:42:04 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@iki.fi> | 2013-05-15 11:14:28 +0300 |
commit | cb6d67c21f11811c5bc023b9565c1c1b1f4081fa (patch) | |
tree | ff8a4b192a2ca846d32111732563432244135910 /framework/source/accelerators | |
parent | 1a357b7394ac7b48b72821bff1aae4706265d7a4 (diff) |
Spelling "separate" (etc) correctly is hard
Diffstat (limited to 'framework/source/accelerators')
-rw-r--r-- | framework/source/accelerators/presethandler.cxx | 10 | ||||
-rw-r--r-- | framework/source/accelerators/storageholder.cxx | 26 |
2 files changed, 18 insertions, 18 deletions
diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx index 6cc93c36efec..7735ea59d41d 100644 --- a/framework/source/accelerators/presethandler.cxx +++ b/framework/source/accelerators/presethandler.cxx @@ -50,7 +50,7 @@ #define FILE_EXTENSION DECLARE_ASCII(".xml") -#define PATH_SEPERATOR DECLARE_ASCII("/") +#define PATH_SEPARATOR DECLARE_ASCII("/") static const ::sal_Int32 ID_CORRUPT_UICONFIG_SHARE = 1; static const ::sal_Int32 ID_CORRUPT_UICONFIG_USER = 2; @@ -423,7 +423,7 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType case E_GLOBAL : { sRelPathBuf.append(SUBSTORAGE_GLOBAL); - sRelPathBuf.append(PATH_SEPERATOR ); + sRelPathBuf.append(PATH_SEPARATOR ); sRelPathBuf.append(sResource ); sRelPathShare = sRelPathBuf.makeStringAndClear(); sRelPathUser = sRelPathShare; @@ -436,9 +436,9 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType case E_MODULES : { sRelPathBuf.append(SUBSTORAGE_MODULES); - sRelPathBuf.append(PATH_SEPERATOR ); + sRelPathBuf.append(PATH_SEPARATOR ); sRelPathBuf.append(sModule ); - sRelPathBuf.append(PATH_SEPERATOR ); + sRelPathBuf.append(PATH_SEPARATOR ); sRelPathBuf.append(sResource ); sRelPathShare = sRelPathBuf.makeStringAndClear(); sRelPathUser = sRelPathShare; @@ -846,7 +846,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openLocalizedPat // Otherwhise we have no acc config at all, which can make other trouble. OUString sLocalizedPath; sLocalizedPath = sPath; - sLocalizedPath += PATH_SEPERATOR; + sLocalizedPath += PATH_SEPARATOR; if (pLocaleFolder != lSubFolders.end()) sLocalizedPath += *pLocaleFolder; else diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx index 40d875c2b51e..395c9943b7a3 100644 --- a/framework/source/accelerators/storageholder.cxx +++ b/framework/source/accelerators/storageholder.cxx @@ -40,9 +40,9 @@ #include <com/sun/star/io/XSeekable.hpp> -#define PATH_SEPERATOR_ASCII "/" -#define PATH_SEPERATOR_UNICODE ((sal_Unicode)'/') -#define PATH_SEPERATOR OUString(PATH_SEPERATOR_ASCII) +#define PATH_SEPARATOR_ASCII "/" +#define PATH_SEPARATOR_UNICODE ((sal_Unicode)'/') +#define PATH_SEPARATOR OUString(PATH_SEPARATOR_ASCII) namespace framework @@ -125,7 +125,7 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openPath(const OUStri const OUString& sChild = *pIt; OUString sCheckPath (sRelPath); sCheckPath += sChild; - sCheckPath += PATH_SEPERATOR; + sCheckPath += PATH_SEPARATOR; // SAFE -> ------------------------------ aReadLock.lock(); @@ -177,7 +177,7 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openPath(const OUStri xParent = xChild; sRelPath += sChild; - sRelPath += PATH_SEPERATOR; + sRelPath += PATH_SEPARATOR; } // TODO think about return last storage as working storage ... but dont caching it inside this holder! @@ -206,7 +206,7 @@ StorageHolder::TStorageList StorageHolder::getAllPathStorages(const OUString& sP const OUString& sChild = *pIt; OUString sCheckPath (sRelPath); sCheckPath += sChild; - sCheckPath += PATH_SEPERATOR; + sCheckPath += PATH_SEPARATOR; TPath2StorageInfo::iterator pCheck = m_lStorages.find(sCheckPath); if (pCheck == m_lStorages.end()) @@ -221,7 +221,7 @@ StorageHolder::TStorageList StorageHolder::getAllPathStorages(const OUString& sP lStoragesOfPath.push_back(rInfo.Storage); sRelPath += sChild; - sRelPath += PATH_SEPERATOR; + sRelPath += PATH_SEPARATOR; } aReadLock.unlock(); @@ -276,7 +276,7 @@ void StorageHolder::closePath(const OUString& rPath) { OUString sCurrentRelPath = sParentPath; sCurrentRelPath += *pIt1; - sCurrentRelPath += PATH_SEPERATOR; + sCurrentRelPath += PATH_SEPARATOR; *pIt1 = sCurrentRelPath; sParentPath = sCurrentRelPath; } @@ -438,7 +438,7 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::getParentStorage(cons for (i=0; i<c-1; ++i) { sParentPath += lFolders[i]; - sParentPath += PATH_SEPERATOR; + sParentPath += PATH_SEPARATOR; } TPath2StorageInfo::const_iterator pParent = m_lStorages.find(sParentPath); @@ -554,7 +554,7 @@ OUString StorageHolder::impl_st_normPath(const OUString& sPath) OUString sNormedPath = sPath; // "/bla" => "bla" && "/" => "" (!) - if (sNormedPath.indexOf(PATH_SEPERATOR) == 0) + if (sNormedPath.indexOf(PATH_SEPARATOR) == 0) sNormedPath += sNormedPath.copy(1); // "/" => "" || "" => "" ? @@ -562,8 +562,8 @@ OUString StorageHolder::impl_st_normPath(const OUString& sPath) return OUString(); // "bla" => "bla/" - if (sNormedPath.lastIndexOf(PATH_SEPERATOR) != (sNormedPath.getLength()-1)) - sNormedPath += PATH_SEPERATOR; + if (sNormedPath.lastIndexOf(PATH_SEPARATOR) != (sNormedPath.getLength()-1)) + sNormedPath += PATH_SEPARATOR; return sNormedPath; } @@ -575,7 +575,7 @@ OUStringList StorageHolder::impl_st_parsePath(const OUString& sPath) sal_Int32 i = 0; while (true) { - OUString sToken = sPath.getToken(0, PATH_SEPERATOR_UNICODE, i); + OUString sToken = sPath.getToken(0, PATH_SEPARATOR_UNICODE, i); if (i < 0) break; lToken.push_back(sToken); |