[Libreoffice-commits] .: binfilter/bf_sfx2 binfilter/bf_svtools binfilter/inc
Julien Nabet
serval2412 at kemper.freedesktop.org
Mon Apr 9 05:44:11 PDT 2012
binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx | 2 +-
binfilter/bf_svtools/source/config/svt_defaultoptions.cxx | 4 ++--
binfilter/bf_svtools/source/config/svt_moduleoptions.cxx | 4 ++--
binfilter/bf_svtools/source/config/svt_pathoptions.cxx | 6 +++---
binfilter/bf_svtools/source/filter.vcl/filter/svt_filter.cxx | 2 +-
binfilter/inc/bf_svtools/pathoptions.hxx | 4 ++--
6 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 48d44b8fa4d45754cf1f15f7bab20af20ff69985
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Mon Apr 9 14:43:39 2012 +0200
s/pathes/paths
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx b/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx
index 0fb4b7c..de0bbbe 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx
@@ -345,7 +345,7 @@ namespace SfxContainer_Impl
/*N*/ }
/*N*/ else
/*N*/ {
-/*N*/ // Default pathes
+/*N*/ // Default paths
/*N*/ maLibraryPath = SvtPathOptions().GetBasicPath();
/*N*/ }
/*N*/
diff --git a/binfilter/bf_svtools/source/config/svt_defaultoptions.cxx b/binfilter/bf_svtools/source/config/svt_defaultoptions.cxx
index d8217ff..600fc16 100644
--- a/binfilter/bf_svtools/source/config/svt_defaultoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_defaultoptions.cxx
@@ -215,7 +215,7 @@ SvtDefaultOptions_Impl::SvtDefaultOptions_Impl() : ConfigItem( ASCII_STR("Office
{
case ::com::sun::star::uno::TypeClass_STRING :
{
- // multi pathes
+ // multi paths
if ( pValues[nProp] >>= aTempStr )
aFullPath = aPathOpt.SubstituteVariable( aTempStr );
else
@@ -227,7 +227,7 @@ SvtDefaultOptions_Impl::SvtDefaultOptions_Impl() : ConfigItem( ASCII_STR("Office
case ::com::sun::star::uno::TypeClass_SEQUENCE :
{
- // single pathes
+ // single paths
aFullPath = OUString();
Sequence < OUString > aList;
if ( pValues[nProp] >>= aList )
diff --git a/binfilter/bf_svtools/source/config/svt_moduleoptions.cxx b/binfilter/bf_svtools/source/config/svt_moduleoptions.cxx
index 933d7e1..257d40f 100644
--- a/binfilter/bf_svtools/source/config/svt_moduleoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_moduleoptions.cxx
@@ -146,7 +146,7 @@ struct FactoryInfo
//---------------------------------------------------------------------------------------------------------
// returns list of properties, which has changed only!
- // We use given value of sNodeBase to build full qualified pathes ...
+ // We use given value of sNodeBase to build full qualified paths ...
// Last sign of it must be "/". Beacuse we use it directly, without any additional things!
css::uno::Sequence< css::beans::PropertyValue > getChangedProperties( const ::rtl::OUString& sNodeBase )
{
@@ -744,7 +744,7 @@ sal_Bool SvtModuleOptions_Impl::ClassifyFactoryByName( const ::rtl::OUString& sN
*//*-*************************************************************************************************************/
void SvtModuleOptions_Impl::impl_Read( const css::uno::Sequence< ::rtl::OUString >& lFactories )
{
- // Expand every set node name in lFactories to full qualified pathes to his properties
+ // Expand every set node name in lFactories to full qualified paths to his properties
// and get right values from configuration.
const css::uno::Sequence< ::rtl::OUString > lProperties = impl_ExpandSetNames( lFactories );
const css::uno::Sequence< css::uno::Any > lValues = GetProperties( lProperties );
diff --git a/binfilter/bf_svtools/source/config/svt_pathoptions.cxx b/binfilter/bf_svtools/source/config/svt_pathoptions.cxx
index d091052..aa3e187 100644
--- a/binfilter/bf_svtools/source/config/svt_pathoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_pathoptions.cxx
@@ -154,7 +154,7 @@ class SvtPathOptions_Impl
public:
SvtPathOptions_Impl();
- // get the pathes, not const because of using a mutex
+ // get the paths, not const because of using a mutex
const String& GetPath( SvtPathOptions::Pathes );
const String& GetAddinPath() { return GetPath( SvtPathOptions::PATH_ADDIN ); }
const String& GetAutoCorrectPath() { return GetPath( SvtPathOptions::PATH_AUTOCORRECT ); }
@@ -182,7 +182,7 @@ class SvtPathOptions_Impl
const String& GetUIConfigPath() { return GetPath( SvtPathOptions::PATH_UICONFIG ); }
const String& GetFingerprintPath() { return GetPath( SvtPathOptions::PATH_FINGERPRINT ); }
- // set the pathes
+ // set the paths
void SetPath( SvtPathOptions::Pathes, const String& rNewPath );
void SetAddinPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_ADDIN, rPath ); }
void SetAutoCorrectPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_AUTOCORRECT, rPath ); }
@@ -293,7 +293,7 @@ const String& SvtPathOptions_Impl::GetPath( SvtPathOptions::Pathes ePath )
ePath == SvtPathOptions::PATH_STORAGE
)
{
- // These office paths have to be converted to system pathes
+ // These office paths have to be converted to system paths
utl::LocalFileHelper::ConvertURLToPhysicalName( aPathValue, aResult );
aPathValue = aResult;
}
diff --git a/binfilter/bf_svtools/source/filter.vcl/filter/svt_filter.cxx b/binfilter/bf_svtools/source/filter.vcl/filter/svt_filter.cxx
index d89abe0..fcba625 100644
--- a/binfilter/bf_svtools/source/filter.vcl/filter/svt_filter.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/filter/svt_filter.cxx
@@ -1525,7 +1525,7 @@ USHORT GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, SvS
{
ImpFilterLibCacheEntry* pFilter = NULL;
- // find first filter in filter pathes
+ // find first filter in filter paths
xub_StrLen i, nTokenCount = aFilterPath.GetTokenCount( ';' );
ImpFilterLibCache &rCache = Cache::get();
for( i = 0; ( i < nTokenCount ) && ( pFilter == NULL ); i++ )
diff --git a/binfilter/inc/bf_svtools/pathoptions.hxx b/binfilter/inc/bf_svtools/pathoptions.hxx
index ca7e965..457a275 100644
--- a/binfilter/inc/bf_svtools/pathoptions.hxx
+++ b/binfilter/inc/bf_svtools/pathoptions.hxx
@@ -79,7 +79,7 @@ public:
SvtPathOptions();
virtual ~SvtPathOptions();
- // get the pathes, not const because of using a mutex
+ // get the paths, not const because of using a mutex
const String& GetAddinPath() const;
const String& GetAutoCorrectPath() const;
const String& GetAutoTextPath() const;
@@ -106,7 +106,7 @@ public:
const String& GetUIConfigPath() const;
const String& GetFingerprintPath() const;
- // set the pathes
+ // set the paths
void SetBasicPath( const String& rPath );
String SubstituteVariable( const String& rVar );
More information about the Libreoffice-commits
mailing list