[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 fde2938 Fixed typos, removed whitespace
fde2938 is described below
commit fde29386b97cf2a92cfaa94fb1d1c1b6ff0663c6
Author: mseidel
AuthorDate: Mon Nov 18 15:43:02 2019 +0100
Fixed typos, removed whitespace
(cherry picked from commit d7056c59ad3c993e2bfa38f5e86555896868d4b8)
---
main/sw/source/core/table/swnewtable.cxx | 42
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/main/sw/source/core/table/swnewtable.cxx
b/main/sw/source/core/table/swnewtable.cxx
index c89aa8c..1e5399c 100644
--- a/main/sw/source/core/table/swnewtable.cxx
+++ b/main/sw/source/core/table/swnewtable.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.
- *
+ *
*/
@@ -216,7 +216,7 @@ SwTableBox* lcl_LeftBorder2Box( long nLeft, const
SwTableLine* pLine )
}
nCurrLeft += pBox->GetFrmFmt()->GetFrmSize().GetWidth();
}
-ASSERT( false, "Didn't found wished box" );
+ASSERT( false, "Didn't find wished box" );
return 0;
}
@@ -266,7 +266,7 @@ void lcl_ChangeRowSpan( const SwTable& rTable, const long
nDiff,
do
{
bGoOn = false; // will be set to true if we found a non-master cell
-// which has to be manipulated => we have to chekc the previous row,
too.
+// which has to be manipulated => we have to check the previous row,
too.
const SwTableLine* pLine = rTable.GetTabLines()[ nRowIdx ];
sal_uInt16 nBoxCount = pLine->GetTabBoxes().Count();
for( sal_uInt16 nCurrBox = 0; nCurrBox < nBoxCount; ++nCurrBox )
@@ -291,10 +291,10 @@ void lcl_ChangeRowSpan( const SwTable& rTable, const long
nDiff,
{
if( nRowSpan > 0 )
{ // A master cell
- // end of row span behind the deleted area ..
+ // end of row span behind the deleted area...
if( nRowSpan - nDistance > -nDiff )
nRowSpan += nDiff;
-else // .. or inside the deleted area
+else // ...or inside the deleted area
nRowSpan = nDistance + 1;
}
else
@@ -313,11 +313,11 @@ void lcl_ChangeRowSpan( const SwTable& rTable, const long
nDiff,
if( nRowIdx )
--nRowIdx;
else
-bGoOn = false; //robust
+bGoOn = false; // robust
} while( bGoOn );
}
-/** CollectBoxSelection(..) create a rectangulare selection based on the given
SwPaM
+/** CollectBoxSelection(..) create a rectangular selection based on the given
SwPaM
and prepares the selected cells for merging
*/
@@ -619,7 +619,7 @@ long lcl_InsertPosition( SwTable ,
std::vector& rInsPos,
nAddWidth += nWidth;
sal_uInt16 nCurrBox = pLine->GetTabBoxes().C40_GETPOS(SwTableBox, pBox
);
sal_uInt16 nCurrLine = rTable.GetTabLines().C40_GETPOS(SwTableLine,
pLine );
-ASSERT( nCurrLine != USHRT_MAX, "Time to say Good-Bye.." );
+ASSERT( nCurrLine != USHRT_MAX, "Time to say goodbye..." );
if( rInsPos[ nCurrLine ] == USHRT_MAX )
{
rInsPos[ nCurrLine ] = nCurrBox;
@@ -701,7 +701,7 @@ sal_Bool SwTable::NewInsertCol( SwDoc* pDoc, const
SwSelBoxes& rBoxes,
{
SwTableLine* pLine = aLines[ i ];
sal_uInt16 nInsPos = aInsPos[i];
-ASSERT( nInsPos != USHRT_MAX, "Didn't found insert position" );
+ASSERT( nInsPos != USHRT_MAX, "Didn't find insert position" );
SwTableBox* pBox = pLine->GetTabBoxes()[ nInsPos ];
if( bBehind )
++nInsPos;
@@ -790,7 +790,7 @@ sal_Bool SwTable::NewInsertCol( SwDoc* pDoc, const
SwSelBoxes& rBoxes,
For the old table model, ::GetMergeSel(..) is called only,
for the new table model,
[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 d7056c5 Fixed typos, removed whitespace
d7056c5 is described below
commit d7056c59ad3c993e2bfa38f5e86555896868d4b8
Author: mseidel
AuthorDate: Mon Nov 18 15:43:02 2019 +0100
Fixed typos, removed whitespace
---
main/sw/source/core/table/swnewtable.cxx | 42
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/main/sw/source/core/table/swnewtable.cxx
b/main/sw/source/core/table/swnewtable.cxx
index c89aa8c..1e5399c 100644
--- a/main/sw/source/core/table/swnewtable.cxx
+++ b/main/sw/source/core/table/swnewtable.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.
- *
+ *
*/
@@ -216,7 +216,7 @@ SwTableBox* lcl_LeftBorder2Box( long nLeft, const
SwTableLine* pLine )
}
nCurrLeft += pBox->GetFrmFmt()->GetFrmSize().GetWidth();
}
-ASSERT( false, "Didn't found wished box" );
+ASSERT( false, "Didn't find wished box" );
return 0;
}
@@ -266,7 +266,7 @@ void lcl_ChangeRowSpan( const SwTable& rTable, const long
nDiff,
do
{
bGoOn = false; // will be set to true if we found a non-master cell
-// which has to be manipulated => we have to chekc the previous row,
too.
+// which has to be manipulated => we have to check the previous row,
too.
const SwTableLine* pLine = rTable.GetTabLines()[ nRowIdx ];
sal_uInt16 nBoxCount = pLine->GetTabBoxes().Count();
for( sal_uInt16 nCurrBox = 0; nCurrBox < nBoxCount; ++nCurrBox )
@@ -291,10 +291,10 @@ void lcl_ChangeRowSpan( const SwTable& rTable, const long
nDiff,
{
if( nRowSpan > 0 )
{ // A master cell
- // end of row span behind the deleted area ..
+ // end of row span behind the deleted area...
if( nRowSpan - nDistance > -nDiff )
nRowSpan += nDiff;
-else // .. or inside the deleted area
+else // ...or inside the deleted area
nRowSpan = nDistance + 1;
}
else
@@ -313,11 +313,11 @@ void lcl_ChangeRowSpan( const SwTable& rTable, const long
nDiff,
if( nRowIdx )
--nRowIdx;
else
-bGoOn = false; //robust
+bGoOn = false; // robust
} while( bGoOn );
}
-/** CollectBoxSelection(..) create a rectangulare selection based on the given
SwPaM
+/** CollectBoxSelection(..) create a rectangular selection based on the given
SwPaM
and prepares the selected cells for merging
*/
@@ -619,7 +619,7 @@ long lcl_InsertPosition( SwTable ,
std::vector& rInsPos,
nAddWidth += nWidth;
sal_uInt16 nCurrBox = pLine->GetTabBoxes().C40_GETPOS(SwTableBox, pBox
);
sal_uInt16 nCurrLine = rTable.GetTabLines().C40_GETPOS(SwTableLine,
pLine );
-ASSERT( nCurrLine != USHRT_MAX, "Time to say Good-Bye.." );
+ASSERT( nCurrLine != USHRT_MAX, "Time to say goodbye..." );
if( rInsPos[ nCurrLine ] == USHRT_MAX )
{
rInsPos[ nCurrLine ] = nCurrBox;
@@ -701,7 +701,7 @@ sal_Bool SwTable::NewInsertCol( SwDoc* pDoc, const
SwSelBoxes& rBoxes,
{
SwTableLine* pLine = aLines[ i ];
sal_uInt16 nInsPos = aInsPos[i];
-ASSERT( nInsPos != USHRT_MAX, "Didn't found insert position" );
+ASSERT( nInsPos != USHRT_MAX, "Didn't find insert position" );
SwTableBox* pBox = pLine->GetTabBoxes()[ nInsPos ];
if( bBehind )
++nInsPos;
@@ -790,7 +790,7 @@ sal_Bool SwTable::NewInsertCol( SwDoc* pDoc, const
SwSelBoxes& rBoxes,
For the old table model, ::GetMergeSel(..) is called only,
for the new table model, PrepareMerge does the main work.
-It modifices all cells to merge (width, border,
