[Libreoffice-commits] core.git: sw/inc sw/source
Tor Lillqvist
tml at collabora.com
Tue Oct 22 05:19:59 PDT 2013
sw/inc/IDocumentLayoutAccess.hxx | 6 +++---
sw/inc/doc.hxx | 14 +++++++-------
sw/inc/viewopt.hxx | 2 +-
sw/inc/viewsh.hxx | 6 +++---
sw/source/core/access/accdoc.cxx | 2 +-
sw/source/core/crsr/swcrsr.cxx | 2 +-
sw/source/core/crsr/viscrs.cxx | 4 ++--
sw/source/core/doc/doc.cxx | 16 ++++++++--------
sw/source/core/doc/doccorr.cxx | 2 +-
sw/source/core/doc/docdraw.cxx | 4 ++--
sw/source/core/doc/docfly.cxx | 4 ++--
sw/source/core/doc/docfmt.cxx | 6 +++---
sw/source/core/doc/docftn.cxx | 22 +++++++++++-----------
sw/source/core/doc/doclay.cxx | 20 ++++++++++----------
sw/source/core/doc/docnew.cxx | 8 ++++----
sw/source/core/doc/docredln.cxx | 4 ++--
sw/source/core/doc/doctxm.cxx | 4 ++--
sw/source/core/doc/ftnidx.cxx | 4 ++--
sw/source/core/doc/htmltbl.cxx | 6 +++---
sw/source/core/doc/lineinfo.cxx | 10 +++++-----
sw/source/core/doc/swserv.cxx | 2 +-
sw/source/core/doc/visiturl.cxx | 2 +-
sw/source/core/docnode/nodes.cxx | 4 ++--
sw/source/core/draw/dcontact.cxx | 2 +-
sw/source/core/draw/dpage.cxx | 2 +-
sw/source/core/draw/dview.cxx | 4 ++--
sw/source/core/fields/ddefld.cxx | 2 +-
sw/source/core/fields/ddetbl.cxx | 2 +-
sw/source/core/fields/docufld.cxx | 4 ++--
sw/source/core/frmedt/fefly1.cxx | 4 ++--
sw/source/core/frmedt/feshview.cxx | 2 +-
sw/source/core/frmedt/tblsel.cxx | 2 +-
sw/source/core/graphic/ndgrf.cxx | 2 +-
sw/source/core/inc/rootfrm.hxx | 8 ++++----
sw/source/core/layout/atrfrm.cxx | 4 ++--
sw/source/core/layout/colfrm.cxx | 2 +-
sw/source/core/layout/flypos.cxx | 2 +-
sw/source/core/layout/laycache.cxx | 4 ++--
sw/source/core/layout/newfrm.cxx | 8 ++++----
sw/source/core/layout/sectfrm.cxx | 4 ++--
sw/source/core/table/swnewtable.cxx | 2 +-
sw/source/core/text/itratr.cxx | 6 +++---
sw/source/core/text/redlnitr.cxx | 2 +-
sw/source/core/text/txtfld.cxx | 2 +-
sw/source/core/txtnode/ndtxt.cxx | 6 +++---
sw/source/core/undo/unattr.cxx | 2 +-
sw/source/core/unocore/unodraw.cxx | 6 +++---
sw/source/core/unocore/unoobj2.cxx | 2 +-
sw/source/core/view/viewimp.cxx | 6 +++---
sw/source/core/view/viewsh.cxx | 12 ++++++------
sw/source/core/view/vnew.cxx | 6 +++---
sw/source/core/view/vprint.cxx | 6 +++---
sw/source/filter/html/htmltab.cxx | 2 +-
sw/source/filter/ww1/fltshell.cxx | 4 ++--
sw/source/filter/ww8/writerhelper.cxx | 2 +-
sw/source/filter/ww8/ww8graf2.cxx | 2 +-
sw/source/filter/xml/wrtxml.cxx | 2 +-
sw/source/filter/xml/xmltbli.cxx | 2 +-
sw/source/ui/app/docsh2.cxx | 2 +-
sw/source/ui/app/swmodul1.cxx | 2 +-
60 files changed, 144 insertions(+), 144 deletions(-)
New commits:
commit a537db8762d93009651d48b9b6a1782eaa842866
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Oct 22 15:14:13 2013 +0300
Bin useless swmod comments
Change-Id: I65df74242453a907b1a1a50f391e7b017bec5fcb
diff --git a/sw/inc/IDocumentLayoutAccess.hxx b/sw/inc/IDocumentLayoutAccess.hxx
index 005385f..fc9bb5c 100644
--- a/sw/inc/IDocumentLayoutAccess.hxx
+++ b/sw/inc/IDocumentLayoutAccess.hxx
@@ -38,14 +38,14 @@ public:
/** Returns the layout set at the document.
*/
virtual const ViewShell* GetCurrentViewShell() const = 0;
- virtual ViewShell* GetCurrentViewShell() = 0; //swmod 071107//swmod 071225
+ virtual ViewShell* GetCurrentViewShell() = 0;
virtual const SwRootFrm* GetCurrentLayout() const = 0;
- virtual SwRootFrm* GetCurrentLayout() = 0; //swmod 080218
+ virtual SwRootFrm* GetCurrentLayout() = 0;
virtual bool HasLayout() const = 0;
/** !!!The old layout must be deleted!!!
*/
- virtual void SetCurrentViewShell( ViewShell* pNew ) = 0; //swmod 071107//swmod 071225
+ virtual void SetCurrentViewShell( ViewShell* pNew ) = 0;
/**
*/
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 42379e4..3dc2f6f 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -314,7 +314,7 @@ class SW_DLLPUBLIC SwDoc :
SwTOXTypes *mpTOXTypes; ///< Tables/indices
SwDefTOXBase_Impl * mpDefTOXBases; ///< defaults of SwTOXBase's
- ViewShell *mpCurrentView; ///< SwDoc should get a new member mpCurrentView//swmod 071225
+ ViewShell *mpCurrentView; ///< SwDoc should get a new member mpCurrentView
SdrModel *mpDrawModel; ///< StarView Drawing
SwDocUpdtFld *mpUpdtFlds; ///< Struct for updating fields
@@ -946,17 +946,17 @@ public:
/** IDocumentLayoutAccess
*/
- virtual void SetCurrentViewShell( ViewShell* pNew );//swmod 071225
+ virtual void SetCurrentViewShell( ViewShell* pNew );
virtual SwLayouter* GetLayouter();
virtual const SwLayouter* GetLayouter() const;
virtual void SetLayouter( SwLayouter* pNew );
virtual SwFrmFmt* MakeLayoutFmt( RndStdIds eRequest, const SfxItemSet* pSet );
virtual void DelLayoutFmt( SwFrmFmt *pFmt );
virtual SwFrmFmt* CopyLayoutFmt( const SwFrmFmt& rSrc, const SwFmtAnchor& rNewAnchor, bool bSetTxtFlyAtt, bool bMakeFrms );
- virtual const ViewShell *GetCurrentViewShell() const; //swmod 080219
- virtual ViewShell *GetCurrentViewShell(); ///< swmod 080219 It must be able to communicate to a ViewShell.This is going to be removerd later.
+ virtual const ViewShell *GetCurrentViewShell() const;
+ virtual ViewShell *GetCurrentViewShell(); ///< It must be able to communicate to a ViewShell.This is going to be removerd later.
virtual const SwRootFrm *GetCurrentLayout() const;
- virtual SwRootFrm *GetCurrentLayout();//swmod 080219
+ virtual SwRootFrm *GetCurrentLayout();
virtual bool HasLayout() const;
void ClearSwLayouterEntries();
@@ -1156,7 +1156,7 @@ public:
OUString GetUniqueOLEName() const;
OUString GetUniqueFrameName() const;
- std::set<SwRootFrm*> GetAllLayouts();//swmod 080225
+ std::set<SwRootFrm*> GetAllLayouts();
void SetFlyName( SwFlyFrmFmt& rFmt, const OUString& rName );
const SwFlyFrmFmt* FindFlyByName( const OUString& rName, sal_Int8 nNdTyp = 0 ) const;
@@ -1877,7 +1877,7 @@ public:
/** update all modified OLE-Objects. The modification is called over the
StarOne - Interface */
void SetOLEObjModified()
- { if( GetCurrentViewShell() ) maOLEModifiedTimer.Start(); } //swmod 071107//swmod 071225
+ { if( GetCurrentViewShell() ) maOLEModifiedTimer.Start(); }
// -------------------- Uno - Interfaces ---------------------------
const SwUnoCrsrTbl& GetUnoCrsrTbl() const { return *mpUnoCrsrTbl; }
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index 93683e2..89f2ef8 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -152,7 +152,7 @@ protected:
sal_Bool bIsPagePreview : 1; // The preview mustn't print field/footnote/... shadings.
sal_Bool bSelectionInReadonly : 1; // Determines whether selection is switched on in readonly documents.
sal_Bool mbFormView : 1;
- sal_Bool mbBrowseMode : 1; // swmod 080130.
+ sal_Bool mbBrowseMode : 1;
sal_Bool mbBookView : 1; // View mode for page preview.
sal_Bool mbViewLayoutBookMode : 1; // Book view mode for edit view.
sal_Bool bShowPlaceHolderFields : 1; // Only used in printing!
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index a106b96..312e563 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -26,7 +26,7 @@
#include <swtypes.hxx>
#include <ring.hxx>
#include <swrect.hxx>
-#include <boost/shared_ptr.hpp> // swmod 080115
+#include <boost/shared_ptr.hpp>
#include <stack>
#include <vcl/mapmod.hxx>
#include <vcl/print.hxx>
@@ -92,7 +92,7 @@ enum FrameControlType
// Define for flags needed in ctor or layers below.
// Currently the Preview flag is needed for DrawPage.
#define VSHELLFLAG_ISPREVIEW ((long)0x1)
-#define VSHELLFLAG_SHARELAYOUT ((long)0x2)//swmod 080125 flag
+#define VSHELLFLAG_SHARELAYOUT ((long)0x2)
typedef boost::shared_ptr<SwRootFrm> SwRootFrmPtr;
class SW_DLLPUBLIC ViewShell : public Ring
@@ -273,7 +273,7 @@ public:
// Invalidate first visible page for all Shells in ring.
void SetFirstVisPageInvalid();
- SwRootFrm *GetLayout() const;// swmod 080116
+ SwRootFrm *GetLayout() const;
sal_Bool IsNewLayout() const; // Has Layout been loaded or created?
Size GetDocSize() const; // Get document size.
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index a792739..5fb1e5f 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -49,7 +49,7 @@ using lang::IndexOutOfBoundsException;
SwAccessibleDocumentBase::SwAccessibleDocumentBase ( SwAccessibleMap *_pMap ) :
SwAccessibleContext( _pMap, AccessibleRole::DOCUMENT,
- _pMap->GetShell()->GetLayout() ),//swmod 071107//swmod 071225
+ _pMap->GetShell()->GetLayout() ),
mxParent( _pMap->GetShell()->GetWin()->GetAccessibleParentWindow()->GetAccessible() ),
mpChildWin( 0 )
{
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index 2798089..7d15de1 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -1287,7 +1287,7 @@ sal_Bool SwCursor::SelectWordWT( ViewShell* pViewShell, sal_Int16 nWordType, con
// set the cursor to the layout position
Point aPt( *pPt );
pLayout->GetCrsrOfst( GetPoint(), aPt );
- } //swmod 071107 //swmod 071225
+ }
const SwTxtNode* pTxtNd = GetNode()->GetTxtNode();
if( pTxtNd && g_pBreakIt->GetBreakIter().is() )
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index e085019..432a93b 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -426,7 +426,7 @@ void SwShellCrsr::FillRects()
(GetMark()->nNode == GetPoint()->nNode ||
(GetMark()->nNode.GetNode().IsCntntNode() &&
GetMark()->nNode.GetNode().GetCntntNode()->getLayoutFrm( GetShell()->GetLayout() ) ) ))
- GetShell()->GetLayout()->CalcFrmRects( *this, GetShell()->IsTableMode() ); //swmod 071107//swmod 071225
+ GetShell()->GetLayout()->CalcFrmRects( *this, GetShell()->IsTableMode() );
}
void SwShellCrsr::Show()
@@ -501,7 +501,7 @@ short SwShellCrsr::MaxReplaceArived()
for( nActCnt = aArr[n]; nActCnt--; )
pSh->StartAction();
pSh = (ViewShell*)pSh->GetNext();
- } //swmod 071107 //swmod 071225
+ }
}
else
// otherwise from the Basic, and than switch to RET_YES
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 9da4abe..26a03b4 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -438,7 +438,7 @@ void SwDoc::setForbiddenCharacters(/*[in]*/ sal_uInt16 nLang,
std::set<SwRootFrm*> aAllLayouts = GetAllLayouts();
std::for_each( aAllLayouts.begin(), aAllLayouts.end(), std::bind2nd(std::mem_fun(&SwRootFrm::InvalidateAllCntnt), INV_SIZE));
pTmpRoot->EndAllAction();
- }//swmod 080310
+ }
SetModified();
}
@@ -538,7 +538,7 @@ void SwDoc::setCharacterCompressionType( /*[in]*/SwCharCompressType n )
std::set<SwRootFrm*> aAllLayouts = GetAllLayouts();
std::for_each( aAllLayouts.begin(), aAllLayouts.end(), std::bind2nd(std::mem_fun(&SwRootFrm::InvalidateAllCntnt), INV_SIZE));
pTmpRoot->EndAllAction();
- }//swmod 080310
+ }
SetModified();
}
}
@@ -2021,18 +2021,18 @@ static bool lcl_CheckSmartTagsAgain( const SwNodePtr& rpNd, void* )
************************************************************************/
void SwDoc::SpellItAgainSam( bool bInvalid, bool bOnlyWrong, bool bSmartTags )
{
- std::set<SwRootFrm*> aAllLayouts = GetAllLayouts();//swmod 080307
+ std::set<SwRootFrm*> aAllLayouts = GetAllLayouts();
OSL_ENSURE( GetCurrentLayout(), "SpellAgain: Where's my RootFrm?" );
if( bInvalid )
{
- std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::AllInvalidateSmartTagsOrSpelling),bSmartTags));//swmod 080305
+ std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::AllInvalidateSmartTagsOrSpelling),bSmartTags));
std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::SetNeedGrammarCheck), true) );
if ( bSmartTags )
GetNodes().ForEach( lcl_CheckSmartTagsAgain, &bOnlyWrong );
GetNodes().ForEach( lcl_SpellAndGrammarAgain, &bOnlyWrong );
}
- std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::mem_fun(&SwRootFrm::SetIdleFlags));//swmod 080307
+ std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::mem_fun(&SwRootFrm::SetIdleFlags));
}
void SwDoc::InvalidateAutoCompleteFlag()
@@ -2041,15 +2041,15 @@ void SwDoc::InvalidateAutoCompleteFlag()
if( pTmpRoot )
{
std::set<SwRootFrm*> aAllLayouts = GetAllLayouts();
- std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::mem_fun(&SwRootFrm::AllInvalidateAutoCompleteWords));//swmod 080305
+ std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::mem_fun(&SwRootFrm::AllInvalidateAutoCompleteWords));
for( sal_uLong nNd = 1, nCnt = GetNodes().Count(); nNd < nCnt; ++nNd )
{
SwTxtNode* pTxtNode = GetNodes()[ nNd ]->GetTxtNode();
if ( pTxtNode ) pTxtNode->SetAutoCompleteWordDirty( true );
}
- std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::mem_fun(&SwRootFrm::SetIdleFlags));//swmod 080228
- } //swmod 080219
+ std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::mem_fun(&SwRootFrm::SetIdleFlags));
+ }
}
const SwFmtINetFmt* SwDoc::FindINetAttr( const OUString& rName ) const
diff --git a/sw/source/core/doc/doccorr.cxx b/sw/source/core/doc/doccorr.cxx
index 9c57fd5..9376d60 100644
--- a/sw/source/core/doc/doccorr.cxx
+++ b/sw/source/core/doc/doccorr.cxx
@@ -331,7 +331,7 @@ SwEditShell* SwDoc::GetEditShell( ViewShell** ppSh ) const
} while( pVSh != ( pSh = (ViewShell*)pSh->GetNext() ));
}
else if( ppSh )
- *ppSh = 0; //swmod 071029//swmod 071225
+ *ppSh = 0;
return 0;
}
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index ae3cd34..567ad9c 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -482,7 +482,7 @@ _ZSortFly::_ZSortFly( const SwFrmFmt* pFrmFmt, const SwFmtAnchor* pFlyAn,
// FlyFrames an alternative method is used now in that case.
if( RES_FLYFRMFMT == pFmt->Which() )
{
- if( pFmt->getIDocumentLayoutAccess()->GetCurrentViewShell() ) //swmod 071107//swmod 071225
+ if( pFmt->getIDocumentLayoutAccess()->GetCurrentViewShell() )
{
// See if there is an SdrObject for it
SwFlyFrm* pFly = SwIterator<SwFlyFrm,SwFmt>::FirstElement( *pFrmFmt );
@@ -779,7 +779,7 @@ SdrModel* SwDoc::_MakeDrawModel()
SfxSimpleHint aHnt( SW_BROADCAST_DRAWVIEWS_CREATED );
GetDocShell()->Broadcast( aHnt );
}
- } //swmod 071029//swmod 071225
+ }
return mpDrawModel;
}
diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx
index 587900b..d5047d9 100644
--- a/sw/source/core/doc/docfly.cxx
+++ b/sw/source/core/doc/docfly.cxx
@@ -146,7 +146,7 @@ static Point lcl_FindAnchorLayPos( SwDoc& rDoc, const SwFmtAnchor& rAnch,
const SwFrmFmt* pFlyFmt )
{
Point aRet;
- if( rDoc.GetCurrentViewShell() ) //swmod 071107//swmod 071225
+ if( rDoc.GetCurrentViewShell() )
switch( rAnch.GetAnchorId() )
{
case FLY_AS_CHAR:
@@ -752,7 +752,7 @@ bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
// We need to find a TextNode, because only there we can anchor a
// content-bound DrawObject.
SwCrsrMoveState aState( MV_SETONLYTEXT );
- GetCurrentLayout()->GetCrsrOfst( &aPos, aPoint, &aState ); //swmod 080218
+ GetCurrentLayout()->GetCrsrOfst( &aPos, aPoint, &aState );
}
else
{
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 76adc1e..156debb 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -2089,7 +2089,7 @@ void SwDoc::CopyPageDesc( const SwPageDesc& rSrcDesc, SwPageDesc& rDstDesc,
bool bCopyPoolIds )
{
bool bNotifyLayout = false;
- SwRootFrm* pTmpRoot = GetCurrentLayout();//swmod 080219
+ SwRootFrm* pTmpRoot = GetCurrentLayout();
rDstDesc.SetLandscape( rSrcDesc.GetLandscape() );
rDstDesc.SetNumType( rSrcDesc.GetNumType() );
@@ -2163,8 +2163,8 @@ void SwDoc::CopyPageDesc( const SwPageDesc& rSrcDesc, SwPageDesc& rDstDesc,
if( bNotifyLayout && pTmpRoot )
{
- std::set<SwRootFrm*> aAllLayouts = GetAllLayouts();//swmod 080225
- std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::mem_fun(&SwRootFrm::AllCheckPageDescs));//swmod 080226
+ std::set<SwRootFrm*> aAllLayouts = GetAllLayouts();
+ std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::mem_fun(&SwRootFrm::AllCheckPageDescs));
}
// If foot notes change the pages have to be triggered
diff --git a/sw/source/core/doc/docftn.cxx b/sw/source/core/doc/docftn.cxx
index bddcbc8..13605392 100644
--- a/sw/source/core/doc/docftn.cxx
+++ b/sw/source/core/doc/docftn.cxx
@@ -255,7 +255,7 @@ SwFtnInfo::SwFtnInfo(SwTxtFmtColl *pFmt) :
void SwDoc::SetFtnInfo(const SwFtnInfo& rInfo)
{
- SwRootFrm* pTmpRoot = GetCurrentLayout();//swmod 080219
+ SwRootFrm* pTmpRoot = GetCurrentLayout();
if( !(GetFtnInfo() == rInfo) )
{
const SwFtnInfo &rOld = GetFtnInfo();
@@ -281,14 +281,14 @@ void SwDoc::SetFtnInfo(const SwFtnInfo& rInfo)
if (pTmpRoot)
{
- std::set<SwRootFrm*> aAllLayouts = GetAllLayouts();//swmod 080304
+ std::set<SwRootFrm*> aAllLayouts = GetAllLayouts();
if ( bFtnPos )
- std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::mem_fun(&SwRootFrm::AllRemoveFtns));//swmod 080305
+ std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::mem_fun(&SwRootFrm::AllRemoveFtns));
else
{
- std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::mem_fun(&SwRootFrm::UpdateFtnNums));//swmod 080304
+ std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::mem_fun(&SwRootFrm::UpdateFtnNums));
if ( bFtnDesc )
- std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::CheckFtnPageDescs), sal_False));//swmod 080304
+ std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::CheckFtnPageDescs), sal_False));
if ( bExtra )
{
// For messages regarding ErgoSum etc. we save the extra code and use the
@@ -303,7 +303,7 @@ void SwDoc::SetFtnInfo(const SwFtnInfo& rInfo)
}
}
}
- } //swmod 080219
+ }
if( FTNNUM_PAGE != rInfo.eNum )
GetFtnIdxs().UpdateAllFtn();
else if( bFtnChrFmts )
@@ -324,7 +324,7 @@ void SwDoc::SetFtnInfo(const SwFtnInfo& rInfo)
void SwDoc::SetEndNoteInfo(const SwEndNoteInfo& rInfo)
{
- SwRootFrm* pTmpRoot = GetCurrentLayout();//swmod 080219
+ SwRootFrm* pTmpRoot = GetCurrentLayout();
if( !(GetEndNoteInfo() == rInfo) )
{
if(GetIDocumentUndoRedo().DoesUndo())
@@ -356,7 +356,7 @@ void SwDoc::SetEndNoteInfo(const SwEndNoteInfo& rInfo)
if ( bFtnDesc )
{
std::set<SwRootFrm*> aAllLayouts = GetAllLayouts();
- std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::CheckFtnPageDescs), sal_True));//swmod 080304
+ std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::CheckFtnPageDescs), sal_True));
}
if ( bExtra )
{
@@ -371,7 +371,7 @@ void SwDoc::SetEndNoteInfo(const SwEndNoteInfo& rInfo)
pTxtFtn->SetNumber(rFtn.GetNumber(), rFtn.GetNumStr());
}
}
- } //swmod 080219
+ }
if( bNumChg )
GetFtnIdxs().UpdateAllFtn();
else if( bFtnChrFmts )
@@ -394,7 +394,7 @@ bool SwDoc::SetCurFtn( const SwPaM& rPam, const OUString& rNumStr,
sal_uInt16 nNumber, bool bIsEndNote )
{
SwFtnIdxs& rFtnArr = GetFtnIdxs();
- SwRootFrm* pTmpRoot = GetCurrentLayout();//swmod 080219
+ SwRootFrm* pTmpRoot = GetCurrentLayout();
const SwPosition* pStt = rPam.Start(), *pEnd = rPam.End();
const sal_uLong nSttNd = pStt->nNode.GetIndex();
@@ -494,7 +494,7 @@ bool SwDoc::SetCurFtn( const SwPaM& rPam, const OUString& rNumStr,
{
std::set<SwRootFrm*> aAllLayouts = GetAllLayouts();
std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::mem_fun(&SwRootFrm::UpdateFtnNums));
- } //swmod 080304pTmpRoot->UpdateFtnNums(); //swmod 080219
+ }
SetModified();
}
else
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index fb5b417..b06d003 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -663,7 +663,7 @@ SwFlyFrmFmt* SwDoc::_MakeFlySection( const SwPosition& rAnchPos,
// Set up frames
if( GetCurrentViewShell() )
- pFmt->MakeFrms(); // ??? //swmod 071108//swmod 071225
+ pFmt->MakeFrms(); // ???
if (GetIDocumentUndoRedo().DoesUndo())
{
@@ -1030,12 +1030,12 @@ SwPosFlyFrms SwDoc::GetAllFlyFmts( const SwPaM* pCmpRange, bool bDrawAlso,
// If we don't have a layout we can't get page anchored FlyFrames.
// Also, page anchored FlyFrames are only returned if no range is specified.
- if( !GetCurrentViewShell() || pCmpRange ) //swmod 071108//swmod 071225
+ if( !GetCurrentViewShell() || pCmpRange )
{
return aRetval;
}
- SwPageFrm *pPage = (SwPageFrm*)GetCurrentLayout()->GetLower(); //swmod 080218
+ SwPageFrm *pPage = (SwPageFrm*)GetCurrentLayout()->GetLower();
while( pPage )
{
if( pPage->GetSortedObjs() )
@@ -1798,7 +1798,7 @@ IMPL_LINK( SwDoc, DoIdleJobs, Timer *, pTimer )
pModLogFile = new ::rtl::Logfile( "First DoIdleJobs" );
#endif
- SwRootFrm* pTmpRoot = GetCurrentLayout();//swmod 080219
+ SwRootFrm* pTmpRoot = GetCurrentLayout();
if( pTmpRoot &&
!SfxProgress::GetActiveProgress( mpDocShell ) )
{
@@ -1823,7 +1823,7 @@ IMPL_LINK( SwDoc, DoIdleJobs, Timer *, pTimer )
if (bIsOnlineSpell && bIsAutoGrammar)
StartGrammarChecking( *this );
}
- std::set<SwRootFrm*> aAllLayouts = GetAllLayouts();//swmod 080320
+ std::set<SwRootFrm*> aAllLayouts = GetAllLayouts();
std::set<SwRootFrm*>::iterator pLayIter = aAllLayouts.begin();
for ( ;pLayIter != aAllLayouts.end();++pLayIter )
{
@@ -1873,7 +1873,7 @@ IMPL_LINK( SwDoc, DoIdleJobs, Timer *, pTimer )
GetUpdtFlds().SetInUpdateFlds( false );
GetUpdtFlds().SetFieldsDirty( false );
}
- } //swmod 080219
+ }
#ifdef TIMELOG
if( pModLogFile && 1 != (long)pModLogFile )
delete pModLogFile, ((long&)pModLogFile) = 1;
@@ -1884,7 +1884,7 @@ IMPL_LINK( SwDoc, DoIdleJobs, Timer *, pTimer )
IMPL_STATIC_LINK( SwDoc, BackgroundDone, SvxBrushItem*, EMPTYARG )
{
ViewShell *pSh, *pStartSh;
- pSh = pStartSh = pThis->GetCurrentViewShell(); //swmod 071108//swmod 071225
+ pSh = pStartSh = pThis->GetCurrentViewShell();
if( pStartSh )
do {
if( pSh->GetWin() )
@@ -2123,7 +2123,7 @@ bool SwDoc::IsInHeaderFooter( const SwNodeIndex& rIdx ) const
// Because Redlines are also attached to Start and EndNoden,
// the Index must not necessarily be from a ContentNode.
SwNode* pNd = &rIdx.GetNode();
- if( pNd->IsCntntNode() && mpCurrentView )//swmod 071029//swmod 071225
+ if( pNd->IsCntntNode() && mpCurrentView )
{
const SwFrm *pFrm = pNd->GetCntntNode()->getLayoutFrm( GetCurrentLayout() );
if( pFrm )
@@ -2266,7 +2266,7 @@ ViewShell *SwDoc::GetCurrentViewShell()
return mpCurrentView;
}
-//swmod 080219
+
// It must be able to communicate to a ViewShell. This is going to be removed later.
const SwRootFrm *SwDoc::GetCurrentLayout() const
{
@@ -2306,6 +2306,6 @@ std::set<SwRootFrm*> SwDoc::GetAllLayouts()
}
return aAllLayouts;
-} //swmod 070825
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index ea4095f..36eaf7b 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -202,7 +202,7 @@ SwDoc::SwDoc()
mpGrfFmtCollTbl( new SwGrfFmtColls() ),
mpTOXTypes( new SwTOXTypes() ),
mpDefTOXBases( new SwDefTOXBase_Impl() ),
- mpCurrentView( 0 ), //swmod 071225
+ mpCurrentView( 0 ),
mpDrawModel( 0 ),
mpUpdtFlds( new SwDocUpdtFld( this ) ),
mpFldTypes( new SwFldTypes() ),
@@ -818,7 +818,7 @@ void SwDoc::ClearDoc()
// create the first one over and over again (without attributes/style etc.
SwTxtNode* pFirstNd = GetNodes().MakeTxtNode( aSttIdx, mpDfltTxtFmtColl );
- if( mpCurrentView ) //swmod 071029//swmod 071225
+ if( mpCurrentView )
{
// set the layout to the dummy pagedesc
pFirstNd->SetAttr( SwFmtPageDesc( pDummyPgDsc ));
@@ -887,7 +887,7 @@ void SwDoc::ClearDoc()
DeleteAndDestroy(*mpFrmFmtTbl, 1, mpFrmFmtTbl->size());
mpFrmFmtTbl->push_back( mpCurrentView->GetLayout()->GetFmt() );
}
- else //swmod 071029//swmod 071225
+ else
DeleteAndDestroy(*mpFrmFmtTbl, 1, mpFrmFmtTbl->size());
mxForbiddenCharsTable.clear();
@@ -984,7 +984,7 @@ void SwDoc::UpdateLinks( bool bUI )
SfxMedium* pMedium = GetDocShell()->GetMedium();
SfxFrame* pFrm = pMedium ? pMedium->GetLoadTargetFrame() : 0;
Window* pDlgParent = pFrm ? &pFrm->GetWindow() : 0;
- if( GetCurrentViewShell() && !GetEditShell( &pVSh ) && !pVSh ) //swmod 071108//swmod 071225
+ if( GetCurrentViewShell() && !GetEditShell( &pVSh ) && !pVSh )
{
ViewShell aVSh( *this, 0, 0 );
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 040fec2..28bdde5 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -2741,7 +2741,7 @@ void SwRedlineTbl::Remove( sal_uInt16 nP )
ViewShell* pSh;
if( pDoc && !pDoc->IsInDtor() &&
- 0 != ( pSh = pDoc->GetCurrentViewShell()) ) //swmod 071108//swmod 071225
+ 0 != ( pSh = pDoc->GetCurrentViewShell()) )
pSh->InvalidateWindows( SwRect( 0, 0, LONG_MAX, LONG_MAX ) );
}
@@ -2762,7 +2762,7 @@ void SwRedlineTbl::DeleteAndDestroy( sal_uInt16 nP, sal_uInt16 nL )
ViewShell* pSh;
if( pDoc && !pDoc->IsInDtor() &&
- 0 != ( pSh = pDoc->GetCurrentViewShell() ) ) //swmod 071108//swmod 071225
+ 0 != ( pSh = pDoc->GetCurrentViewShell() ) )
pSh->InvalidateWindows( SwRect( 0, 0, LONG_MAX, LONG_MAX ) );
}
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 6e5f7cd..a5919b1 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -745,7 +745,7 @@ bool SwTOXBaseSection::SetPosAtStartEnd( SwPosition& rPos, bool bAtStart ) const
/// Collect table of contents content
void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
- const bool _bNewTOX )//swmodtest 080307
+ const bool _bNewTOX )
{
const SwSectionNode* pSectNd;
if( !SwTOXBase::GetRegisteredIn()->GetDepends() ||
@@ -1013,7 +1013,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
for ( std::set<SwRootFrm*>::iterator pLayoutIter = aAllLayouts.begin(); pLayoutIter != aAllLayouts.end(); ++pLayoutIter)
{
SwFrm::CheckPageDescs( (SwPageFrm*)(*pLayoutIter)->Lower() );
- }//swmod 080310
+ }
SetProtect( SwTOXBase::IsProtected() );
}
diff --git a/sw/source/core/doc/ftnidx.cxx b/sw/source/core/doc/ftnidx.cxx
index 91bcb89..ff65d94 100644
--- a/sw/source/core/doc/ftnidx.cxx
+++ b/sw/source/core/doc/ftnidx.cxx
@@ -166,7 +166,7 @@ void SwFtnIdxs::UpdateAllFtn()
SwUpdFtnEndNtAtEnd aNumArr;
- SwRootFrm* pTmpRoot = pDoc->GetCurrentLayout();//swmod 080305
+ SwRootFrm* pTmpRoot = pDoc->GetCurrentLayout();
std::set<SwRootFrm*> aAllLayouts = pDoc->GetAllLayouts();
// For normal Footnotes per-chapter and per-document numbering are treated separately.
// For Endnotes we only have document-wise numbering.
@@ -236,7 +236,7 @@ void SwFtnIdxs::UpdateAllFtn()
}
if( pTmpRoot && FTNNUM_PAGE == rFtnInfo.eNum )
- std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::mem_fun(&SwRootFrm::UpdateFtnNums));//swmod 0
+ std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::mem_fun(&SwRootFrm::UpdateFtnNums));
}
SwTxtFtn* SwFtnIdxs::SeekEntry( const SwNodeIndex& rPos, sal_uInt16* pFndPos ) const
diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx
index 0287a98..ba545ab 100644
--- a/sw/source/core/doc/htmltbl.cxx
+++ b/sw/source/core/doc/htmltbl.cxx
@@ -331,7 +331,7 @@ sal_uInt16 SwHTMLTableLayout::GetBrowseWidthByVisArea( const SwDoc& rDoc )
sal_uInt16 SwHTMLTableLayout::GetBrowseWidth( const SwDoc& rDoc )
{
// If we have a layout, we can get the width from there.
- const SwRootFrm *pRootFrm = rDoc.GetCurrentLayout(); //swmod 080218
+ const SwRootFrm *pRootFrm = rDoc.GetCurrentLayout();
if( pRootFrm )
{
const SwFrm *pPageFrm = pRootFrm->GetLower();
@@ -1691,13 +1691,13 @@ void SwHTMLTableLayout::_Resize( sal_uInt16 nAbsAvail, sal_Bool bRecalc )
SwRootFrm *pRoot = (SwRootFrm*)GetDoc()->GetCurrentViewShell()->GetLayout();
if ( pRoot && pRoot->IsCallbackActionEnabled() )
- pRoot->StartAllAction(); //swmod 071108//swmod 071225
+ pRoot->StartAllAction();
// Else we can set the widths, in which we have to run Pass 2 in each case.
SetWidths( sal_True, nAbsAvail );
if ( pRoot && pRoot->IsCallbackActionEnabled() )
- pRoot->EndAllAction( sal_True ); //True per VirDev (browsing is calmer) //swmod 071108//swmod 071225
+ pRoot->EndAllAction( sal_True ); //True per VirDev (browsing is calmer)
}
IMPL_STATIC_LINK( SwHTMLTableLayout, DelayedResize_Impl, void*, EMPTYARG )
diff --git a/sw/source/core/doc/lineinfo.cxx b/sw/source/core/doc/lineinfo.cxx
index 43150ad..ec449b5 100644
--- a/sw/source/core/doc/lineinfo.cxx
+++ b/sw/source/core/doc/lineinfo.cxx
@@ -27,19 +27,19 @@
void SwDoc::SetLineNumberInfo( const SwLineNumberInfo &rNew )
{
- SwRootFrm* pTmpRoot = GetCurrentLayout();//swmod 080219
+ SwRootFrm* pTmpRoot = GetCurrentLayout();
if ( pTmpRoot &&
(rNew.IsCountBlankLines() != mpLineNumberInfo->IsCountBlankLines() ||
rNew.IsRestartEachPage() != mpLineNumberInfo->IsRestartEachPage()) )
{
- std::set<SwRootFrm*> aAllLayouts = GetAllLayouts();//swmod 080225
+ std::set<SwRootFrm*> aAllLayouts = GetAllLayouts();
pTmpRoot->StartAllAction();
// FME 2007-08-14 #i80120# Invalidate size, because ChgThisLines()
// is only (onny may only be) called by the formatting routines
//pTmpRoot->InvalidateAllCntnt( INV_LINENUM | INV_SIZE );
- std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::InvalidateAllCntnt), INV_LINENUM | INV_SIZE));//swmod 080226
+ std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::InvalidateAllCntnt), INV_LINENUM | INV_SIZE));
pTmpRoot->EndAllAction();
- } //swmod 080219
+ }
*mpLineNumberInfo = rNew;
SetModified();
}
@@ -138,7 +138,7 @@ void SwLineNumberInfo::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew
{
pRoot->StartAllAction();
std::set<SwRootFrm*> aAllLayouts = pDoc->GetAllLayouts();
- std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::mem_fun(&SwRootFrm::AllAddPaintRect));//swmod 080305
+ std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::mem_fun(&SwRootFrm::AllAddPaintRect));
//pRoot->GetCurrShell()->AddPaintRect( pRoot->Frm() );
pRoot->EndAllAction();
}
diff --git a/sw/source/core/doc/swserv.cxx b/sw/source/core/doc/swserv.cxx
index de8a8a5..708c118 100644
--- a/sw/source/core/doc/swserv.cxx
+++ b/sw/source/core/doc/swserv.cxx
@@ -302,7 +302,7 @@ SwDataChanged::SwDataChanged( SwDoc* pDc, const SwPosition& rPos )
SwDataChanged::~SwDataChanged()
{
// JP 09.04.96: Only if the Layout is available (thus during input)
- if( pDoc->GetCurrentViewShell() ) //swmod 071108//swmod 071225
+ if( pDoc->GetCurrentViewShell() )
{
const ::sfx2::SvLinkSources& rServers = pDoc->GetLinkManager().GetServers();
diff --git a/sw/source/core/doc/visiturl.cxx b/sw/source/core/doc/visiturl.cxx
index 6f27b61..8c9ac67 100644
--- a/sw/source/core/doc/visiturl.cxx
+++ b/sw/source/core/doc/visiturl.cxx
@@ -41,7 +41,7 @@ SwURLStateChanged::~SwURLStateChanged()
void SwURLStateChanged::Notify( SfxBroadcaster& , const SfxHint& rHint )
{
- if( rHint.ISA( INetURLHistoryHint ) && pDoc->GetCurrentViewShell() ) //swmod 071108//swmod 071225
+ if( rHint.ISA( INetURLHistoryHint ) && pDoc->GetCurrentViewShell() )
{
// This URL has been changed:
const INetURLObject* pIURL = ((INetURLHistoryHint&)rHint).GetObject();
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index 9d6dbb4..e9a03e7 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -343,7 +343,7 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz,
if( bNewFrms )
bNewFrms = &GetDoc()->GetNodes() == (const SwNodes*)&rNds &&
- GetDoc()->GetCurrentViewShell(); //swmod 071108//swmod 071225
+ GetDoc()->GetCurrentViewShell();
if( bNewFrms )
{
@@ -2044,7 +2044,7 @@ SwNode* SwNodes::FindPrvNxtFrmNode( SwNodeIndex& rFrmIdx,
SwNode* pFrmNd = 0;
// no layout -> skip
- if( GetDoc()->GetCurrentViewShell() ) //swmod 071108//swmod 071225
+ if( GetDoc()->GetCurrentViewShell() )
{
SwNode* pSttNd = &rFrmIdx.GetNode();
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 6026513..2674ff7 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -1062,7 +1062,7 @@ void SwDrawContact::Changed( const SdrObject& rObj,
//Put on Action, but not if presently anywhere an action runs.
ViewShell *pSh = 0, *pOrg;
- SwRootFrm *pTmpRoot = pDoc->GetCurrentLayout();//swmod 080317
+ SwRootFrm *pTmpRoot = pDoc->GetCurrentLayout();
if ( pTmpRoot && pTmpRoot->IsCallbackActionEnabled() )
{
pDoc->GetEditShell( &pOrg );
diff --git a/sw/source/core/draw/dpage.cxx b/sw/source/core/draw/dpage.cxx
index 4eff6b1..9f18b52 100644
--- a/sw/source/core/draw/dpage.cxx
+++ b/sw/source/core/draw/dpage.cxx
@@ -83,7 +83,7 @@ void InsertGridFrame( SdrPageGridFrameList *pLst, const SwFrm *pPg )
const SdrPageGridFrameList* SwDPage::GetGridFrameList(
const SdrPageView* pPV, const Rectangle *pRect ) const
{
- ViewShell *pSh = ((SwDrawDocument*)GetModel())->GetDoc().GetCurrentViewShell(); //swmod 071108//swmod 071225
+ ViewShell *pSh = ((SwDrawDocument*)GetModel())->GetDoc().GetCurrentViewShell();
if ( pSh )
{
while ( pSh->Imp()->GetPageView() != pPV )
diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx
index c36a233..266324d 100644
--- a/sw/source/core/draw/dview.cxx
+++ b/sw/source/core/draw/dview.cxx
@@ -930,7 +930,7 @@ void SwDrawView::ReplaceMarkedDrawVirtObjs( SdrMarkView& _rMarkView )
void SwDrawView::DeleteMarked()
{
SwDoc* pDoc = Imp().GetShell()->GetDoc();
- SwRootFrm *pTmpRoot = pDoc->GetCurrentLayout();//swmod 080317
+ SwRootFrm *pTmpRoot = pDoc->GetCurrentLayout();
if ( pTmpRoot )
pTmpRoot->StartAllAction();
pDoc->GetIDocumentUndoRedo().StartUndo(UNDO_EMPTY, NULL);
@@ -953,7 +953,7 @@ void SwDrawView::DeleteMarked()
}
pDoc->GetIDocumentUndoRedo().EndUndo(UNDO_EMPTY, NULL);
if( pTmpRoot )
- pTmpRoot->EndAllAction(); //swmod 080218
+ pTmpRoot->EndAllAction();
}
// support enhanced text edit for draw objects
diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx
index 40240a6..1f69c78 100644
--- a/sw/source/core/fields/ddefld.cxx
+++ b/sw/source/core/fields/ddefld.cxx
@@ -301,7 +301,7 @@ void SwDDEFieldType::_RefCntChgd()
{
refLink->SetVisible( pDoc->IsVisibleLinks() );
pDoc->GetLinkManager().InsertDDELink( refLink );
- if( pDoc->GetCurrentViewShell() ) //swmod 071108//swmod 071225
+ if( pDoc->GetCurrentViewShell() )
UpdateNow();
}
else
diff --git a/sw/source/core/fields/ddetbl.cxx b/sw/source/core/fields/ddetbl.cxx
index 48e9da0..940abf6 100644
--- a/sw/source/core/fields/ddetbl.cxx
+++ b/sw/source/core/fields/ddetbl.cxx
@@ -167,7 +167,7 @@ sal_Bool SwDDETable::NoDDETable()
GetTabLines().begin(), GetTabLines().end() ); // move lines
GetTabLines().clear();
- if( pDoc->GetCurrentViewShell() ) //swmod 071108//swmod 071225
+ if( pDoc->GetCurrentViewShell() )
((SwDDEFieldType*)aDepend.GetRegisteredIn())->DecRefCnt();
pTblNd->SetNewTable( pNewTbl ); // replace table
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index 3967351..dfafdcc 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -754,8 +754,8 @@ OUString SwDocStatFieldType::Expand(sal_uInt16 nSubType, sal_uInt32 nFmt) const
case DS_WORD: nVal = rDStat.nWord; break;
case DS_CHAR: nVal = rDStat.nChar; break;
case DS_PAGE:
- if( pDoc->GetCurrentLayout() )//swmod 080218
- ((SwDocStat &)rDStat).nPage = pDoc->GetCurrentLayout()->GetPageNum(); //swmod 080218
+ if( pDoc->GetCurrentLayout() )
+ ((SwDocStat &)rDStat).nPage = pDoc->GetCurrentLayout()->GetPageNum();
nVal = rDStat.nPage;
if( SVX_NUM_PAGEDESC == nFmt )
nFmt = (sal_uInt32)nNumberingType;
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index 648ed1e..574f0f2 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -159,7 +159,7 @@ static sal_Bool lcl_FindAnchorPos( SwDoc& rDoc, const Point& rPt, const SwFrm& r
SwCrsrMoveState aState( MV_SETONLYTEXT );
SwPosition aPos( rDoc.GetNodes() );
aTmpPnt.setX(aTmpPnt.getX() - 1); // do not land in the fly!
- rDoc.GetCurrentLayout()->GetCrsrOfst( &aPos, aTmpPnt, &aState ); //swmod 071108//swmod 071225
+ rDoc.GetCurrentLayout()->GetCrsrOfst( &aPos, aTmpPnt, &aState );
pNewAnch = ::FindAnchor(
aPos.nNode.GetNode().GetCntntNode()->getLayoutFrm( rFrm.getRootFrm(), 0, 0, sal_False ),
aTmpPnt )->FindFlyFrm();
@@ -955,7 +955,7 @@ void SwFEShell::SetPageObjsNewPage( std::vector<SwFrmFmt*>& rFillArr, int nOffse
StartUndo();
long nNewPage;
- SwRootFrm* pTmpRootFrm = GetLayout();//swmod 080317
+ SwRootFrm* pTmpRootFrm = GetLayout();
sal_uInt16 nMaxPage = pTmpRootFrm->GetPageNum();
bool bTmpAssert = false;
for( sal_uInt16 n = 0; n < rFillArr.size(); ++n )
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index 713a6b0..3a93e69 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -1631,7 +1631,7 @@ sal_Bool SwFEShell::ImpEndCreate()
SwPosition aPos( GetDoc()->GetNodes() );
SwCrsrMoveState aState( MV_SETONLYTEXT );
Point aPoint( aPt.getX(), aPt.getY() + rBound.GetHeight()/2 );
- GetLayout()->GetCrsrOfst( &aPos, aPoint, &aState ); //swmod 080317
+ GetLayout()->GetCrsrOfst( &aPos, aPoint, &aState );
// characterbinding not allowed in readonly-content
if( !aPos.nNode.GetNode().IsProtect() )
diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx
index aab34be..615ef1f 100644
--- a/sw/source/core/frmedt/tblsel.cxx
+++ b/sw/source/core/frmedt/tblsel.cxx
@@ -138,7 +138,7 @@ void GetTblSelCrs( const SwTableCursor& rTblCrsr, SwSelBoxes& rBoxes )
if (rTblCrsr.IsChgd() || !rTblCrsr.GetSelectedBoxesCount())
{
SwTableCursor* pTCrsr = (SwTableCursor*)&rTblCrsr;
- pTCrsr->GetDoc()->GetCurrentLayout()->MakeTblCrsrs( *pTCrsr ); //swmod 080218
+ pTCrsr->GetDoc()->GetCurrentLayout()->MakeTblCrsrs( *pTCrsr );
}
if (rTblCrsr.GetSelectedBoxesCount())
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 5dc05fd..c9e7376 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -678,7 +678,7 @@ sal_Bool SwGrfNode::RestorePersistentData()
IDocumentLinksAdministration* pIDLA = getIDocumentLinksAdministration();
refLink->SetVisible( pIDLA->IsVisibleLinks() );
pIDLA->GetLinkManager().InsertDDELink( refLink );
- if( getIDocumentLayoutAccess()->GetCurrentLayout() ) //swmod 080218
+ if( getIDocumentLayoutAccess()->GetCurrentLayout() )
refLink->Update();
}
return sal_True;
diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx
index ee71eb6..d374ded 100644
--- a/sw/source/core/inc/rootfrm.hxx
+++ b/sw/source/core/inc/rootfrm.hxx
@@ -149,11 +149,11 @@ public:
//MasterObjekte aus der Page entfernen (von den Ctoren gerufen).
static void RemoveMasterObjs( SdrPage *pPg );
- void AllCheckPageDescs() const;//swmod 080226
- void AllInvalidateAutoCompleteWords() const;//swmod 080305
+ void AllCheckPageDescs() const;
+ void AllInvalidateAutoCompleteWords() const;
void AllAddPaintRect() const;
- void AllRemoveFtns() ;//swmod 080305
- void AllInvalidateSmartTagsOrSpelling(bool bSmartTags) const;//swmod 080307
+ void AllRemoveFtns() ;
+ void AllInvalidateSmartTagsOrSpelling(bool bSmartTags) const;
//Virtuelles Device ausgeben (z.B. wenn Animationen ins Spiel kommen)
static sal_Bool FlushVout();
//Clipping sparen, wenn im Vout eh genau das Cliprechteck ausgegeben wird
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 8fc790c..597f8db 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -2645,7 +2645,7 @@ void SwFlyFrmFmt::MakeFrms()
{
// is there a layout?
if( !GetDoc()->GetCurrentViewShell() )
- return; //swmod 071108//swmod 071225
+ return;
SwModify *pModify = 0;
// OD 24.07.2003 #111032# - create local copy of anchor attribute for possible changes.
@@ -2705,7 +2705,7 @@ void SwFlyFrmFmt::MakeFrms()
case FLY_AT_PAGE:
{
sal_uInt16 nPgNum = aAnchorAttr.GetPageNum();
- SwPageFrm *pPage = (SwPageFrm*)GetDoc()->GetCurrentLayout()->Lower(); //swmod 080218
+ SwPageFrm *pPage = (SwPageFrm*)GetDoc()->GetCurrentLayout()->Lower();
if( !nPgNum && aAnchorAttr.GetCntntAnchor() )
{
SwCntntNode *pCNd =
diff --git a/sw/source/core/layout/colfrm.cxx b/sw/source/core/layout/colfrm.cxx
index ae174d2..ef7847c 100644
--- a/sw/source/core/layout/colfrm.cxx
+++ b/sw/source/core/layout/colfrm.cxx
@@ -223,7 +223,7 @@ void SwLayoutFrm::ChgColumns( const SwFmtCol &rOld, const SwFmtCol &rNew,
// SaveCntnt would also suck up the content of the footnote container
// and store it within the normal text flow.
if( IsPageBodyFrm() )
- pDoc->GetCurrentLayout()->RemoveFtns( (SwPageFrm*)GetUpper(), sal_True, sal_False ); //swmod 080218
+ pDoc->GetCurrentLayout()->RemoveFtns( (SwPageFrm*)GetUpper(), sal_True, sal_False );
pSave = ::SaveCntnt( this );
//If columns exist, they get deleted if a column count of 0 or 1 is requested.
diff --git a/sw/source/core/layout/flypos.cxx b/sw/source/core/layout/flypos.cxx
index 0bceb6b..661a4e9 100644
--- a/sw/source/core/layout/flypos.cxx
+++ b/sw/source/core/layout/flypos.cxx
@@ -46,7 +46,7 @@ SwPosFlyFrm::SwPosFlyFrm( const SwNodeIndex& rIdx, const SwFrmFmt* pFmt,
{
pNdIdx = new SwNodeIndex( rIdx );
}
- else if( pFmt->GetDoc()->GetCurrentViewShell() ) //swmod 071108//swmod 071225
+ else if( pFmt->GetDoc()->GetCurrentViewShell() )
{
if( RES_FLYFRMFMT == pFmt->Which() )
{
diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx
index 2bb2a792..ce9db62 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -173,7 +173,7 @@ bool SwLayCacheImpl::Read( SvStream& rStream )
void SwLayoutCache::Write( SvStream &rStream, const SwDoc& rDoc )
{
- if( rDoc.GetCurrentLayout() ) // the layout itself .. //swmod 080218
+ if( rDoc.GetCurrentLayout() ) // the layout itself ..
{
SwLayCacheIoImpl aIo( rStream, true );
// We want to save the relative index, so we need the index
@@ -181,7 +181,7 @@ void SwLayoutCache::Write( SvStream &rStream, const SwDoc& rDoc )
sal_uLong nStartOfContent = rDoc.GetNodes().GetEndOfContent().
StartOfSectionNode()->GetIndex();
// The first page..
- SwPageFrm* pPage = (SwPageFrm*)rDoc.GetCurrentLayout()->Lower(); //swmod 080218
+ SwPageFrm* pPage = (SwPageFrm*)rDoc.GetCurrentLayout()->Lower();
aIo.OpenRec( SW_LAYCACHE_IO_REC_PAGES );
aIo.OpenFlagRec( 0, 0 );
diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
index 960fec7..9676a90 100644
--- a/sw/source/core/layout/newfrm.cxx
+++ b/sw/source/core/layout/newfrm.cxx
@@ -655,7 +655,7 @@ void SwRootFrm::AllCheckPageDescs() const
{
CheckPageDescs( (SwPageFrm*)this->Lower() );
}
-//swmod 080226
+
void SwRootFrm::AllInvalidateAutoCompleteWords() const
{
SwPageFrm *pPage = (SwPageFrm*)this->Lower();
@@ -664,11 +664,11 @@ void SwRootFrm::AllInvalidateAutoCompleteWords() const
pPage->InvalidateAutoCompleteWords();
pPage = (SwPageFrm*)pPage->GetNext();
}
-}//swmod 080305
+}
void SwRootFrm::AllAddPaintRect() const
{
GetCurrShell()->AddPaintRect( this->Frm() );
-}//swmod 080305
+}
void SwRootFrm::AllRemoveFtns()
{
RemoveFtns();
@@ -683,7 +683,7 @@ void SwRootFrm::AllInvalidateSmartTagsOrSpelling(bool bSmartTags) const
pPage->InvalidateSpelling();
pPage = (SwPageFrm*)pPage->GetNext();
- } //swmod 080218
+ }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx
index c4894bd..99b6dda 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -143,7 +143,7 @@ SwSectionFrm::~SwSectionFrm()
{
SwRootFrm *pRootFrm = getRootFrm();
if( pRootFrm )
- pRootFrm->RemoveFromList( this ); //swmod 071108//swmod 071225
+ pRootFrm->RemoveFromList( this );
if( IsFollow() )
{
SwSectionFrm *pMaster = FindMaster();
@@ -224,7 +224,7 @@ void SwSectionFrm::DelEmpty( sal_Bool bRemove )
getRootFrm()->RemoveFromList( this );
}
else if( getRootFrm() )
- getRootFrm()->InsertEmptySct( this ); //swmod 071108//swmod 071225
+ getRootFrm()->InsertEmptySct( this );
pSection = NULL; // like this a reanimation is virtually impossible though
}
}
diff --git a/sw/source/core/table/swnewtable.cxx b/sw/source/core/table/swnewtable.cxx
index 23edc85..be3728d 100644
--- a/sw/source/core/table/swnewtable.cxx
+++ b/sw/source/core/table/swnewtable.cxx
@@ -1395,7 +1395,7 @@ sal_Bool SwTable::NewSplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16
_FndBox aFndBox( 0, 0 );
aFndBox.SetTableLines( rBoxes, *this );
- if( bSameHeight && pDoc->GetCurrentViewShell() ) //swmod 071108//swmod 071225
+ if( bSameHeight && pDoc->GetCurrentViewShell() )
{
SwSplitLines aRowLines;
SwSplitLines aSplitLines;
diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx
index 74bf883..7a74d3e 100644
--- a/sw/source/core/text/itratr.cxx
+++ b/sw/source/core/text/itratr.cxx
@@ -428,13 +428,13 @@ static sal_Bool lcl_MinMaxString( SwMinMaxArgs& rArg, SwFont* pFnt, const OUStri
return bRet;
}
-sal_Bool SwTxtNode::IsSymbol( const xub_StrLen nBegin ) const//swmodtest 080307
+sal_Bool SwTxtNode::IsSymbol( const xub_StrLen nBegin ) const
{
SwScriptInfo aScriptInfo;
SwAttrIter aIter( *(SwTxtNode*)this, aScriptInfo );
aIter.Seek( nBegin );
return aIter.GetFnt()->IsSymbol(
- const_cast<ViewShell *>(getIDocumentLayoutAccess()->GetCurrentViewShell()) );//swmod 080311
+ const_cast<ViewShell *>(getIDocumentLayoutAccess()->GetCurrentViewShell()) );
}
class SwMinMaxNodeArgs
@@ -697,7 +697,7 @@ void SwTxtNode::GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rMa
{
OUString sTmp( cChar );
SwDrawTextInfo aDrawInf( const_cast<ViewShell *>(getIDocumentLayoutAccess()->GetCurrentViewShell()),
- *pOut, 0, sTmp, 0, 1, 0, sal_False );//swmod 080311
+ *pOut, 0, sTmp, 0, 1, 0, sal_False );
nAktWidth = aIter.GetFnt()->_GetTxtSize( aDrawInf ).Width();
aArg.nWordWidth += nAktWidth;
aArg.nRowWidth += nAktWidth;
diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx
index d31ab8d..1529ad6 100644
--- a/sw/source/core/text/redlnitr.cxx
+++ b/sw/source/core/text/redlnitr.cxx
@@ -49,7 +49,7 @@ void SwAttrIter::CtorInitAttrIter( SwTxtNode& rTxtNode, SwScriptInfo& rScrInf, S
{
// Beim HTML-Import kann es vorkommen, dass kein Layout existiert.
SwRootFrm* pRootFrm = rTxtNode.getIDocumentLayoutAccess()->GetCurrentLayout();
- pShell = pRootFrm ? pRootFrm->GetCurrShell() : 0; //swmod 080218
+ pShell = pRootFrm ? pRootFrm->GetCurrShell() : 0;
pScriptInfo = &rScrInf;
diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx
index 0133de7..ea4841c 100644
--- a/sw/source/core/text/txtfld.cxx
+++ b/sw/source/core/text/txtfld.cxx
@@ -150,7 +150,7 @@ SwExpandPortion *SwTxtFormatter::NewFldPortion( SwTxtFormatInfo &rInf,
case RES_PAGENUMBERFLD:
{
- if( !bName && pSh && pSh->GetLayout() && !pSh->Imp()->IsUpdateExpFlds() )//swmod 080122
+ if( !bName && pSh && pSh->GetLayout() && !pSh->Imp()->IsUpdateExpFlds() )
{
SwPageNumberFieldType *pPageNr = (SwPageNumberFieldType *)pFld->GetTyp();
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 6f07f4f..4e5152f 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -113,7 +113,7 @@ SwTxtNode *SwNodes::MakeTxtNode( const SwNodeIndex & rWhere,
// if there is no layout or it is in a hidden section, MakeFrms is not needed
const SwSectionNode* pSectNd;
- if( !GetDoc()->GetCurrentViewShell() || //swmod 071108//swmod 071225
+ if( !GetDoc()->GetCurrentViewShell() ||
( 0 != (pSectNd = pNode->FindSectionNode()) &&
pSectNd->GetSection().IsHiddenFlag() ))
return pNode;
@@ -280,7 +280,7 @@ xub_StrLen SwTxtNode::Len() const
static void lcl_ChangeFtnRef( SwTxtNode &rNode )
{
SwpHints *pSwpHints = rNode.GetpSwpHints();
- if( pSwpHints && rNode.GetDoc()->GetCurrentViewShell() ) //swmod 071108//swmod 071225
+ if( pSwpHints && rNode.GetDoc()->GetCurrentViewShell() )
{
SwTxtAttr* pHt;
SwCntntFrm* pFrm = NULL;
@@ -486,7 +486,7 @@ SwCntntNode *SwTxtNode::SplitCntntNode( const SwPosition &rPos )
const SwRootFrm *pRootFrm;
if ( (nTxtLen != nSplitPos) ||
( (pRootFrm = pNode->GetDoc()->GetCurrentLayout()) != 0 &&
- pRootFrm->IsAnyShellAccessible() ) ) //swmod 080218
+ pRootFrm->IsAnyShellAccessible() ) )
{
// dann sage den Frames noch, das am Ende etwas "geloescht" wurde
if( 1 == nTxtLen - nSplitPos )
diff --git a/sw/source/core/undo/unattr.cxx b/sw/source/core/undo/unattr.cxx
index 365c871..e4e35cb 100644
--- a/sw/source/core/undo/unattr.cxx
+++ b/sw/source/core/undo/unattr.cxx
@@ -478,7 +478,7 @@ bool SwUndoFmtAttr::RestoreFlyAnchor(::sw::UndoRedoContext & rContext)
aNewAnchor.SetPageNum( rAnchor.GetPageNum() );
Point aDrawSavePt, aDrawOldPt;
- if( pDoc->GetCurrentViewShell() ) //swmod 071108//swmod 071225
+ if( pDoc->GetCurrentViewShell() )
{
if( RES_DRAWFRMFMT == pFrmFmt->Which() )
{
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index a76c20d..f6ecc4f 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -706,7 +706,7 @@ void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape)
{
SwCrsrMoveState aState( MV_SETONLYTEXT );
Point aTmp(MM100_TO_TWIP(aMM100Pos.X), MM100_TO_TWIP(aMM100Pos.Y));
- pDoc->GetCurrentLayout()->GetCrsrOfst( pPam->GetPoint(), aTmp, &aState ); //swmod 080218
+ pDoc->GetCurrentLayout()->GetCrsrOfst( pPam->GetPoint(), aTmp, &aState );
aAnchor.SetAnchor( pPam->GetPoint() );
// #i32349# - adjustment of vertical positioning
@@ -1235,7 +1235,7 @@ void SwXShape::setPropertyValue(const OUString& rPropertyName, const uno::Any& a
aValue >>= nPositionLayoutDir;
pFmt->SetPositionLayoutDir( nPositionLayoutDir );
}
- else if( pDoc->GetCurrentLayout()) //swmod 080218
+ else if( pDoc->GetCurrentLayout())
{
UnoActionContext aCtx(pDoc);
if(RES_ANCHOR == pEntry->nWID && MID_ANCHOR_ANCHORTYPE == pEntry->nMemberId)
@@ -1448,7 +1448,7 @@ void SwXShape::setPropertyValue(const OUString& rPropertyName, const uno::Any& a
{
aKeepedPosition = getPosition();
}
- if( pFmt && pFmt->GetDoc()->GetCurrentViewShell() ) //swmod 071108//swmod 071225
+ if( pFmt && pFmt->GetDoc()->GetCurrentViewShell() )
{
UnoActionContext aCtx(pFmt->GetDoc());
xPrSet->setPropertyValue(rPropertyName, aValue);
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index c14ab21..5fa3419 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -188,7 +188,7 @@ void CollectFrameAtNode( SwClient& rClnt, const SwNodeIndex& rIdx,
? FLY_AT_CHAR : FLY_AT_PARA);
const SwCntntFrm* pCFrm;
const SwCntntNode* pCNd;
- if( pDoc->GetCurrentViewShell() && //swmod 071108//swmod 071225
+ if( pDoc->GetCurrentViewShell() &&
0 != (pCNd = rIdx.GetNode().GetCntntNode()) &&
0 != (pCFrm = pCNd->getLayoutFrm( pDoc->GetCurrentLayout())) )
{
diff --git a/sw/source/core/view/viewimp.cxx b/sw/source/core/view/viewimp.cxx
index b48df50..4c77bd8 100644
--- a/sw/source/core/view/viewimp.cxx
+++ b/sw/source/core/view/viewimp.cxx
@@ -47,7 +47,7 @@ void SwViewImp::Init( const SwViewOption *pNewOpt )
{
OSL_ENSURE( pDrawView, "SwViewImp::Init without DrawView" );
//Create PageView if it doesn't exist
- SwRootFrm *pRoot = pSh->GetLayout(); //swmod 071108//swmod 071225
+ SwRootFrm *pRoot = pSh->GetLayout();
if ( !pSdrPageView )
{
IDocumentDrawModelAccess* pIDDMA = pSh->getIDocumentDrawModelAccess();
@@ -279,10 +279,10 @@ void SwViewImp::UpdateAccessible()
// We require a layout and an XModel to be accessible.
IDocumentLayoutAccess* pIDLA = GetShell()->getIDocumentLayoutAccess();
Window *pWin = GetShell()->GetWin();
- OSL_ENSURE( GetShell()->GetLayout(), "no layout, no access" ); //swmod 071108//swmod 071225
+ OSL_ENSURE( GetShell()->GetLayout(), "no layout, no access" );
OSL_ENSURE( pWin, "no window, no access" );
- if( IsAccessible() && pIDLA->GetCurrentViewShell() && pWin ) //swmod 071108//swmod 071225
+ if( IsAccessible() && pIDLA->GetCurrentViewShell() && pWin )
GetAccessibleMap().GetDocumentView();
}
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 0dc456f..7929dbd 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -528,7 +528,7 @@ void ViewShell::MakeVisible( const SwRect &rRect )
StartAction();
ScrollMDI( this, rRect, USHRT_MAX, USHRT_MAX );
EndAction();
- } while( nOldH != pRoot->Frm().Height() && nLoopCnt-- ); //swmod 071108//swmod 071225
+ } while( nOldH != pRoot->Frm().Height() && nLoopCnt-- );
}
#if OSL_DEBUG_LEVEL > 0
else
@@ -1021,7 +1021,7 @@ void ViewShell::VisPortChgd( const SwRect &rRect)
// If possible, don't scroll the application background
// (PaintDesktop). Also limit the left and right side of
// the scroll range to the pages.
- const SwPageFrm *pPage = (SwPageFrm*)GetLayout()->Lower(); //swmod 071108//swmod 071225
+ const SwPageFrm *pPage = (SwPageFrm*)GetLayout()->Lower();
if ( pPage->Frm().Top() > pOldPage->Frm().Top() )
pPage = (SwPageFrm*)pOldPage;
SwRect aBoth( VisArea() );
@@ -1383,7 +1383,7 @@ void ViewShell::PaintDesktop( const SwRect &rRect )
//Unfortunately we must at any rate Paint the rectangles next to the pages,
//as these are not painted at VisPortChgd.
bool bBorderOnly = false;
- const SwRootFrm *pRoot = GetLayout();//swmod 080305
+ const SwRootFrm *pRoot = GetLayout();
if ( rRect.Top() > pRoot->Frm().Bottom() )
{
const SwFrm *pPg = pRoot->Lower();
@@ -1405,7 +1405,7 @@ void ViewShell::PaintDesktop( const SwRect &rRect )
if ( bBorderOnly )
{
- const SwFrm *pPage =pRoot->Lower(); //swmod 071108//swmod 071225
+ const SwFrm *pPage =pRoot->Lower();
SwRect aLeft( rRect ), aRight( rRect );
while ( pPage )
{
@@ -2144,7 +2144,7 @@ uno::Reference< ::com::sun::star::accessibility::XAccessible > ViewShell::Create
OSL_ENSURE( mpLayout, "no layout, no access" );
OSL_ENSURE( GetWin(), "no window, no access" );
- if( mpDoc->GetCurrentViewShell() && GetWin() ) //swmod 071108
+ if( mpDoc->GetCurrentViewShell() && GetWin() )
xAcc = Imp()->GetAccessibleMap().GetDocumentView();
return xAcc;
@@ -2166,7 +2166,7 @@ ViewShell::CreateAccessiblePreview()
PagePreviewLayout()->maPreviewPages,
GetWin()->GetMapMode().GetScaleX(),
GetLayout()->GetPageByPageNum( PagePreviewLayout()->mnSelectedPageNum ),
- PagePreviewLayout()->maWinSize ); //swmod 080305
+ PagePreviewLayout()->maWinSize );
}
return NULL;
}
diff --git a/sw/source/core/view/vnew.cxx b/sw/source/core/view/vnew.cxx
index b3e7ab9..a09df55 100644
--- a/sw/source/core/view/vnew.cxx
+++ b/sw/source/core/view/vnew.cxx
@@ -125,7 +125,7 @@ void ViewShell::Init( const SwViewOption *pNewOpt )
mpLayout->Init( mpDoc->GetDfltFrmFmt() );
}
}
- SizeChgNotify(); //swmod 071108
+ SizeChgNotify();
// --> #i31958#
// XForms mode: initialize XForms mode, based on design mode (draw view)
@@ -250,7 +250,7 @@ ViewShell::ViewShell( ViewShell& rShell, Window *pWindow,
mbEndActionByVirDev = sal_False;
mbPreview = 0 !=( VSHELLFLAG_ISPREVIEW & nFlags );
// OD 12.12.2002 #103492#
- if( nFlags & VSHELLFLAG_SHARELAYOUT ) //swmod 080125
+ if( nFlags & VSHELLFLAG_SHARELAYOUT )
mpLayout = rShell.mpLayout;
SET_CURR_SHELL( this );
@@ -332,7 +332,7 @@ ViewShell::~ViewShell()
delete mpDoc, mpDoc = 0;
else
GetLayout()->ResetNewLayout();
- }//swmod 080317
+ }
delete mpOpt;
diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx
index fdd9971..e21abd4 100644
--- a/sw/source/core/view/vprint.cxx
+++ b/sw/source/core/view/vprint.cxx
@@ -527,9 +527,9 @@ void ViewShell::PrtOle2( SwDoc *pDoc, const SwViewOption *pOpt, const SwPrintDat
// create a new view, or it has none, than we create the first view.
ViewShell *pSh;
if( pDoc->GetCurrentViewShell() )
- pSh = new ViewShell( *pDoc->GetCurrentViewShell(), 0, pOleOut,VSHELLFLAG_SHARELAYOUT );//swmod 080129
- else //swmod 071108//swmod 071225
- pSh = new ViewShell( *pDoc, 0, pOpt, pOleOut);//swmod 080129
+ pSh = new ViewShell( *pDoc->GetCurrentViewShell(), 0, pOleOut,VSHELLFLAG_SHARELAYOUT );
+ else
+ pSh = new ViewShell( *pDoc, 0, pOpt, pOleOut);
{
SET_CURR_SHELL( pSh );
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index ac47bbc..3156424 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -5060,7 +5060,7 @@ void _TblSaveStruct::MakeTable( sal_uInt16 nWidth, SwPosition& rPos, SwDoc *pDoc
SwTableNode *pTblNd = pTCntxt->GetTableNode();
OSL_ENSURE( pTblNd, "Wo ist der Tabellen-Node" );
- if( pDoc->GetCurrentViewShell() && pTblNd ) //swmod 071108//swmod 071225
+ if( pDoc->GetCurrentViewShell() && pTblNd )
{
// Existiert schon ein Layout, dann muss an dieser Tabelle die
// BoxFrames neu erzeugt werden.
diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx
index 8be21f2..459705f 100644
--- a/sw/source/filter/ww1/fltshell.cxx
+++ b/sw/source/filter/ww1/fltshell.cxx
@@ -506,7 +506,7 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos,
pFmt->SetFmtAttr(aAnchor);
// Damit die Frames bei Einfuegen in existierendes Doc
// erzeugt werden (erst nach Setzen des Ankers!):
- if(pDoc->GetCurrentViewShell() //swmod 071108//swmod 071225
+ if(pDoc->GetCurrentViewShell()
&& (FLY_AT_PARA == pFmt->GetAnchor().GetAnchorId()))
{
pFmt->MakeFrms();
@@ -1722,7 +1722,7 @@ void SwFltOutDoc::EndTable()
rStack.SetAttr( *pPaM->GetPoint(), 0, sal_False );
rEndStack.SetAttr( *pPaM->GetPoint(), 0, sal_False );
- if (GetDoc().GetCurrentViewShell()){ //swmod 071108//swmod 071225
+ if (GetDoc().GetCurrentViewShell()){
SwTableNode* pTableNode = GetDoc().IsIdxInTbl(
pPaM->GetPoint()->nNode);
pTableNode->DelFrms();
diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx
index 84de3bf..558bb46 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -816,7 +816,7 @@ namespace sw
}
InsertedTablesManager::InsertedTablesManager(const SwDoc &rDoc)
- : mbHasRoot(rDoc.GetCurrentLayout()) //swmod 080218
+ : mbHasRoot(rDoc.GetCurrentLayout())
{
}
diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx
index 5901720..ae756e2 100644
--- a/sw/source/filter/ww8/ww8graf2.cxx
+++ b/sw/source/filter/ww8/ww8graf2.cxx
@@ -373,7 +373,7 @@ SwFlyFrmFmt* SwWW8ImplReader::MakeGrafNotInCntnt(const WW8PicDesc& rPD,
&aFlySet, &rGrfSet, NULL);
// Damit die Frames bei Einfuegen in existierendes Doc erzeugt werden:
- if (rDoc.GetCurrentViewShell() && //swmod 071108//swmod 071225
+ if (rDoc.GetCurrentViewShell() &&
(FLY_AT_PARA == pFlyFmt->GetAnchor().GetAnchorId()))
{
pFlyFmt->MakeFrms();
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx
index 6542fbe..a090ebf 100644
--- a/sw/source/filter/xml/wrtxml.cxx
+++ b/sw/source/filter/xml/wrtxml.cxx
@@ -390,7 +390,7 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg,
}
}
- if( pDoc->GetCurrentViewShell() && pDoc->GetDocStat().nPage > 1 && //swmod 071108//swmod 071225
+ if( pDoc->GetCurrentViewShell() && pDoc->GetDocStat().nPage > 1 &&
!(bOrganizerMode || bBlock || bErr) )
{
OUString sStreamName("layout-cache");
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 940b9ce..2e129a2 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -2851,7 +2851,7 @@ void SwXMLTableContext::MakeTable()
}
// ??? this is always false: root frame is only created in ViewShell::Init
- if( pTableNode->GetDoc()->GetCurrentViewShell() ) //swmod 071108//swmod 071225
+ if( pTableNode->GetDoc()->GetCurrentViewShell() )
{
pTableNode->DelFrms();
SwNodeIndex aIdx( *pTableNode->EndOfSectionNode(), 1 );
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index a04194a..d2f9b7c 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -389,7 +389,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
pDocSh = (SwDocShell*)SfxObjectShell::GetNext( *pDocSh, &aType ) )
{
SwDoc* pTmp = pDocSh->GetDoc();
- if ( pTmp->GetCurrentViewShell() ) //swmod 071108//swmod 071225
+ if ( pTmp->GetCurrentViewShell() )
pTmp->InvalidateAutoCompleteFlag();
}
}
diff --git a/sw/source/ui/app/swmodul1.cxx b/sw/source/ui/app/swmodul1.cxx
index 0bda79b..7b59769 100644
--- a/sw/source/ui/app/swmodul1.cxx
+++ b/sw/source/ui/app/swmodul1.cxx
@@ -619,7 +619,7 @@ void SwModule::CheckSpellChanges( bool bOnlineSpelling,
pDocSh = (SwDocShell*)SfxObjectShell::GetNext( *pDocSh, &aType ) )
{
SwDoc* pTmp = pDocSh->GetDoc();
- if ( pTmp->GetCurrentViewShell() ) //swmod 071108//swmod 071225
+ if ( pTmp->GetCurrentViewShell() )
{
pTmp->SpellItAgainSam( bInvalid, bOnlyWrong, bSmartTags );
ViewShell* pViewShell = 0;
More information about the Libreoffice-commits
mailing list