summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2012-04-09 13:43:22 +0300
committerTor Lillqvist <tml@iki.fi>2012-04-09 14:19:58 +0300
commit383a9c777f1e9d60584d3b1c26a1440e6bef3fa5 (patch)
treeb94ab652cebda9814d94406ea216932ae997a09b
parente1c10e673c0d1a72f6aa53c257c3aac5fc02f380 (diff)
s/pathes/paths/
-rw-r--r--filter/source/config/cache/cacheupdatelistener.cxx2
-rw-r--r--filter/source/config/cache/filtercache.cxx2
-rw-r--r--framework/inc/jobs/jobdispatch.hxx2
-rw-r--r--framework/source/accelerators/acceleratorconfiguration.cxx2
-rw-r--r--framework/source/fwi/classes/protocolhandlercache.cxx2
-rw-r--r--framework/source/fwi/jobs/configaccess.cxx2
-rw-r--r--framework/source/jobs/jobdata.cxx2
-rw-r--r--framework/source/jobs/jobexecutor.cxx2
-rw-r--r--framework/source/services/pathsettings.cxx2
-rw-r--r--svtools/source/config/colorcfg.cxx2
-rw-r--r--svtools/source/config/extcolorcfg.cxx2
-rw-r--r--sw/source/ui/envelp/labelcfg.cxx2
-rw-r--r--unotools/Library_utl.mk2
-rw-r--r--unotools/Package_inc.mk2
-rw-r--r--unotools/inc/unotools/configpaths.hxx (renamed from unotools/inc/unotools/configpathes.hxx)6
-rw-r--r--unotools/source/config/configitem.cxx2
-rw-r--r--unotools/source/config/confignode.cxx2
-rw-r--r--unotools/source/config/configpaths.cxx (renamed from unotools/source/config/configpathes.cxx)2
-rw-r--r--unotools/source/config/fontcfg.cxx2
-rw-r--r--unotools/source/config/viewoptions.cxx2
20 files changed, 22 insertions, 22 deletions
diff --git a/filter/source/config/cache/cacheupdatelistener.cxx b/filter/source/config/cache/cacheupdatelistener.cxx
index 09997222e1fe..1e09df3ac435 100644
--- a/filter/source/config/cache/cacheupdatelistener.cxx
+++ b/filter/source/config/cache/cacheupdatelistener.cxx
@@ -35,7 +35,7 @@
#include <com/sun/star/util/XChangesNotifier.hpp>
#include <com/sun/star/util/XRefreshable.hpp>
#include <salhelper/singletonref.hxx>
-#include <unotools/configpathes.hxx>
+#include <unotools/configpaths.hxx>
#include <rtl/ustring.hxx>
//_______________________________________________
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index 9c2481a48816..1da6f142bc38 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -54,7 +54,7 @@
#include <comphelper/locale.hxx>
#include <comphelper/processfactory.hxx>
-#include <unotools/configpathes.hxx>
+#include <unotools/configpaths.hxx>
#include <rtl/ustrbuf.hxx>
#include <rtl/logfile.hxx>
#include <rtl/uri.hxx>
diff --git a/framework/inc/jobs/jobdispatch.hxx b/framework/inc/jobs/jobdispatch.hxx
index 78c1535192c0..b002332676f0 100644
--- a/framework/inc/jobs/jobdispatch.hxx
+++ b/framework/inc/jobs/jobdispatch.hxx
@@ -60,7 +60,7 @@
//_______________________________________
// other includes
-#include <unotools/configpathes.hxx>
+#include <unotools/configpaths.hxx>
#include <cppuhelper/weak.hxx>
#include <rtl/ustring.hxx>
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index ed3d0ca721fd..3fd5c72eac3b 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -63,7 +63,7 @@
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/util/XChangesNotifier.hpp>
#include <comphelper/configurationhelper.hxx>
-#include <unotools/configpathes.hxx>
+#include <unotools/configpaths.hxx>
#include <rtl/logfile.hxx>
#include <svtools/acceleratorexecute.hxx>
#include <stdio.h>
diff --git a/framework/source/fwi/classes/protocolhandlercache.cxx b/framework/source/fwi/classes/protocolhandlercache.cxx
index 229767cae71b..c7e1a8d06de4 100644
--- a/framework/source/fwi/classes/protocolhandlercache.cxx
+++ b/framework/source/fwi/classes/protocolhandlercache.cxx
@@ -51,7 +51,7 @@
// other includes
//_________________________________________________________________________________________________________________
#include <tools/wldcrd.hxx>
-#include <unotools/configpathes.hxx>
+#include <unotools/configpaths.hxx>
#include <rtl/ustrbuf.hxx>
//_________________________________________________________________________________________________________________
diff --git a/framework/source/fwi/jobs/configaccess.cxx b/framework/source/fwi/jobs/configaccess.cxx
index f39bda8e21d9..b6e13167d13b 100644
--- a/framework/source/fwi/jobs/configaccess.cxx
+++ b/framework/source/fwi/jobs/configaccess.cxx
@@ -46,7 +46,7 @@
//________________________________
// includes of other projects
-#include <unotools/configpathes.hxx>
+#include <unotools/configpaths.hxx>
#include <rtl/ustrbuf.hxx>
//________________________________
diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx
index d059fd45bca6..bf1925a76bed 100644
--- a/framework/source/jobs/jobdata.cxx
+++ b/framework/source/jobs/jobdata.cxx
@@ -46,7 +46,7 @@
//________________________________
// includes of other projects
#include <tools/wldcrd.hxx>
-#include <unotools/configpathes.hxx>
+#include <unotools/configpaths.hxx>
#include <rtl/ustrbuf.hxx>
#include <vcl/svapp.hxx>
diff --git a/framework/source/jobs/jobexecutor.cxx b/framework/source/jobs/jobexecutor.cxx
index 9fe0b3da4061..e41c518ed27a 100644
--- a/framework/source/jobs/jobexecutor.cxx
+++ b/framework/source/jobs/jobexecutor.cxx
@@ -50,7 +50,7 @@
//________________________________
// includes of other projects
-#include <unotools/configpathes.hxx>
+#include <unotools/configpaths.hxx>
#include <rtl/ustrbuf.hxx>
#include <vcl/svapp.hxx>
diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx
index 9bdd098a1d9a..8d74d71379ef 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -56,7 +56,7 @@
#include <rtl/logfile.hxx>
#include <comphelper/configurationhelper.hxx>
-#include <unotools/configpathes.hxx>
+#include <unotools/configpaths.hxx>
#include <fwkdllapi.h>
diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx
index 7c8d59bf94eb..41fc23812908 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -33,7 +33,7 @@
#include <com/sun/star/lang/Locale.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <unotools/configitem.hxx>
-#include <unotools/configpathes.hxx>
+#include <unotools/configpaths.hxx>
#include <com/sun/star/uno/Sequence.h>
#include <svl/poolitem.hxx> //Any2Bool
#include <svl/smplhint.hxx>
diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx
index f612aabd2fe1..6fc1a34f845d 100644
--- a/svtools/source/config/extcolorcfg.cxx
+++ b/svtools/source/config/extcolorcfg.cxx
@@ -33,7 +33,7 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <tools/color.hxx>
#include <unotools/configitem.hxx>
-#include <unotools/configpathes.hxx>
+#include <unotools/configpaths.hxx>
#include <com/sun/star/uno/Sequence.h>
#include <svl/poolitem.hxx> //Any2Bool
#include <svl/smplhint.hxx>
diff --git a/sw/source/ui/envelp/labelcfg.cxx b/sw/source/ui/envelp/labelcfg.cxx
index 04a8695e0782..3ee9fe382070 100644
--- a/sw/source/ui/envelp/labelcfg.cxx
+++ b/sw/source/ui/envelp/labelcfg.cxx
@@ -32,7 +32,7 @@
#include <labelcfg.hxx>
#include <labimp.hxx>
#include <comphelper/string.hxx>
-#include <unotools/configpathes.hxx>
+#include <unotools/configpaths.hxx>
#include <unomid.h>
diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk
index da53b60443f5..69708a12737f 100644
--- a/unotools/Library_utl.mk
+++ b/unotools/Library_utl.mk
@@ -78,7 +78,7 @@ $(eval $(call gb_Library_add_exception_objects,utl,\
unotools/source/config/configitem \
unotools/source/config/configmgr \
unotools/source/config/confignode \
- unotools/source/config/configpathes \
+ unotools/source/config/configpaths \
unotools/source/config/configvaluecontainer \
unotools/source/config/defaultoptions \
unotools/source/config/docinfohelper \
diff --git a/unotools/Package_inc.mk b/unotools/Package_inc.mk
index 5925034dc422..1812cb53dbdb 100644
--- a/unotools/Package_inc.mk
+++ b/unotools/Package_inc.mk
@@ -43,7 +43,7 @@ $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/componentresmodule.h
$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/configitem.hxx,unotools/configitem.hxx))
$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/configmgr.hxx,unotools/configmgr.hxx))
$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/confignode.hxx,unotools/confignode.hxx))
-$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/configpathes.hxx,unotools/configpathes.hxx))
+$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/configpaths.hxx,unotools/configpaths.hxx))
$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/configvaluecontainer.hxx,unotools/configvaluecontainer.hxx))
$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/datetime.hxx,unotools/datetime.hxx))
$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/defaultoptions.hxx,unotools/defaultoptions.hxx))
diff --git a/unotools/inc/unotools/configpathes.hxx b/unotools/inc/unotools/configpaths.hxx
index 258ea01c97ec..110263431f48 100644
--- a/unotools/inc/unotools/configpathes.hxx
+++ b/unotools/inc/unotools/configpaths.hxx
@@ -27,8 +27,8 @@
************************************************************************/
#include "unotools/unotoolsdllapi.h"
-#ifndef UNOTOOLS_CONFIGPATHES_HXX_INCLUDED
-#define UNOTOOLS_CONFIGPATHES_HXX_INCLUDED
+#ifndef UNOTOOLS_CONFIGPATHS_HXX_INCLUDED
+#define UNOTOOLS_CONFIGPATHS_HXX_INCLUDED
#include <sal/types.h>
namespace rtl
@@ -178,6 +178,6 @@ namespace utl
} // namespace utl
//----------------------------------------------------------------------------
-#endif // UNOTOOLS_CONFIGPATHES_HXX_INCLUDED
+#endif // UNOTOOLS_CONFIGPATHS_HXX_INCLUDED
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx
index 615eb03a777a..3aaeaf6dde61 100644
--- a/unotools/source/config/configitem.cxx
+++ b/unotools/source/config/configitem.cxx
@@ -28,7 +28,7 @@
#include "unotools/configitem.hxx"
#include "unotools/configmgr.hxx"
-#include "unotools/configpathes.hxx"
+#include "unotools/configpaths.hxx"
#include <comphelper/processfactory.hxx>
#include <com/sun/star/beans/XMultiPropertySet.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/unotools/source/config/confignode.cxx b/unotools/source/config/confignode.cxx
index 68f6e92704df..9888490e2af8 100644
--- a/unotools/source/config/confignode.cxx
+++ b/unotools/source/config/confignode.cxx
@@ -28,7 +28,7 @@
#include <unotools/confignode.hxx>
-#include <unotools/configpathes.hxx>
+#include <unotools/configpaths.hxx>
#include <tools/diagnose_ex.h>
#include <osl/diagnose.h>
#include <com/sun/star/container/XHierarchicalName.hpp>
diff --git a/unotools/source/config/configpathes.cxx b/unotools/source/config/configpaths.cxx
index 8973e63cc8f5..aa40b533ba20 100644
--- a/unotools/source/config/configpathes.cxx
+++ b/unotools/source/config/configpaths.cxx
@@ -27,7 +27,7 @@
************************************************************************/
-#include "unotools/configpathes.hxx"
+#include "unotools/configpaths.hxx"
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
#include <osl/diagnose.h>
diff --git a/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx
index f464f890f092..91aa696ed14e 100644
--- a/unotools/source/config/fontcfg.cxx
+++ b/unotools/source/config/fontcfg.cxx
@@ -32,7 +32,7 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
-#include <unotools/configpathes.hxx>
+#include <unotools/configpaths.hxx>
#include <unotools/syslocale.hxx>
#include <rtl/ustrbuf.hxx>
#include <rtl/instance.hxx>
diff --git a/unotools/source/config/viewoptions.cxx b/unotools/source/config/viewoptions.cxx
index 444fc3ad0af0..0ec236d30a62 100644
--- a/unotools/source/config/viewoptions.cxx
+++ b/unotools/source/config/viewoptions.cxx
@@ -39,7 +39,7 @@
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <rtl/ustrbuf.hxx>
-#include <unotools/configpathes.hxx>
+#include <unotools/configpaths.hxx>
#include <comphelper/configurationhelper.hxx>
#include <comphelper/processfactory.hxx>