sw/source/core/view/vnew.cxx | 44 +++++++++++++++----------------------------
1 file changed, 16 insertions(+), 28 deletions(-)
New commits:
commit 8970f569f1309d16d3686c75925810c94504f891
Author: apurvapriyadarshi <apriyadarshi.1...@gmail.com>
Date: Sun May 29 11:50:45 2016 +0530
tdf#90834 Turn in-line version control history comments
cleanup in sw/source/core/view/vnew.cxx
Change-Id: Ifc53ad8a195835291aa7fb4c2a2db1a8e468117b
Reviewed-on: https://gerrit.libreoffice.org/25595
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: jan iversen <j...@documentfoundation.org>
diff --git a/sw/source/core/view/vnew.cxx b/sw/source/core/view/vnew.cxx
index 9bd1868..c015d18 100644
--- a/sw/source/core/view/vnew.cxx
+++ b/sw/source/core/view/vnew.cxx
@@ -75,34 +75,29 @@ void SwViewShell::Init( const SwViewOption *pNewOpt )
SwDocShell* pDShell = mpDoc->GetDocShell();
mpDoc->GetDocumentSettingManager().set(DocumentSettingId::HTML_MODE, 0 !=
::GetHtmlMode( pDShell ) );
- // JP 02.02.99: Bug 61335 - set readonly flag at ViewOptions before
creating layout. Otherwise,
- // one would have to reformat again.
+ // set readonly flag at ViewOptions before creating layout. Otherwise,
+ // one would have to reformat again.
if( pDShell && pDShell->IsReadOnly() )
mpOpt->SetReadonly( true );
SAL_INFO( "sw.core", "View::Init - before InitPrt" );
- // --> FME 2007-11-06 #i82967#
OutputDevice* pPDFOut = nullptr;
if ( mpOut && mpOut->GetPDFWriter() )
pPDFOut = mpOut;
- // <--
- // --> FME 2005-01-21 #i41075#
// Only setup the printer if we need one:
const bool bBrowseMode = mpOpt->getBrowseMode();
if( pPDFOut )
InitPrt( pPDFOut );
- // <--
- // --> FME 2005-03-16 #i44963# Good occasion to check if page sizes in
+ //Good occasion to check if page sizes in
// page descriptions are still set to (LONG_MAX, LONG_MAX) (html import)
if ( !bBrowseMode )
{
mpDoc->CheckDefaultPageFormat();
}
- // <--
SAL_INFO( "sw.core", "View::Init - after InitPrt" );
if( GetWin() )
@@ -133,7 +128,6 @@ void SwViewShell::Init( const SwViewOption *pNewOpt )
}
SizeChgNotify();
- // --> #i31958#
// XForms mode: initialize XForms mode, based on design mode (draw view)
// MakeDrawView() requires layout
if( GetDoc()->isXForms() )
@@ -142,7 +136,6 @@ void SwViewShell::Init( const SwViewOption *pNewOpt )
MakeDrawView();
mpOpt->SetFormView( ! GetDrawView()->IsDesignMode() );
}
- // <-- #i31958#
}
/// CTor for the first Shell.
@@ -165,18 +158,18 @@ SwViewShell::SwViewShell( SwDoc& rDocument, vcl::Window
*pWindow,
mbShowHeaderSeparator( false ),
mbShowFooterSeparator( false ),
mbHeaderFooterEdit( false ),
- mpTargetPaintWindow(nullptr), // #i74769#
- mpBufferedOut(nullptr), // #i74769#
+ mpTargetPaintWindow(nullptr),
+ mpBufferedOut(nullptr),
mpDoc( &rDocument ),
mnStartAction( 0 ),
mnLockPaint( 0 ),
mbSelectAll(false),
mbInLibreOfficeKitCallback(false),
mbOutputToWindow(false),
- mpPrePostOutDev(nullptr), // #i72754#
+ mpPrePostOutDev(nullptr),
maPrePostMapMode()
{
- // OD 2004-06-01 #i26791# - in order to suppress event handling in
+ // in order to suppress event handling in
// <SwDrawContact::Changed> during construction of <SwViewShell> instance
mbInConstructor = true;
@@ -185,7 +178,7 @@ SwViewShell::SwViewShell( SwDoc& rDocument, vcl::Window
*pWindow,
mbPaintWorks = mbEnableSmooth = true;
mbPreview = 0 !=( VSHELLFLAG_ISPREVIEW & nFlags );
- // --> OD 2005-02-11 #i38810# - Do not reset modified state of document,
+ // Do not reset modified state of document,
// if it's already been modified.
const bool bIsDocModified( mpDoc->getIDocumentState().IsModified() );
mpDoc->acquire();
@@ -193,11 +186,11 @@ SwViewShell::SwViewShell( SwDoc& rDocument, vcl::Window
*pWindow,
Init( pNewOpt ); // may change the Outdev (InitPrt())
mpOut = pOutput;
- // OD 28.03.2003 #108470# - initialize print preview layout after layout
+ // initialize print preview layout after layout
// is created in <SwViewShell::Init(..)> - called above.
if ( mbPreview )
{
- // OD 12.12.2002 #103492# - init page preview layout
+ // init page preview layout
mpImp->InitPagePreviewLayout();
}
@@ -207,10 +200,8 @@ SwViewShell::SwViewShell( SwDoc& rDocument, vcl::Window
*pWindow,
SetHiddenFlag( !mpOpt->IsShowHiddenField() );
// In Init a standard FrameFormat is created.
- // --> OD 2005-02-11 #i38810#
if ( !mpDoc->GetIDocumentUndoRedo().IsUndoNoResetModified()
&& !bIsDocModified )
- // <--
{
mpDoc->getIDocumentState().ResetModified();
}
@@ -221,7 +212,6 @@ SwViewShell::SwViewShell( SwDoc& rDocument, vcl::Window
*pWindow,
if( mpOpt->IsGridVisible() || getIDocumentDrawModelAccess().GetDrawModel()
)
Imp()->MakeDrawView();
- // OD 2004-06-01 #i26791#
mbInConstructor = false;
}
@@ -245,18 +235,18 @@ SwViewShell::SwViewShell( SwViewShell& rShell,
vcl::Window *pWindow,
mbShowHeaderSeparator( false ),
mbShowFooterSeparator( false ),
mbHeaderFooterEdit( false ),
- mpTargetPaintWindow(nullptr), // #i74769#
- mpBufferedOut(nullptr), // #i74769#
+ mpTargetPaintWindow(nullptr),
+ mpBufferedOut(nullptr),
mpDoc( rShell.GetDoc() ),
mnStartAction( 0 ),
mnLockPaint( 0 ),
mbSelectAll(false),
mbInLibreOfficeKitCallback(false),
mbOutputToWindow(false),
- mpPrePostOutDev(nullptr), // #i72754#
+ mpPrePostOutDev(nullptr),
maPrePostMapMode()
{
- // OD 2004-06-01 #i26791# - in order to suppress event handling in
+ // in order to suppress event handling in
// <SwDrawContact::Changed> during construction of <SwViewShell> instance
mbInConstructor = true;
@@ -264,7 +254,7 @@ SwViewShell::SwViewShell( SwViewShell& rShell, vcl::Window
*pWindow,
mbPaintInProgress = mbViewLocked = mbInEndAction = mbFrameView =
mbEndActionByVirDev = false;
mbPreview = 0 !=( VSHELLFLAG_ISPREVIEW & nFlags );
- // OD 12.12.2002 #103492#
+
if( nFlags & VSHELLFLAG_SHARELAYOUT )
mpLayout = rShell.mpLayout;
@@ -277,7 +267,6 @@ SwViewShell::SwViewShell( SwViewShell& rShell, vcl::Window
*pWindow,
Init( rShell.GetViewOptions() ); // might change Outdev (InitPrt())
mpOut = pOutput;
- // OD 12.12.2002 #103492#
if ( mbPreview )
mpImp->InitPagePreviewLayout();
@@ -296,7 +285,6 @@ SwViewShell::SwViewShell( SwViewShell& rShell, vcl::Window
*pWindow,
if( mpOpt->IsGridVisible() || getIDocumentDrawModelAccess().GetDrawModel()
)
Imp()->MakeDrawView();
- // OD 2004-06-01 #i26791#
mbInConstructor = false;
}
@@ -307,7 +295,7 @@ SwViewShell::~SwViewShell()
SET_CURR_SHELL( this );
mbPaintWorks = false;
- // FME 2004-06-21 #i9684# Stopping the animated graphics is not
+ // Stopping the animated graphics is not
// necessary during printing or pdf export, because the animation
// has not been started in this case.
if( mpDoc && GetWin() )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
