You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2022/05/06 18:19:11 UTC
[openoffice] branch AOO41X updated (5777ee1955 -> cf2047b48d)
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a change to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
from 5777ee1955 Updated English dictionary
new 089ea22402 Fixed typos, removed whitespace
new cf2047b48d Code cleanup for removing Writer page shadows
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
main/sw/source/core/inc/pagefrm.hxx | 80 +++++++++++++-------------
main/sw/source/core/layout/paintfrm.cxx | 13 ++---
main/sw/source/core/view/pagepreviewlayout.cxx | 28 ++++-----
3 files changed, 60 insertions(+), 61 deletions(-)
[openoffice] 02/02: Code cleanup for removing Writer page shadows
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit cf2047b48da09145d9aec329d02ddae268cb5ffb
Author: mseidel <ms...@apache.org>
AuthorDate: Fri May 6 20:18:51 2022 +0200
Code cleanup for removing Writer page shadows
---
main/sw/source/core/layout/paintfrm.cxx | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/main/sw/source/core/layout/paintfrm.cxx b/main/sw/source/core/layout/paintfrm.cxx
index bdc928d5f4..1989f9e8d8 100644
--- a/main/sw/source/core/layout/paintfrm.cxx
+++ b/main/sw/source/core/layout/paintfrm.cxx
@@ -2859,7 +2859,7 @@ SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) const
while ( pPage )
{
- const bool bPaintRightShadow = !bBookMode || (pPage == Lower()) || (!bLTR && !pPage->OnRightPage()) || (bLTR && pPage->OnRightPage());
+// const bool bPaintRightShadow = !bBookMode || (pPage == Lower()) || (!bLTR && !pPage->OnRightPage()) || (bLTR && pPage->OnRightPage());
const bool bRightSidebar = pPage->SidebarPosition() == sw::sidebarwindows::SIDEBAR_RIGHT;
if ( !pPage->IsEmptyPage() )
@@ -6796,4 +6796,3 @@ Graphic SwDrawFrmFmt::MakeGraphic( ImageMap* )
}
return aRet;
}
-
[openoffice] 01/02: Fixed typos, removed whitespace
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 089ea22402e93581b8fda1cee8eaf1fe0fbbc087
Author: mseidel <ms...@apache.org>
AuthorDate: Tue Dec 14 17:20:47 2021 +0100
Fixed typos, removed whitespace
(cherry picked from commit c72520d534804340d6648e5bc715e01b3be8f130)
---
main/sw/source/core/inc/pagefrm.hxx | 80 +++++++++++++-------------
main/sw/source/core/layout/paintfrm.cxx | 10 ++--
main/sw/source/core/view/pagepreviewlayout.cxx | 28 ++++-----
3 files changed, 59 insertions(+), 59 deletions(-)
diff --git a/main/sw/source/core/inc/pagefrm.hxx b/main/sw/source/core/inc/pagefrm.hxx
index 514da118ae..10ed71726d 100644
--- a/main/sw/source/core/inc/pagefrm.hxx
+++ b/main/sw/source/core/inc/pagefrm.hxx
@@ -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,19 +7,20 @@
* 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.
- *
+ *
*************************************************************/
+
#ifndef _PAGEFRM_HXX
#define _PAGEFRM_HXX
@@ -66,19 +67,19 @@ class SwPageFrm: public SwFtnBossFrm
sal_uInt16 nPhyPageNum; //Physikalische Seitennummer.
- sal_Bool bInvalidCntnt :1;
- sal_Bool bInvalidLayout :1;
- sal_Bool bInvalidFlyCntnt :1;
- sal_Bool bInvalidFlyLayout :1;
- sal_Bool bInvalidFlyInCnt :1;
- sal_Bool bFtnPage :1; //Diese Seite ist fuer Dokumentende-Fussnoten.
- sal_Bool bEmptyPage :1; //Dies ist eine explizite Leerseite
- sal_Bool bEndNotePage :1; //'Fussnotenseite' fuer Endnoten
- sal_Bool bInvalidSpelling :1; //Das Online-Spelling ist gefordert
- sal_Bool bInvalidSmartTags :1; //checking for smarttags is needed // SMARTTAGS
- sal_Bool bInvalidAutoCmplWrds :1; //Auto-Complete Wordliste aktualisieren
- sal_Bool bInvalidWordCount :1;
- sal_Bool bHasGrid :1; // Grid for Asian layout
+ sal_Bool bInvalidCntnt :1;
+ sal_Bool bInvalidLayout :1;
+ sal_Bool bInvalidFlyCntnt :1;
+ sal_Bool bInvalidFlyLayout :1;
+ sal_Bool bInvalidFlyInCnt :1;
+ sal_Bool bFtnPage :1; //Diese Seite ist fuer Dokumentende-Fussnoten.
+ sal_Bool bEmptyPage :1; //Dies ist eine explizite Leerseite
+ sal_Bool bEndNotePage :1; //'Fussnotenseite' fuer Endnoten
+ sal_Bool bInvalidSpelling :1; //Das Online-Spelling ist gefordert
+ sal_Bool bInvalidSmartTags :1; //checking for smarttags is needed // SMARTTAGS
+ sal_Bool bInvalidAutoCmplWrds :1; //Auto-Complete Wordliste aktualisieren
+ sal_Bool bInvalidWordCount :1;
+ sal_Bool bHasGrid :1; // Grid for Asian layout
// OD 2004-05-17 #i28701# - boolean, indicating that layout of page frame
// is in progress.
@@ -167,7 +168,7 @@ class SwPageFrm: public SwFtnBossFrm
SwRect& _orBottomShadowRect,
bool bRightSidebar );
- /** adds the sidebar used for notes to right and left border
+ /** adds the sidebar used for comments to right and left border
mod 20.10.2007 for #i6193#
@author mod
@@ -253,12 +254,12 @@ public:
virtual void Cut();
virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 );
- virtual void CheckDirection( sal_Bool bVert );
- void CheckGrid( sal_Bool bInvalidate );
- void PaintGrid( OutputDevice* pOut, SwRect &rRect ) const;
- sal_Bool HasGrid() const { return bHasGrid; }
+ virtual void CheckDirection( sal_Bool bVert );
+ void CheckGrid( sal_Bool bInvalidate );
+ void PaintGrid( OutputDevice* pOut, SwRect &rRect ) const;
+ sal_Bool HasGrid() const { return bHasGrid; }
- //Zeilennummern usw malen
+ //Zeilennummern usw. malen
void RefreshExtraData( const SwRect & ) const;
//Hilfslinien malen.
@@ -283,18 +284,18 @@ public:
inline void InvalidateLayout() const;
inline void InvalidateCntnt() const;
inline void InvalidateSpelling() const;
- inline void InvalidateSmartTags() const;
+ inline void InvalidateSmartTags() const;
inline void InvalidateAutoCompleteWords() const;
- inline void InvalidateWordCount() const;
+ inline void InvalidateWordCount() const;
inline void ValidateFlyLayout() const;
inline void ValidateFlyCntnt() const;
inline void ValidateFlyInCnt() const;
inline void ValidateLayout() const;
inline void ValidateCntnt() const;
inline void ValidateSpelling() const;
- inline void ValidateSmartTags() const; // SMARTTAGS
- inline void ValidateAutoCompleteWords() const;
- inline void ValidateWordCount() const;
+ inline void ValidateSmartTags() const; // SMARTTAGS
+ inline void ValidateAutoCompleteWords() const;
+ inline void ValidateWordCount() const;
inline sal_Bool IsInvalid() const;
inline sal_Bool IsInvalidFly() const;
sal_Bool IsInvalidFlyLayout() const { return bInvalidFlyLayout; }
@@ -303,9 +304,9 @@ public:
sal_Bool IsInvalidLayout() const { return bInvalidLayout; }
sal_Bool IsInvalidCntnt() const { return (bInvalidCntnt || bInvalidFlyInCnt); }
sal_Bool IsInvalidSpelling() const { return bInvalidSpelling; }
- sal_Bool IsInvalidSmartTags() const { return bInvalidSmartTags; } // SMARTTAGS
+ sal_Bool IsInvalidSmartTags() const { return bInvalidSmartTags; } // SMARTTAGS
sal_Bool IsInvalidAutoCompleteWords() const { return bInvalidAutoCmplWrds; }
- sal_Bool IsInvalidWordCount() const { return bInvalidWordCount; }
+ sal_Bool IsInvalidWordCount() const { return bInvalidWordCount; }
/** SwPageFrm::GetDrawBackgrdColor - for #102450#
@@ -388,7 +389,7 @@ public:
/**
mod #6i193#
- asks the page on which side a margin should be shown, e.g for notes
+ asks the page on which side a margin should be shown, e.g. for comments
returns true for left side, false for right side
*/
sw::sidebarwindows::SidebarPosition SidebarPosition() const;
@@ -466,17 +467,17 @@ inline void SwPageFrm::InvalidateSpelling() const
((SwPageFrm*)this)->bInvalidSpelling = sal_True;
}
// SMARTTAGS
-inline void SwPageFrm::InvalidateSmartTags() const
+inline void SwPageFrm::InvalidateSmartTags() const
{
- ((SwPageFrm*)this)->bInvalidSmartTags = sal_True;
+ ((SwPageFrm*)this)->bInvalidSmartTags = sal_True;
}
inline void SwPageFrm::InvalidateAutoCompleteWords() const
{
- ((SwPageFrm*)this)->bInvalidAutoCmplWrds = sal_True;
+ ((SwPageFrm*)this)->bInvalidAutoCmplWrds = sal_True;
}
inline void SwPageFrm::InvalidateWordCount() const
{
- ((SwPageFrm*)this)->bInvalidWordCount = sal_True;
+ ((SwPageFrm*)this)->bInvalidWordCount = sal_True;
}
inline void SwPageFrm::ValidateFlyLayout() const
{
@@ -503,9 +504,9 @@ inline void SwPageFrm::ValidateSpelling() const
((SwPageFrm*)this)->bInvalidSpelling = sal_False;
}
// SMARTTAGS
-inline void SwPageFrm::ValidateSmartTags() const
+inline void SwPageFrm::ValidateSmartTags() const
{
- ((SwPageFrm*)this)->bInvalidSmartTags = sal_False;
+ ((SwPageFrm*)this)->bInvalidSmartTags = sal_False;
}
inline void SwPageFrm::ValidateAutoCompleteWords() const
{
@@ -513,7 +514,7 @@ inline void SwPageFrm::ValidateAutoCompleteWords() const
}
inline void SwPageFrm::ValidateWordCount() const
{
- ((SwPageFrm*)this)->bInvalidWordCount = sal_False;
+ ((SwPageFrm*)this)->bInvalidWordCount = sal_False;
}
inline sal_Bool SwPageFrm::IsInvalid() const
@@ -530,9 +531,8 @@ inline sal_Bool SwPageFrm::IsInvalidFly() const
GetPageDesc()->GetMaster().GetFmtAttr(RES_TEXTGRID))->GetGridType() ) \
pGrid = NULL;}
-#define GETGRIDWIDTH( pGrid , pDoc ) pDoc->IsSquaredPageMode() ? \
+#define GETGRIDWIDTH( pGrid , pDoc ) pDoc->IsSquaredPageMode() ? \
pGrid->GetBaseHeight(): pGrid->GetBaseWidth()
-
#endif //_PAGEFRM_HXX
diff --git a/main/sw/source/core/layout/paintfrm.cxx b/main/sw/source/core/layout/paintfrm.cxx
index aff0e80456..bdc928d5f4 100644
--- a/main/sw/source/core/layout/paintfrm.cxx
+++ b/main/sw/source/core/layout/paintfrm.cxx
@@ -167,7 +167,7 @@ SV_DECL_VARARR( SwLRects, SwLineRect, 100, 100 )
class SwLineRects : public SwLRects
{
- sal_uInt16 nLastCount; //unuetze Durchlaeufe im PaintLines verhindern.
+ sal_uInt16 nLastCount; // unnuetze Durchlaeufe im PaintLines verhindern.
public:
SwLineRects() : nLastCount( 0 ) {}
void AddLineRect( const SwRect& rRect, const Color *pColor,
@@ -193,7 +193,7 @@ public:
static ViewShell *pGlobalShell = 0;
-//Wenn durchsichtige FlyInCnts im PaintBackground gepainted werden so soll der
+//Wenn durchsichtige FlyInCnts im PaintBackground gepaintet werden so soll der
//Hintergrund nicht mehr retouchiert werden.
//static sal_Bool bLockFlyBackground = sal_False;
@@ -226,7 +226,7 @@ static double aEdgeScale = 0.5;
//In pSubsLines werden Hilfslinien gesammelt und zusammengefasst. Diese
//werden vor der Ausgabe mit pLines abgeglichen, so dass moeglichst keine
//Umrandungen von den Hilfslinen verdeckt werden.
-//bTablines ist waerend des Paints einer Tabelle sal_True.
+//bTablines ist waehrend des Paints einer Tabelle sal_True.
static SwLineRects *pLines = 0;
static SwSubsRects *pSubsLines = 0;
// OD 18.11.2002 #99672# - global variable for sub-lines of body, header, footer,
@@ -4748,7 +4748,7 @@ void SwFrm::PaintBorder( const SwRect& rRect, const SwPageFrm *pPage,
if ( bLine || bShadow || bFoundCellForTopOrBorderAttrs )
{
//Wenn das Rechteck vollstandig innerhalb der PrtArea liegt,
- //so braucht kein Rand gepainted werden.
+ //so braucht kein Rand gepaintet werden.
//Fuer die PrtArea muss der Aligned'e Wert zugrunde gelegt werden,
//anderfalls wuerden u.U. Teile nicht verarbeitet.
SwRect aRect( Prt() );
@@ -6712,7 +6712,7 @@ Graphic SwFlyFrmFmt::MakeGraphic( ImageMap* pMap )
aDev.SetFillColor();
aDev.SetFont( pOld->GetFont() );
- //Rechteck ggf. ausdehnen, damit die Umrandunge mit aufgezeichnet werden.
+ //Rechteck ggf. ausdehnen, damit die Umrandungen mit aufgezeichnet werden.
SwRect aOut( pFly->Frm() );
SwBorderAttrAccess aAccess( SwFrm::GetCache(), pFly );
const SwBorderAttrs &rAttrs = *aAccess.Get();
diff --git a/main/sw/source/core/view/pagepreviewlayout.cxx b/main/sw/source/core/view/pagepreviewlayout.cxx
index 543689872f..c8d8dfe040 100644
--- a/main/sw/source/core/view/pagepreviewlayout.cxx
+++ b/main/sw/source/core/view/pagepreviewlayout.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.
- *
+ *
*************************************************************/
@@ -211,7 +211,7 @@ bool SwPagePreviewLayout::Init( const sal_uInt16 _nCols,
return false;
}
- // environment and parameters ok
+ // environment and parameters OK
// clear existing preview settings
_Clear();
@@ -355,7 +355,7 @@ bool SwPagePreviewLayout::Prepare( const sal_uInt16 _nProposedStartPageNum,
nProposedStartPageNum = 1;
}
- // environment and parameter ok
+ // environment and parameter OK
// update window size at preview setting data
maWinSize = mrParentViewShell.GetOut()->PixelToLogic( _rPxWinSize );
@@ -462,7 +462,7 @@ bool SwPagePreviewLayout::Prepare( const sal_uInt16 _nProposedStartPageNum,
}
// OD 20.01.2003 #103492# - shift visible preview document area to the top,
- // if on the botton is an area left blank.
+ // if at the bottom is an area left blank.
if ( mbBookPreviewModeToggled &&
maPaintedPrevwDocRect.Bottom() == maPreviewDocRect.Bottom() &&
maPaintedPrevwDocRect.GetHeight() < maWinSize.Height() )
@@ -598,7 +598,7 @@ void SwPagePreviewLayout::_CalcPreviewPages()
sal_uInt16 nCurrCol = mnPaintStartCol;
sal_uInt16 nConsideredRows = 0;
Point aCurrPaintOffset = aInitialPaintOffset;
- // loop on pages to determine preview background retangles
+ // loop on pages to determine preview background rectangles
while ( pPage &&
(!mbDoesLayoutRowsFitIntoWindow || nConsideredRows < mnRows) &&
aCurrPaintOffset.Y() < maWinSize.Height()
@@ -615,7 +615,7 @@ void SwPagePreviewLayout::_CalcPreviewPages()
// consider only pages, which have to be painted.
if ( nCurrCol < mnPaintStartCol )
{
- // calculate data of unvisible page needed for accessibility
+ // calculate data of invisible page needed for accessibility
PrevwPage* pPrevwPage = new PrevwPage;
Point aCurrAccOffset = aCurrPaintOffset -
Point( (mnPaintStartCol-nCurrCol) * mnColWidth, 0 );
@@ -649,7 +649,7 @@ void SwPagePreviewLayout::_CalcPreviewPages()
}
else
{
- // calculate data of unvisible page needed for accessibility
+ // calculate data of invisible page needed for accessibility
PrevwPage* pPrevwPage = new PrevwPage;
_CalcPreviewDataForPage( *(pPage), aCurrPaintOffset, pPrevwPage );
pPrevwPage->bVisible = false;
@@ -825,7 +825,7 @@ Point SwPagePreviewLayout::GetPreviewStartPosForNewScale(
OD 12.12.2002 #103492#
- @author OD, _nPageNum is absolut!
+ @author OD, _nPageNum is absolute!
*/
bool SwPagePreviewLayout::IsPageVisible( const sal_uInt16 _nPageNum ) const
{
@@ -1047,7 +1047,7 @@ SwTwips SwPagePreviewLayout::GetWinPagesScrollAmount(
@author OD
*/
-bool SwPagePreviewLayout::Paint( const Rectangle _aOutRect ) const
+bool SwPagePreviewLayout::Paint( const Rectangle _aOutRect ) const
{
// check environment and parameters
{
@@ -1324,14 +1324,14 @@ void SwPagePreviewLayout::_PaintSelectMarkAtPage(
Perform paint for current selected page in order to unmark it.
Set new selected page and perform paint to mark this page.
- @author OD, _nSelectedPage, mnSelectedPage are absolut
+ @author OD, _nSelectedPage, mnSelectedPage are absolute
*/
void SwPagePreviewLayout::MarkNewSelectedPage( const sal_uInt16 _nSelectedPage )
{
sal_uInt16 nOldSelectedPageNum = mnSelectedPageNum;
mnSelectedPageNum = _nSelectedPage;
- // re-paint for current selected page in order to umark it.
+ // re-paint for current selected page in order to unmark it.
const PrevwPage* pOldSelectedPrevwPage = _GetPrevwPageByPageNum( nOldSelectedPageNum );
if ( pOldSelectedPrevwPage && pOldSelectedPrevwPage->bVisible )
{