This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 4b08535208 Fixed Powerpoint -> PowerPoint
4b08535208 is described below
commit 4b08535208fa6e554901106973f392c5522988ae
Author: mseidel <msei...@apache.org>
AuthorDate: Thu Aug 11 18:01:47 2022 +0200
Fixed Powerpoint -> PowerPoint
(cherry picked from commit 96eff78449471f0a47d9dd67e20ea2d4ec78fe8d)
---
main/filter/inc/filter/msfilter/svdfppt.hxx | 2 +-
main/filter/source/msfilter/svdfppt.cxx | 2 +-
main/migrationanalysis/src/driver_docs/CreateDriverDocs.wsf | 2 +-
main/migrationanalysis/src/driver_docs/DocAnalysisRunMacro.vbs | 4 ++--
main/oox/inc/oox/core/filterdetect.hxx | 4 ++--
main/sd/source/filter/eppt/eppt.cxx | 2 +-
main/sd/source/ui/func/fuinsfil.cxx | 2 +-
main/svx/inc/svx/svxerr.hxx | 2 +-
main/sysui/desktop/macosx/Info.plist | 2 +-
9 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/main/filter/inc/filter/msfilter/svdfppt.hxx
b/main/filter/inc/filter/msfilter/svdfppt.hxx
index f488c5a6b8..615f6f2217 100644
--- a/main/filter/inc/filter/msfilter/svdfppt.hxx
+++ b/main/filter/inc/filter/msfilter/svdfppt.hxx
@@ -1150,7 +1150,7 @@ class PPTConvertOCXControls : public
SvxMSConvertOCXControls
////////////////////////////////////////////////////////////////////////////////////////////////////
-// Powerpoint Recordtypen
+// PowerPoint Recordtypen
#define PPT_PST_Unknown 0
#define PPT_PST_SubContainerCompleted 1
#define PPT_PST_IRRAtom
2
diff --git a/main/filter/source/msfilter/svdfppt.cxx
b/main/filter/source/msfilter/svdfppt.cxx
index eb5c9cbe1a..b0571fabb1 100644
--- a/main/filter/source/msfilter/svdfppt.cxx
+++ b/main/filter/source/msfilter/svdfppt.cxx
@@ -276,7 +276,7 @@ Size PptDocumentAtom::GetPageSize(const Size& rSiz) const
Size aRet;
switch ( eSlidesPageFormat )
{
- // Wenn man in Powerpoint als Seitenformat "Bildschirmgroesse"
+ // Wenn man in PowerPoint als Seitenformat "Bildschirmgroesse"
// einstellt, dann zeigt dieser Dialog zwar 24x18cm an, die
// angezeigte Seite ist aber anders. Das sieht man, wenn man
// ein Rechteck seitenfuellend aufzieht und sich dessen Groesse
diff --git a/main/migrationanalysis/src/driver_docs/CreateDriverDocs.wsf
b/main/migrationanalysis/src/driver_docs/CreateDriverDocs.wsf
index 2585fca6fb..182d4b94ef 100644
--- a/main/migrationanalysis/src/driver_docs/CreateDriverDocs.wsf
+++ b/main/migrationanalysis/src/driver_docs/CreateDriverDocs.wsf
@@ -35,7 +35,7 @@ Const CStub = "Stripped"
Const CUTIL_APPNAME_WORD = "Word"
Const CUTIL_APPNAME_EXCEL = "Excel"
-Const CUTIL_APPNAME_POWERPOINT = "Powerpoint"
+Const CUTIL_APPNAME_POWERPOINT = "PowerPoint"
Const CDIAG_STD_DELAY = 2
diff --git a/main/migrationanalysis/src/driver_docs/DocAnalysisRunMacro.vbs
b/main/migrationanalysis/src/driver_docs/DocAnalysisRunMacro.vbs
index 983f7e0daf..8b7ef22103 100644
--- a/main/migrationanalysis/src/driver_docs/DocAnalysisRunMacro.vbs
+++ b/main/migrationanalysis/src/driver_docs/DocAnalysisRunMacro.vbs
@@ -18,7 +18,7 @@
' under the License.
'
'*************************************************************************
-'### Support Module for running macros in Word. Excel and Powerpoint
+'### Support Module for running macros in Word. Excel and PowerPoint
'### using automation
CONST CDA_TITLE = "Document Analysis Run Macro"
@@ -26,7 +26,7 @@ CONST CDA_ANALYSIS_INI = "analysis.ini"
Const CDA_ERR_STD_DELAY = 10
Const CDA_APPNAME_WORD = "Word"
Const CDA_APPNAME_EXCEL = "Excel"
-Const CDA_APPNAME_POWERPOINT = "Powerpoint"
+Const CDA_APPNAME_POWERPOINT = "PowerPoint"
Dim daWrd
Dim daDoc
diff --git a/main/oox/inc/oox/core/filterdetect.hxx
b/main/oox/inc/oox/core/filterdetect.hxx
index 5ed89571c8..6227e705d2 100644
--- a/main/oox/inc/oox/core/filterdetect.hxx
+++ b/main/oox/inc/oox/core/filterdetect.hxx
@@ -139,8 +139,8 @@ public:
- MS Excel 2007 XML Document (*.xlsx, *.xlsm)
- MS Excel 2007 BIFF12 Document (*.xlsb)
- MS Excel 2007 XML Template (*.xltx, *.xltm)
- - MS Powerpoint 2007 XML Document (*.pptx, *.pptm)
- - MS Powerpoint 2007 XML Template (*.potx, *.potm)
+ - MS PowerPoint 2007 XML Document (*.pptx, *.pptm)
+ - MS PowerPoint 2007 XML Template (*.potx, *.potm)
If the package is encrypted, the detection tries to decrypt it into a
temporary file. The user may be asked for a password. The XStream
diff --git a/main/sd/source/filter/eppt/eppt.cxx
b/main/sd/source/filter/eppt/eppt.cxx
index 451ba6a135..1dedf14c26 100644
--- a/main/sd/source/filter/eppt/eppt.cxx
+++ b/main/sd/source/filter/eppt/eppt.cxx
@@ -539,7 +539,7 @@ sal_Bool PPTWriter::ImplCreateDocument()
<< nHeight // " " " " "
Y
<< (sal_Int32)maNotesPageSize.Width // Notes Page Size
X
<< (sal_Int32)maNotesPageSize.Height // " " "
Y
- << (sal_Int32)1 << (sal_Int32)2; // the scale used when
the Powerpoint document is embedded. the default is 1:2
+ << (sal_Int32)1 << (sal_Int32)2; // the scale used when
the PowerPoint document is embedded. the default is 1:2
mpPptEscherEx->InsertPersistOffset( EPP_MAINNOTESMASTER_PERSIST_KEY,
mpStrm->Tell() );
*mpStrm << (sal_uInt32)0 // Reference to
NotesMaster ( 0 if none );
<< (sal_uInt32)0 // Reference to
HandoutMaster ( 0 if none );
diff --git a/main/sd/source/ui/func/fuinsfil.cxx
b/main/sd/source/ui/func/fuinsfil.cxx
index 552d053531..624f3fd481 100644
--- a/main/sd/source/ui/func/fuinsfil.cxx
+++ b/main/sd/source/ui/func/fuinsfil.cxx
@@ -174,7 +174,7 @@ void FuInsertFile::DoExecute( SfxRequest& rReq )
if( pFilter )
xFilterManager->appendFilter(
pFilter->GetUIName(), pFilter->GetDefaultExtension() );
- // get Powerpoint filter
+ // get PowerPoint filter
aExt = UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM(
".ppt" ) );
pFilter = aMatch.GetFilter4Extension( aExt );
if( pFilter )
diff --git a/main/svx/inc/svx/svxerr.hxx b/main/svx/inc/svx/svxerr.hxx
index 4b1e3724ce..716c855556 100644
--- a/main/svx/inc/svx/svxerr.hxx
+++ b/main/svx/inc/svx/svxerr.hxx
@@ -70,7 +70,7 @@
/** Error message: "Read error. Unsupported encryption method." */
#define ERRCODE_SVX_READ_FILTER_CRYPT (16UL | ERRCODE_AREA_SVX |
ERRCODE_CLASS_READ)
-/** Error message: "Read error. Passwort encrypted Powerpoint documents..." */
+/** Error message: "Read error. Password encrypted PowerPoint documents..." */
#define ERRCODE_SVX_READ_FILTER_PPOINT (17UL | ERRCODE_AREA_SVX |
ERRCODE_CLASS_READ)
/** Error message: "Warning. Passwort protection is not suppported when ..." */
diff --git a/main/sysui/desktop/macosx/Info.plist
b/main/sysui/desktop/macosx/Info.plist
index d68734eaa6..d26d4251fe 100644
--- a/main/sysui/desktop/macosx/Info.plist
+++ b/main/sysui/desktop/macosx/Info.plist
@@ -759,7 +759,7 @@
</dict>
</dict>
- <!-- Microsoft Powerpoint XML -->
+ <!-- Microsoft PowerPoint XML -->
<dict>
<key>UTTypeConformsTo</key>
<array>
