Renaming of files in preparation for code style tools.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit 8b78a8791bc539bcffe7159f9d9714d577cb3d7d)
author: Michele Calgaro <michele.calgaro@yahoo.it> 2021-05-23 20:48:35 +0900
committer: Michele Calgaro <michele.calgaro@yahoo.it> 2021-05-29 15:17:38 +0900
commit: d63c9d696eb6e2539528b99afc21f4086c9defe3 (patch)
tree: b3bfc97a66431a12cdd8f9379c0072673ede43df /filters/kword
parent: 5363fe3c36504c37bdc6dcfafd5f71daeae251e8 (diff)
download: koffice-d63c9d69.tar.gz
koffice-d63c9d69.zip
203 files changed, 254 insertions, 254 deletions
diff --git a/filters/kword/abiword/ImportField.cc b/filters/kword/abiword/ImportField.cpp
index e9474364f..e9474364f 100644
--- a/filters/kword/abiword/ImportField.cc
+++ b/filters/kword/abiword/ImportField.cpp
diff --git a/filters/kword/abiword/ImportFormatting.cc b/filters/kword/abiword/ImportFormatting.cpp
index 7c45f07a0..7c45f07a0 100644
--- a/filters/kword/abiword/ImportFormatting.cc
+++ b/filters/kword/abiword/ImportFormatting.cpp
diff --git a/filters/kword/abiword/ImportHelpers.cc b/filters/kword/abiword/ImportHelpers.cpp
index c3cad308a..c3cad308a 100644
--- a/filters/kword/abiword/ImportHelpers.cc
+++ b/filters/kword/abiword/ImportHelpers.cpp
diff --git a/filters/kword/abiword/ImportStyle.cc b/filters/kword/abiword/ImportStyle.cpp
index 1a023c8e5..1a023c8e5 100644
--- a/filters/kword/abiword/ImportStyle.cc
+++ b/filters/kword/abiword/ImportStyle.cpp
diff --git a/filters/kword/abiword/Makefile.am b/filters/kword/abiword/Makefile.am
index 0a0f1f824..098266e96 100644
--- a/filters/kword/abiword/Makefile.am
+++ b/filters/kword/abiword/Makefile.am
@@ -12,10 +12,10 @@ libabiwordexport_la_LIBADD = $(KOFFICE_LIBS) ../libexport/libkwordexportfilters.
 
 kde_module_LTLIBRARIES = libabiwordimport.la libabiwordexport.la
 
-libabiwordimport_la_SOURCES = abiwordimport.cc ImportHelpers.cc\
-ImportFormatting.cc ImportStyle.cc ImportField.cc
+libabiwordimport_la_SOURCES = abiwordimport.cpp ImportHelpers.cpp\
+ImportFormatting.cpp ImportStyle.cpp ImportField.cpp
 
-libabiwordexport_la_SOURCES = abiwordexport.cc
+libabiwordexport_la_SOURCES = abiwordexport.cpp
 
 noinst_HEADERS = abiwordimport.h ImportHelpers.h ImportFormatting.h\
 ImportStyle.h ImportField.h abiwordexport.h
diff --git a/filters/kword/abiword/abiwordexport.cc b/filters/kword/abiword/abiwordexport.cpp
index 11f5d2dd7..d1b5a98a2 100644
--- a/filters/kword/abiword/abiwordexport.cc
+++ b/filters/kword/abiword/abiwordexport.cpp
@@ -19,7 +19,7 @@
 
 /*
    This file is based on the old file:
-    /home/kde/koffice/filters/kword/ascii/asciiexport.cc
+    /home/kde/koffice/filters/kword/ascii/asciiexport.cpp
 
    The old file was copyrighted by
     Copyright (C) 1998, 1999 Reginald Stadlbauer <reggie@kde.org>
diff --git a/filters/kword/abiword/abiwordimport.cc b/filters/kword/abiword/abiwordimport.cpp
index bd6ea1e38..bd6ea1e38 100644
--- a/filters/kword/abiword/abiwordimport.cc
+++ b/filters/kword/abiword/abiwordimport.cpp
diff --git a/filters/kword/amipro/Makefile.am b/filters/kword/amipro/Makefile.am
index f872af037..845049868 100644
--- a/filters/kword/amipro/Makefile.am
+++ b/filters/kword/amipro/Makefile.am
@@ -11,8 +11,8 @@ libamiproexport_la_LIBADD = $(KOFFICE_LIBS) ../libexport/libkwordexportfilters.l
 
 kde_module_LTLIBRARIES = libamiproimport.la libamiproexport.la
 
-libamiproimport_la_SOURCES = amiproimport.cc amiproparser.cpp
-libamiproexport_la_SOURCES = amiproexport.cc
+libamiproimport_la_SOURCES = amiproimport.cpp amiproparser.cpp
+libamiproexport_la_SOURCES = amiproexport.cpp
 
 noinst_HEADERS = amiproparser.h
 
diff --git a/filters/kword/amipro/amiproexport.cc b/filters/kword/amipro/amiproexport.cpp
index e6703fc02..e6703fc02 100644
--- a/filters/kword/amipro/amiproexport.cc
+++ b/filters/kword/amipro/amiproexport.cpp
diff --git a/filters/kword/amipro/amiproimport.cc b/filters/kword/amipro/amiproimport.cpp
index fe45ca18e..fe45ca18e 100644
--- a/filters/kword/amipro/amiproimport.cc
+++ b/filters/kword/amipro/amiproimport.cpp
diff --git a/filters/kword/applixword/Makefile.am b/filters/kword/applixword/Makefile.am
index 14e899746..7bc406c7d 100644
--- a/filters/kword/applixword/Makefile.am
+++ b/filters/kword/applixword/Makefile.am
@@ -7,7 +7,7 @@ libapplixwordimport_la_LDFLAGS	= $(all_libraries) -module -avoid-version -no-und
 
 kde_module_LTLIBRARIES = libapplixwordimport.la
 
-libapplixwordimport_la_SOURCES = applixwordimport.cc
+libapplixwordimport_la_SOURCES = applixwordimport.cpp
 libapplixwordimport_la_LIBADD = $(KOFFICE_LIBS)
 noinst_HEADERS = applixwordimport.h
 
diff --git a/filters/kword/applixword/applixwordimport.cc b/filters/kword/applixword/applixwordimport.cpp
index 4c8b6620a..4c8b6620a 100644
--- a/filters/kword/applixword/applixwordimport.cc
+++ b/filters/kword/applixword/applixwordimport.cpp
diff --git a/filters/kword/ascii/ExportDialog.cc b/filters/kword/ascii/ExportDialog.cpp
index 577fb72b9..577fb72b9 100644
--- a/filters/kword/ascii/ExportDialog.cc
+++ b/filters/kword/ascii/ExportDialog.cpp
diff --git a/filters/kword/ascii/ImportDialog.cc b/filters/kword/ascii/ImportDialog.cpp
index 09c81a090..09c81a090 100644
--- a/filters/kword/ascii/ImportDialog.cc
+++ b/filters/kword/ascii/ImportDialog.cpp
diff --git a/filters/kword/ascii/Makefile.am b/filters/kword/ascii/Makefile.am
index 74b9dde20..22a5d5555 100644
--- a/filters/kword/ascii/Makefile.am
+++ b/filters/kword/ascii/Makefile.am
@@ -12,9 +12,9 @@ libasciiexport_la_LIBADD = $(KOFFICE_LIBS) ../libexport/libkwordexportfilters.la
 
 kde_module_LTLIBRARIES = libasciiimport.la libasciiexport.la
 
-libasciiimport_la_SOURCES = asciiimport.cc ImportDialogUI.ui ImportDialog.cc
+libasciiimport_la_SOURCES = asciiimport.cpp ImportDialogUI.ui ImportDialog.cpp
 
-libasciiexport_la_SOURCES = asciiexport.cc ExportDialogUI.ui ExportDialog.cc
+libasciiexport_la_SOURCES = asciiexport.cpp ExportDialogUI.ui ExportDialog.cpp
 
 noinst_HEADERS = asciiimport.h ImportDialog.h asciiexport.h ExportDialog.h
 
diff --git a/filters/kword/ascii/asciiexport.cc b/filters/kword/ascii/asciiexport.cpp
index 1bea9a269..1bea9a269 100644
--- a/filters/kword/ascii/asciiexport.cc
+++ b/filters/kword/ascii/asciiexport.cpp
diff --git a/filters/kword/ascii/asciiimport.cc b/filters/kword/ascii/asciiimport.cpp
index b7c4c0f5e..b7c4c0f5e 100644
--- a/filters/kword/ascii/asciiimport.cc
+++ b/filters/kword/ascii/asciiimport.cpp
diff --git a/filters/kword/docbook/Makefile.am b/filters/kword/docbook/Makefile.am
index 9ce299cbb..93967bc11 100644
--- a/filters/kword/docbook/Makefile.am
+++ b/filters/kword/docbook/Makefile.am
@@ -8,7 +8,7 @@ libdocbookexport_la_LIBADD = $(KOFFICE_LIBS) ../libexport/libkwordexportfilters.
 
 kde_module_LTLIBRARIES = libdocbookexport.la
 
-libdocbookexport_la_SOURCES = docbookexport.cc
+libdocbookexport_la_SOURCES = docbookexport.cpp
 
 noinst_HEADERS = docbookexport.h 
 
diff --git a/filters/kword/docbook/docbookexport.cc b/filters/kword/docbook/docbookexport.cpp
index f54bec6b1..f54bec6b1 100644
--- a/filters/kword/docbook/docbookexport.cc
+++ b/filters/kword/docbook/docbookexport.cpp
diff --git a/filters/kword/html/export/ExportBasic.cc b/filters/kword/html/export/ExportBasic.cpp
index d222d7df4..d222d7df4 100644
--- a/filters/kword/html/export/ExportBasic.cc
+++ b/filters/kword/html/export/ExportBasic.cpp
diff --git a/filters/kword/html/export/ExportCss.cc b/filters/kword/html/export/ExportCss.cpp
index 2388477c3..2388477c3 100644
--- a/filters/kword/html/export/ExportCss.cc
+++ b/filters/kword/html/export/ExportCss.cpp
diff --git a/filters/kword/html/export/ExportDialog.cc b/filters/kword/html/export/ExportDialog.cpp
index 5fc3fdc59..5fc3fdc59 100644
--- a/filters/kword/html/export/ExportDialog.cc
+++ b/filters/kword/html/export/ExportDialog.cpp
diff --git a/filters/kword/html/export/ExportDocStruct.cc b/filters/kword/html/export/ExportDocStruct.cpp
index eccdead1d..eccdead1d 100644
--- a/filters/kword/html/export/ExportDocStruct.cc
+++ b/filters/kword/html/export/ExportDocStruct.cpp
diff --git a/filters/kword/html/export/ExportFilter.cc b/filters/kword/html/export/ExportFilter.cpp
index 96f0b6c5b..96f0b6c5b 100644
--- a/filters/kword/html/export/ExportFilter.cc
+++ b/filters/kword/html/export/ExportFilter.cpp
diff --git a/filters/kword/html/export/Makefile.am b/filters/kword/html/export/Makefile.am
index e35b70a5a..280dbb5e4 100644
--- a/filters/kword/html/export/Makefile.am
+++ b/filters/kword/html/export/Makefile.am
@@ -10,8 +10,8 @@ libhtmlexport_la_LIBADD = $(KOFFICE_LIBS) ../../libexport/libkwordexportfilters.
 
 kde_module_LTLIBRARIES = libhtmlexport.la
 
-libhtmlexport_la_SOURCES = htmlexport.cc ExportDialog.cc ExportDialogUI.ui \
-ExportFilter.cc ExportCss.cc ExportDocStruct.cc ExportBasic.cc
+libhtmlexport_la_SOURCES = htmlexport.cpp ExportDialog.cpp ExportDialogUI.ui \
+ExportFilter.cpp ExportCss.cpp ExportDocStruct.cpp ExportBasic.cpp
 
 noinst_HEADERS = htmlexport.h ExportDialog.h ExportDialogUI.h ExportFilter.h \
 ExportCss.h ExportDocStruct.h ExportBasic.h
diff --git a/filters/kword/html/export/htmlexport.cc b/filters/kword/html/export/htmlexport.cpp
index 285735176..76d780527 100644
--- a/filters/kword/html/export/htmlexport.cc
+++ b/filters/kword/html/export/htmlexport.cpp
@@ -20,7 +20,7 @@
 
 /*
    This file is based on the old file:
-    /home/kde/koffice/filters/kword/ascii/asciiexport.cc
+    /home/kde/koffice/filters/kword/ascii/asciiexport.cpp
 
    The old file was copyrighted by
     Copyright (C) 1998, 1999 Reginald Stadlbauer <reggie@kde.org>
diff --git a/filters/kword/latex/export/Makefile.am b/filters/kword/latex/export/Makefile.am
index 24900b6ef..180d45dc3 100644
--- a/filters/kword/latex/export/Makefile.am
+++ b/filters/kword/latex/export/Makefile.am
@@ -8,17 +8,17 @@ libkwordlatexexport_la_LIBADD  = $(KOFFICE_LIBS) $(LIB_KFORMULA) $(LIBMAGICK_LIB
 
 kde_module_LTLIBRARIES = libkwordlatexexport.la
 
-libkwordlatexexport_la_SOURCES = anchor.cc config.cc document.cc element.cc fileheader.cc \
- latexexportdia.ui footnote.cc format.cc formula.cc key.cc \
- kwordlatexexportdia.cc latexexport.cc latexexportIface.cc \
- latexexportIface.skel layout.cc listtable.cc para.cc \
- pixmapFrame.cc table.cc \
- textFrame.cc textformat.cc textzone.cc variableformat.cc \
- variablezone.cc xml2latexparser.cc xmlparser.cc
+libkwordlatexexport_la_SOURCES = anchor.cpp config.cpp document.cpp element.cpp fileheader.cpp \
+ latexexportdia.ui footnote.cpp format.cpp formula.cpp key.cpp \
+ kwordlatexexportdia.cpp latexexport.cpp latexexportIface.cpp \
+ latexexportIface.skel layout.cpp listtable.cpp para.cpp \
+ pixmapFrame.cpp table.cpp \
+ textFrame.cpp textformat.cpp textzone.cpp variableformat.cpp \
+ variablezone.cpp xml2latexparser.cpp xmlparser.cpp
 
 ######## Debug
 #check_PROGRAMS = texlauncher
-#texlauncher_SOURCES = texlauncher.cc
+#texlauncher_SOURCES = texlauncher.cpp
 #texlauncher_LDADD = liblatexexport.la
 #texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
diff --git a/filters/kword/latex/export/anchor.cc b/filters/kword/latex/export/anchor.cpp
index 999153847..999153847 100644
--- a/filters/kword/latex/export/anchor.cc
+++ b/filters/kword/latex/export/anchor.cpp
diff --git a/filters/kword/latex/export/config.cc b/filters/kword/latex/export/config.cpp
index 8460aae41..8460aae41 100644
--- a/filters/kword/latex/export/config.cc
+++ b/filters/kword/latex/export/config.cpp
diff --git a/filters/kword/latex/export/document.cc b/filters/kword/latex/export/document.cpp
index 13d40415f..13d40415f 100644
--- a/filters/kword/latex/export/document.cc
+++ b/filters/kword/latex/export/document.cpp
diff --git a/filters/kword/latex/export/element.cc b/filters/kword/latex/export/element.cpp
index 992293243..992293243 100644
--- a/filters/kword/latex/export/element.cc
+++ b/filters/kword/latex/export/element.cpp
diff --git a/filters/kword/latex/export/fileheader.cc b/filters/kword/latex/export/fileheader.cpp
index 8da25a16e..8da25a16e 100644
--- a/filters/kword/latex/export/fileheader.cc
+++ b/filters/kword/latex/export/fileheader.cpp
diff --git a/filters/kword/latex/export/footnote.cc b/filters/kword/latex/export/footnote.cpp
index fbfba354f..fbfba354f 100644
--- a/filters/kword/latex/export/footnote.cc
+++ b/filters/kword/latex/export/footnote.cpp
diff --git a/filters/kword/latex/export/format.cc b/filters/kword/latex/export/format.cpp
index d2e7d4a2b..d2e7d4a2b 100644
--- a/filters/kword/latex/export/format.cc
+++ b/filters/kword/latex/export/format.cpp
diff --git a/filters/kword/latex/export/formula.cc b/filters/kword/latex/export/formula.cpp
index 98f173797..98f173797 100644
--- a/filters/kword/latex/export/formula.cc
+++ b/filters/kword/latex/export/formula.cpp
diff --git a/filters/kword/latex/export/key.cc b/filters/kword/latex/export/key.cpp
index dccf89c6e..dccf89c6e 100644
--- a/filters/kword/latex/export/key.cc
+++ b/filters/kword/latex/export/key.cpp
diff --git a/filters/kword/latex/export/kwordlatexexportdia.cc b/filters/kword/latex/export/kwordlatexexportdia.cpp
index 3498bcdb9..3498bcdb9 100644
--- a/filters/kword/latex/export/kwordlatexexportdia.cc
+++ b/filters/kword/latex/export/kwordlatexexportdia.cpp
diff --git a/filters/kword/latex/export/latexexport.cc b/filters/kword/latex/export/latexexport.cpp
index fed29704f..fed29704f 100644
--- a/filters/kword/latex/export/latexexport.cc
+++ b/filters/kword/latex/export/latexexport.cpp
diff --git a/filters/kword/latex/export/latexexportIface.cc b/filters/kword/latex/export/latexexportIface.cpp
index 102845b10..102845b10 100644
--- a/filters/kword/latex/export/latexexportIface.cc
+++ b/filters/kword/latex/export/latexexportIface.cpp
diff --git a/filters/kword/latex/export/layout.cc b/filters/kword/latex/export/layout.cpp
index 74cee48ba..74cee48ba 100644
--- a/filters/kword/latex/export/layout.cc
+++ b/filters/kword/latex/export/layout.cpp
diff --git a/filters/kword/latex/export/listeformat.cc b/filters/kword/latex/export/listeformat.cpp
index 1122e70bb..1122e70bb 100644
--- a/filters/kword/latex/export/listeformat.cc
+++ b/filters/kword/latex/export/listeformat.cpp
diff --git a/filters/kword/latex/export/listelement.cc b/filters/kword/latex/export/listelement.cpp
index bb309ee93..bb309ee93 100644
--- a/filters/kword/latex/export/listelement.cc
+++ b/filters/kword/latex/export/listelement.cpp
diff --git a/filters/kword/latex/export/listepara.cc b/filters/kword/latex/export/listepara.cpp
index 0eb8dcad2..0eb8dcad2 100644
--- a/filters/kword/latex/export/listepara.cc
+++ b/filters/kword/latex/export/listepara.cpp
diff --git a/filters/kword/latex/export/listtable.cc b/filters/kword/latex/export/listtable.cpp
index 55cbf2382..55cbf2382 100644
--- a/filters/kword/latex/export/listtable.cc
+++ b/filters/kword/latex/export/listtable.cpp
diff --git a/filters/kword/latex/export/para.cc b/filters/kword/latex/export/para.cpp
index 9cc829b57..9cc829b57 100644
--- a/filters/kword/latex/export/para.cc
+++ b/filters/kword/latex/export/para.cpp
diff --git a/filters/kword/latex/export/pixmapFrame.cc b/filters/kword/latex/export/pixmapFrame.cpp
index 25f5951d7..25f5951d7 100644
--- a/filters/kword/latex/export/pixmapFrame.cc
+++ b/filters/kword/latex/export/pixmapFrame.cpp
diff --git a/filters/kword/latex/export/table.cc b/filters/kword/latex/export/table.cpp
index 90fdc378c..90fdc378c 100644
--- a/filters/kword/latex/export/table.cc
+++ b/filters/kword/latex/export/table.cpp
diff --git a/filters/kword/latex/export/texlauncher.cc b/filters/kword/latex/export/texlauncher.cpp
index 17c00b7d9..17c00b7d9 100644
--- a/filters/kword/latex/export/texlauncher.cc
+++ b/filters/kword/latex/export/texlauncher.cpp
diff --git a/filters/kword/latex/export/textFrame.cc b/filters/kword/latex/export/textFrame.cpp
index d6141e966..d6141e966 100644
--- a/filters/kword/latex/export/textFrame.cc
+++ b/filters/kword/latex/export/textFrame.cpp
diff --git a/filters/kword/latex/export/textformat.cc b/filters/kword/latex/export/textformat.cpp
index 02576354d..02576354d 100644
--- a/filters/kword/latex/export/textformat.cc
+++ b/filters/kword/latex/export/textformat.cpp
diff --git a/filters/kword/latex/export/textzone.cc b/filters/kword/latex/export/textzone.cpp
index 0bf4e436e..0bf4e436e 100644
--- a/filters/kword/latex/export/textzone.cc
+++ b/filters/kword/latex/export/textzone.cpp
diff --git a/filters/kword/latex/export/variableformat.cc b/filters/kword/latex/export/variableformat.cpp
index 5c6f9f40e..5c6f9f40e 100644
--- a/filters/kword/latex/export/variableformat.cc
+++ b/filters/kword/latex/export/variableformat.cpp
diff --git a/filters/kword/latex/export/variablezone.cc b/filters/kword/latex/export/variablezone.cpp
index b73788b3e..b73788b3e 100644
--- a/filters/kword/latex/export/variablezone.cc
+++ b/filters/kword/latex/export/variablezone.cpp
diff --git a/filters/kword/latex/export/xml2latexparser.cc b/filters/kword/latex/export/xml2latexparser.cpp
index 88936c9a1..88936c9a1 100644
--- a/filters/kword/latex/export/xml2latexparser.cc
+++ b/filters/kword/latex/export/xml2latexparser.cpp
diff --git a/filters/kword/latex/export/xmlparser.cc b/filters/kword/latex/export/xmlparser.cpp
index 9d83bedb8..9d83bedb8 100644
--- a/filters/kword/latex/export/xmlparser.cc
+++ b/filters/kword/latex/export/xmlparser.cpp
diff --git a/filters/kword/latex/import/Makefile.am b/filters/kword/latex/import/Makefile.am
index 25c8a12ea..428f8f15d 100644
--- a/filters/kword/latex/import/Makefile.am
+++ b/filters/kword/latex/import/Makefile.am
@@ -10,14 +10,14 @@ libkwordlateximport_la_LIBADD = $(KOFFICE_LIBS) parser/liblatexparser.la generat
 
 kde_module_LTLIBRARIES = libkwordlateximport.la
 
-libkwordlateximport_la_SOURCES = config.cc lateximport.cc \
-																 lateximportdia.cc lateximportdia.skel
+libkwordlateximport_la_SOURCES = config.cpp lateximport.cpp \
+																 lateximportdia.cpp lateximportdia.skel
 
 noinst_HEADERS = config.h lateximport.h lateximportdia.h
 
 ######## Debug
 #check_PROGRAMS = texlauncher
-#texlauncher_SOURCES = texlauncher.cc
+#texlauncher_SOURCES = texlauncher.cpp
 #texlauncher_LDADD = liblatexexport.la
 #texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
diff --git a/filters/kword/latex/import/config.cc b/filters/kword/latex/import/config.cpp
index d4594f700..d4594f700 100644
--- a/filters/kword/latex/import/config.cc
+++ b/filters/kword/latex/import/config.cpp
diff --git a/filters/kword/latex/import/generator/Makefile.am b/filters/kword/latex/import/generator/Makefile.am
index 089014e34..308e11c69 100644
--- a/filters/kword/latex/import/generator/Makefile.am
+++ b/filters/kword/latex/import/generator/Makefile.am
@@ -8,7 +8,7 @@ liblatexgenerator_la_LIBADD  = -lm $(KOFFICE_LIBS)
 
 kde_module_LTLIBRARIES = liblatexgenerator.la
 
-liblatexgenerator_la_SOURCES = body.cc document.cc kwordgenerator.cc latex.cc paragraph.cc
+liblatexgenerator_la_SOURCES = body.cpp document.cpp kwordgenerator.cpp latex.cpp paragraph.cpp
 
 noinst_HEADERS = body.h document.h kwordgenerator.h latex.h paragraph.h
 
diff --git a/filters/kword/latex/import/generator/body.cc b/filters/kword/latex/import/generator/body.cpp
index fcf5e534c..fcf5e534c 100644
--- a/filters/kword/latex/import/generator/body.cc
+++ b/filters/kword/latex/import/generator/body.cpp
diff --git a/filters/kword/latex/import/generator/document.cc b/filters/kword/latex/import/generator/document.cpp
index cb333d41f..cb333d41f 100644
--- a/filters/kword/latex/import/generator/document.cc
+++ b/filters/kword/latex/import/generator/document.cpp
diff --git a/filters/kword/latex/import/generator/kwordgenerator.cc b/filters/kword/latex/import/generator/kwordgenerator.cpp
index 945c3869b..945c3869b 100644
--- a/filters/kword/latex/import/generator/kwordgenerator.cc
+++ b/filters/kword/latex/import/generator/kwordgenerator.cpp
diff --git a/filters/kword/latex/import/generator/latex.cc b/filters/kword/latex/import/generator/latex.cpp
index 22c773d83..22c773d83 100644
--- a/filters/kword/latex/import/generator/latex.cc
+++ b/filters/kword/latex/import/generator/latex.cpp
diff --git a/filters/kword/latex/import/generator/paragraph.cc b/filters/kword/latex/import/generator/paragraph.cpp
index c25ab9946..c25ab9946 100644
--- a/filters/kword/latex/import/generator/paragraph.cc
+++ b/filters/kword/latex/import/generator/paragraph.cpp
diff --git a/filters/kword/latex/import/lateximport.cc b/filters/kword/latex/import/lateximport.cpp
index 5bea13ccb..5bea13ccb 100644
--- a/filters/kword/latex/import/lateximport.cc
+++ b/filters/kword/latex/import/lateximport.cpp
diff --git a/filters/kword/latex/import/lateximportdia.cc b/filters/kword/latex/import/lateximportdia.cpp
index c69b7e901..f0dd908bd 100644
--- a/filters/kword/latex/import/lateximportdia.cc
+++ b/filters/kword/latex/import/lateximportdia.cpp
@@ -19,11 +19,11 @@
 
 /*
    This file is based on the file :
-    koffice/filters/kword/html/htmlexportdia.cc
+    koffice/filters/kword/html/htmlexportdia.cpp
 	Copyright (C) 2001 Nicolas Goutte <goutte@kde.org>
 
    which was based on the old file:
-    /home/kde/koffice/filters/kspread/csv/csvfilterdia.cc
+    /home/kde/koffice/filters/kspread/csv/csvfilterdia.cpp
 
    The old file was copyrighted by
     Copyright (C) 1999 David Faure <faure@kde.org>
diff --git a/filters/kword/latex/import/parser/Makefile.am b/filters/kword/latex/import/parser/Makefile.am
index d397bcd7b..c10e7df4f 100644
--- a/filters/kword/latex/import/parser/Makefile.am
+++ b/filters/kword/latex/import/parser/Makefile.am
@@ -8,22 +8,22 @@ liblatexparser_la_LIBADD  = -lm $(KOFFICE_LIBS)
 
 kde_module_LTLIBRARIES = liblatexparser.la
 
-liblatexparser_la_SOURCES = command.cc comment.cc element.cc env.cc group.cc \
-														latexparser.cc param.cc text.cc texparser.cc \
-														texscaner.cc
+liblatexparser_la_SOURCES = command.cpp comment.cpp element.cpp env.cpp group.cpp \
+														latexparser.cpp param.cpp text.cpp texparser.cpp \
+														texscaner.cpp
 
 noinst_HEADERS = command.h comment.h element.h env.h group.h \
 								 latexparser.h param.h text.h
 
-texparser.cc: $(srcdir)/texparser.l texscaner.cc
-		flex -B -8 -otexparser.cc $(srcdir)/texparser.l
+texparser.cpp: $(srcdir)/texparser.l texscaner.cpp
+		flex -B -8 -otexparser.cpp $(srcdir)/texparser.l
 
-texscaner.cc: $(srcdir)/texscaner.y
-		bison --debug --verbose -d -o texscaner.cc $(srcdir)/texscaner.y && mv -f texscaner.cc.h texscaner.hh
+texscaner.cpp: $(srcdir)/texscaner.y
+		bison --debug --verbose -d -o texscaner.cpp $(srcdir)/texscaner.y && mv -f texscaner.cpp.h texscaner.hh
 # -p texparser
 ######## Debug
 check_PROGRAMS = texlauncher
-texlauncher_SOURCES = texlauncher.cc
+texlauncher_SOURCES = texlauncher.cpp
 texlauncher_LDADD = liblatexexport.la
 texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
diff --git a/filters/kword/latex/import/parser/command.cc b/filters/kword/latex/import/parser/command.cpp
index d110c0899..d110c0899 100644
--- a/filters/kword/latex/import/parser/command.cc
+++ b/filters/kword/latex/import/parser/command.cpp
diff --git a/filters/kword/latex/import/parser/comment.cc b/filters/kword/latex/import/parser/comment.cpp
index ba52332e0..ba52332e0 100644
--- a/filters/kword/latex/import/parser/comment.cc
+++ b/filters/kword/latex/import/parser/comment.cpp
diff --git a/filters/kword/latex/import/parser/element.cc b/filters/kword/latex/import/parser/element.cpp
index 40a5ab981..40a5ab981 100644
--- a/filters/kword/latex/import/parser/element.cc
+++ b/filters/kword/latex/import/parser/element.cpp
diff --git a/filters/kword/latex/import/parser/env.cc b/filters/kword/latex/import/parser/env.cpp
index 14abad37a..14abad37a 100644
--- a/filters/kword/latex/import/parser/env.cc
+++ b/filters/kword/latex/import/parser/env.cpp
diff --git a/filters/kword/latex/import/parser/group.cc b/filters/kword/latex/import/parser/group.cpp
index 6654ea73f..6654ea73f 100644
--- a/filters/kword/latex/import/parser/group.cc
+++ b/filters/kword/latex/import/parser/group.cpp
diff --git a/filters/kword/latex/import/parser/latexparser.cc b/filters/kword/latex/import/parser/latexparser.cpp
index a5b3a8228..a5b3a8228 100644
--- a/filters/kword/latex/import/parser/latexparser.cc
+++ b/filters/kword/latex/import/parser/latexparser.cpp
diff --git a/filters/kword/latex/import/parser/main.cc b/filters/kword/latex/import/parser/main.cpp
index bce8e7714..bce8e7714 100644
--- a/filters/kword/latex/import/parser/main.cc
+++ b/filters/kword/latex/import/parser/main.cpp
diff --git a/filters/kword/latex/import/parser/param.cc b/filters/kword/latex/import/parser/param.cpp
index 66bb7fffb..66bb7fffb 100644
--- a/filters/kword/latex/import/parser/param.cc
+++ b/filters/kword/latex/import/parser/param.cpp
diff --git a/filters/kword/latex/import/parser/texparser.l b/filters/kword/latex/import/parser/texparser.l
index c187f29d6..ea78619fe 100644
--- a/filters/kword/latex/import/parser/texparser.l
+++ b/filters/kword/latex/import/parser/texparser.l
@@ -2,8 +2,8 @@
  * Ajouter une pile contenant tout les environnements.
  *
  * To compil :
- * flex -+ -otexparser.cc texparser.lex
- * g++ -o texparser texparser.cc -lfl -lm
+ * flex -+ -otexparser.cpp texparser.lex
+ * g++ -o texparser texparser.cpp -lfl -lm
  *
  */
 
diff --git a/filters/kword/latex/import/parser/texparser.lex b/filters/kword/latex/import/parser/texparser.lex
index eb9b27aac..e945f48dd 100644
--- a/filters/kword/latex/import/parser/texparser.lex
+++ b/filters/kword/latex/import/parser/texparser.lex
@@ -2,8 +2,8 @@
  * Ajouter une pile contenant tout les environnements.
  *
  * To compil :
- * flex -+ -otexparser.cc texparser.lex
- * g++ -o texparser texparser.cc -lfl -lm
+ * flex -+ -otexparser.cpp texparser.lex
+ * g++ -o texparser texparser.cpp -lfl -lm
  *
  */
 
diff --git a/filters/kword/latex/import/parser/text.cc b/filters/kword/latex/import/parser/text.cpp
index 62fd09982..62fd09982 100644
--- a/filters/kword/latex/import/parser/text.cc
+++ b/filters/kword/latex/import/parser/text.cpp
diff --git a/filters/kword/libexport/KWEFBaseWorker.cc b/filters/kword/libexport/KWEFBaseWorker.cpp
index a47f647da..a47f647da 100644
--- a/filters/kword/libexport/KWEFBaseWorker.cc
+++ b/filters/kword/libexport/KWEFBaseWorker.cpp
diff --git a/filters/kword/libexport/KWEFKWordLeader.cc b/filters/kword/libexport/KWEFKWordLeader.cpp
index b0a7913d8..05e4024a5 100644
--- a/filters/kword/libexport/KWEFKWordLeader.cc
+++ b/filters/kword/libexport/KWEFKWordLeader.cpp
@@ -22,7 +22,7 @@
 
 /*
    Part of this code comes from the old file:
-    /home/kde/koffice/filters/kword/ascii/asciiexport.cc
+    /home/kde/koffice/filters/kword/ascii/asciiexport.cpp
 
    The old file was copyrighted by
     Copyright (C) 1998, 1999 Reginald Stadlbauer <reggie@kde.org>
diff --git a/filters/kword/libexport/KWEFStructures.cc b/filters/kword/libexport/KWEFStructures.cpp
index 6c9c301f2..6c9c301f2 100644
--- a/filters/kword/libexport/KWEFStructures.cc
+++ b/filters/kword/libexport/KWEFStructures.cpp
diff --git a/filters/kword/libexport/KWEFStructures.h b/filters/kword/libexport/KWEFStructures.h
index 682606feb..2f8ba74ab 100644
--- a/filters/kword/libexport/KWEFStructures.h
+++ b/filters/kword/libexport/KWEFStructures.h
@@ -22,8 +22,8 @@
 
 /*
    The classes in this file are based on a class in the old files:
-    /home/kde/koffice/filters/kword/ascii/asciiexport.cc
-    /home/kde/koffice/filters/kword/docbookexpert/docbookexport.cc
+    /home/kde/koffice/filters/kword/ascii/asciiexport.cpp
+    /home/kde/koffice/filters/kword/docbookexpert/docbookexport.cpp
 
    The old file was copyrighted by
     Copyright (C) 1998, 1999 Reginald Stadlbauer <reggie@kde.org>
diff --git a/filters/kword/libexport/KWEFUtil.cc b/filters/kword/libexport/KWEFUtil.cpp
index a02a45ece..a02a45ece 100644
--- a/filters/kword/libexport/KWEFUtil.cc
+++ b/filters/kword/libexport/KWEFUtil.cpp
diff --git a/filters/kword/libexport/Makefile.am b/filters/kword/libexport/Makefile.am
index 6e2581749..cef09322c 100644
--- a/filters/kword/libexport/Makefile.am
+++ b/filters/kword/libexport/Makefile.am
@@ -10,8 +10,8 @@ libkwordexportfilters_la_LIBADD = $(KOFFICE_LIBS)
 
 lib_LTLIBRARIES = libkwordexportfilters.la
 
-libkwordexportfilters_la_SOURCES = TagProcessing.cc KWEFStructures.cc\
-ProcessDocument.cc KWEFUtil.cc KWEFKWordLeader.cc KWEFBaseWorker.cc
+libkwordexportfilters_la_SOURCES = TagProcessing.cpp KWEFStructures.cpp\
+ProcessDocument.cpp KWEFUtil.cpp KWEFKWordLeader.cpp KWEFBaseWorker.cpp
 
 noinst_HEADERS = TagProcessing.h KWEFStructures.h\
 ProcessDocument.h KWEFUtil.h KWEFKWordLeader.h KWEFBaseWorker.h
diff --git a/filters/kword/libexport/ProcessDocument.cc b/filters/kword/libexport/ProcessDocument.cpp
index 3a626f7f1..69b14857f 100644
--- a/filters/kword/libexport/ProcessDocument.cc
+++ b/filters/kword/libexport/ProcessDocument.cpp
@@ -22,7 +22,7 @@
 
 /*
    This file is based on the old file:
-    /home/kde/koffice/filters/kword/ascii/asciiexport.cc
+    /home/kde/koffice/filters/kword/ascii/asciiexport.cpp
 
    The old file was copyrighted by
     Copyright (C) 1998, 1999 Reginald Stadlbauer <reggie@kde.org>
diff --git a/filters/kword/libexport/TagProcessing.cc b/filters/kword/libexport/TagProcessing.cpp
index b70d58d9b..46a8fb353 100644
--- a/filters/kword/libexport/TagProcessing.cc
+++ b/filters/kword/libexport/TagProcessing.cpp
@@ -22,7 +22,7 @@
 
 /*
    This file is based on the old file:
-    /home/kde/koffice/filters/kword/ascii/asciiexport.cc
+    /home/kde/koffice/filters/kword/ascii/asciiexport.cpp
 
    The old file was copyrighted by
     Copyright (C) 1998, 1999 Reginald Stadlbauer <reggie@kde.org>
diff --git a/filters/kword/libexport/TagProcessing.h b/filters/kword/libexport/TagProcessing.h
index f2bf46652..62176fd36 100644
--- a/filters/kword/libexport/TagProcessing.h
+++ b/filters/kword/libexport/TagProcessing.h
@@ -20,7 +20,7 @@
 
 /*
    This file is based on the old file:
-    /home/kde/koffice/filters/kword/ascii/asciiexport.cc
+    /home/kde/koffice/filters/kword/ascii/asciiexport.cpp
 
    The old file was copyrighted by
     Copyright (C) 1998, 1999 Reginald Stadlbauer <reggie@kde.org>
diff --git a/filters/kword/msword/document.cpp b/filters/kword/msword/document.cpp
index 043c1bc24..2e20b999d 100644
--- a/filters/kword/msword/document.cpp
+++ b/filters/kword/msword/document.cpp
@@ -498,9 +498,9 @@ KoStoreDevice* Document::createPictureFrameSet( const KoSize& size )
 
     // The position doesn't matter as long as the picture is inline
     // FIXME for non-inline pics ####
-    // To determine the size, look at OOo's filter (WW8PicDesc in ww8graf2.cxx, version 1.50, line 406)
+    // To determine the size, look at OOo's filter (WW8PicDesc in ww8graf2.cpp, version 1.50, line 406)
     // Hint: #i17200#, a bit of guesswork I'm afraid
-    //        if (aPic.dxaGoal == 1000 && aPic.mx == 1)  //100% hack ? (from ww8graf2.cxx)
+    //        if (aPic.dxaGoal == 1000 && aPic.mx == 1)  //100% hack ? (from ww8graf2.cpp)
     createInitialFrame( framesetElement, 0, size.width(), 0, size.height(), false, NoFollowup );
 
     TQDomElement pictureElem = m_mainDocument.createElement("PICTURE");
diff --git a/filters/kword/msword/texthandler.cpp b/filters/kword/msword/texthandler.cpp
index 775f8bce8..d25408693 100644
--- a/filters/kword/msword/texthandler.cpp
+++ b/filters/kword/msword/texthandler.cpp
@@ -659,7 +659,7 @@ void KWordTextHandler::writeLayout( TQDomElement& parentElement, const wvWare::P
             // which kword doesn't support. We map it to 0 with a clever '%4' :)
             tabElement.setAttribute( "type", td.tbd.jc % 4 );
             int filling = 0;
-            double width = 0.5; // default kword value, see koparaglayout.cc
+            double width = 0.5; // default kword value, see koparaglayout.cpp
             switch ( td.tbd.tlc ) {
             case 1: // dots
             case 2: // hyphenated
diff --git a/filters/kword/mswrite/ImportDialog.cc b/filters/kword/mswrite/ImportDialog.cpp
index cb9834913..cb9834913 100644
--- a/filters/kword/mswrite/ImportDialog.cc
+++ b/filters/kword/mswrite/ImportDialog.cpp
diff --git a/filters/kword/mswrite/Makefile.am b/filters/kword/mswrite/Makefile.am
index c1318f7a6..dc0f110fe 100644
--- a/filters/kword/mswrite/Makefile.am
+++ b/filters/kword/mswrite/Makefile.am
@@ -6,13 +6,13 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) -I$(srcdir)/../libexport $(all_include
 
 kde_module_LTLIBRARIES = libmswriteimport.la libmswriteexport.la
 
-libmswriteimport_la_SOURCES = mswriteimport.cc \
-								libmswrite_defs.cpp structures_generated.cpp structures_private.cpp structures.cpp libmswrite.cpp ImportDialogUI.ui ImportDialog.cc
+libmswriteimport_la_SOURCES = mswriteimport.cpp \
+								libmswrite_defs.cpp structures_generated.cpp structures_private.cpp structures.cpp libmswrite.cpp ImportDialogUI.ui ImportDialog.cpp
 
 libmswriteimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
 libmswriteimport_la_LIBADD = $(KOFFICE_LIBS)
 
-libmswriteexport_la_SOURCES = mswriteexport.cc	\
+libmswriteexport_la_SOURCES = mswriteexport.cpp	\
 								libmswrite_defs.cpp structures_generated.cpp structures_private.cpp structures.cpp libmswrite.cpp
 libmswriteexport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
 libmswriteexport_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KOWMF) ../libexport/libkwordexportfilters.la
diff --git a/filters/kword/mswrite/mswriteexport.cc b/filters/kword/mswrite/mswriteexport.cpp
index abf007f88..abf007f88 100644
--- a/filters/kword/mswrite/mswriteexport.cc
+++ b/filters/kword/mswrite/mswriteexport.cpp
diff --git a/filters/kword/mswrite/mswriteimport.cc b/filters/kword/mswrite/mswriteimport.cpp
index 7fd3b63e3..7fd3b63e3 100644
--- a/filters/kword/mswrite/mswriteimport.cc
+++ b/filters/kword/mswrite/mswriteimport.cpp
diff --git a/filters/kword/mswrite/status.html b/filters/kword/mswrite/status.html
index 5a8bddd15..9d70e7b21 100644
--- a/filters/kword/mswrite/status.html
+++ b/filters/kword/mswrite/status.html
@@ -99,7 +99,7 @@
 
 		<br>
 	  	<b> Version 0.3-1: KOffice 1.2 Beta1 </b> <br>
-		- fixed mswritelib.cc crash on files with an unusual font table <br>
+		- fixed mswritelib.cpp crash on files with an unusual font table <br>
 		- emulates image position from left margin by using paragraph indents <br>
 		- WMFs now render correctly in KWord (thanks to Lorthiois Thierry); note that only TQWMF code was changed <br>
 		- gcc 2.95.3 internal error workaround <br>
diff --git a/filters/kword/oowriter/ExportFilter.cc b/filters/kword/oowriter/ExportFilter.cpp
index 216ace492..0894d0443 100644
--- a/filters/kword/oowriter/ExportFilter.cc
+++ b/filters/kword/oowriter/ExportFilter.cpp
@@ -19,7 +19,7 @@
 
 /*
    This file is based on the old file:
-    /home/kde/koffice/filters/kword/ascii/asciiexport.cc
+    /home/kde/koffice/filters/kword/ascii/asciiexport.cpp
 
    The old file was copyrighted by
     Copyright (C) 1998, 1999 Reginald Stadlbauer <reggie@kde.org>
diff --git a/filters/kword/oowriter/ExportFilter.h b/filters/kword/oowriter/ExportFilter.h
index c89e15acb..d4fa9db2e 100644
--- a/filters/kword/oowriter/ExportFilter.h
+++ b/filters/kword/oowriter/ExportFilter.h
@@ -19,7 +19,7 @@
 
 /*
    This file is based on the old file:
-    /home/kde/koffice/filters/kword/ascii/asciiexport.cc
+    /home/kde/koffice/filters/kword/ascii/asciiexport.cpp
 
    The old file was copyrighted by
     Copyright (C) 1998, 1999 Reginald Stadlbauer <reggie@kde.org>
diff --git a/filters/kword/oowriter/Makefile.am b/filters/kword/oowriter/Makefile.am
index 63b37bbfc..775b2beb6 100644
--- a/filters/kword/oowriter/Makefile.am
+++ b/filters/kword/oowriter/Makefile.am
@@ -7,13 +7,13 @@ $(KOFFICE_INCLUDES) $(all_includes)
 kde_module_LTLIBRARIES = liboowriterimport.la liboowriterexport.la
 
 noinst_LTLIBRARIES = libcommon.la
-libcommon_la_SOURCES = conversion.cc
+libcommon_la_SOURCES = conversion.cpp
 
-liboowriterimport_la_SOURCES = oowriterimport.cc
+liboowriterimport_la_SOURCES = oowriterimport.cpp
 liboowriterimport_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
 liboowriterimport_la_LIBADD  = ../../liboofilter/liboofilter.la libcommon.la $(KOFFICE_LIBS)
 
-liboowriterexport_la_SOURCES = oowriterexport.cc ExportFilter.cc
+liboowriterexport_la_SOURCES = oowriterexport.cpp ExportFilter.cpp
 liboowriterexport_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
 liboowriterexport_la_LIBADD  = $(KOFFICE_LIBS) ../libexport/libkwordexportfilters.la libcommon.la
 
diff --git a/filters/kword/oowriter/conversion.cc b/filters/kword/oowriter/conversion.cpp
index 259d97b5b..259d97b5b 100644
--- a/filters/kword/oowriter/conversion.cc
+++ b/filters/kword/oowriter/conversion.cpp
diff --git a/filters/kword/oowriter/oowriterexport.cc b/filters/kword/oowriter/oowriterexport.cpp
index aba0ee9fd..5c974084e 100644
--- a/filters/kword/oowriter/oowriterexport.cc
+++ b/filters/kword/oowriter/oowriterexport.cpp
@@ -19,7 +19,7 @@
 
 /*
    This file is based on the old file:
-    /home/kde/koffice/filters/kword/ascii/asciiexport.cc
+    /home/kde/koffice/filters/kword/ascii/asciiexport.cpp
 
    The old file was copyrighted by
     Copyright (C) 1998, 1999 Reginald Stadlbauer <reggie@kde.org>
diff --git a/filters/kword/oowriter/oowriterimport.cc b/filters/kword/oowriter/oowriterimport.cpp
index 5e54ce06f..5e54ce06f 100644
--- a/filters/kword/oowriter/oowriterimport.cc
+++ b/filters/kword/oowriter/oowriterimport.cpp
diff --git a/filters/kword/palmdoc/Makefile.am b/filters/kword/palmdoc/Makefile.am
index 1e0e7d9ec..6f1b64e47 100644
--- a/filters/kword/palmdoc/Makefile.am
+++ b/filters/kword/palmdoc/Makefile.am
@@ -10,8 +10,8 @@ libpalmdocexport_la_LIBADD = $(KOFFICE_LIBS) ../libexport/libkwordexportfilters.
 
 kde_module_LTLIBRARIES = libpalmdocimport.la libpalmdocexport.la
 
-libpalmdocimport_la_SOURCES = palmdocimport.cc palmdb.cpp palmdoc.cpp
-libpalmdocexport_la_SOURCES = palmdocexport.cc palmdb.cpp palmdoc.cpp
+libpalmdocimport_la_SOURCES = palmdocimport.cpp palmdb.cpp palmdoc.cpp
+libpalmdocexport_la_SOURCES = palmdocexport.cpp palmdb.cpp palmdoc.cpp
 
 noinst_HEADERS = palmdocimport.h palmdb.h palmdoc.h
 
diff --git a/filters/kword/palmdoc/palmdocexport.cc b/filters/kword/palmdoc/palmdocexport.cpp
index 37f8d9cf2..37f8d9cf2 100644
--- a/filters/kword/palmdoc/palmdocexport.cc
+++ b/filters/kword/palmdoc/palmdocexport.cpp
diff --git a/filters/kword/palmdoc/palmdocimport.cc b/filters/kword/palmdoc/palmdocimport.cpp
index a1e8107bc..a1e8107bc 100644
--- a/filters/kword/palmdoc/palmdocimport.cc
+++ b/filters/kword/palmdoc/palmdocimport.cpp
diff --git a/filters/kword/pdf/diffs/goo_enable-final.diff b/filters/kword/pdf/diffs/goo_enable-final.diff
index b3d137ad7..7993ce58e 100644
--- a/filters/kword/pdf/diffs/goo_enable-final.diff
+++ b/filters/kword/pdf/diffs/goo_enable-final.diff
@@ -1,11 +1,11 @@
-Index: GHash.cc
+Index: GHash.cpp
 ===================================================================
-RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/goo/GHash.cc,v
+RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/goo/GHash.cpp,v
 retrieving revision 1.2
 retrieving revision 1.3
 diff -u -p -r1.2 -r1.3
---- GHash.cc	13 Jan 2003 14:51:16 -0000	1.2
-+++ GHash.cc	10 Oct 2004 21:37:09 -0000	1.3
+--- GHash.cpp	13 Jan 2003 14:51:16 -0000	1.2
++++ GHash.cpp	10 Oct 2004 21:37:09 -0000	1.3
 @@ -8,9 +8,6 @@
  
  #include <aconf.h>
@@ -34,14 +34,14 @@ diff -u -p -r1.2 -r1.3
  
  #include "gtypes.h"
  
-Index: GList.cc
+Index: GList.cpp
 ===================================================================
-RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/goo/GList.cc,v
+RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/goo/GList.cpp,v
 retrieving revision 1.1
 retrieving revision 1.2
 diff -u -p -r1.1 -r1.2
---- GList.cc	23 Nov 2002 14:15:14 -0000	1.1
-+++ GList.cc	10 Oct 2004 21:37:09 -0000	1.2
+--- GList.cpp	23 Nov 2002 14:15:14 -0000	1.1
++++ GList.cpp	10 Oct 2004 21:37:09 -0000	1.2
 @@ -8,9 +8,6 @@
  
  #include <aconf.h>
@@ -70,14 +70,14 @@ diff -u -p -r1.1 -r1.2
  
  #include "gtypes.h"
  
-Index: GString.cc
+Index: GString.cpp
 ===================================================================
-RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/goo/GString.cc,v
+RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/goo/GString.cpp,v
 retrieving revision 1.1
 retrieving revision 1.2
 diff -u -p -r1.1 -r1.2
---- GString.cc	23 Nov 2002 14:15:14 -0000	1.1
-+++ GString.cc	10 Oct 2004 21:37:09 -0000	1.2
+--- GString.cpp	23 Nov 2002 14:15:14 -0000	1.1
++++ GString.cpp	10 Oct 2004 21:37:09 -0000	1.2
 @@ -10,9 +10,6 @@
  
  #include <aconf.h>
diff --git a/filters/kword/pdf/diffs/goo_gfile.diff b/filters/kword/pdf/diffs/goo_gfile.diff
index 6aac2487c..2e9cdd537 100644
--- a/filters/kword/pdf/diffs/goo_gfile.diff
+++ b/filters/kword/pdf/diffs/goo_gfile.diff
@@ -1,6 +1,6 @@
-diff -u /home/azhyd/xpdf-2.00/goo/gfile.cc goo/gfile.cc
---- /home/azhyd/xpdf-2.00/goo/gfile.cc	Sun Nov  3 23:15:36 2002
-+++ goo/gfile.cc	Wed Nov 20 06:43:32 2002
+diff -u /home/azhyd/xpdf-2.00/goo/gfile.cpp goo/gfile.cpp
+--- /home/azhyd/xpdf-2.00/goo/gfile.cpp	Sun Nov  3 23:15:36 2002
++++ goo/gfile.cpp	Wed Nov 20 06:43:32 2002
 @@ -443,7 +443,7 @@
  #endif
  }
diff --git a/filters/kword/pdf/diffs/xpdf_TextOutputDev.diff b/filters/kword/pdf/diffs/xpdf_TextOutputDev.diff
index ec981364b..693ecb556 100644
--- a/filters/kword/pdf/diffs/xpdf_TextOutputDev.diff
+++ b/filters/kword/pdf/diffs/xpdf_TextOutputDev.diff
@@ -1,6 +1,6 @@
-diff -u /home/azhyd/xpdf-2.00/xpdf/TextOutputDev.cc xpdf/TextOutputDev.cc
---- /home/azhyd/xpdf-2.00/xpdf/TextOutputDev.cc	Thu Nov 14 04:41:00 2002
-+++ xpdf/TextOutputDev.cc	Sat Nov 23 21:01:14 2002
+diff -u /home/azhyd/xpdf-2.00/xpdf/TextOutputDev.cpp xpdf/TextOutputDev.cpp
+--- /home/azhyd/xpdf-2.00/xpdf/TextOutputDev.cpp	Thu Nov 14 04:41:00 2002
++++ xpdf/TextOutputDev.cpp	Sat Nov 23 21:01:14 2002
 @@ -46,26 +46,6 @@
  // TextBlock
  //------------------------------------------------------------------------
diff --git a/filters/kword/pdf/diffs/xpdf_includes.diff b/filters/kword/pdf/diffs/xpdf_includes.diff
index 33fbea601..c9eeb465d 100644
--- a/filters/kword/pdf/diffs/xpdf_includes.diff
+++ b/filters/kword/pdf/diffs/xpdf_includes.diff
@@ -10,9 +10,9 @@ diff -u /home/azhyd/xpdf-2.00/xpdf/Error.h xpdf/Error.h
  
  extern void CDECL error(int pos, char *msg, ...);
  
-diff -u /home/azhyd/xpdf-2.00/xpdf/PDFDoc.cc xpdf/PDFDoc.cc
---- /home/azhyd/xpdf-2.00/xpdf/PDFDoc.cc	Sun Nov  3 23:15:36 2002
-+++ xpdf/PDFDoc.cc	Wed Nov 20 07:30:55 2002
+diff -u /home/azhyd/xpdf-2.00/xpdf/PDFDoc.cpp xpdf/PDFDoc.cpp
+--- /home/azhyd/xpdf-2.00/xpdf/PDFDoc.cpp	Sun Nov  3 23:15:36 2002
++++ xpdf/PDFDoc.cpp	Wed Nov 20 07:30:55 2002
 @@ -17,7 +17,7 @@
  #include <stddef.h>
  #include <string.h>
@@ -22,9 +22,9 @@ diff -u /home/azhyd/xpdf-2.00/xpdf/PDFDoc.cc xpdf/PDFDoc.cc
  #include "GlobalParams.h"
  #include "Page.h"
  #include "Catalog.h"
-diff -u /home/azhyd/xpdf-2.00/xpdf/Stream.cc xpdf/Stream.cc
---- /home/azhyd/xpdf-2.00/xpdf/Stream.cc	Sun Nov  3 23:15:37 2002
-+++ xpdf/Stream.cc	Wed Nov 20 07:31:33 2002
+diff -u /home/azhyd/xpdf-2.00/xpdf/Stream.cpp xpdf/Stream.cpp
+--- /home/azhyd/xpdf-2.00/xpdf/Stream.cpp	Sun Nov  3 23:15:37 2002
++++ xpdf/Stream.cpp	Wed Nov 20 07:31:33 2002
 @@ -22,7 +22,7 @@
  #include <ctype.h>
  #include "gmem.h"
@@ -34,9 +34,9 @@ diff -u /home/azhyd/xpdf-2.00/xpdf/Stream.cc xpdf/Stream.cc
  #include "Error.h"
  #include "Object.h"
  #ifndef NO_DECRYPTION
-diff -u /home/azhyd/xpdf-2.00/xpdf/TextOutputDev.cc xpdf/TextOutputDev.cc
---- /home/azhyd/xpdf-2.00/xpdf/TextOutputDev.cc	Thu Nov 14 04:41:00 2002
-+++ xpdf/TextOutputDev.cc	Wed Nov 20 07:31:41 2002
+diff -u /home/azhyd/xpdf-2.00/xpdf/TextOutputDev.cpp xpdf/TextOutputDev.cpp
+--- /home/azhyd/xpdf-2.00/xpdf/TextOutputDev.cpp	Thu Nov 14 04:41:00 2002
++++ xpdf/TextOutputDev.cpp	Wed Nov 20 07:31:41 2002
 @@ -19,7 +19,7 @@
  #include <ctype.h>
  #include "GString.h"
diff --git a/filters/kword/pdf/diffs/xpdf_security_integer_overflow.diff b/filters/kword/pdf/diffs/xpdf_security_integer_overflow.diff
index 1b3872083..d5261ba68 100644
--- a/filters/kword/pdf/diffs/xpdf_security_integer_overflow.diff
+++ b/filters/kword/pdf/diffs/xpdf_security_integer_overflow.diff
@@ -1,10 +1,10 @@
-Index: Catalog.cc
+Index: Catalog.cpp
 ===================================================================
-RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/Catalog.cc,v
+RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/Catalog.cpp,v
 retrieving revision 1.1
-diff -u -p -r1.1 Catalog.cc
---- Catalog.cc	23 Nov 2002 14:15:14 -0000	1.1
-+++ Catalog.cc	30 Oct 2004 16:34:49 -0000
+diff -u -p -r1.1 Catalog.cpp
+--- Catalog.cpp	23 Nov 2002 14:15:14 -0000	1.1
++++ Catalog.cpp	30 Oct 2004 16:34:49 -0000
 @@ -12,6 +12,7 @@
  #pragma implementation
  #endif
@@ -38,13 +38,13 @@ diff -u -p -r1.1 Catalog.cc
  	pages = (Page **)grealloc(pages, pagesSize * sizeof(Page *));
  	pageRefs = (Ref *)grealloc(pageRefs, pagesSize * sizeof(Ref));
  	for (j = pagesSize - 32; j < pagesSize; ++j) {
-Index: XRef.cc
+Index: XRef.cpp
 ===================================================================
-RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/XRef.cc,v
+RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/XRef.cpp,v
 retrieving revision 1.1
-diff -u -p -r1.1 XRef.cc
---- XRef.cc	23 Nov 2002 14:15:14 -0000	1.1
-+++ XRef.cc	30 Oct 2004 16:34:53 -0000
+diff -u -p -r1.1 XRef.cpp
+--- XRef.cpp	23 Nov 2002 14:15:14 -0000	1.1
++++ XRef.cpp	30 Oct 2004 16:34:53 -0000
 @@ -12,6 +12,7 @@
  #pragma implementation
  #endif
diff --git a/filters/kword/pdf/diffs/xpdf_security_integer_overflow_2.diff b/filters/kword/pdf/diffs/xpdf_security_integer_overflow_2.diff
index e64646128..38bb723ec 100644
--- a/filters/kword/pdf/diffs/xpdf_security_integer_overflow_2.diff
+++ b/filters/kword/pdf/diffs/xpdf_security_integer_overflow_2.diff
@@ -1,11 +1,11 @@
-Index: goo/GHash.cc
+Index: goo/GHash.cpp
 ===================================================================
-RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/goo/GHash.cc,v
+RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/goo/GHash.cpp,v
 retrieving revision 1.3
 retrieving revision 1.2.2.1
 diff -u -p -r1.3 -r1.2.2.1
---- goo/GHash.cc	10 Oct 2004 21:37:09 -0000	1.3
-+++ goo/GHash.cc	21 Oct 2004 20:32:51 -0000	1.2.2.1
+--- goo/GHash.cpp	10 Oct 2004 21:37:09 -0000	1.3
++++ goo/GHash.cpp	21 Oct 2004 20:32:51 -0000	1.2.2.1
 @@ -8,7 +8,6 @@
  
  #include <aconf.h>
@@ -30,14 +30,14 @@ diff -u -p -r1.3 -r1.2.2.1
  #include "gtypes.h"
  
  class GString;
-Index: goo/GList.cc
+Index: goo/GList.cpp
 ===================================================================
-RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/goo/GList.cc,v
+RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/goo/GList.cpp,v
 retrieving revision 1.2
 retrieving revision 1.1.2.1
 diff -u -p -r1.2 -r1.1.2.1
---- goo/GList.cc	10 Oct 2004 21:37:09 -0000	1.2
-+++ goo/GList.cc	21 Oct 2004 20:32:51 -0000	1.1.2.1
+--- goo/GList.cpp	10 Oct 2004 21:37:09 -0000	1.2
++++ goo/GList.cpp	21 Oct 2004 20:32:51 -0000	1.1.2.1
 @@ -8,7 +8,6 @@
  
  #include <aconf.h>
@@ -62,14 +62,14 @@ diff -u -p -r1.2 -r1.1.2.1
  #include "gtypes.h"
  
  //------------------------------------------------------------------------
-Index: goo/GString.cc
+Index: goo/GString.cpp
 ===================================================================
-RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/goo/GString.cc,v
+RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/goo/GString.cpp,v
 retrieving revision 1.2
 retrieving revision 1.1.2.1
 diff -u -p -r1.2 -r1.1.2.1
---- goo/GString.cc	10 Oct 2004 21:37:09 -0000	1.2
-+++ goo/GString.cc	21 Oct 2004 20:32:51 -0000	1.1.2.1
+--- goo/GString.cpp	10 Oct 2004 21:37:09 -0000	1.2
++++ goo/GString.cpp	21 Oct 2004 20:32:51 -0000	1.1.2.1
 @@ -10,7 +10,6 @@
  
  #include <aconf.h>
@@ -94,14 +94,14 @@ diff -u -p -r1.3 -r1.2.2.1
  #include <string.h>
  
  class GString {
-Index: xpdf/Gfx.cc
+Index: xpdf/Gfx.cpp
 ===================================================================
-RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/Gfx.cc,v
+RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/Gfx.cpp,v
 retrieving revision 1.3
 retrieving revision 1.3.2.1
 diff -u -p -r1.3 -r1.3.2.1
---- xpdf/Gfx.cc	25 Jan 2003 23:17:44 -0000	1.3
-+++ xpdf/Gfx.cc	22 Dec 2004 12:07:12 -0000	1.3.2.1
+--- xpdf/Gfx.cpp	25 Jan 2003 23:17:44 -0000	1.3
++++ xpdf/Gfx.cpp	22 Dec 2004 12:07:12 -0000	1.3.2.1
 @@ -2379,7 +2379,9 @@ void Gfx::doImage(Object *ref, Stream *s
      haveMask = gFalse;
      dict->lookup("Mask", &maskObj);
@@ -113,14 +113,14 @@ diff -u -p -r1.3 -r1.3.2.1
  	maskObj.arrayGet(i, &obj1);
  	maskColors[i] = obj1.getInt();
  	obj1.free();
-Index: xpdf/GfxState.cc
+Index: xpdf/GfxState.cpp
 ===================================================================
-RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/GfxState.cc,v
+RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/GfxState.cpp,v
 retrieving revision 1.3
 retrieving revision 1.3.2.2
 diff -u -p -r1.3 -r1.3.2.2
---- xpdf/GfxState.cc	25 Jan 2003 23:17:44 -0000	1.3
-+++ xpdf/GfxState.cc	22 Dec 2004 13:50:53 -0000	1.3.2.2
+--- xpdf/GfxState.cpp	25 Jan 2003 23:17:44 -0000	1.3
++++ xpdf/GfxState.cpp	22 Dec 2004 13:50:53 -0000	1.3.2.2
 @@ -682,6 +682,11 @@ GfxColorSpace *GfxICCBasedColorSpace::pa
    }
    nCompsA = obj2.getInt();
diff --git a/filters/kword/pdf/xpdf/CHANGES b/filters/kword/pdf/xpdf/CHANGES
index 7a09620d2..6cf5c8ef1 100644
--- a/filters/kword/pdf/xpdf/CHANGES
+++ b/filters/kword/pdf/xpdf/CHANGES
@@ -44,7 +44,7 @@ Changed several things to ease porting:
   - changed '__inline' to 'inline' (to adhere to the ANSI standard)
   - surrounded interface/implementation pragmas with #ifdef _GNUC__
   - got rid of empty array initializer lists
-  - moved Operator type definition from Gfx.cc to Gfx.h
+  - moved Operator type definition from Gfx.cpp to Gfx.h
   - renamed String, uint, etc.
   - ability to uncompress to file (NO_POPEN and USE_GZIP flags)
   - added definitions of XK_Page_Up/Down and XPointer for old versions
@@ -75,7 +75,7 @@ Fixed PostScript output:
   - if page is larger than paper size, scale it down.
 Set default MediaBox to 8.5" x 11" to deal with non-compliant PDF
   files which don't specify a MediaBox.
-Added DEBUG_MEM stuff in gmem.c and gmempp.cc.
+Added DEBUG_MEM stuff in gmem.c and gmempp.cpp.
 Fixed memory leaks:
   - LTKWindow didn't delete the LTKBox.
   - LinkAction needs a virtual destructor.
@@ -149,7 +149,7 @@ Added file name to window title.
 Implemented RunLength filter.
 Implemented forms.
 Convert ObjType to an enum.
-Changed isDict("Pages") to isDict() (in Catalog.cc) to deal with
+Changed isDict("Pages") to isDict() (in Catalog.cpp) to deal with
   incorrect PDF files.
 Changed color selection so that very pale colors don't map to white.
 Fixed bug in CCITTFax filter (multiple make-up codes).
@@ -292,10 +292,10 @@ ASCII85Stream, ASCIIHexStream, and DCTStream didn't check for EOF and
   could run past the end of the stream in damaged files.
 Handle hex escapes (#xx) in names.  Still allow the name /# for
   backward-compatibility.
-Check for NULL characters in encoding array in GfxFont.cc (was calling
+Check for NULL characters in encoding array in GfxFont.cpp (was calling
   strcmp() with NULL which crashed under Solaris).
 PageAttrs::PageAttrs() didn't initialize crop box boundaries.
-Changed uses of lookup() to lookupNF() in XRef.cc.
+Changed uses of lookup() to lookupNF() in XRef.cpp.
 Fixed type checking of operators which take a variable number of
   args.
 Gfx::buildImageStream() doesn't need to check for parser (since I got
@@ -311,7 +311,7 @@ Throw away zero-length strings in TextOutputDev -- they don't have
   valid xMin/xMax values.
 Swapped order of XLIBS and XPMLIB in xpdf/Makefile.
 Deleted 'LTKApp::' in function declaration in LTKApp.h.
-Changed '(XKeyEvent *)&event' to '&event.xkey' in LTKApp.cc.
+Changed '(XKeyEvent *)&event' to '&event.xkey' in LTKApp.cpp.
 Check that the link rectangle coordinates are in the correct order,
   and swap if necessary.
 TextOutputDev didn't set text to NULL, which caused pdftotext to
@@ -346,7 +346,7 @@ Rewrote XRef::readXRef() to avoid using a parser to read the xref
   entries.
 Added NO_TEXT_SELECT option.
 Ignore APPn/COM/etc. markers in DCT streams.
-Replaced select() with XMultiplexInput() in LTKApp.cc for VMS.
+Replaced select() with XMultiplexInput() in LTKApp.cpp for VMS.
 Handle WM_DELETE_WINDOW protocol -- if you ask the window manager to
   delete the xpdf window, xpdf will exit cleanly; other
   windows/dialogs are simply closed.
@@ -359,7 +359,7 @@ Added "normal" SETWIDTH parameter to all font descriptors in
 Added FOPEN_READ_BIN and FOPEN_WRITE_BIN to support Win32.
 Added a hack which allows better font substitution for some Type 3
   fonts.  Also allow character names of the form /nn and /nnn.
-Added <strings.h> and <bstring.h> to LTKApp.cc (needed by AIX and IRIX
+Added <strings.h> and <bstring.h> to LTKApp.cpp (needed by AIX and IRIX
   for bzero() declaration for FD_ZERO).
 
 0.80 (98-nov-27)
@@ -404,7 +404,7 @@ Changes to configure script and Makefiles:
   - Get rid of AC_C_INLINE -- this is meant for C, not C++.
   - Changed -USE_GZIP to -DUSE_GZIP.
   - Added ability to compile ouside of the source tree.
-  - Added .cc.o rule to {goo,ltk,xpdf}/Makefile.in.
+  - Added .cpp.o rule to {goo,ltk,xpdf}/Makefile.in.
   - Added @LIBS@ to XLIBS in xpdf/Makefile.in.
   - In top-level Makefile.in: added '-' to clean commands; added
     distclean rule.
@@ -529,7 +529,7 @@ Do a better job with anti-aliased Type 1 fonts on non-white
 Handle Lab color spaces.
 Handle non-null user passwords.
 Avoid security hole with tmpnam()/fopen() -- added openTempFile() in
-  goo/gfile.cc.  [Thanks to Joseph S. Myers for pointing this out.]
+  goo/gfile.cpp.  [Thanks to Joseph S. Myers for pointing this out.]
 Filter out quote marks (' and ") in URLs before running urlCommand to
   avoid a potential security hole.  [Thanks to Frank Doepper for
   pointing this out.]
@@ -582,7 +582,7 @@ Fixed a memory (malloc size) bug in CCITTFaxStream.
 Fixed two bugs in FontEncoding::hash() -- handle zero-length character
   names (which were found in a (buggy?) PDF file), and handle
   character names with high-bit-set characters (use unsigned ints).
-Added PDFDoc::isLinearized() and corresponding code in pdfinfo.cc.
+Added PDFDoc::isLinearized() and corresponding code in pdfinfo.cpp.
 Handle files with an incorrect page count in the Pages dictionary
   (FOP, from the Apache project produces a page count of 0).
 Handle TrueType equivalents to the Base14 fonts (Arial, TimesNewRoman,
@@ -602,7 +602,7 @@ Configure script switches to C++ for the strings.h/bstring.h test.
 Gfx::opRestore() calls clearPath() to handle (apparently) buggy PDF
   files produced by FreeHand.
 The /Type field in most dictionaries is optional (PDF 1.3 change).
-Move printCommands variable definition into Gfx.cc.
+Move printCommands variable definition into Gfx.cpp.
 If page is smaller than paper, center the PostScript output.
 Fix a minor bug in the SELECT_TAKES_INT detection in the configure
   script.
@@ -661,7 +661,7 @@ Rearranged the GfxResources class.
 Clean up white space handling in Lexer.
 Make the dpi parameter to PDFDoc::displayPage etc. a double - this
   avoids margin gaps with fit-page and fit-width.
-Fix a rounding problem in xpdf.cc that was causing the window to
+Fix a rounding problem in xpdf.cpp that was causing the window to
   sometimes be one pixel too small.
 Fixed a minor bug in dealing with Base-14 TrueType font names.
 Fixed Lab -> RGB color space conversion.
@@ -998,7 +998,7 @@ Added psASCIIHex parameter.
 Added the GBK Unicode map to the simplified Chinese language pack.
 Pdftotext now opens the text file in binary mode to avoid Microsoft's
   annoying automatic end-of-line translation stuff.
-Added an executeCommand function in goo/gfile.cc.  [Thanks to Mikhail
+Added an executeCommand function in goo/gfile.cpp.  [Thanks to Mikhail
   Kruk.]
 The %ALDImagePosition OPI comment was wrong if the page was scaled to
   a different paper size.
diff --git a/filters/kword/pdf/xpdf/goo/GHash.cc b/filters/kword/pdf/xpdf/goo/GHash.cpp
index d336f88e3..94b327766 100644
--- a/filters/kword/pdf/xpdf/goo/GHash.cc
+++ b/filters/kword/pdf/xpdf/goo/GHash.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// GHash.cc
+// GHash.cpp
 //
 // Copyright 2001-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/goo/GList.cc b/filters/kword/pdf/xpdf/goo/GList.cpp
index 3754cc713..5d2a76467 100644
--- a/filters/kword/pdf/xpdf/goo/GList.cc
+++ b/filters/kword/pdf/xpdf/goo/GList.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// GList.cc
+// GList.cpp
 //
 // Copyright 2001-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/goo/GString.cc b/filters/kword/pdf/xpdf/goo/GString.cpp
index 6a556fab8..ef792adba 100644
--- a/filters/kword/pdf/xpdf/goo/GString.cc
+++ b/filters/kword/pdf/xpdf/goo/GString.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// GString.cc
+// GString.cpp
 //
 // Simple variable-length string type.
 //
diff --git a/filters/kword/pdf/xpdf/goo/Makefile.am b/filters/kword/pdf/xpdf/goo/Makefile.am
index 186aa0db3..3a5700d7b 100644
--- a/filters/kword/pdf/xpdf/goo/Makefile.am
+++ b/filters/kword/pdf/xpdf/goo/Makefile.am
@@ -3,5 +3,5 @@ INCLUDES= -I$(srcdir)
 
 noinst_LTLIBRARIES = libgoo.la
 
-libgoo_la_SOURCES = GHash.cc GList.cc GString.cc gmempp.cc gfile.cc \
+libgoo_la_SOURCES = GHash.cpp GList.cpp GString.cpp gmempp.cpp gfile.cpp \
                     gmem.c parseargs.c
diff --git a/filters/kword/pdf/xpdf/goo/gfile.cc b/filters/kword/pdf/xpdf/goo/gfile.cpp
index 55fb2f837..7fb7aaefb 100644
--- a/filters/kword/pdf/xpdf/goo/gfile.cc
+++ b/filters/kword/pdf/xpdf/goo/gfile.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// gfile.cc
+// gfile.cpp
 //
 // Miscellaneous file and directory name manipulation.
 //
diff --git a/filters/kword/pdf/xpdf/goo/gmempp.cc b/filters/kword/pdf/xpdf/goo/gmempp.cpp
index ed94f7a1d..6339f2e8f 100644
--- a/filters/kword/pdf/xpdf/goo/gmempp.cc
+++ b/filters/kword/pdf/xpdf/goo/gmempp.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// gmempp.cc
+// gmempp.cpp
 //
 // Use gmalloc/gfree for C++ new/delete operators.
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/Annot.cc b/filters/kword/pdf/xpdf/xpdf/Annot.cpp
index 8ebf6a0c0..c3a161190 100644
--- a/filters/kword/pdf/xpdf/xpdf/Annot.cc
+++ b/filters/kword/pdf/xpdf/xpdf/Annot.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Annot.cc
+// Annot.cpp
 //
 // Copyright 2000-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/Array.cc b/filters/kword/pdf/xpdf/xpdf/Array.cpp
index 9c6cb3415..758dbfd0b 100644
--- a/filters/kword/pdf/xpdf/xpdf/Array.cc
+++ b/filters/kword/pdf/xpdf/xpdf/Array.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Array.cc
+// Array.cpp
 //
 // Copyright 1996-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/BuiltinFont.cc b/filters/kword/pdf/xpdf/xpdf/BuiltinFont.cpp
index 72b845792..3f1effb5e 100644
--- a/filters/kword/pdf/xpdf/xpdf/BuiltinFont.cc
+++ b/filters/kword/pdf/xpdf/xpdf/BuiltinFont.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// BuiltinFont.cc
+// BuiltinFont.cpp
 //
 // Copyright 2001-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/BuiltinFontTables.cc b/filters/kword/pdf/xpdf/xpdf/BuiltinFontTables.cpp
index e2acfef8a..3120d0852 100644
--- a/filters/kword/pdf/xpdf/xpdf/BuiltinFontTables.cc
+++ b/filters/kword/pdf/xpdf/xpdf/BuiltinFontTables.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// BuiltinFontTables.cc
+// BuiltinFontTables.cpp
 //
 // Copyright 2001-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/CMap.cc b/filters/kword/pdf/xpdf/xpdf/CMap.cpp
index b00021835..09a7bfe43 100644
--- a/filters/kword/pdf/xpdf/xpdf/CMap.cc
+++ b/filters/kword/pdf/xpdf/xpdf/CMap.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// CMap.cc
+// CMap.cpp
 //
 // Copyright 2001-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/Catalog.cc b/filters/kword/pdf/xpdf/xpdf/Catalog.cpp
index 8f7e6b04e..583666b22 100644
--- a/filters/kword/pdf/xpdf/xpdf/Catalog.cc
+++ b/filters/kword/pdf/xpdf/xpdf/Catalog.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Catalog.cc
+// Catalog.cpp
 //
 // Copyright 1996-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/CharCodeToUnicode.cc b/filters/kword/pdf/xpdf/xpdf/CharCodeToUnicode.cpp
index f61d4007d..1a01b37d6 100644
--- a/filters/kword/pdf/xpdf/xpdf/CharCodeToUnicode.cc
+++ b/filters/kword/pdf/xpdf/xpdf/CharCodeToUnicode.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// CharCodeToUnicode.cc
+// CharCodeToUnicode.cpp
 //
 // Copyright 2001-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/Decrypt.cc b/filters/kword/pdf/xpdf/xpdf/Decrypt.cpp
index 920cd63f4..11767f752 100644
--- a/filters/kword/pdf/xpdf/xpdf/Decrypt.cc
+++ b/filters/kword/pdf/xpdf/xpdf/Decrypt.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Decrypt.cc
+// Decrypt.cpp
 //
 // Copyright 1996-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/Dict.cc b/filters/kword/pdf/xpdf/xpdf/Dict.cpp
index 351c23a02..70592a61b 100644
--- a/filters/kword/pdf/xpdf/xpdf/Dict.cc
+++ b/filters/kword/pdf/xpdf/xpdf/Dict.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Dict.cc
+// Dict.cpp
 //
 // Copyright 1996-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/Error.cc b/filters/kword/pdf/xpdf/xpdf/Error.cpp
index c1985ca85..e7312a006 100644
--- a/filters/kword/pdf/xpdf/xpdf/Error.cc
+++ b/filters/kword/pdf/xpdf/xpdf/Error.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Error.cc
+// Error.cpp
 //
 // Copyright 1996-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/FTFont.cc b/filters/kword/pdf/xpdf/xpdf/FTFont.cpp
index 8de09e0e6..f993ca05e 100644
--- a/filters/kword/pdf/xpdf/xpdf/FTFont.cc
+++ b/filters/kword/pdf/xpdf/xpdf/FTFont.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// FTFont.cc
+// FTFont.cpp
 //
 // Copyright 2001-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/FontEncodingTables.cc b/filters/kword/pdf/xpdf/xpdf/FontEncodingTables.cpp
index db4f9dd8b..83774bf87 100644
--- a/filters/kword/pdf/xpdf/xpdf/FontEncodingTables.cc
+++ b/filters/kword/pdf/xpdf/xpdf/FontEncodingTables.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// FontEncodingTables.cc
+// FontEncodingTables.cpp
 //
 // Copyright 2001-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/FontFile.cc b/filters/kword/pdf/xpdf/xpdf/FontFile.cpp
index ccb880bfb..8a6597b08 100644
--- a/filters/kword/pdf/xpdf/xpdf/FontFile.cc
+++ b/filters/kword/pdf/xpdf/xpdf/FontFile.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// FontFile.cc
+// FontFile.cpp
 //
 // Copyright 1999-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/Function.cc b/filters/kword/pdf/xpdf/xpdf/Function.cpp
index e72d3d288..84e27d197 100644
--- a/filters/kword/pdf/xpdf/xpdf/Function.cc
+++ b/filters/kword/pdf/xpdf/xpdf/Function.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Function.cc
+// Function.cpp
 //
 // Copyright 2001-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/Gfx.cc b/filters/kword/pdf/xpdf/xpdf/Gfx.cpp
index 7948d78ae..cb6b47831 100644
--- a/filters/kword/pdf/xpdf/xpdf/Gfx.cc
+++ b/filters/kword/pdf/xpdf/xpdf/Gfx.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Gfx.cc
+// Gfx.cpp
 //
 // Copyright 1996-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/GfxFont.cc b/filters/kword/pdf/xpdf/xpdf/GfxFont.cpp
index 1ed211743..53708b492 100644
--- a/filters/kword/pdf/xpdf/xpdf/GfxFont.cc
+++ b/filters/kword/pdf/xpdf/xpdf/GfxFont.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// GfxFont.cc
+// GfxFont.cpp
 //
 // Copyright 1996-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/GfxState.cc b/filters/kword/pdf/xpdf/xpdf/GfxState.cpp
index 5101f773d..866e692f1 100644
--- a/filters/kword/pdf/xpdf/xpdf/GfxState.cc
+++ b/filters/kword/pdf/xpdf/xpdf/GfxState.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// GfxState.cc
+// GfxState.cpp
 //
 // Copyright 1996-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/GlobalParams.cc b/filters/kword/pdf/xpdf/xpdf/GlobalParams.cpp
index 8a7b36de8..be2569d34 100644
--- a/filters/kword/pdf/xpdf/xpdf/GlobalParams.cc
+++ b/filters/kword/pdf/xpdf/xpdf/GlobalParams.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// GlobalParams.cc
+// GlobalParams.cpp
 //
 // Copyright 2001-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/ImageOutputDev.cc b/filters/kword/pdf/xpdf/xpdf/ImageOutputDev.cpp
index 1a6d87e1f..9c1628437 100644
--- a/filters/kword/pdf/xpdf/xpdf/ImageOutputDev.cc
+++ b/filters/kword/pdf/xpdf/xpdf/ImageOutputDev.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// ImageOutputDev.cc
+// ImageOutputDev.cpp
 //
 // Copyright 1998-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/JBIG2Stream.cc b/filters/kword/pdf/xpdf/xpdf/JBIG2Stream.cpp
index 6312cacae..fefab4a7e 100644
--- a/filters/kword/pdf/xpdf/xpdf/JBIG2Stream.cc
+++ b/filters/kword/pdf/xpdf/xpdf/JBIG2Stream.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// JBIG2Stream.cc
+// JBIG2Stream.cpp
 //
 // Copyright 2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/Lexer.cc b/filters/kword/pdf/xpdf/xpdf/Lexer.cpp
index 982295ee3..2d588814c 100644
--- a/filters/kword/pdf/xpdf/xpdf/Lexer.cc
+++ b/filters/kword/pdf/xpdf/xpdf/Lexer.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Lexer.cc
+// Lexer.cpp
 //
 // Copyright 1996-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/Link.cc b/filters/kword/pdf/xpdf/xpdf/Link.cpp
index 345e7296a..45805d20d 100644
--- a/filters/kword/pdf/xpdf/xpdf/Link.cc
+++ b/filters/kword/pdf/xpdf/xpdf/Link.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Link.cc
+// Link.cpp
 //
 // Copyright 1996-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/Makefile.am b/filters/kword/pdf/xpdf/xpdf/Makefile.am
index 2ad61b24f..001e9ea00 100644
--- a/filters/kword/pdf/xpdf/xpdf/Makefile.am
+++ b/filters/kword/pdf/xpdf/xpdf/Makefile.am
@@ -4,11 +4,11 @@ INCLUDES= -I$(srcdir) -I$(srcdir)/../goo $(all_includes)
 
 noinst_LTLIBRARIES = libxpdf.la
 
-libxpdf_la_SOURCES = Array.cc BuiltinFont.cc BuiltinFontTables.cc Catalog.cc \
-	CharCodeToUnicode.cc CMap.cc Decrypt.cc Dict.cc Error.cc \
-	FontEncodingTables.cc FontFile.cc Function.cc Gfx.cc \
-	GfxFont.cc GfxState.cc GlobalParams.cc Lexer.cc Link.cc \
-	NameToCharCode.cc Object.cc OutputDev.cc Page.cc Parser.cc PDFDoc.cc \
-	PSTokenizer.cc Stream.cc UnicodeMap.cc XRef.cc Annot.cc \
-    Outline.cc JBIG2Stream.cc PDFDocEncoding.cc \
-    TextOutputDev.cc
+libxpdf_la_SOURCES = Array.cpp BuiltinFont.cpp BuiltinFontTables.cpp Catalog.cpp \
+	CharCodeToUnicode.cpp CMap.cpp Decrypt.cpp Dict.cpp Error.cpp \
+	FontEncodingTables.cpp FontFile.cpp Function.cpp Gfx.cpp \
+	GfxFont.cpp GfxState.cpp GlobalParams.cpp Lexer.cpp Link.cpp \
+	NameToCharCode.cpp Object.cpp OutputDev.cpp Page.cpp Parser.cpp PDFDoc.cpp \
+	PSTokenizer.cpp Stream.cpp UnicodeMap.cpp XRef.cpp Annot.cpp \
+    Outline.cpp JBIG2Stream.cpp PDFDocEncoding.cpp \
+    TextOutputDev.cpp
diff --git a/filters/kword/pdf/xpdf/xpdf/NameToCharCode.cc b/filters/kword/pdf/xpdf/xpdf/NameToCharCode.cpp
index bc5165335..81739488a 100644
--- a/filters/kword/pdf/xpdf/xpdf/NameToCharCode.cc
+++ b/filters/kword/pdf/xpdf/xpdf/NameToCharCode.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// NameToCharCode.cc
+// NameToCharCode.cpp
 //
 // Copyright 2001-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/Object.cc b/filters/kword/pdf/xpdf/xpdf/Object.cpp
index 296522ce4..2a251536f 100644
--- a/filters/kword/pdf/xpdf/xpdf/Object.cc
+++ b/filters/kword/pdf/xpdf/xpdf/Object.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Object.cc
+// Object.cpp
 //
 // Copyright 1996-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/Outline.cc b/filters/kword/pdf/xpdf/xpdf/Outline.cpp
index 256d38d4b..b0753fda2 100644
--- a/filters/kword/pdf/xpdf/xpdf/Outline.cc
+++ b/filters/kword/pdf/xpdf/xpdf/Outline.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Outline.cc
+// Outline.cpp
 //
 // Copyright 2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/OutputDev.cc b/filters/kword/pdf/xpdf/xpdf/OutputDev.cpp
index 34ec56836..84f7a2ac9 100644
--- a/filters/kword/pdf/xpdf/xpdf/OutputDev.cc
+++ b/filters/kword/pdf/xpdf/xpdf/OutputDev.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// OutputDev.cc
+// OutputDev.cpp
 //
 // Copyright 1996-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/PBMOutputDev.cc b/filters/kword/pdf/xpdf/xpdf/PBMOutputDev.cpp
index 34432991d..4a65ac041 100644
--- a/filters/kword/pdf/xpdf/xpdf/PBMOutputDev.cc
+++ b/filters/kword/pdf/xpdf/xpdf/PBMOutputDev.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// PBMOutputDev.cc
+// PBMOutputDev.cpp
 //
 // Copyright 1998-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/PDFDoc.cc b/filters/kword/pdf/xpdf/xpdf/PDFDoc.cpp
index 19efc1aa6..63f5d2da4 100644
--- a/filters/kword/pdf/xpdf/xpdf/PDFDoc.cc
+++ b/filters/kword/pdf/xpdf/xpdf/PDFDoc.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// PDFDoc.cc
+// PDFDoc.cpp
 //
 // Copyright 1996-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/PDFDocEncoding.cc b/filters/kword/pdf/xpdf/xpdf/PDFDocEncoding.cpp
index 4f1e20132..4f1e20132 100644
--- a/filters/kword/pdf/xpdf/xpdf/PDFDocEncoding.cc
+++ b/filters/kword/pdf/xpdf/xpdf/PDFDocEncoding.cpp
diff --git a/filters/kword/pdf/xpdf/xpdf/PSOutputDev.cc b/filters/kword/pdf/xpdf/xpdf/PSOutputDev.cpp
index 111d8717b..66fd3fa6a 100644
--- a/filters/kword/pdf/xpdf/xpdf/PSOutputDev.cc
+++ b/filters/kword/pdf/xpdf/xpdf/PSOutputDev.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// PSOutputDev.cc
+// PSOutputDev.cpp
 //
 // Copyright 1996-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/PSTokenizer.cc b/filters/kword/pdf/xpdf/xpdf/PSTokenizer.cpp
index 570a7bac7..73b04323e 100644
--- a/filters/kword/pdf/xpdf/xpdf/PSTokenizer.cc
+++ b/filters/kword/pdf/xpdf/xpdf/PSTokenizer.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// PSTokenizer.cc
+// PSTokenizer.cpp
 //
 // Copyright 2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/Page.cc b/filters/kword/pdf/xpdf/xpdf/Page.cpp
index 891ed82ee..96cb4613d 100644
--- a/filters/kword/pdf/xpdf/xpdf/Page.cc
+++ b/filters/kword/pdf/xpdf/xpdf/Page.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Page.cc
+// Page.cpp
 //
 // Copyright 1996-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/Parser.cc b/filters/kword/pdf/xpdf/xpdf/Parser.cpp
index 4bcb0ceb8..3fb58d6b2 100644
--- a/filters/kword/pdf/xpdf/xpdf/Parser.cc
+++ b/filters/kword/pdf/xpdf/xpdf/Parser.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Parser.cc
+// Parser.cpp
 //
 // Copyright 1996-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/SFont.cc b/filters/kword/pdf/xpdf/xpdf/SFont.cpp
index 53214b08f..9899301cf 100644
--- a/filters/kword/pdf/xpdf/xpdf/SFont.cc
+++ b/filters/kword/pdf/xpdf/xpdf/SFont.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// SFont.cc
+// SFont.cpp
 //
 // Copyright 2001-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/Stream.cc b/filters/kword/pdf/xpdf/xpdf/Stream.cpp
index 8c997d032..7b3dbb5d5 100644
--- a/filters/kword/pdf/xpdf/xpdf/Stream.cc
+++ b/filters/kword/pdf/xpdf/xpdf/Stream.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Stream.cc
+// Stream.cpp
 //
 // Copyright 1996-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/T1Font.cc b/filters/kword/pdf/xpdf/xpdf/T1Font.cpp
index 9815e4901..350f7bd66 100644
--- a/filters/kword/pdf/xpdf/xpdf/T1Font.cc
+++ b/filters/kword/pdf/xpdf/xpdf/T1Font.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// T1Font.cc
+// T1Font.cpp
 //
 // Copyright 2001-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/TTFont.cc b/filters/kword/pdf/xpdf/xpdf/TTFont.cpp
index 6107fd43a..51761fbf1 100644
--- a/filters/kword/pdf/xpdf/xpdf/TTFont.cc
+++ b/filters/kword/pdf/xpdf/xpdf/TTFont.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// TTFont.cc
+// TTFont.cpp
 //
 // Copyright 2001-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/TextOutputDev.cc b/filters/kword/pdf/xpdf/xpdf/TextOutputDev.cpp
index 8eb789032..3266678fb 100644
--- a/filters/kword/pdf/xpdf/xpdf/TextOutputDev.cc
+++ b/filters/kword/pdf/xpdf/xpdf/TextOutputDev.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// TextOutputDev.cc
+// TextOutputDev.cpp
 //
 // Copyright 1997-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/UnicodeMap.cc b/filters/kword/pdf/xpdf/xpdf/UnicodeMap.cpp
index fe1185d7d..dce0cae7a 100644
--- a/filters/kword/pdf/xpdf/xpdf/UnicodeMap.cc
+++ b/filters/kword/pdf/xpdf/xpdf/UnicodeMap.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// UnicodeMap.cc
+// UnicodeMap.cpp
 //
 // Copyright 2001-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/XOutputDev.cc b/filters/kword/pdf/xpdf/xpdf/XOutputDev.cpp
index 3c58f5650..e8acbf66a 100644
--- a/filters/kword/pdf/xpdf/xpdf/XOutputDev.cc
+++ b/filters/kword/pdf/xpdf/xpdf/XOutputDev.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// XOutputDev.cc
+// XOutputDev.cpp
 //
 // Copyright 1996-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFApp.cc b/filters/kword/pdf/xpdf/xpdf/XPDFApp.cpp
index e456310b6..b64f17c7f 100644
--- a/filters/kword/pdf/xpdf/xpdf/XPDFApp.cc
+++ b/filters/kword/pdf/xpdf/xpdf/XPDFApp.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// XPDFApp.cc
+// XPDFApp.cpp
 //
 // Copyright 2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFCore.cc b/filters/kword/pdf/xpdf/xpdf/XPDFCore.cpp
index 8376ce97d..517b99700 100644
--- a/filters/kword/pdf/xpdf/xpdf/XPDFCore.cc
+++ b/filters/kword/pdf/xpdf/xpdf/XPDFCore.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// XPDFCore.cc
+// XPDFCore.cpp
 //
 // Copyright 2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFTree.cc b/filters/kword/pdf/xpdf/xpdf/XPDFTree.cpp
index 46e5466c5..edc7fb8fc 100644
--- a/filters/kword/pdf/xpdf/xpdf/XPDFTree.cc
+++ b/filters/kword/pdf/xpdf/xpdf/XPDFTree.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// XPDFTree.cc
+// XPDFTree.cpp
 //
 //========================================================================
 
diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc b/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cpp
index a8c8f8f0f..8327a7a22 100644
--- a/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc
+++ b/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// XPDFViewer.cc
+// XPDFViewer.cpp
 //
 // Copyright 2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/XPixmapOutputDev.cc b/filters/kword/pdf/xpdf/xpdf/XPixmapOutputDev.cpp
index ecd149801..39fc474e2 100644
--- a/filters/kword/pdf/xpdf/xpdf/XPixmapOutputDev.cc
+++ b/filters/kword/pdf/xpdf/xpdf/XPixmapOutputDev.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// XPixmapOutputDev.cc
+// XPixmapOutputDev.cpp
 //
 // Copyright 2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/XRef.cc b/filters/kword/pdf/xpdf/xpdf/XRef.cpp
index 0553b1595..471d5c854 100644
--- a/filters/kword/pdf/xpdf/xpdf/XRef.cc
+++ b/filters/kword/pdf/xpdf/xpdf/XRef.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// XRef.cc
+// XRef.cpp
 //
 // Copyright 1996-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/pdffonts.cc b/filters/kword/pdf/xpdf/xpdf/pdffonts.cpp
index fcb739a20..831e773ca 100644
--- a/filters/kword/pdf/xpdf/xpdf/pdffonts.cc
+++ b/filters/kword/pdf/xpdf/xpdf/pdffonts.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// pdffonts.cc
+// pdffonts.cpp
 //
 // Copyright 2001-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/pdfimages.cc b/filters/kword/pdf/xpdf/xpdf/pdfimages.cpp
index 5e35bfb48..c2f4bf804 100644
--- a/filters/kword/pdf/xpdf/xpdf/pdfimages.cc
+++ b/filters/kword/pdf/xpdf/xpdf/pdfimages.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// pdfimages.cc
+// pdfimages.cpp
 //
 // Copyright 1998-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/pdfinfo.cc b/filters/kword/pdf/xpdf/xpdf/pdfinfo.cpp
index 43bf38afb..e21a299fd 100644
--- a/filters/kword/pdf/xpdf/xpdf/pdfinfo.cc
+++ b/filters/kword/pdf/xpdf/xpdf/pdfinfo.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// pdfinfo.cc
+// pdfinfo.cpp
 //
 // Copyright 1998-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/pdftopbm.cc b/filters/kword/pdf/xpdf/xpdf/pdftopbm.cpp
index 76f60a6af..9a2002296 100644
--- a/filters/kword/pdf/xpdf/xpdf/pdftopbm.cc
+++ b/filters/kword/pdf/xpdf/xpdf/pdftopbm.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// pdftopbm.cc
+// pdftopbm.cpp
 //
 // Copyright 1998-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/pdftops.cc b/filters/kword/pdf/xpdf/xpdf/pdftops.cpp
index d5d2de85d..91a324ac2 100644
--- a/filters/kword/pdf/xpdf/xpdf/pdftops.cc
+++ b/filters/kword/pdf/xpdf/xpdf/pdftops.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// pdftops.cc
+// pdftops.cpp
 //
 // Copyright 1996-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/pdftotext.cc b/filters/kword/pdf/xpdf/xpdf/pdftotext.cpp
index 150954fc9..b2e68b422 100644
--- a/filters/kword/pdf/xpdf/xpdf/pdftotext.cc
+++ b/filters/kword/pdf/xpdf/xpdf/pdftotext.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// pdftotext.cc
+// pdftotext.cpp
 //
 // Copyright 1997-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/xpdf.cc b/filters/kword/pdf/xpdf/xpdf/xpdf.cpp
index ef47fb6e5..9cb3f82d7 100644
--- a/filters/kword/pdf/xpdf/xpdf/xpdf.cc
+++ b/filters/kword/pdf/xpdf/xpdf/xpdf.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// xpdf.cc
+// xpdf.cpp
 //
 // Copyright 1996-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/rtf/export/ExportFilter.cc b/filters/kword/rtf/export/ExportFilter.cpp
index eba2b645d..eba2b645d 100644
--- a/filters/kword/rtf/export/ExportFilter.cc
+++ b/filters/kword/rtf/export/ExportFilter.cpp
diff --git a/filters/kword/rtf/export/Makefile.am b/filters/kword/rtf/export/Makefile.am
index ba3d5c097..e6c49d00c 100644
--- a/filters/kword/rtf/export/Makefile.am
+++ b/filters/kword/rtf/export/Makefile.am
@@ -10,7 +10,7 @@ librtfexport_la_LIBADD = $(KOFFICE_LIBS) ../../libexport/libkwordexportfilters.l
 
 kde_module_LTLIBRARIES = librtfexport.la
 
-librtfexport_la_SOURCES = rtfexport.cc ExportFilter.cc
+librtfexport_la_SOURCES = rtfexport.cpp ExportFilter.cpp
 
 noinst_HEADERS = rtfexport.h ExportFilter.h
 
diff --git a/filters/kword/rtf/export/rtfexport.cc b/filters/kword/rtf/export/rtfexport.cpp
index 6f23530b1..91f35523d 100644
--- a/filters/kword/rtf/export/rtfexport.cc
+++ b/filters/kword/rtf/export/rtfexport.cpp
@@ -22,7 +22,7 @@
 
 /*
    This file is based on the old file:
-    /home/kde/koffice/filters/kword/ascii/asciiexport.cc
+    /home/kde/koffice/filters/kword/ascii/asciiexport.cpp
 
    The old file was copyrighted by
     Copyright (C) 1998, 1999 Reginald Stadlbauer <reggie@kde.org>
diff --git a/filters/kword/starwriter/Makefile.am b/filters/kword/starwriter/Makefile.am
index 6ad15ba84..bba3714d3 100644
--- a/filters/kword/starwriter/Makefile.am
+++ b/filters/kword/starwriter/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) $(all_includes)
 
 kde_module_LTLIBRARIES = libstarwriterimport.la
 
-libstarwriterimport_la_SOURCES = pole.cpp starwriterimport.cc
+libstarwriterimport_la_SOURCES = pole.cpp starwriterimport.cpp
 libstarwriterimport_la_LDFLAGS	= -module $(KDE_PLUGIN)
 libstarwriterimport_la_LIBADD = $(KOFFICE_LIBS)
 
diff --git a/filters/kword/starwriter/starwriterimport.cc b/filters/kword/starwriter/starwriterimport.cpp
index 43dc1b623..43dc1b623 100644
--- a/filters/kword/starwriter/starwriterimport.cc
+++ b/filters/kword/starwriter/starwriterimport.cpp
diff --git a/filters/kword/wml/Makefile.am b/filters/kword/wml/Makefile.am
index d22ac2c59..892a57cbf 100644
--- a/filters/kword/wml/Makefile.am
+++ b/filters/kword/wml/Makefile.am
@@ -10,8 +10,8 @@ libwmlexport_la_LIBADD = $(KOFFICE_LIBS) ../libexport/libkwordexportfilters.la
 
 kde_module_LTLIBRARIES = libwmlimport.la libwmlexport.la
 
-libwmlimport_la_SOURCES = wmlimport.cc wmlparser.cpp
-libwmlexport_la_SOURCES = wmlexport.cc
+libwmlimport_la_SOURCES = wmlimport.cpp wmlparser.cpp
+libwmlexport_la_SOURCES = wmlexport.cpp
 
 noinst_HEADERS = wmlparser.h
 
diff --git a/filters/kword/wml/wmlexport.cc b/filters/kword/wml/wmlexport.cpp
index 978cb14d2..978cb14d2 100644
--- a/filters/kword/wml/wmlexport.cc
+++ b/filters/kword/wml/wmlexport.cpp
diff --git a/filters/kword/wml/wmlimport.cc b/filters/kword/wml/wmlimport.cpp
index 83e14d9f0..83e14d9f0 100644
--- a/filters/kword/wml/wmlimport.cc
+++ b/filters/kword/wml/wmlimport.cpp
diff --git a/filters/kword/wordperfect/export/Makefile.am b/filters/kword/wordperfect/export/Makefile.am
index a3ef671a3..bc23e5fd2 100644
--- a/filters/kword/wordperfect/export/Makefile.am
+++ b/filters/kword/wordperfect/export/Makefile.am
@@ -2,7 +2,7 @@
 INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) -I$(srcdir)/../../libexport $(all_includes)
 kde_module_LTLIBRARIES = libwpexport.la
 
-libwpexport_la_SOURCES = wpexport.cc wp5.cc wp6.cc
+libwpexport_la_SOURCES = wpexport.cpp wp5.cpp wp6.cpp
 libwpexport_la_LDFLAGS	= $(all_libraries) -module -avoid-version -no-undefined
 libwpexport_la_LIBADD = $(KOFFICE_LIBS) ../../libexport/libkwordexportfilters.la
 
diff --git a/filters/kword/wordperfect/export/wp5.cc b/filters/kword/wordperfect/export/wp5.cpp
index 965753537..965753537 100644
--- a/filters/kword/wordperfect/export/wp5.cc
+++ b/filters/kword/wordperfect/export/wp5.cpp
diff --git a/filters/kword/wordperfect/export/wp6.cc b/filters/kword/wordperfect/export/wp6.cpp
index 5d0079b44..5d0079b44 100644
--- a/filters/kword/wordperfect/export/wp6.cc
+++ b/filters/kword/wordperfect/export/wp6.cpp
diff --git a/filters/kword/wordperfect/export/wpexport.cc b/filters/kword/wordperfect/export/wpexport.cpp
index 619d5d476..619d5d476 100644
--- a/filters/kword/wordperfect/export/wpexport.cc
+++ b/filters/kword/wordperfect/export/wpexport.cpp
diff --git a/filters/kword/wordperfect/import/DocumentElement.cxx b/filters/kword/wordperfect/import/DocumentElement.cpp
index a1a928925..f10e56969 100644
--- a/filters/kword/wordperfect/import/DocumentElement.cxx
+++ b/filters/kword/wordperfect/import/DocumentElement.cpp
@@ -26,9 +26,9 @@
  * Corel Corporation or Corel Corporation Limited."
  */
 
-#include "DocumentElement.hxx"
-#include "DocumentHandler.hxx"
-#include "FilterInternal.hxx"
+#include "DocumentElement.h"
+#include "DocumentHandler.h"
+#include "FilterInternal.h"
 #include <string.h>
 
 #define ASCII_SPACE 0x0020
diff --git a/filters/kword/wordperfect/import/DocumentElement.hxx b/filters/kword/wordperfect/import/DocumentElement.h
index 764758e83..3fc2cf532 100644
--- a/filters/kword/wordperfect/import/DocumentElement.hxx
+++ b/filters/kword/wordperfect/import/DocumentElement.h
@@ -32,7 +32,7 @@
 #include <libwpd/libwpd.h>
 #include <vector>
 #include "shared_headers.h"
-#include "DocumentHandler.hxx"
+#include "DocumentHandler.h"
 
 const float fDefaultSideMargin = 1.0f; // inches
 const float fDefaultPageWidth = 8.5f; // inches (OOo required default: we will handle this later)
diff --git a/filters/kword/wordperfect/import/DocumentHandler.hxx b/filters/kword/wordperfect/import/DocumentHandler.h
index ff8e39f03..ff8e39f03 100644
--- a/filters/kword/wordperfect/import/DocumentHandler.hxx
+++ b/filters/kword/wordperfect/import/DocumentHandler.h
diff --git a/filters/kword/wordperfect/import/FilterInternal.hxx b/filters/kword/wordperfect/import/FilterInternal.h
index 51615951e..0a20f7c60 100644
--- a/filters/kword/wordperfect/import/FilterInternal.hxx
+++ b/filters/kword/wordperfect/import/FilterInternal.h
@@ -28,7 +28,7 @@
 #endif
 
 #if 0
-#include <rtl/string.hxx>
+#include <rtl/string.h>
 inline rtl::OString utf8_itoa(int i)
 {
 	return rtl::OString::valueOf( (sal_Int32) i );
diff --git a/filters/kword/wordperfect/import/FontStyle.cxx b/filters/kword/wordperfect/import/FontStyle.cpp
index b926ccddc..6099e7e39 100644
--- a/filters/kword/wordperfect/import/FontStyle.cxx
+++ b/filters/kword/wordperfect/import/FontStyle.cpp
@@ -25,9 +25,9 @@
 /* "This product is not manufactured, approved, or supported by 
  * Corel Corporation or Corel Corporation Limited."
  */
-#include "FontStyle.hxx"
-#include "WriterProperties.hxx"
-#include "DocumentElement.hxx"
+#include "FontStyle.h"
+#include "WriterProperties.h"
+#include "DocumentElement.h"
 
 FontStyle::FontStyle(const char *psName, const char *psFontFamily) : Style(psName),
 	msFontFamily(psFontFamily),
diff --git a/filters/kword/wordperfect/import/FontStyle.hxx b/filters/kword/wordperfect/import/FontStyle.h
index 6d09de5c8..994184950 100644
--- a/filters/kword/wordperfect/import/FontStyle.hxx
+++ b/filters/kword/wordperfect/import/FontStyle.h
@@ -29,8 +29,8 @@
 #define _FONTSTYLE_H
 
 #include <libwpd/libwpd.h>
-#include "Style.hxx"
-#include "WriterProperties.hxx"
+#include "Style.h"
+#include "WriterProperties.h"
 #include "shared_headers.h"
 
 class FontStyle : public Style
diff --git a/filters/kword/wordperfect/import/ListStyle.cxx b/filters/kword/wordperfect/import/ListStyle.cpp
index 66373a109..baba4b679 100644
--- a/filters/kword/wordperfect/import/ListStyle.cxx
+++ b/filters/kword/wordperfect/import/ListStyle.cpp
@@ -25,9 +25,9 @@
 /* "This product is not manufactured, approved, or supported by 
  * Corel Corporation or Corel Corporation Limited."
  */
-#include "FilterInternal.hxx"
-#include "ListStyle.hxx"
-#include "DocumentElement.hxx"
+#include "FilterInternal.h"
+#include "ListStyle.h"
+#include "DocumentElement.h"
 
 OrderedListLevelStyle::OrderedListLevelStyle(const _SH_PropertyList &xPropList) : 
         mPropList(xPropList)
diff --git a/filters/kword/wordperfect/import/ListStyle.hxx b/filters/kword/wordperfect/import/ListStyle.h
index d8e6a25f2..11bda504d 100644
--- a/filters/kword/wordperfect/import/ListStyle.hxx
+++ b/filters/kword/wordperfect/import/ListStyle.h
@@ -32,8 +32,8 @@
 
 #define WP6_NUM_LIST_LEVELS 8 // see WP6FileStructure.h (we shouldn't need to reference this)
 
-#include "Style.hxx"
-#include "WriterProperties.hxx"
+#include "Style.h"
+#include "WriterProperties.h"
 
 class DocumentElement;
 
diff --git a/filters/kword/wordperfect/import/Makefile.am b/filters/kword/wordperfect/import/Makefile.am
index 92494e0ea..f5380749a 100644
--- a/filters/kword/wordperfect/import/Makefile.am
+++ b/filters/kword/wordperfect/import/Makefile.am
@@ -2,11 +2,11 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) $(LIBWPD_CFLAGS) $(all_includes)
 
 kde_module_LTLIBRARIES = libwpimport.la 
 
-libwpimport_la_SOURCES = wpimport.cc DocumentElement.cxx FontStyle.cxx ListStyle.cxx PageSpan.cxx SectionStyle.cxx TableStyle.cxx TextRunStyle.cxx WordPerfectCollector.cxx
+libwpimport_la_SOURCES = wpimport.cpp DocumentElement.cpp FontStyle.cpp ListStyle.cpp PageSpan.cpp SectionStyle.cpp TableStyle.cpp TextRunStyle.cpp WordPerfectCollector.cpp
 libwpimport_la_LDFLAGS	= $(all_libraries) -module -avoid-version -no-undefined
 libwpimport_la_LIBADD = $(KOFFICE_LIBS) $(LIBWPD_LIBS)
 
-noinst_HEADERS = wpimport.h FilterInternal.hxx Style.hxx WriterProperties.hxx DocumentElement.hxx DocumentHandler.hxx FontStyle.hxx ListStyle.hxx PageSpan.hxx SectionStyle.hxx TableStyle.hxx TextRunStyle.hxx WordPerfectCollector.hxx
+noinst_HEADERS = wpimport.h FilterInternal.h Style.h WriterProperties.h DocumentElement.h DocumentHandler.h FontStyle.h ListStyle.h PageSpan.h SectionStyle.h TableStyle.h TextRunStyle.h WordPerfectCollector.h
 
 
 METASOURCES = AUTO
diff --git a/filters/kword/wordperfect/import/PageSpan.cxx b/filters/kword/wordperfect/import/PageSpan.cpp
index 1113004d7..0127d0804 100644
--- a/filters/kword/wordperfect/import/PageSpan.cxx
+++ b/filters/kword/wordperfect/import/PageSpan.cpp
@@ -28,9 +28,9 @@
  */
 #include <config.h>
 
-#include "FilterInternal.hxx"
-#include "PageSpan.hxx"
-#include "DocumentElement.hxx"
+#include "FilterInternal.h"
+#include "PageSpan.h"
+#include "DocumentElement.h"
 
 
 PageSpan::PageSpan(const _SH_PropertyList &xPropList) :
diff --git a/filters/kword/wordperfect/import/PageSpan.hxx b/filters/kword/wordperfect/import/PageSpan.h
index 58c5ad811..58c5ad811 100644
--- a/filters/kword/wordperfect/import/PageSpan.hxx
+++ b/filters/kword/wordperfect/import/PageSpan.h
diff --git a/filters/kword/wordperfect/import/SectionStyle.cxx b/filters/kword/wordperfect/import/SectionStyle.cpp
index 153ee45d7..9a8b6790f 100644
--- a/filters/kword/wordperfect/import/SectionStyle.cxx
+++ b/filters/kword/wordperfect/import/SectionStyle.cpp
@@ -27,9 +27,9 @@
 /* "This product is not manufactured, approved, or supported by
  * Corel Corporation or Corel Corporation Limited."
  */
-#include "FilterInternal.hxx"
-#include "SectionStyle.hxx"
-#include "DocumentElement.hxx"
+#include "FilterInternal.h"
+#include "SectionStyle.h"
+#include "DocumentElement.h"
 #include <math.h>
 
 #ifdef _MSC_VER
diff --git a/filters/kword/wordperfect/import/SectionStyle.hxx b/filters/kword/wordperfect/import/SectionStyle.h
index 2f01d7520..5614f1182 100644
--- a/filters/kword/wordperfect/import/SectionStyle.hxx
+++ b/filters/kword/wordperfect/import/SectionStyle.h
@@ -30,8 +30,8 @@
 #include <libwpd/libwpd.h>
 #include "shared_headers.h"
 
-#include "Style.hxx"
-#include "WriterProperties.hxx"
+#include "Style.h"
+#include "WriterProperties.h"
 
 
 class SectionStyle : public Style
diff --git a/filters/kword/wordperfect/import/Style.hxx b/filters/kword/wordperfect/import/Style.h
index 49f5e28e4..08e53eff4 100644
--- a/filters/kword/wordperfect/import/Style.hxx
+++ b/filters/kword/wordperfect/import/Style.h
@@ -29,7 +29,7 @@
 #ifndef _STYLE_H
 #define _STYLE_H
 #include <libwpd/libwpd.h>
-#include "DocumentElement.hxx"
+#include "DocumentElement.h"
 
 #include <cstddef>
 
diff --git a/filters/kword/wordperfect/import/TableStyle.cxx b/filters/kword/wordperfect/import/TableStyle.cpp
index 2913fea1f..e35d7acb8 100644
--- a/filters/kword/wordperfect/import/TableStyle.cxx
+++ b/filters/kword/wordperfect/import/TableStyle.cpp
@@ -29,9 +29,9 @@
  */
 #include <cstring>
 #include <math.h>
-#include "FilterInternal.hxx"
-#include "TableStyle.hxx"
-#include "DocumentElement.hxx"
+#include "FilterInternal.h"
+#include "TableStyle.h"
+#include "DocumentElement.h"
 
 #ifdef _MSC_VER
 #include <minmax.h>
diff --git a/filters/kword/wordperfect/import/TableStyle.hxx b/filters/kword/wordperfect/import/TableStyle.h
index 3730da4b2..c15f4d81f 100644
--- a/filters/kword/wordperfect/import/TableStyle.hxx
+++ b/filters/kword/wordperfect/import/TableStyle.h
@@ -31,8 +31,8 @@
 #include <libwpd/libwpd.h>
 #include <vector>
 #include "shared_headers.h"
-#include "Style.hxx"
-#include "WriterProperties.hxx"
+#include "Style.h"
+#include "WriterProperties.h"
 
 class DocumentElement;
 class DocumentHandler;
diff --git a/filters/kword/wordperfect/import/TextRunStyle.cxx b/filters/kword/wordperfect/import/TextRunStyle.cpp
index b188632c5..06cbc4c6c 100644
--- a/filters/kword/wordperfect/import/TextRunStyle.cxx
+++ b/filters/kword/wordperfect/import/TextRunStyle.cpp
@@ -28,10 +28,10 @@
 /* "This product is not manufactured, approved, or supported by
  * Corel Corporation or Corel Corporation Limited."
  */
-#include "FilterInternal.hxx"
-#include "TextRunStyle.hxx"
-#include "WriterProperties.hxx"
-#include "DocumentElement.hxx"
+#include "FilterInternal.h"
+#include "TextRunStyle.h"
+#include "WriterProperties.h"
+#include "DocumentElement.h"
 
 #include <cstring>
 
diff --git a/filters/kword/wordperfect/import/TextRunStyle.hxx b/filters/kword/wordperfect/import/TextRunStyle.h
index e0847e2fa..139b32bec 100644
--- a/filters/kword/wordperfect/import/TextRunStyle.hxx
+++ b/filters/kword/wordperfect/import/TextRunStyle.h
@@ -32,7 +32,7 @@
 #define _TEXTRUNSTYLE_H
 
 #include <libwpd/libwpd.h>
-#include "Style.hxx"
+#include "Style.h"
 #include "shared_headers.h"
 
 class TagOpenElement;
diff --git a/filters/kword/wordperfect/import/WordPerfectCollector.cxx b/filters/kword/wordperfect/import/WordPerfectCollector.cpp
index eb59a70f0..76fe6fc65 100644
--- a/filters/kword/wordperfect/import/WordPerfectCollector.cxx
+++ b/filters/kword/wordperfect/import/WordPerfectCollector.cpp
@@ -34,16 +34,16 @@
 #include <libwpd/libwpd.h>
 #include <string.h> // for strcmp
 
-#include "WordPerfectCollector.hxx"
-#include "DocumentElement.hxx"
-#include "TextRunStyle.hxx"
-#include "FontStyle.hxx"
-#include "ListStyle.hxx"
-#include "PageSpan.hxx"
-#include "SectionStyle.hxx"
-#include "TableStyle.hxx"
-#include "FilterInternal.hxx"
-#include "WriterProperties.hxx"
+#include "WordPerfectCollector.h"
+#include "DocumentElement.h"
+#include "TextRunStyle.h"
+#include "FontStyle.h"
+#include "ListStyle.h"
+#include "PageSpan.h"
+#include "SectionStyle.h"
+#include "TableStyle.h"
+#include "FilterInternal.h"
+#include "WriterProperties.h"
 
 _WriterDocumentState::_WriterDocumentState() :
 	mbFirstElement(true),
diff --git a/filters/kword/wordperfect/import/WordPerfectCollector.hxx b/filters/kword/wordperfect/import/WordPerfectCollector.h
index 7c5e8286b..2f0af74a3 100644
--- a/filters/kword/wordperfect/import/WordPerfectCollector.hxx
+++ b/filters/kword/wordperfect/import/WordPerfectCollector.h
@@ -32,7 +32,7 @@
 #ifndef _WORDPERFECTCOLLECTOR_H
 #define _WORDPERFECTCOLLECTOR_H
 
-#include "SectionStyle.hxx"
+#include "SectionStyle.h"
 
 #include <config.h>
 #include <libwpd/libwpd.h>
diff --git a/filters/kword/wordperfect/import/WriterProperties.hxx b/filters/kword/wordperfect/import/WriterProperties.h
index a3c643301..a3c643301 100644
--- a/filters/kword/wordperfect/import/WriterProperties.hxx
+++ b/filters/kword/wordperfect/import/WriterProperties.h
diff --git a/filters/kword/wordperfect/import/wpimport.cc b/filters/kword/wordperfect/import/wpimport.cpp
index e8537b76c..12f5446e3 100644
--- a/filters/kword/wordperfect/import/wpimport.cc
+++ b/filters/kword/wordperfect/import/wpimport.cpp
@@ -35,8 +35,8 @@ typedef KGenericFactory<WPImport, KoFilter> WPImportFactory;
 K_EXPORT_COMPONENT_FACTORY( libwpimport, WPImportFactory( "kofficefilters" ) )
 
 #include <libwpd/libwpd.h>
-#include "DocumentHandler.hxx"
-#include "WordPerfectCollector.hxx"
+#include "DocumentHandler.h"
+#include "WordPerfectCollector.h"
 
 class _SH_MemoryInputStream : public _SH_InputStream
 {
author	Michele Calgaro <michele.calgaro@yahoo.it>	2021-05-23 20:48:35 +0900
committer	Michele Calgaro <michele.calgaro@yahoo.it>	2021-05-29 15:17:38 +0900
commit	d63c9d696eb6e2539528b99afc21f4086c9defe3 (patch)
tree	b3bfc97a66431a12cdd8f9379c0072673ede43df /filters/kword
parent	5363fe3c36504c37bdc6dcfafd5f71daeae251e8 (diff)
download	koffice-d63c9d69.tar.gz koffice-d63c9d69.zip