[openoffice] branch AOO42X updated: Fixed typos, removed whitespace

2021-12-09 Thread mseidel
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 579128b  Fixed typos, removed whitespace
579128b is described below

commit 579128bdcdfb9f064693afcea932008f0dae7cb3
Author: mseidel 
AuthorDate: Thu Dec 9 15:34:28 2021 +0100

Fixed typos, removed whitespace

(cherry picked from commit 5829e3e65d041dae4777b7e48d9eac1549ff4f1a)
---
 main/sd/source/ui/app/optsitem.cxx | 278 +
 main/sd/source/ui/app/sddll2.cxx   |  36 +++--
 main/sd/source/ui/app/sdmod.cxx|  96 ++---
 main/sd/source/ui/app/sdmod2.cxx   | 208 ++-
 main/sd/source/ui/app/sdpopup.cxx  |  32 ++---
 5 files changed, 298 insertions(+), 352 deletions(-)

diff --git a/main/sd/source/ui/app/optsitem.cxx 
b/main/sd/source/ui/app/optsitem.cxx
index 543e235..e75f1ac 100644
--- a/main/sd/source/ui/app/optsitem.cxx
+++ b/main/sd/source/ui/app/optsitem.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 ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  */
 
 
@@ -198,18 +198,16 @@ void SdOptionsGeneric::Store()
 bool SdOptionsGeneric::isMetricSystem()
 {
SvtSysLocale aSysLocale;
-MeasurementSystem eSys = 
aSysLocale.GetLocaleDataPtr()->getMeasurementSystemEnum();
+   MeasurementSystem eSys = 
aSysLocale.GetLocaleDataPtr()->getMeasurementSystemEnum();
 
return ( eSys == MEASURE_METRIC );
 }
 
 /*
-|*
 |* SdOptionsLayout
-|*
 \/
 
-SdOptionsLayout::SdOptionsLayout(  sal_uInt16 nConfigId, sal_Bool bUseConfig ) 
:
+SdOptionsLayout::SdOptionsLayout( sal_uInt16 nConfigId, sal_Bool bUseConfig ) :
SdOptionsGeneric( nConfigId, bUseConfig ?
  ( ( SDCFG_DRAW == nConfigId ) ?
B2U( "Office.Draw/Layout" ) :
@@ -221,7 +219,7 @@ SdOptionsLayout::SdOptionsLayout(  sal_uInt16 nConfigId, 
sal_Bool bUseConfig ) :
bHandlesBezier( sal_False ),
bHelplines( sal_True ),
nMetric((sal_uInt16)(isMetricSystem() ? FUNIT_CM : FUNIT_INCH)),
-   nDefTab( 1250 )  
+   nDefTab( 1250 )
 {
EnableModify( sal_True );
 }
@@ -304,9 +302,7 @@ sal_Bool SdOptionsLayout::WriteData( Any* pValues ) const
 }
 
 /*
-|*
 |* SdOptionsLayoutItem
-|*
 \/
 
 SdOptionsLayoutItem::SdOptionsLayoutItem( sal_uInt16 _nWhich )
@@ -358,7 +354,7 @@ SfxPoolItem* SdOptionsLayoutItem::Clone( SfxItemPool* ) 
const
 int SdOptionsLayoutItem::operator==( const SfxPoolItem& rAttr ) const
 {
const bool bSameType = SfxPoolItem::operator==( rAttr );
-   DBG_ASSERT( bSameType, "SdOptionsLayoutItem::operator==(), differen 
pool item type!" );
+   DBG_ASSERT( bSameType, "SdOptionsLayoutItem::operator==(), different 
pool item type!" );
return bSameType && ( maOptionsLayout == static_cast< const 
SdOptionsLayoutItem& >( rAttr ).maOptionsLayout );
 }
 
@@ -379,9 +375,7 @@ void SdOptionsLayoutItem::SetOptions( SdOptions* pOpts ) 
const
 }
 
 /*
-|*
 |* SdOptionsContents
-|*
 \/
 
 SdOptionsContents::SdOptionsContents( sal_uInt16 nConfigId, sal_Bool 
bUseConfig ) :
@@ -398,7 +392,7 @@ SdOptionsContents::SdOptionsContents( sal_uInt16 nConfigId, 
sal_Bool bUseConfig
 
 sal_Bool SdOptionsContents::operator==(const SdOptionsContents&) const
 {
-return true;
+   return true;
 }
 
 // 
-
@@ -438,9 +432,7 @@ sal_Bool SdOptionsContents::WriteData( Any* pValues ) const
 }
 
 

[openoffice] branch trunk updated: Fixed typos, removed whitespace

2021-12-09 Thread mseidel
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 5829e3e  Fixed typos, removed whitespace
5829e3e is described below

commit 5829e3e65d041dae4777b7e48d9eac1549ff4f1a
Author: mseidel 
AuthorDate: Thu Dec 9 15:34:28 2021 +0100

Fixed typos, removed whitespace
---
 main/sd/source/ui/app/optsitem.cxx | 278 +
 main/sd/source/ui/app/sddll2.cxx   |  36 +++--
 main/sd/source/ui/app/sdmod.cxx|  96 ++---
 main/sd/source/ui/app/sdmod2.cxx   | 208 ++-
 main/sd/source/ui/app/sdpopup.cxx  |  32 ++---
 5 files changed, 298 insertions(+), 352 deletions(-)

diff --git a/main/sd/source/ui/app/optsitem.cxx 
b/main/sd/source/ui/app/optsitem.cxx
index 543e235..e75f1ac 100644
--- a/main/sd/source/ui/app/optsitem.cxx
+++ b/main/sd/source/ui/app/optsitem.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 ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  */
 
 
@@ -198,18 +198,16 @@ void SdOptionsGeneric::Store()
 bool SdOptionsGeneric::isMetricSystem()
 {
SvtSysLocale aSysLocale;
-MeasurementSystem eSys = 
aSysLocale.GetLocaleDataPtr()->getMeasurementSystemEnum();
+   MeasurementSystem eSys = 
aSysLocale.GetLocaleDataPtr()->getMeasurementSystemEnum();
 
return ( eSys == MEASURE_METRIC );
 }
 
 /*
-|*
 |* SdOptionsLayout
-|*
 \/
 
-SdOptionsLayout::SdOptionsLayout(  sal_uInt16 nConfigId, sal_Bool bUseConfig ) 
:
+SdOptionsLayout::SdOptionsLayout( sal_uInt16 nConfigId, sal_Bool bUseConfig ) :
SdOptionsGeneric( nConfigId, bUseConfig ?
  ( ( SDCFG_DRAW == nConfigId ) ?
B2U( "Office.Draw/Layout" ) :
@@ -221,7 +219,7 @@ SdOptionsLayout::SdOptionsLayout(  sal_uInt16 nConfigId, 
sal_Bool bUseConfig ) :
bHandlesBezier( sal_False ),
bHelplines( sal_True ),
nMetric((sal_uInt16)(isMetricSystem() ? FUNIT_CM : FUNIT_INCH)),
-   nDefTab( 1250 )  
+   nDefTab( 1250 )
 {
EnableModify( sal_True );
 }
@@ -304,9 +302,7 @@ sal_Bool SdOptionsLayout::WriteData( Any* pValues ) const
 }
 
 /*
-|*
 |* SdOptionsLayoutItem
-|*
 \/
 
 SdOptionsLayoutItem::SdOptionsLayoutItem( sal_uInt16 _nWhich )
@@ -358,7 +354,7 @@ SfxPoolItem* SdOptionsLayoutItem::Clone( SfxItemPool* ) 
const
 int SdOptionsLayoutItem::operator==( const SfxPoolItem& rAttr ) const
 {
const bool bSameType = SfxPoolItem::operator==( rAttr );
-   DBG_ASSERT( bSameType, "SdOptionsLayoutItem::operator==(), differen 
pool item type!" );
+   DBG_ASSERT( bSameType, "SdOptionsLayoutItem::operator==(), different 
pool item type!" );
return bSameType && ( maOptionsLayout == static_cast< const 
SdOptionsLayoutItem& >( rAttr ).maOptionsLayout );
 }
 
@@ -379,9 +375,7 @@ void SdOptionsLayoutItem::SetOptions( SdOptions* pOpts ) 
const
 }
 
 /*
-|*
 |* SdOptionsContents
-|*
 \/
 
 SdOptionsContents::SdOptionsContents( sal_uInt16 nConfigId, sal_Bool 
bUseConfig ) :
@@ -398,7 +392,7 @@ SdOptionsContents::SdOptionsContents( sal_uInt16 nConfigId, 
sal_Bool bUseConfig
 
 sal_Bool SdOptionsContents::operator==(const SdOptionsContents&) const
 {
-return true;
+   return true;
 }
 
 // 
-
@@ -438,9 +432,7 @@ sal_Bool SdOptionsContents::WriteData( Any* pValues ) const
 }
 
 /*
-|*
 |* SdOptionsContentsItem
-|*