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 8873b33 Fixed typos, removed whitespace
8873b33 is described below
commit 8873b33ac88121a6e442878b17c5655b77902ff6
Author: mseidel <msei...@apache.org>
AuthorDate: Thu Dec 16 17:22:15 2021 +0100
Fixed typos, removed whitespace
---
main/sw/source/core/view/printdata.cxx | 81 +++++++++++++++++-----------------
main/sw/source/core/view/vdraw.cxx | 45 +++++++------------
main/sw/source/core/view/viewimp.cxx | 69 ++++++++++-------------------
main/sw/source/core/view/viewpg.cxx | 32 +++++++-------
4 files changed, 95 insertions(+), 132 deletions(-)
diff --git a/main/sw/source/core/view/printdata.cxx
b/main/sw/source/core/view/printdata.cxx
index 6c89bb4..48b784a 100644
--- a/main/sw/source/core/view/printdata.cxx
+++ b/main/sw/source/core/view/printdata.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.
- *
+ *
*************************************************************/
@@ -69,7 +69,7 @@ SwRenderData::~SwRenderData()
DBG_ASSERT( !m_pPostItShell, "m_pPostItShell should already have been
deleted" );
DBG_ASSERT( !m_pPostItDoc, "m_pPostItDoc should already have been deleted"
);
DBG_ASSERT( !m_pPostItFields, " should already have been deleted" );
-}
+}
void SwRenderData::CreatePostItData( SwDoc *pDoc, const SwViewOption
*pViewOpt, OutputDevice *pOutDev )
@@ -83,29 +83,29 @@ void SwRenderData::CreatePostItData( SwDoc *pDoc, const
SwViewOption *pViewOpt,
//!! Disable spell and grammar checking in the temporary document.
//!! Otherwise the grammar checker might process it and crash if we later
on
//!! simply delete this document while he is still at it.
- SwViewOption aViewOpt( *pViewOpt );
+ SwViewOption aViewOpt( *pViewOpt );
aViewOpt.SetOnlineSpell( sal_False );
- m_pPostItShell = new ViewShell( *m_pPostItDoc, 0, &aViewOpt, pOutDev );
+ m_pPostItShell = new ViewShell( *m_pPostItDoc, 0, &aViewOpt, pOutDev );
}
-
+
void SwRenderData::DeletePostItData()
{
if (HasPostItData())
{
- m_pPostItDoc->setPrinter( 0, false, false ); //damit am echten DOC
der Drucker bleibt
+ m_pPostItDoc->setPrinter( 0, false, false ); // damit am echten DOC
der Drucker bleibt
delete m_pPostItShell;
- m_pPostItShell = 0;
+ m_pPostItShell = 0;
delete m_pPostItFields;
m_pPostItFields = 0;
if ( !m_pPostItDoc->release() )
{
delete m_pPostItDoc;
}
- m_pPostItDoc = 0;
+ m_pPostItDoc = 0;
}
-}
+}
bool SwRenderData::NeedNewViewOptionAdjust( const ViewShell& rCompare ) const
{
@@ -170,7 +170,7 @@ void SwRenderData::MakeSwPrtOptions(
rOptions.bPrintProspectRTL = pOpt->IsPrintProspectRTL();
// bPrintSingleJobs <-- not set here; mail merge and or
configuration
// bModified <-- not set here; mail merge only
- rOptions.bPrintBlackFont = pOpt->IsPrintWithBlackTextColor();
+ rOptions.bPrintBlackFont = pOpt->IsPrintWithBlackTextColor();
rOptions.bPrintHiddenText = pOpt->IsPrintHiddenText();
rOptions.bPrintTextPlaceholder = pOpt->IsPrintTextPlaceholders();
rOptions.nPrintPostIts = pOpt->GetPrintPostItsType();
@@ -184,11 +184,11 @@ void SwRenderData::MakeSwPrtOptions(
//////////////////////////////////////////////////////////////////////
-SwPrintUIOptions::SwPrintUIOptions(
- bool bWeb,
- bool bSwSrcView,
- bool bHasSelection,
- bool bHasPostIts,
+SwPrintUIOptions::SwPrintUIOptions(
+ bool bWeb,
+ bool bSwSrcView,
+ bool bHasSelection,
+ bool bHasPostIts,
const SwPrintData &rDefaultPrintData ) :
m_pLast( NULL ),
m_rDefaultPrintData( rDefaultPrintData )
@@ -198,15 +198,15 @@ SwPrintUIOptions::SwPrintUIOptions(
DBG_ASSERT( aLocalizedStrings.Count() >= 30, "resource incomplete" );
if( aLocalizedStrings.Count() < 30 ) // bad resource ?
return;
-
+
// printing HTML sources does not have any valid UI options.
- // Its just the source code that gets printed ...
+ // It's just the source code that gets printed...
if (bSwSrcView)
{
m_aUIProperties.realloc( 0 );
return;
}
-
+
// check if CTL is enabled
SvtLanguageOptions aLangOpt;
bool bCTL = aLangOpt.IsCTLFontEnabled();
@@ -218,14 +218,14 @@ SwPrintUIOptions::SwPrintUIOptions(
m_aUIProperties.realloc( nNumProps );
int nIdx = 0;
- // create "writer" section (new tab page in dialog)
+ // create "Writer" section (new tab page in dialog)
SvtModuleOptions aModOpt;
String aAppGroupname( aLocalizedStrings.GetString( 0 ) );
aAppGroupname.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "%s"
) ),
- aModOpt.GetModuleName(
SvtModuleOptions::E_SWRITER ) );
+ aModOpt.GetModuleName(
SvtModuleOptions::E_SWRITER ) );
m_aUIProperties[ nIdx++ ].Value = getGroupControlOpt( aAppGroupname,
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
".HelpID:vcl:PrintDialog:TabPage:AppPage" ) ) );
- // create sub section for Contents
+ // create sub section for Contents
m_aUIProperties[ nIdx++ ].Value = getSubgroupControlOpt(
aLocalizedStrings.GetString( 1 ), rtl::OUString() );
// create a bool option for background
@@ -307,7 +307,7 @@ SwPrintUIOptions::SwPrintUIOptions(
rtl::OUString(),
aPrintRangeOpt
);
-
+
// create a choice for the content to create
rtl::OUString aPrintRangeName( RTL_CONSTASCII_USTRINGPARAM( "PrintContent"
) );
uno::Sequence< rtl::OUString > aChoices( 3 );
@@ -337,7 +337,7 @@ SwPrintUIOptions::SwPrintUIOptions(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "PageRange" ) ),
rtl::OUString(),
aPageRangeOpt
- );
+ );
// print content selection
vcl::PrinterOptionsHelper::UIControlOptions aContentsOpt;
aContentsOpt.maGroupHint = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
"JobPage" ) );
@@ -366,7 +366,7 @@ SwPrintUIOptions::SwPrintUIOptions(
uno::Sequence<
sal_Bool >(),
aAnnotOpt
);
-
+
// create subsection for Page settings
vcl::PrinterOptionsHelper::UIControlOptions aPageSetOpt;
aPageSetOpt.maGroupHint = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
"LayoutPage" ) );
@@ -387,7 +387,7 @@ SwPrintUIOptions::SwPrintUIOptions(
// 0 : all pages (left & right)
// 1 : left pages
// 2 : right pages
- DBG_ASSERT( rDefaultPrintData.IsPrintLeftPage() ||
rDefaultPrintData.IsPrintRightPage(),
+ DBG_ASSERT( rDefaultPrintData.IsPrintLeftPage() ||
rDefaultPrintData.IsPrintRightPage(),
"unexpected value combination" );
sal_Int16 nPagesChoice = 0;
if (rDefaultPrintData.IsPrintLeftPage() &&
!rDefaultPrintData.IsPrintRightPage())
@@ -397,12 +397,12 @@ SwPrintUIOptions::SwPrintUIOptions(
m_aUIProperties[ nIdx++ ].Value = getChoiceControlOpt(
aLocalizedStrings.GetString( 22 ),
aRLHelp,
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "PrintLeftRightPages" ) ),
- aRLChoices,
- nPagesChoice,
+ aRLChoices,
+ nPagesChoice,
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "List" ) )
);
}
-
+
// create a bool option for brochure
bDefaultVal = rDefaultPrintData.IsPrintProspect();
rtl::OUString aBrochurePropertyName( RTL_CONSTASCII_USTRINGPARAM(
"PrintProspect" ) );
@@ -412,7 +412,7 @@ SwPrintUIOptions::SwPrintUIOptions(
bDefaultVal,
aPageSetOpt
);
-
+
if (bCTL)
{
// create a bool option for brochure RTL dependent on brochure
@@ -430,14 +430,14 @@ SwPrintUIOptions::SwPrintUIOptions(
m_aUIProperties[ nIdx++ ].Value = getChoiceControlOpt( rtl::OUString(),
aBRTLHelpIds,
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "PrintProspectRTL" ) ),
- aBRTLChoices,
- nBRTLChoice,
+ aBRTLChoices,
+ nBRTLChoice,
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "List" ) ),
uno::Sequence<
sal_Bool >(),
aBrochureRTLOpt
);
}
-
+
DBG_ASSERT( nIdx == nNumProps, "number of added properties is not as
expected" );
}
@@ -446,7 +446,7 @@ SwPrintUIOptions::SwPrintUIOptions(
SwPrintUIOptions::~SwPrintUIOptions()
{
}
-
+
bool SwPrintUIOptions::IsPrintLeftPages() const
{
// take care of different property names for the option.
@@ -477,7 +477,7 @@ bool SwPrintUIOptions::IsPrintEmptyPages( bool bIsPDFExport
) const
// take care of different property names for the option.
bool bRes = bIsPDFExport ?
- !getBoolValue( "IsSkipEmptyPages", sal_True ) :
+ !getBoolValue( "IsSkipEmptyPages", sal_True ) :
getBoolValue( "PrintEmptyPages", sal_True );
return bRes;
}
@@ -518,22 +518,21 @@ bool SwPrintUIOptions::processPropertiesAndCheckFormat(
const uno::Sequence< bea
{
bool bChanged = processProperties( i_rNewProp );
- uno::Reference< awt::XDevice > xRenderDevice;
+ uno::Reference< awt::XDevice > xRenderDevice;
uno::Any aVal( getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
"RenderDevice" ) ) ) );
aVal >>= xRenderDevice;
OutputDevice* pOut = 0;
if (xRenderDevice.is())
{
- VCLXDevice* pDevice = VCLXDevice::GetImplementation( xRenderDevice
);
+ VCLXDevice* pDevice = VCLXDevice::GetImplementation( xRenderDevice );
pOut = pDevice ? pDevice->GetOutputDevice() : 0;
}
bChanged = bChanged || (pOut != m_pLast);
if( pOut )
m_pLast = pOut;
-
+
return bChanged;
}
//////////////////////////////////////////////////////////////////////
-
diff --git a/main/sw/source/core/view/vdraw.cxx
b/main/sw/source/core/view/vdraw.cxx
index e95d84c..0683dbf 100644
--- a/main/sw/source/core/view/vdraw.cxx
+++ b/main/sw/source/core/view/vdraw.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,18 +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.
- *
+ *
*************************************************************/
+
+
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
@@ -49,13 +51,11 @@
#include <drawdoc.hxx>
/*************************************************************************
-|*
|* SwSaveHdl
|*
|* Ersterstellung MA 14. Feb. 95
|* Letzte Aenderung MA 02. Jun. 98
-|*
-|*************************************************************************/
+**************************************************************************/
//SwSaveHdl::SwSaveHdl( SwViewImp *pI ) :
// pImp( pI ),
// bXorVis( sal_False )
@@ -77,13 +77,11 @@
/*************************************************************************
-|*
|* SwViewImp::StartAction(), EndAction()
|*
|* Ersterstellung MA 14. Feb. 95
|* Letzte Aenderung MA 14. Sep. 98
-|*
-|*************************************************************************/
+**************************************************************************/
void SwViewImp::StartAction()
@@ -113,13 +111,11 @@ void SwViewImp::EndAction()
}
/*************************************************************************
-|*
|* SwViewImp::LockPaint(), UnlockPaint()
|*
|* Ersterstellung MA 11. Jun. 96
|* Letzte Aenderung MA 11. Jun. 96
-|*
-|*************************************************************************/
+**************************************************************************/
void SwViewImp::LockPaint()
@@ -151,13 +147,11 @@ void SwViewImp::UnlockPaint()
/*************************************************************************
-|*
|* SwViewImp::PaintLayer(), PaintDispatcher()
|*
|* Ersterstellung MA 20. Dec. 94
|* Letzte Aenderung AMA 04. Jun. 98
-|*
-|*************************************************************************/
+**************************************************************************/
// OD 29.08.2002 #102450#
// add 3rd parameter <const Color* pPageBackgrdColor> for setting this
// color as the background color at the outliner of the draw view.
@@ -238,13 +232,11 @@ void SwViewImp::PaintLayer( const SdrLayerID _nLayerID,
}
/*************************************************************************
-|*
|* SwViewImp::IsDragPossible()
|*
|* Ersterstellung MA 19. Jan. 93
|* Letzte Aenderung MA 16. Jan. 95
-|*
-|*************************************************************************/
+**************************************************************************/
#define WIEDUWILLST 400
sal_Bool SwViewImp::IsDragPossible( const Point &rPoint )
@@ -277,13 +269,11 @@ sal_Bool SwViewImp::IsDragPossible( const Point &rPoint )
}
/*************************************************************************
-|*
|* SwViewImp::NotifySizeChg()
|*
|* Ersterstellung MA 23. Jun. 93
|* Letzte Aenderung MA 05. Oct. 98
-|*
-|*************************************************************************/
+**************************************************************************/
void SwViewImp::NotifySizeChg( const Size &rNewSz )
{
@@ -294,7 +284,7 @@ void SwViewImp::NotifySizeChg( const Size &rNewSz )
GetPageView()->GetPage()->SetSize( rNewSz );
//Begrenzung des Arbeitsbereiches.
- const Rectangle aRect( Point( DOCUMENTBORDER, DOCUMENTBORDER ), rNewSz );
+ const Rectangle aRect( Point( DOCUMENTBORDER, DOCUMENTBORDER ), rNewSz
);
const Rectangle &rOldWork = GetDrawView()->GetWorkArea();
sal_Bool bCheckDrawObjs = sal_False;
if ( aRect != rOldWork )
@@ -306,8 +296,8 @@ void SwViewImp::NotifySizeChg( const Size &rNewSz )
if ( !bCheckDrawObjs )
return;
- ASSERT( pSh->getIDocumentDrawModelAccess()->GetDrawModel(), "NotifySizeChg
without DrawModel" );
- SdrPage* pPage =
pSh->getIDocumentDrawModelAccess()->GetDrawModel()->GetPage( 0 );
+ ASSERT( pSh->getIDocumentDrawModelAccess()->GetDrawModel(),
"NotifySizeChg without DrawModel" );
+ SdrPage* pPage =
pSh->getIDocumentDrawModelAccess()->GetDrawModel()->GetPage( 0 );
const sal_uLong nObjs = pPage->GetObjCount();
for( sal_uLong nObj = 0; nObj < nObjs; ++nObj )
{
@@ -349,7 +339,7 @@ void SwViewImp::NotifySizeChg( const Size &rNewSz )
if ( aSz.Width() || aSz.Height() )
pObj->Move( aSz );
- //Notanker: Grosse Objekte nicht nach oben
verschwinden lassen.
+ // Notanker: Grosse Objekte nicht nach oben
verschwinden lassen.
aSz.Width() = aSz.Height() = 0;
if ( aBound.Bottom() < aRect.Top() )
aSz.Width() = (aBound.Bottom() -
aRect.Top()) - MINFLY;
@@ -361,6 +351,3 @@ void SwViewImp::NotifySizeChg( const Size &rNewSz )
}
}
}
-
-
-
diff --git a/main/sw/source/core/view/viewimp.cxx
b/main/sw/source/core/view/viewimp.cxx
index a9347f3..1c8fa84 100644
--- a/main/sw/source/core/view/viewimp.cxx
+++ b/main/sw/source/core/view/viewimp.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,18 +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.
- *
+ *
*************************************************************/
+
+
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
@@ -48,18 +50,16 @@
#include <drawdoc.hxx>
/*************************************************************************
-|*
|* SwViewImp::Init()
|*
|* Ersterstellung MA 25. Jul. 94
|* Letzte Aenderung MA 03. Nov. 95
-|*
-|*************************************************************************/
+**************************************************************************/
void SwViewImp::Init( const SwViewOption *pNewOpt )
{
ASSERT( pDrawView, "SwViewImp::Init without DrawView" );
- //Jetzt die PageView erzeugen wenn sie noch nicht existiert.
+ // Jetzt die PageView erzeugen wenn sie noch nicht existiert.
SwRootFrm *pRoot = pSh->GetLayout(); //swmod 071108//swmod 071225
if ( !pSdrPageView )
{
@@ -102,13 +102,11 @@ void SwViewImp::Init( const SwViewOption *pNewOpt )
}
/*************************************************************************
-|*
|* SwViewImp::SwViewImp() CTor fuer die Core-Internas
|*
|* Ersterstellung MA 25. Jul. 94
|* Letzte Aenderung MA 06. Sep. 96
-|*
-|*************************************************************************/
+**************************************************************************/
SwViewImp::SwViewImp( ViewShell *pParent ) :
pSh( pParent ),
@@ -132,12 +130,10 @@ SwViewImp::SwViewImp( ViewShell *pParent ) :
}
/******************************************************************************
-|*
|* SwViewImp::~SwViewImp()
|*
|* Ersterstellung MA 25. Jul. 94
|* Letzte Aenderung MA 16. Dec. 94
-|*
******************************************************************************/
SwViewImp::~SwViewImp()
@@ -160,12 +156,10 @@ SwViewImp::~SwViewImp()
}
/******************************************************************************
-|*
|* SwViewImp::DelRegions()
|*
|* Ersterstellung MA 14. Apr. 94
|* Letzte Aenderung MA 14. Apr. 94
-|*
******************************************************************************/
void SwViewImp::DelRegion()
@@ -174,12 +168,10 @@ void SwViewImp::DelRegion()
}
/******************************************************************************
-|*
|* SwViewImp::AddPaintRect()
|*
|* Ersterstellung MA ??
|* Letzte Aenderung MA 27. Jul. 94
-|*
******************************************************************************/
sal_Bool SwViewImp::AddPaintRect( const SwRect &rRect )
@@ -196,12 +188,10 @@ sal_Bool SwViewImp::AddPaintRect( const SwRect &rRect )
/******************************************************************************
-|*
|* ViewImp::CheckWaitCrsr()
|*
|* Ersterstellung MA 10. Aug. 94
|* Letzte Aenderung MA 10. Aug. 94
-|*
******************************************************************************/
void SwViewImp::CheckWaitCrsr()
@@ -211,12 +201,10 @@ void SwViewImp::CheckWaitCrsr()
}
/******************************************************************************
-|*
|* ViewImp::IsCalcLayoutProgress()
|*
|* Ersterstellung MA 12. Aug. 94
|* Letzte Aenderung MA 12. Aug. 94
-|*
******************************************************************************/
sal_Bool SwViewImp::IsCalcLayoutProgress() const
@@ -227,12 +215,10 @@ sal_Bool SwViewImp::IsCalcLayoutProgress() const
}
/******************************************************************************
-|*
|* ViewImp::IsUpdateExpFlds()
|*
|* Ersterstellung MA 28. Mar. 96
|* Letzte Aenderung MA 28. Mar. 96
-|*
******************************************************************************/
sal_Bool SwViewImp::IsUpdateExpFlds()
@@ -247,21 +233,19 @@ sal_Bool SwViewImp::IsUpdateExpFlds()
/******************************************************************************
-|*
|* SwViewImp::SetFirstVisPage(), ImplGetFirstVisPage();
|*
|* Ersterstellung MA 21. Sep. 93
|* Letzte Aenderung MA 08. Mar. 94
-|*
******************************************************************************/
void SwViewImp::SetFirstVisPage()
{
if ( pSh->bDocSizeChgd && pSh->VisArea().Top() >
pSh->GetLayout()->Frm().Height() )
{
- //Wir stecken in einer Action und die VisArea sitzt wegen
+ //Wir stecken in einer Aktion und die VisArea sitzt wegen
//Loeschoperationen hinter der erste sichtbaren Seite.
- //Damit nicht zu heftig Formatiert wird, liefern wir die letzte
Seite
+ //Damit nicht zu heftig formatiert wird, liefern wir die letzte
Seite
//zurueck.
pFirstVisPage = (SwPageFrm*)pSh->GetLayout()->Lower();
while ( pFirstVisPage && pFirstVisPage->GetNext() )
@@ -293,23 +277,21 @@ void SwViewImp::SetFirstVisPage()
}
/******************************************************************************
-|*
|* SwViewImp::MakeDrawView();
|*
|* Ersterstellung AMA 01. Nov. 95
|* Letzte Aenderung AMA 01. Nov. 95
-|*
******************************************************************************/
void SwViewImp::MakeDrawView()
{
- IDocumentDrawModelAccess* pIDDMA =
GetShell()->getIDocumentDrawModelAccess();
+ IDocumentDrawModelAccess* pIDDMA =
GetShell()->getIDocumentDrawModelAccess();
// the else here is not an error, _MakeDrawModel() calls this method
again
// after the DrawModel is created to create DrawViews for all shells...
if( !pIDDMA->GetDrawModel() )
{
- pIDDMA->_MakeDrawModel();
+ pIDDMA->_MakeDrawModel();
}
else
{
@@ -360,29 +342,27 @@ void SwViewImp::MakeDrawView()
}
/******************************************************************************
-|*
|* SwViewImp::GetRetoucheColor()
|*
|* Ersterstellung MA 24. Jun. 98
|* Letzte Aenderung MA 24. Jun. 98
-|*
******************************************************************************/
Color SwViewImp::GetRetoucheColor() const
{
- Color aRet( COL_TRANSPARENT );
+ Color aRet( COL_TRANSPARENT );
const ViewShell &rSh = *GetShell();
if ( rSh.GetWin() )
{
- if ( rSh.GetViewOptions()->getBrowseMode() &&
+ if ( rSh.GetViewOptions()->getBrowseMode() &&
COL_TRANSPARENT !=
rSh.GetViewOptions()->GetRetoucheColor().GetColor() )
aRet = rSh.GetViewOptions()->GetRetoucheColor();
- else if(rSh.GetViewOptions()->IsPagePreview() &&
-
!SW_MOD()->GetAccessibilityOptions().GetIsForPagePreviews())
- aRet.SetColor(COL_WHITE);
- else
- aRet = SwViewOption::GetDocColor();
- }
+ else if(rSh.GetViewOptions()->IsPagePreview() &&
+
!SW_MOD()->GetAccessibilityOptions().GetIsForPagePreviews())
+ aRet.SetColor(COL_WHITE);
+ else
+ aRet = SwViewOption::GetDocColor();
+ }
return aRet;
}
@@ -455,7 +435,7 @@ void SwViewImp::FireSectionChangeEvent(sal_uInt16
nOldSection, sal_uInt16 nNewSe
void SwViewImp::FireColumnChangeEvent(sal_uInt16 nOldColumn, sal_uInt16
nNewColumn)
{
if( IsAccessible() )
- GetAccessibleMap().FireColumnChangeEvent(nOldColumn,
nNewColumn);
+ GetAccessibleMap().FireColumnChangeEvent(nOldColumn,
nNewColumn);
}
void SwViewImp::InvalidateAccessibleFrmContent( const SwFrm *pFrm )
{
@@ -477,7 +457,7 @@ void SwViewImp::InvalidateAccessibleCursorPosition( const
SwFrm *pFrm )
}
void SwViewImp::InvalidateAccessibleEditableState( sal_Bool bAllShells,
-
const SwFrm *pFrm )
+
const SwFrm *pFrm )
{
if( bAllShells )
{
@@ -497,7 +477,7 @@ void SwViewImp::InvalidateAccessibleEditableState( sal_Bool
bAllShells,
}
void SwViewImp::InvalidateAccessibleRelationSet( const SwFlyFrm *pMaster,
- const SwFlyFrm *pFollow )
+
const SwFlyFrm *pFollow )
{
ViewShell *pVSh = GetShell();
ViewShell *pTmp = pVSh;
@@ -624,4 +604,3 @@ IMPL_LINK(SwViewImp, SetStopPrt, void *, EMPTYARG)
return 0;
}
-
diff --git a/main/sw/source/core/view/viewpg.cxx
b/main/sw/source/core/view/viewpg.cxx
index 65f8b2b..3bf558b 100644
--- a/main/sw/source/core/view/viewpg.cxx
+++ b/main/sw/source/core/view/viewpg.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.
- *
+ *
*************************************************************/
@@ -44,7 +44,7 @@
#include <hints.hxx>
#include <fntcache.hxx>
-#include <statstr.hrc> // Text fuer SfxProgress
+#include <statstr.hrc> // Text for SfxProgress
#include <comcore.hrc>
#include <IDocumentFieldsAccess.hxx>
@@ -73,7 +73,7 @@ void ViewShell::AdjustOptionsForPagePreview(SwPrintData
const& rPrintOptions)
{
if ( !IsPreView() )
{
- ASSERT( false, "view shell doesn't belongs to a page preview - no
adjustment of its view options");
+ ASSERT( false, "view shell doesn't belong to a page preview - no
adjustment of its view options");
return;
}
@@ -85,7 +85,7 @@ void ViewShell::AdjustOptionsForPagePreview(SwPrintData
const& rPrintOptions)
// print brochure
// OD 05.05.2003 #i14016# - consider empty pages on calculation of the scaling
// for a page to be printed.
-void ViewShell::PrintProspect(
+void ViewShell::PrintProspect(
OutputDevice *pOutDev,
const SwPrintData &rPrintData,
sal_Int32 nRenderer // the index in the vector of prospect pages to be
printed
@@ -103,7 +103,7 @@ void ViewShell::PrintProspect(
// output device is now provided by a call from outside the Writer)
pPrinter->Push();
- std::pair< sal_Int32, sal_Int32 > rPagesToPrint =
+ std::pair< sal_Int32, sal_Int32 > rPagesToPrint =
rPrintData.GetRenderData().GetPagePairsForProspectPrinting()[
nRenderer ];
// const sal_uInt16 nPageMax = static_cast< sal_uInt16 >(rPagesToPrint.first >
rPagesToPrint.second ?
// rPagesToPrint.first : rPagesToPrint.second);
@@ -112,14 +112,14 @@ void ViewShell::PrintProspect(
DBG_ASSERT( rPagesToPrint.second == -1 ||
rPrintData.GetRenderData().GetValidPagesSet().count( rPagesToPrint.second ) ==
1, "second Page not valid" );
#endif
- // eine neue Shell fuer den Printer erzeugen
+ // create new shell for printer
ViewShell aShell( *this, 0, pPrinter );
-
+
SET_CURR_SHELL( &aShell );
aShell.PrepareForPrint( rPrintData );
- //!! applying view options and formatting the dcoument should now only be
done in getRendererCount!
+ //!! applying view options and formatting the document should now only be
done in getRendererCount!
MapMode aMapMode( MAP_TWIP );
Size aPrtSize( pPrinter->PixelToLogic( pPrinter->GetPaperSizePixel(),
aMapMode ) );
@@ -200,7 +200,7 @@ void ViewShell::PrintProspect(
aScY = aScX;
{
- // fuer Drawing, damit diese ihre Objecte vernuenftig Painten
+ // fuer Drawing, damit diese ihre Objekte vernuenftig Painten
// koennen, auf "glatte" Prozentwerte setzen
aScY *= Fraction( 1000, 1 );
long nTmp = (long)aScY;
@@ -218,7 +218,7 @@ void ViewShell::PrintProspect(
Size aTmpPrtSize( pPrinter->PixelToLogic( pPrinter->GetPaperSizePixel(),
aMapMode ) );
// calculate start point for equal border on all sides
- Point aSttPt( (aTmpPrtSize.Width() - nMaxColSz) / 2,
+ Point aSttPt( (aTmpPrtSize.Width() - nMaxColSz) / 2,
(aTmpPrtSize.Height() - nMaxRowSz) / 2 );
for( int nC = 0; nC < 2; ++nC )
{
@@ -241,13 +241,11 @@ void ViewShell::PrintProspect(
SwPaintQueue::Repaint();
- //!! applying/modifying view options and formatting the dcoument should
now only be done in getRendererCount!
-
+ //!! applying/modifying view options and formatting the document should
now only be done in getRendererCount!
+
pFntCache->Flush();
// restore settings of OutputDevice (should be done always now since the
// output device is now provided by a call from outside the Writer)
pPrinter->Pop();
}
-
-
