[openoffice] branch trunk updated: Fixed typos, removed whitespace
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new a25b988 Fixed typos, removed whitespace
a25b988 is described below
commit a25b98880c8ea98078d213f117d6b81f2c1653e0
Author: mseidel
AuthorDate: Thu Oct 21 00:41:57 2021 +0200
Fixed typos, removed whitespace
---
main/sd/source/core/sdpage.cxx | 12 +--
main/sd/source/core/sdpage2.cxx | 157 ++--
2 files changed, 77 insertions(+), 92 deletions(-)
diff --git a/main/sd/source/core/sdpage.cxx b/main/sd/source/core/sdpage.cxx
index f4527d2..13a2b11 100644
--- a/main/sd/source/core/sdpage.cxx
+++ b/main/sd/source/core/sdpage.cxx
@@ -432,7 +432,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind,
sal_Bool bVertical, const
aTempAttr.Put(SdrTextAutoGrowHeightItem(sal_False));
}
- // check if we need another vertical adjustment than
the default
+ // check if we need another vertical adjustment then
the default
SdrTextVertAdjust eV = SDRTEXTVERTADJUST_TOP;
if( (eObjKind == PRESOBJ_FOOTER) && (mePageKind !=
PK_STANDARD) )
@@ -1547,12 +1547,12 @@ void SdPage::SetAutoLayout(AutoLayout eLayout, sal_Bool
bInit, sal_Bool bCreate
meAutoLayout = eLayout;
- // if needed, creates and initialises the presentation shapes on this
slides master page
+ // if needed, creates and initializes the presentation shapes on this
slides master page
CreateTitleAndLayout(bInit, bCreate);
if((meAutoLayout == AUTOLAYOUT_NONE &&
maPresentationShapeList.isEmpty()) || mbMaster)
{
- // MasterPage or no layout and no presentation shapes
available, noting to do
+ // MasterPage or no layout and no presentation shapes
available, nothing to do
return;
}
@@ -1985,7 +1985,7 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const
Rectangle& rNewBorderR
((SdStyleSheet*) pOutlineSheet)->AdjustToFontHeight(aTempSet, sal_False);
//
Sonderbehandlung: die INVALIDS auf NULL-Pointer
- //
zurueckgesetzen (sonst landen INVALIDs oder
+ //
zuruecksetzen (sonst landen INVALIDs oder
//
Pointer auf die DefaultItems in der Vorlage;
//
beides wuerde die Attribut-Vererbung unterbinden)
aTempSet.ClearInvalidItems();
@@ -2563,7 +2563,7 @@ const String& SdPage::GetName() const
if( GetModel()->GetPageNumType() == SVX_NUMBER_NONE )
{
// if the document has number none as a
formating
- // for page numbers we still default to arabic
numbering
+ // for page numbers we still default to Arabic
numbering
// to keep the default page names unique
aCreatedPageName += String::CreateFromInt32(
(sal_Int32)nNum );
}
@@ -2962,7 +2962,7 @@ void SdPage::CalculateHandoutAreas( SdDrawDocument&
rModel, AutoLayout eLayout,
{
Size aArea = rHandoutMaster.GetSize();
- const long nGapW = 1000; // gap is 1cm
+ const long nGapW = 1000; // gap is 1 cm
const long nGapH = 1000;
long nLeftBorder = rHandoutMaster.GetLftBorder();
diff --git a/main/sd/source/core/sdpage2.cxx b/main/sd/source/core/sdpage2.cxx
index aa8c9d2..7ae405c 100644
--- a/main/sd/source/core/sdpage2.cxx
+++ b/main/sd/source/core/sdpage2.cxx
@@ -1,5 +1,5 @@
/**
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
[openoffice] branch AOO42X updated: Fixed typos, removed whitespace
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 9b1ac90 Fixed typos, removed whitespace
9b1ac90 is described below
commit 9b1ac90519f5d954ad8168938c55a081d7b1ba00
Author: mseidel
AuthorDate: Thu Oct 21 00:41:57 2021 +0200
Fixed typos, removed whitespace
(cherry picked from commit a25b98880c8ea98078d213f117d6b81f2c1653e0)
---
main/sd/source/core/sdpage.cxx | 12 +--
main/sd/source/core/sdpage2.cxx | 157 ++--
2 files changed, 77 insertions(+), 92 deletions(-)
diff --git a/main/sd/source/core/sdpage.cxx b/main/sd/source/core/sdpage.cxx
index f4527d2..13a2b11 100644
--- a/main/sd/source/core/sdpage.cxx
+++ b/main/sd/source/core/sdpage.cxx
@@ -432,7 +432,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind,
sal_Bool bVertical, const
aTempAttr.Put(SdrTextAutoGrowHeightItem(sal_False));
}
- // check if we need another vertical adjustment than
the default
+ // check if we need another vertical adjustment then
the default
SdrTextVertAdjust eV = SDRTEXTVERTADJUST_TOP;
if( (eObjKind == PRESOBJ_FOOTER) && (mePageKind !=
PK_STANDARD) )
@@ -1547,12 +1547,12 @@ void SdPage::SetAutoLayout(AutoLayout eLayout, sal_Bool
bInit, sal_Bool bCreate
meAutoLayout = eLayout;
- // if needed, creates and initialises the presentation shapes on this
slides master page
+ // if needed, creates and initializes the presentation shapes on this
slides master page
CreateTitleAndLayout(bInit, bCreate);
if((meAutoLayout == AUTOLAYOUT_NONE &&
maPresentationShapeList.isEmpty()) || mbMaster)
{
- // MasterPage or no layout and no presentation shapes
available, noting to do
+ // MasterPage or no layout and no presentation shapes
available, nothing to do
return;
}
@@ -1985,7 +1985,7 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const
Rectangle& rNewBorderR
((SdStyleSheet*) pOutlineSheet)->AdjustToFontHeight(aTempSet, sal_False);
//
Sonderbehandlung: die INVALIDS auf NULL-Pointer
- //
zurueckgesetzen (sonst landen INVALIDs oder
+ //
zuruecksetzen (sonst landen INVALIDs oder
//
Pointer auf die DefaultItems in der Vorlage;
//
beides wuerde die Attribut-Vererbung unterbinden)
aTempSet.ClearInvalidItems();
@@ -2563,7 +2563,7 @@ const String& SdPage::GetName() const
if( GetModel()->GetPageNumType() == SVX_NUMBER_NONE )
{
// if the document has number none as a
formating
- // for page numbers we still default to arabic
numbering
+ // for page numbers we still default to Arabic
numbering
// to keep the default page names unique
aCreatedPageName += String::CreateFromInt32(
(sal_Int32)nNum );
}
@@ -2962,7 +2962,7 @@ void SdPage::CalculateHandoutAreas( SdDrawDocument&
rModel, AutoLayout eLayout,
{
Size aArea = rHandoutMaster.GetSize();
- const long nGapW = 1000; // gap is 1cm
+ const long nGapW = 1000; // gap is 1 cm
const long nGapH = 1000;
long nLeftBorder = rHandoutMaster.GetLftBorder();
diff --git a/main/sd/source/core/sdpage2.cxx b/main/sd/source/core/sdpage2.cxx
index aa8c9d2..7ae405c 100644
--- a/main/sd/source/core/sdpage2.cxx
+++ b/main/sd/source/core/sdpage2.cxx
@@ -1,5 +1,5 @@
/**
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the Lic
buildbot failure in on openoffice-win7
The Buildbot has detected a new failure on builder openoffice-win7 while building . Full details are available at: https://ci.apache.org/builders/openoffice-win7/builds/712 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-win10 Build Reason: The Nightly scheduler named 'openoffice-win7-nightly' triggered this build Build Source Stamp: [branch trunk] HEAD Blamelist: BUILD FAILED: failed bootstrap Sincerely, -The Buildbot
