odk/Package_examples.mk | 8 ++++----
odk/examples/OLE/activex/Makefile | 12 ++++++------
odk/examples/OLE/activex/SOActiveX.cxx | 2 +-
odk/examples/OLE/activex/StdAfx2.cxx | 6 +++---
odk/examples/OLE/activex/so_activex.cxx | 2 +-
solenv/clang-format/excludelist | 2 +-
6 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit 65325f9c2f9aff6782fa5df910e8f2f5e63dfd93
Author: Hossein <hoss...@libreoffice.org>
AuthorDate: Thu Sep 7 17:16:24 2023 +0200
Commit: Hossein <hoss...@libreoffice.org>
CommitDate: Sat Sep 9 01:20:46 2023 +0200
Rename .cpp examples to .cxx
The files are renamed, and the associated lines in Makefiles and
elsewhere are also changed.
Change-Id: Ieec38055690e03afd8982320ee0836904a3f41eb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156670
Tested-by: Jenkins
Reviewed-by: Hossein <hoss...@libreoffice.org>
diff --git a/odk/Package_examples.mk b/odk/Package_examples.mk
index 457aea37e166..f533a91a346c 100644
--- a/odk/Package_examples.mk
+++ b/odk/Package_examples.mk
@@ -366,17 +366,17 @@ $(eval $(call
gb_Package_add_files_with_dir,odk_examples,$(SDKDIRNAME)/examples,
DevelopersGuide/UCB/data/data.txt \
OLE/activex/Makefile \
OLE/activex/README.txt \
- OLE/activex/SOActiveX.cpp \
+ OLE/activex/SOActiveX.cxx \
OLE/activex/SOActiveX.h \
OLE/activex/SOActiveX.rgs \
- OLE/activex/SOComWindowPeer.cpp \
+ OLE/activex/SOComWindowPeer.cxx \
OLE/activex/SOComWindowPeer.h \
OLE/activex/SOComWindowPeer.rgs \
- OLE/activex/StdAfx2.cpp \
+ OLE/activex/StdAfx2.cxx \
OLE/activex/StdAfx2.h \
OLE/activex/example.html \
OLE/activex/resource.h \
- OLE/activex/so_activex.cpp \
+ OLE/activex/so_activex.cxx \
OLE/activex/so_activex.def \
OLE/activex/so_activex.idl \
OLE/activex/so_activex.rc \
diff --git a/odk/examples/OLE/activex/Makefile
b/odk/examples/OLE/activex/Makefile
index 15167bc93ba4..ca893a44362a 100644
--- a/odk/examples/OLE/activex/Makefile
+++ b/odk/examples/OLE/activex/Makefile
@@ -50,12 +50,12 @@ OUT_COMP_SLO=$(OUT_SLO)/$(COMPONENT_NAME)
MIDLFILES = so_activex.idl
-CXXFILES = SOActiveX.cpp \
- SOComWindowPeer.cpp \
- so_activex.cpp \
- StdAfx2.cpp
+CXXFILES = SOActiveX.cxx \
+ SOComWindowPeer.cxx \
+ so_activex.cxx \
+ StdAfx2.cxx
-SLOFILES = $(patsubst %.cpp,$(OUT_COMP_SLO)/%.$(OBJ_EXT),$(CXXFILES))
+SLOFILES = $(patsubst %.cxx,$(OUT_COMP_SLO)/%.$(OBJ_EXT),$(CXXFILES))
# Targets
.PHONY: ALL
@@ -76,7 +76,7 @@ $(OUT_COMP_GEN)/so_activex.res : so_activex.rc
$(OUT_COMP_INC)/so_activex.h
-$(MKDIR) $(subst /,$(PS),$(@D))
rc $(CC_INCLUDES) /R /FO$@ so_activex.rc
-$(OUT_COMP_SLO)/%.$(OBJ_EXT) : %.cpp
+$(OUT_COMP_SLO)/%.$(OBJ_EXT) : %.cxx
-$(MKDIR) $(subst /,$(PS),$(@D))
$(CC) $(CC_FLAGS) $(CC_INCLUDES) -I$(OUT_COMP_INC) $(CC_DEFINES)
$(CC_OUTPUT_SWITCH)$(subst /,$(PS),$@) $<
diff --git a/odk/examples/OLE/activex/SOActiveX.cpp
b/odk/examples/OLE/activex/SOActiveX.cxx
similarity index 99%
rename from odk/examples/OLE/activex/SOActiveX.cpp
rename to odk/examples/OLE/activex/SOActiveX.cxx
index 81159e489f2e..e29a439f3552 100644
--- a/odk/examples/OLE/activex/SOActiveX.cpp
+++ b/odk/examples/OLE/activex/SOActiveX.cxx
@@ -33,7 +33,7 @@
*
*************************************************************************/
-// SOActiveX.cpp : Implementation of CSOActiveX
+// SOActiveX.cxx : Implementation of CSOActiveX
#include "stdafx2.h"
#include "so_activex.h"
diff --git a/odk/examples/OLE/activex/SOComWindowPeer.cpp
b/odk/examples/OLE/activex/SOComWindowPeer.cxx
similarity index 100%
rename from odk/examples/OLE/activex/SOComWindowPeer.cpp
rename to odk/examples/OLE/activex/SOComWindowPeer.cxx
diff --git a/odk/examples/OLE/activex/StdAfx2.cpp
b/odk/examples/OLE/activex/StdAfx2.cxx
similarity index 95%
rename from odk/examples/OLE/activex/StdAfx2.cpp
rename to odk/examples/OLE/activex/StdAfx2.cxx
index 3911bcf24003..46743f22c2a0 100644
--- a/odk/examples/OLE/activex/StdAfx2.cpp
+++ b/odk/examples/OLE/activex/StdAfx2.cxx
@@ -33,7 +33,7 @@
*
*************************************************************************/
-// stdafx1.cpp : source file that includes just the standard includes
+// stdafx1.cxx : source file that includes just the standard includes
// stdafx1.pch will be the pre-compiled header
// stdafx1.obj will contain the pre-compiled type information
@@ -41,9 +41,9 @@
#ifdef _ATL_STATIC_REGISTRY
#include <statreg.h>
-#include <statreg.cpp>
+#include <statreg.cxx>
#endif
-#include <atlimpl.cpp>
+#include <atlimpl.cxx>
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/odk/examples/OLE/activex/so_activex.cpp
b/odk/examples/OLE/activex/so_activex.cxx
similarity index 98%
rename from odk/examples/OLE/activex/so_activex.cpp
rename to odk/examples/OLE/activex/so_activex.cxx
index b2cf16a80349..614d9866a7ec 100644
--- a/odk/examples/OLE/activex/so_activex.cpp
+++ b/odk/examples/OLE/activex/so_activex.cxx
@@ -33,7 +33,7 @@
*
*************************************************************************/
-// so_activex.cpp : Implementation of DLL Exports.
+// so_activex.cxx : Implementation of DLL Exports.
// Note: Proxy/Stub Information
// To build a separate proxy/stub DLL,
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 14ff7c544643..a07a69f09927 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -6871,7 +6871,7 @@
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
odk/examples/DevelopersGuide/ProfUNO/CppBinding/office_connect.cxx
odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/SimpleBootstrap_cpp.cxx
-odk/examples/OLE/activex/SOActiveX.cpp
+odk/examples/OLE/activex/SOActiveX.cxx
odk/examples/OLE/activex/SOActiveX.h
odk/examples/OLE/activex/SOComWindowPeer.h
odk/examples/OLE/activex/resource.h
