diff options
author | Jesús Corrius <jesus@softcatala.org> | 2012-02-01 14:42:58 +0100 |
---|---|---|
committer | Jesús Corrius <jesus@softcatala.org> | 2012-02-01 14:43:37 +0100 |
commit | 7be0cc289d9745e0842c4fa6c0a6ac3450f3801b (patch) | |
tree | 5b349b17cc872dfb45ef5ec73a6ba2eec27a37ef /framework | |
parent | e8b7f1faaf3b0fd837a236a4a53d0f7392723713 (diff) |
A few safe replacements of pathes->paths
Diffstat (limited to 'framework')
-rw-r--r-- | framework/inc/classes/filtercachedata.hxx | 6 | ||||
-rw-r--r-- | framework/inc/classes/protocolhandlercache.hxx | 2 | ||||
-rw-r--r-- | framework/inc/services/pathsettings.hxx | 2 | ||||
-rwxr-xr-x | framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java | 2 | ||||
-rw-r--r-- | framework/source/accelerators/storageholder.cxx | 2 | ||||
-rw-r--r-- | framework/source/services/desktop.cxx | 2 | ||||
-rw-r--r-- | framework/source/services/frame.cxx | 4 | ||||
-rw-r--r-- | framework/source/services/pathsettings.cxx | 16 |
8 files changed, 18 insertions, 18 deletions
diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx index ba77457f5ada..db320ebc9782 100644 --- a/framework/inc/classes/filtercachedata.hxx +++ b/framework/inc/classes/filtercachedata.hxx @@ -78,9 +78,9 @@ namespace framework{ #define PACKAGENAME_TYPEDETECTION_STANDARD DECLARE_ASCII("Office.TypeDetection" ) /// Names of our configuration files. #define PACKAGENAME_TYPEDETECTION_ADDITIONAL DECLARE_ASCII("Office.TypeDetectionAdditional" ) -#define CFG_PATH_SEPERATOR DECLARE_ASCII("/" ) /// seperator for configuration pathes -#define PROPERTY_SEPERATOR sal_Unicode(',') /// seperator for own formated property strings of types and filters -#define LIST_SEPERATOR sal_Unicode(';') /// seperator for own formated lists as part of our own formated type- or filter-string +#define CFG_PATH_SEPERATOR DECLARE_ASCII("/" ) /// separator for configuration paths +#define PROPERTY_SEPERATOR sal_Unicode(',') /// separator for own formated property strings of types and filters +#define LIST_SEPERATOR sal_Unicode(';') /// separator for own formated lists as part of our own formated type- or filter-string #define LOCALE_FALLBACK DECLARE_ASCII("en-US" ) /// fallback, if configuration can't give us current set locale ... #define DEFAULT_FILTERCACHE_VERSION 6 /// these implmentation of FilterCache support different version of TypeDetection.xml! This define the current set default one. diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx index 79f4cdc93259..8fe3dfcf1e0c 100644 --- a/framework/inc/classes/protocolhandlercache.hxx +++ b/framework/inc/classes/protocolhandlercache.hxx @@ -62,7 +62,7 @@ namespace framework{ #define PACKAGENAME_PROTOCOLHANDLER DECLARE_ASCII("Office.ProtocolHandler" ) /// name of our configuration package -#define CFG_PATH_SEPERATOR DECLARE_ASCII("/" ) /// seperator for configuration pathes +#define CFG_PATH_SEPERATOR DECLARE_ASCII("/" ) /// separator for configuration paths #define CFG_ENCODING_OPEN DECLARE_ASCII("[\'" ) /// used to start encoding of set names #define CFG_ENCODING_CLOSE DECLARE_ASCII("\']" ) /// used to finish encoding of set names diff --git a/framework/inc/services/pathsettings.hxx b/framework/inc/services/pathsettings.hxx index 8e7d1de958d3..e587cc59f766 100644 --- a/framework/inc/services/pathsettings.hxx +++ b/framework/inc/services/pathsettings.hxx @@ -118,7 +118,7 @@ class PathSettings : public css::lang::XTypeProvider , /// this special path is used to generate feature depending content there ::rtl::OUString sWritePath; - /// indicates real single pathes, which uses WritePath property only + /// indicates real single paths, which uses WritePath property only sal_Bool bIsSinglePath; /// simple handling of finalized/mandatory states ... => we know one state READONLY only .-) diff --git a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java index 1c67271fd6bb..425b91e8515c 100755 --- a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java +++ b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java @@ -75,7 +75,7 @@ import static org.junit.Assert.*; The parameters for this have to be "ftp_access" and "http_access". If they are not given, tests for ftp and http will fail. - @todo We need a further test for accessing UNC pathes on windows! + @todo We need a further test for accessing UNC paths on windows! */ public class CheckXComponentLoader { diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx index d60e18d7674e..285b771aee37 100644 --- a/framework/source/accelerators/storageholder.cxx +++ b/framework/source/accelerators/storageholder.cxx @@ -295,7 +295,7 @@ void StorageHolder::closePath(const ::rtl::OUString& rPath) ::rtl::OUString sNormedPath = StorageHolder::impl_st_normPath(rPath); OUStringList lFolders = StorageHolder::impl_st_parsePath(sNormedPath); - /* convert list of pathes in the following way: + /* convert list of paths in the following way: [0] = "path_1" => "path_1 [1] = "path_2" => "path_1/path_2" [2] = "path_3" => "path_1/path_2/path_3" diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index c6d414c6b0e5..eccd010df82b 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -555,7 +555,7 @@ css::uno::Reference< css::lang::XComponent > SAL_CALL Desktop::getCurrentCompone /*-************************************************************************************************************//** @interface XDesktop @short return the current active frame in hierarchy - @descr There can be more then one different active pathes in our frame hierarchy. But only one of them + @descr There can be more then one different active paths in our frame hierarchy. But only one of them could be the most active frame (normal he has the focus). Don't mix it with getActiveFrame()! That will return our current active frame, which must be a direct child of us and should be a part(!) of an active path. diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index cd60a6c5756b..7db911772824 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -1051,7 +1051,7 @@ sal_Bool SAL_CALL Frame::isTop() throw( css::uno::RuntimeException ) /*-****************************************************************************************************//** @short activate frame in hierarchy - @descr This feature is used to mark active pathes in our frame hierarchy. + @descr This feature is used to mark active paths in our frame hierarchy. You can be a listener for this event to react for it ... change some internal states or something else. @seealso method deactivate() @@ -1151,7 +1151,7 @@ void SAL_CALL Frame::activate() throw( css::uno::RuntimeException ) /*-****************************************************************************************************//** @short deactivate frame in hierarchy - @descr This feature is used to deactive pathes in our frame hierarchy. + @descr This feature is used to deactive paths in our frame hierarchy. You can be a listener for this event to react for it ... change some internal states or something else. @seealso method activate() diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx index d94df4368c3a..9e26c30b28ba 100644 --- a/framework/source/services/pathsettings.cxx +++ b/framework/source/services/pathsettings.cxx @@ -304,7 +304,7 @@ PathSettings::PathInfo PathSettings::impl_readNewFormat(const ::rtl::OUString& s sal_Bool bFinalized = ((aInfo.Attributes & css::beans::PropertyAttribute::READONLY ) == css::beans::PropertyAttribute::READONLY ); // Note: Till we support finalized / mandatory on our API more in detail we handle - // all states simple as READONLY ! But because all realy needed pathes are "mandatory" by default + // all states simple as READONLY ! But because all realy needed paths are "mandatory" by default // we have to handle "finalized" as the real "readonly" indicator . aPathVal.bIsReadonly = bFinalized; } @@ -323,7 +323,7 @@ void PathSettings::impl_storePath(const PathSettings::PathInfo& aPath) // try to replace path-parts with well known and uspported variables. // So an office can be moved easialy to another location without loosing - // it's related pathes. + // it's related paths. PathInfo aResubstPath(aPath); impl_subst(aResubstPath, sal_True); @@ -348,7 +348,7 @@ void PathSettings::impl_storePath(const PathSettings::PathInfo& aPath) // on loading time realy represent an user setting !!! // Check if the given path exists inside the old configuration. - // Because our new configuration knows more then the list of old pathes ... ! + // Because our new configuration knows more then the list of old paths ... ! if (xCfgOld->hasByName(aResubstPath.sPathName)) { css::uno::Reference< css::beans::XPropertySet > xProps(xCfgOld, css::uno::UNO_QUERY_THROW); @@ -408,7 +408,7 @@ PathSettings::EChangeOp PathSettings::impl_updatePath(const ::rtl::OUString& sPa aPath = impl_readNewFormat(sPath); aPath.sPathName = sPath; // replace all might existing variables with real values - // Do it before these old pathes will be compared against the + // Do it before these old paths will be compared against the // new path configuration. Otherwise some striungs uses different variables ... but substitution // will produce strings with same content (because some variables are redundant!) impl_subst(aPath, sal_False); @@ -427,7 +427,7 @@ PathSettings::EChangeOp PathSettings::impl_updatePath(const ::rtl::OUString& sPa // can be disabled for a new major OUStringList lOldVals = impl_readOldFormat(sPath); // replace all might existing variables with real values - // Do it before these old pathes will be compared against the + // Do it before these old paths will be compared against the // new path configuration. Otherwise some striungs uses different variables ... but substitution // will produce strings with same content (because some variables are redundant!) impl_subst(lOldVals, fa_getSubstitution(), sal_False); @@ -893,7 +893,7 @@ void PathSettings::impl_setPathValue( sal_Int32 nID , ::rtl::OUStringBuffer sMsg(256); sMsg.appendAscii("The path '" ); sMsg.append (aChangePath.sPathName); - sMsg.appendAscii("' is defined as SINGLE_PATH. It's sub set of internal pathes cant be set."); + sMsg.appendAscii("' is defined as SINGLE_PATH. It's sub set of internal paths cant be set."); throw css::uno::Exception(sMsg.makeStringAndClear(), static_cast< ::cppu::OWeakObject* >(this)); } @@ -913,7 +913,7 @@ void PathSettings::impl_setPathValue( sal_Int32 nID , ::rtl::OUStringBuffer sMsg(256); sMsg.appendAscii("The path '" ); sMsg.append (aChangePath.sPathName); - sMsg.appendAscii("' is defined as SINGLE_PATH. It's sub set of internal pathes cant be set."); + sMsg.appendAscii("' is defined as SINGLE_PATH. It's sub set of internal paths cant be set."); throw css::uno::Exception(sMsg.makeStringAndClear(), static_cast< ::cppu::OWeakObject* >(this)); } @@ -968,7 +968,7 @@ sal_Bool PathSettings::impl_isValidPath(const OUStringList& lPath) const sal_Bool PathSettings::impl_isValidPath(const ::rtl::OUString& sPath) const { // allow empty path to reset a path. -// idea by LLA to support empty pathes +// idea by LLA to support empty paths // if (sPath.getLength() == 0) // { // return sal_True; |