Commits

Anonymous committed 39c0ac2

CWS swlayoutrefactoring: fixes for compilation on unxlngxi after resync

  • Participants
  • Parent commits e70d9d9

Comments (0)

Files changed (32)

File sw/inc/calbck.hxx

 //	friend class SwClientIter;
 
 	SwClient* pRoot;                // the start of the linked list of clients
-	BOOL bModifyLocked : 1;         // don't broadcast changes now
-	BOOL bLockClientList : 1;       // may be set when this instance notifies its clients
-	BOOL bInDocDTOR	: 1;            // workaround for problems when a lot of objects are destroyed
-	BOOL bInCache	: 1;
-	BOOL bInSwFntCache : 1;
+	sal_Bool bModifyLocked : 1;         // don't broadcast changes now
+	sal_Bool bLockClientList : 1;       // may be set when this instance notifies its clients
+	sal_Bool bInDocDTOR	: 1;            // workaround for problems when a lot of objects are destroyed
+	sal_Bool bInCache	: 1;
+	sal_Bool bInSwFntCache : 1;
 
     // mba: IMHO this method should be pure virtual
     virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
 
 	void LockModify()                   { bModifyLocked = sal_True;  }
 	void UnlockModify()  				{ bModifyLocked = sal_False; }
-	void SetInCache( BOOL bNew )		{ bInCache = bNew;		 }
-	void SetInSwFntCache( BOOL bNew ) 	{ bInSwFntCache = bNew;	 }
+	void SetInCache( sal_Bool bNew )		{ bInCache = bNew;		 }
+	void SetInSwFntCache( sal_Bool bNew ) 	{ bInSwFntCache = bNew;	 }
 	void SetInDocDTOR()                 { bInDocDTOR = sal_True; }
 	sal_Bool IsModifyLocked() const		{ return bModifyLocked;  }
 	sal_Bool IsInDocDTOR()	  const 	{ return bInDocDTOR;	 }

File sw/inc/swcrsr.hxx

     sal_Bool GoEndWord();
     sal_Bool GoNextWord();
     sal_Bool GoPrevWord();
-    sal_Bool SelectWord( const Point* pPt = 0 );
+    sal_Bool SelectWord( ViewShell* pViewShell, const Point* pPt = 0 );
 
     // API versions of above functions (will be used with a different
     // WordType for the break iterator)
     sal_Bool GoEndWordWT( sal_Int16 nWordType );
     sal_Bool GoNextWordWT( sal_Int16 nWordType );
     sal_Bool GoPrevWordWT( sal_Int16 nWordType );
-    sal_Bool SelectWordWT( sal_Int16 nWordType, const Point* pPt = 0 );
+    sal_Bool SelectWordWT( ViewShell* pViewShell, sal_Int16 nWordType, const Point* pPt = 0 );
 
 	enum SentenceMoveType
 	{

File sw/inc/viewopt.hxx

 	sal_Bool			bStarOneSetting : 1;// prevent from UI automatics (no scrollbars in readonly documents)
     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            bFormView : 1;
+    sal_Bool            mbFormView : 1;
     sal_Bool			mbBrowseMode : 1;    //swmod 080130
-    sal_Bool            bBookview : 1;      // view mode for page preview
+    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!
     mutable bool    bIdle;
     sal_Bool         IsSelectionInReadonly() const {return bSelectionInReadonly;}
     void         SetSelectionInReadonly(sal_Bool bSet) {bSelectionInReadonly = bSet;}
 
-    sal_Bool         IsFormView() const { return bFormView; }
-    void         SetFormView( sal_Bool bSet ) { bFormView = bSet; }
+    sal_Bool         IsFormView() const { return mbFormView; }
+    void         SetFormView( sal_Bool bSet ) { mbFormView = bSet; }
     // <--
 
     inline sal_Bool  getBrowseMode() const { return mbBrowseMode; }
     inline void  setBrowseMode(sal_Bool bSet) { mbBrowseMode = bSet; }
-    inline sal_Bool  IsPagePrevBookview() const { return bBookview; }
-    inline void  SetPagePrevBookview(sal_Bool bSet) { bBookview = bSet; }
+    inline sal_Bool  IsPagePrevBookview() const { return mbBookView; }
+    inline void  SetPagePrevBookview(sal_Bool bSet) { mbBookView = bSet; }
 
     sal_Bool IsAutoCompleteWords() const;
 

File sw/source/core/attr/calbck.cxx

 SwModify::SwModify() 
     : SwClient(0), pRoot(0) 
 {
-    bModifyLocked = FALSE;
-    bLockClientList = FALSE;
-	bInDocDTOR = FALSE;
-	bInCache = FALSE;
-	bInSwFntCache = FALSE;
+    bModifyLocked = sal_False;
+    bLockClientList = sal_False;
+	bInDocDTOR = sal_False;
+	bInCache = sal_False;
+	bInSwFntCache = sal_False;
 }
 
 SwModify::SwModify( SwModify *pToRegisterIn )
 	: SwClient(pToRegisterIn), pRoot( 0 )
 {
-    bModifyLocked = FALSE;
-    bLockClientList = FALSE;
-	bInDocDTOR = FALSE;
-	bInCache = FALSE;
-	bInSwFntCache = FALSE;
+    bModifyLocked = sal_False;
+    bLockClientList = sal_False;
+	bInDocDTOR = sal_False;
+	bInCache = sal_False;
+	bInSwFntCache = sal_False;
 }
 
 /*************************************************************************/

File sw/source/core/crsr/crsrsh.cxx

 	Size aOldSz( GetDocSize() );
 	SwCntntNode *pCNode = pShellCrsr->GetCntntNode();
 	SwCntntFrm  *pFrm = pCNode ?
-		pCNode->getLayoutFrm( GetLayout(), &pShellCrsr->GetPtPos(), pShellCrsr->GetPoint(), FALSE ) :0;
+		pCNode->getLayoutFrm( GetLayout(), &pShellCrsr->GetPtPos(), pShellCrsr->GetPoint(), sal_False ) :0;
 	if( !pFrm || (pFrm->IsTxtFrm() && ((SwTxtFrm*)pFrm)->IsHiddenNow()) )
 	{
 		SwCrsrMoveState aTmpState( MV_NONE );
         }
 
 		SwCntntFrm *pTblFrm = pPos->nNode.GetNode().GetCntntNode()->
-                              getLayoutFrm( GetLayout(), &aTmpPt, pPos, FALSE );
+                              getLayoutFrm( GetLayout(), &aTmpPt, pPos, sal_False );
 
         ASSERT( pTblFrm, "Tabelle Crsr nicht im Content ??" );
 
 				{
 					CalcLayout();
 					pFrm = pShellCrsr->GetCntntNode()->getLayoutFrm( GetLayout(),
-								&pShellCrsr->GetPtPos(), pShellCrsr->GetPoint(), FALSE );
+								&pShellCrsr->GetPtPos(), pShellCrsr->GetPoint(), sal_False );
 				}  while( !pFrm );
 			}
 			else if ( Imp()->IsIdleAction() )
     ASSERT( pBlockCrsr, "Don't call me without a block cursor" );
     SwShellCrsr &rBlock = pBlockCrsr->getShellCrsr();
     Point aPt = rBlock.GetPtPos();
-    SwCntntFrm* pFrm = rBlock.GetCntntNode()->getLayoutFrm( GetLayout(), &aPt, rBlock.GetPoint(), FALSE );
+    SwCntntFrm* pFrm = rBlock.GetCntntNode()->getLayoutFrm( GetLayout(), &aPt, rBlock.GetPoint(), sal_False );
     Point aMk;
     if( pBlockCrsr->getEndPoint() && pBlockCrsr->getStartPoint() )
     {

File sw/source/core/doc/docdesc.cxx

             }
         }
     }
-=======
-		sal_Bool bFtnInf = sal_False;
-		if ( sal_True == (bFtnInf = pLast == pFtnInfo->GetPageDescDep()) ||
-			 pLast == pEndNoteInfo->GetPageDescDep() )
-		{
-			aPageDescs[0]->Add( pLast );
-			if ( GetRootFrm() )
-				GetRootFrm()->CheckFtnPageDescs( !bFtnInf );
-		}
-	}
-
-	for ( sal_uInt16 j = 0; j < aPageDescs.Count(); ++j )
-	{
-		if ( aPageDescs[j]->GetFollow() == pDel )
-		{
-			aPageDescs[j]->SetFollow( 0 );
-			//Clients des PageDesc sind die Attribute, denen sagen wir bescheid.
-			//die Attribute wiederum reichen die Meldung an die Absaetze weiter.
-
-			//Layot benachrichtigen!
-			if( GetRootFrm() )  // ist nicht immer vorhanden!! (Orginizer)
-				GetRootFrm()->CheckPageDescs( (SwPageFrm*)GetRootFrm()->Lower() );
-		}
-	}
 }
 
 // #116530#
 				::SetProgressState( i, GetDocShell() );
 
 				SwOLENode* pOLENd = (*pNodes)[i];
-				pOLENd->SetOLESizeInvalid( sal_false );
+				pOLENd->SetOLESizeInvalid( sal_False );
 
 				//Kennen wir nicht, also muss das Objekt geladen werden.
 				//Wenn es keine Benachrichtigung wuenscht

File sw/source/core/doc/doclay.cxx

 				break;
 			}
 		}
-		BOOL bAllValid = pLayIter == aAllLayouts.end() ? 1 : 0;
+	    bool bAllValid = pLayIter == aAllLayouts.end() ? 1 : 0;
         if( bAllValid && ( AUTOUPD_FIELD_ONLY ==
                  ( nFldUpdFlag = getFieldUpdateFlags(true) )
 					|| AUTOUPD_FIELD_AND_CHARTS == nFldUpdFlag ) &&

File sw/source/core/doc/number.cxx

 	// dann suche mal in dem Doc nach dem NumRules-Object, in dem dieses
 	// NumFormat gesetzt ist. Das Format muss es nicht geben!
 	const SwCharFmt* pFmt = 0;
-    USHORT nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0;
+    sal_uInt16 nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0;
 	switch( nWhich )
 	{
 	case RES_ATTRSET_CHG:

File sw/source/core/docnode/node.cxx

 	else
 		pNd = GetCntntNode();
 
-	const SwFrm* pFrm;
-	if( pNd && 0 != ( pFrm = pNd->GetFrm( 0, 0, sal_False ) ) )
-	{
-		if( !pSh )
-			// dann die Shell vom Doc besorgen:
-			GetDoc()->GetEditShell( &pSh );
+	if( !pSh )
+		// dann die Shell vom Doc besorgen:
+		GetDoc()->GetEditShell( &pSh );
 
-		if( pSh )
-		{
+    if( pSh )
+    {
+	    const SwFrm* pFrm;
+	    if( pNd && 0 != ( pFrm = pNd->getLayoutFrm( pSh->GetLayout(), 0, 0, sal_False ) ) )
+	    {
+
 			if ( pFrm->IsInTab() )
 				pFrm = pFrm->FindTabFrm();
 

File sw/source/core/draw/dview.cxx

 	SwRootFrm *pTmpRoot = pDoc->GetCurrentLayout();//swmod 080317
     if ( pTmpRoot )
 		pTmpRoot->StartAllAction();	
-    pDoc->StartUndo(UNDO_EMPTY, NULL);
+    pDoc->GetIDocumentUndoRedo().StartUndo(UNDO_EMPTY, NULL);
     // OD 18.06.2003 #108784# - replace marked <SwDrawVirtObj>-objects by its
     // reference objects.
     {
 		FmFormView::DeleteMarked();
 		::FrameNotify( Imp().GetShell(), FLY_DRAG_END );
 	}
-    pDoc->EndUndo(UNDO_EMPTY, NULL);
+    pDoc->GetIDocumentUndoRedo().EndUndo(UNDO_EMPTY, NULL);
 	if( pTmpRoot )
 		pTmpRoot->EndAllAction();	//swmod 080218
 }

File sw/source/core/frmedt/fefly1.cxx

 		Point aPt( rPt );
 		GetLayout()->GetCrsrOfst( &aPos, aPt );
 		SwCntntNode *pNd = aPos.nNode.GetNode().GetCntntNode();
-		SwFrm* pFrm = pNd->getLayoutFrm( GetLayout(), &rPt, 0, FALSE )->FindFlyFrm();
+		SwFrm* pFrm = pNd->getLayoutFrm( GetLayout(), &rPt, 0, sal_False )->FindFlyFrm();
 		pRet = pFrm ? ((SwLayoutFrm*)pFrm)->GetFmt() : 0;
 	}
 	return pRet;

File sw/source/core/frmedt/fews.cxx

         {
             const bool bOldCallbackActionEnabled = GetLayout()->IsCallbackActionEnabled();
             if( bOldCallbackActionEnabled )
-                GetLayout()->SetCallbackActionEnabled( FALSE );
+                GetLayout()->SetCallbackActionEnabled( sal_False );
 			pFrm = GetCurrFrm();
             if( bOldCallbackActionEnabled )
-                GetLayout()->SetCallbackActionEnabled( TRUE );
+                GetLayout()->SetCallbackActionEnabled( sal_True );
         }
 	}
 

File sw/source/core/inc/UndoCore.hxx

 class SdrMarkList;
 class SwUndoDelete;
 class SwRedlineSaveData;
+class SwFrm;
+class SwFmt;
 
 namespace sw {
     class UndoManager;
     virtual void RedoImpl( ::sw::UndoRedoContext & );
 
     virtual SwRewriter GetRewriter() const;
+    void DeRegisterFromFormat( SwFmt& );
 };
 
 

File sw/source/core/inc/flyfrm.hxx

 class SwFlyFrm : public SwLayoutFrm, public SwAnchoredObject
 {
 	//darf Locken. Definiert in frmtool.cxx
-	friend void AppendObjs   ( const SwSpzFrmFmts *, ULONG, SwFrm *, SwPageFrm * );
+	friend void AppendObjs   ( const SwSpzFrmFmts *, sal_uLong, SwFrm *, SwPageFrm * );
     friend void Notify( SwFlyFrm *, SwPageFrm *pOld, const SwRect &rOld,
                         const SwRect* pOldPrt );
 

File sw/source/core/inc/rootfrm.hxx

 	void AllInvalidateAutoCompleteWords() const;//swmod 080305
 	void AllAddPaintRect() const;
 	void AllRemoveFtns() ;//swmod 080305
-	void AllInvalidateSmartTagsOrSpelling(BOOL bSmartTags) const;//swmod 080307
+	void AllInvalidateSmartTagsOrSpelling(sal_Bool bSmartTags) const;//swmod 080307
 	//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

File sw/source/core/layout/flowfrm.cxx

 	{
         const ViewShell *pSh = rThis.getRootFrm()->GetCurrShell();
         if( pSh && pSh->GetViewOptions()->getBrowseMode() )
-            return FALSE;
+            return sal_False;
         const SwAttrSet *pSet = rThis.GetAttrSet();
 
         //Vorgaenger ermitteln

File sw/source/core/layout/fly.cxx

     SdrPage* pPg( 0L );
 	if ( 0 != ( pPg = pContact->GetMaster()->GetPage() ) )
 	{
-		const UINT32 nOrdNum = pContact->GetMaster()->GetOrdNum();
+		const sal_uInt32 nOrdNum = pContact->GetMaster()->GetOrdNum();
 		pPg->ReplaceObject( pDrawObj, nOrdNum );
 	}
     // --> OD 2004-08-16 #i27030# - insert new <SwVirtFlyDrawObj> instance

File sw/source/core/layout/frmtool.cxx

 {
 	pDoc->BlockIdling();
 	SwRootFrm* pLayout = pLay->getRootFrm();
-    const BOOL bOldCallbackActionEnabled = pLayout ? pLayout->IsCallbackActionEnabled() : sal_False;
+    const sal_Bool bOldCallbackActionEnabled = pLayout ? pLayout->IsCallbackActionEnabled() : sal_False;
 	if( bOldCallbackActionEnabled )
         pLayout->SetCallbackActionEnabled( sal_False );
 

File sw/source/core/layout/ftnfrm.cxx

 		}
 	}
     const ViewShell *pSh = getRootFrm() ? getRootFrm()->GetCurrShell() : 0;
-    const BOOL bBrowseMode = pSh && pSh->GetViewOptions()->getBrowseMode();
+    const sal_Bool bBrowseMode = pSh && pSh->GetViewOptions()->getBrowseMode();
     SwPageFrm *pPage = pBoss->FindPageFrm();
     if ( bBrowseMode || !pPage->IsFtnPage() )
     {

File sw/source/core/layout/layact.cxx

 {
 	sal_Bool bRet = sal_False;
     const ViewShell *pSh = pRoot->GetCurrShell();
-    const BOOL bBrowse = pSh && pSh->GetViewOptions()->getBrowseMode();
+    const sal_Bool bBrowse = pSh && pSh->GetViewOptions()->getBrowseMode();
 
 	//Wenn die Seite nicht Gueltig ist wird sie schnell formatiert, sonst
 	//gibts nix als Aerger.
 				aPaint.Bottom( aPaint.Bottom() + nBorderWidth + nShadowWidth);
             }
 
-            BOOL bPageInBrowseMode = pLay->IsPageFrm();
+            sal_Bool bPageInBrowseMode = pLay->IsPageFrm();
             if( bPageInBrowseMode )
             {
                 const ViewShell *pSh = pLay->getRootFrm()->GetCurrShell();
                 if( !pSh || !pSh->GetViewOptions()->getBrowseMode() )
-                    bPageInBrowseMode = FALSE;
+                    bPageInBrowseMode = sal_False;
             }
             if( bPageInBrowseMode )
 			{

File sw/source/core/layout/newfrm.cxx

 {
 	RemoveFtns();
 }
-void SwRootFrm::AllInvalidateSmartTagsOrSpelling(BOOL bSmartTags) const
+void SwRootFrm::AllInvalidateSmartTagsOrSpelling(sal_Bool bSmartTags) const
 {
 	SwPageFrm *pPage = (SwPageFrm*)this->Lower();
 	while ( pPage )

File sw/source/core/layout/sectfrm.cxx

 
         sal_Bool bInCalcCntnt = GetUpper() && IsInFly() && FindFlyFrm()->IsLocked();
         // OD 2004-03-15 #116561# - allow grow in online layout
-        BOOL bGrow = !Lower() || !Lower()->IsColumnFrm() || !Lower()->GetNext() ||
+        sal_Bool bGrow = !Lower() || !Lower()->IsColumnFrm() || !Lower()->GetNext() ||
              GetSection()->GetFmt()->GetBalancedColumns().GetValue();
         if( !bGrow )
         {
     const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint);
     if ( pSimpleHint && pSimpleHint->GetId() == SFX_HINT_DYING && &rMod == GetRegisteredIn() )
     {
-        SwSectionFrm::MoveCntntAndDelete( this, TRUE );        
+        SwSectionFrm::MoveCntntAndDelete( this, sal_True );
     }
 }
 

File sw/source/core/layout/ssfrm.cxx

         {
             SwCntntFrm* pMaster = (SwTxtFrm*)pFrm->FindMaster();
             pMaster->SetFollow( pFrm->GetFollow() );
-            pFrm->_SetIsFollow( FALSE );
+            pFrm->_SetIsFollow( sal_False );
         }
 		pFrm->SetFollow( 0 );//Damit er nicht auf dumme Gedanken kommt.
 								//Andernfalls kann es sein, dass ein Follow

File sw/source/core/layout/trvlfrm.cxx

 {
 	ASSERT( pActualCrsr, "Welche Seite soll's denn sein?" );
     SwFrm const*const pActFrm = pActualCrsr->GetPoint()->nNode.GetNode().
-									GetCntntNode()->GetFrm( 0,
+									GetCntntNode()->getLayoutFrm( this, 0,
 													pActualCrsr->GetPoint(),
 													sal_False );
 	return pActFrm->FindPageFrm()->GetPhyPageNum();

File sw/source/core/layout/wsfrm.cxx

     if( pFmt )
     {
         const ViewShell *pSh = getRootFrm()->GetCurrShell();
-        const BOOL bBrowseMode = pSh && pSh->GetViewOptions()->getBrowseMode();
+        const sal_Bool bBrowseMode = pSh && pSh->GetViewOptions()->getBrowseMode();
         CheckDir(((SvxFrameDirectionItem&)pFmt->GetFmtAttr(RES_FRAMEDIR)).GetValue(),
                     bVert, sal_True, bBrowseMode );
     }
     if( pFmt )
     {
         const ViewShell *pSh = getRootFrm()->GetCurrShell();
-        const BOOL bBrowseMode = pSh && pSh->GetViewOptions()->getBrowseMode();
+        const sal_Bool bBrowseMode = pSh && pSh->GetViewOptions()->getBrowseMode();
         CheckDir(((SvxFrameDirectionItem&)pFmt->GetFmtAttr(RES_FRAMEDIR)).GetValue(),
                     bVert, sal_False, bBrowseMode );
     }
     if( pFmt )
     {
         const ViewShell *pSh = getRootFrm()->GetCurrShell();
-        const BOOL bBrowseMode = pSh && pSh->GetViewOptions()->getBrowseMode();
+        const sal_Bool bBrowseMode = pSh && pSh->GetViewOptions()->getBrowseMode();
         CheckDir(((SvxFrameDirectionItem&)pFmt->GetFmtAttr(RES_FRAMEDIR)).GetValue(),
                     bVert, sal_True, bBrowseMode );
     }
     {
         const SvxFrameDirectionItem* pFrmDirItem = static_cast<const SvxFrameDirectionItem*>(pItem);
         const ViewShell *pSh = getRootFrm()->GetCurrShell();
-        const BOOL bBrowseMode = pSh && pSh->GetViewOptions()->getBrowseMode();
+        const sal_Bool bBrowseMode = pSh && pSh->GetViewOptions()->getBrowseMode();
         CheckDir( pFrmDirItem->GetValue(), bVert, sal_False, bBrowseMode );
     }
     else
 void SwTxtFrm::CheckDirection( sal_Bool bVert )
 {
     const ViewShell *pSh = getRootFrm()->GetCurrShell();
-    const BOOL bBrowseMode = pSh && pSh->GetViewOptions()->getBrowseMode();
+    const sal_Bool bBrowseMode = pSh && pSh->GetViewOptions()->getBrowseMode();
     CheckDir( GetTxtNode()->GetSwAttrSet().GetFrmDir().GetValue(), bVert,
               sal_True, bBrowseMode );
 }
 		const SwFrm *pRel = GetUpper();
 		long nRel = LONG_MAX;
 		const ViewShell *pSh = getRootFrm()->GetCurrShell();
-        const BOOL bBrowseMode = pSh && pSh->GetViewOptions()->getBrowseMode();
+        const sal_Bool bBrowseMode = pSh && pSh->GetViewOptions()->getBrowseMode();
         if( pRel->IsPageBodyFrm() && pSh && bBrowseMode && pSh->VisArea().Width() )
 		{
 			nRel = pSh->GetBrowseWidth();

File sw/source/core/txtnode/txtatr2.cxx

     }
 }
 
-sal_Bool SwTxtCharFmt::GetInfo( SfxPoolItem& rInfo ) const
+bool SwTxtCharFmt::GetInfo( SfxPoolItem& rInfo ) const
 {
     if ( RES_AUTOFMT_DOCNODE != rInfo.Which() || !m_pTxtNode ||
         &m_pTxtNode->GetNodes() != static_cast<SwAutoFmtGetDocNode&>(rInfo).pNodes )
     {
-		return sal_True;
+		return true;
     }
 
     static_cast<SwAutoFmtGetDocNode&>(rInfo).pCntntNode = m_pTxtNode;
-	return sal_False;
+	return false;
 }
 
 

File sw/source/core/unocore/unofield.cxx

 	}
 }
 
-const Programmatic2UIName_Impl* lcl_GetFieldNameTable()
-{
-	static sal_Bool bInitialized = sal_False;
-	static Programmatic2UIName_Impl aFieldNames[5];
-	if(!bInitialized)
-	{
-		bInitialized = sal_True;
-		int nName = 0;
-		aFieldNames[nName].sUIName = String				(SW_RES(STR_POOLCOLL_LABEL_ABB ));
-		aFieldNames[nName++].sProgrammaticName = String	(SW_RES(STR_POCO_PRGM_LABEL_ABB));
-		aFieldNames[nName].sUIName = String				(SW_RES(STR_POOLCOLL_LABEL_TABLE ));
-		aFieldNames[nName++].sProgrammaticName = String	(SW_RES(STR_POCO_PRGM_LABEL_TABLE));
-		aFieldNames[nName].sUIName = String				(SW_RES(STR_POOLCOLL_LABEL_FRAME));
-		aFieldNames[nName++].sProgrammaticName = String	(SW_RES(STR_POCO_PRGM_LABEL_FRAME));
-		aFieldNames[nName].sUIName = String				(SW_RES(STR_POOLCOLL_LABEL_DRAWING ));
-		aFieldNames[nName++].sProgrammaticName = String	(SW_RES(STR_POCO_PRGM_LABEL_DRAWING));
-	}
-	return &aFieldNames[0];
-}
-
 OUString SwXFieldMaster::GetProgrammaticName(const SwFieldType& rType, SwDoc& rDoc)
 {
 	OUString sRet(rType.GetName());

File sw/source/core/view/viewsh.cxx

         // page descriptions are still set to (LONG_MAX, LONG_MAX) (html import)
         pDoc->CheckDefaultPageFmt();
         // <--
-        CheckBrowseView( TRUE );
+        CheckBrowseView( sal_True );
     }
 
     pMyWin->Invalidate();

File sw/source/ui/app/docsh2.cxx

 
 // Disable "multiple layout"
 
-void    SwDocShell::ToggleBrowserMode(BOOL bSet, SwView* _pView )
+void    SwDocShell::ToggleBrowserMode(sal_Bool bSet, SwView* _pView )
 {
 	GetDoc()->set(IDocumentSettingAccess::BROWSE_MODE, bSet );
 	UpdateFontList();
         if( !GetDoc()->getPrinter( false ) )
             pTempView->SetPrinter( GetDoc()->getPrinter( false ), SFX_PRINTER_PRINTER | SFX_PRINTER_JOBSETUP );
         GetDoc()->CheckDefaultPageFmt();
-		SfxViewFrame *pTmpFrm = SfxViewFrame::GetFirst(this, FALSE);
+		SfxViewFrame *pTmpFrm = SfxViewFrame::GetFirst(this, sal_False);
 		do {
 			if( pTmpFrm != pTempView->GetViewFrame() )
 			{
 				pTmpFrm->DoClose();
-				pTmpFrm = SfxViewFrame::GetFirst(this, FALSE);
+				pTmpFrm = SfxViewFrame::GetFirst(this, sal_False);
 			}
 			else
-				pTmpFrm = pTmpFrm->GetNext(*pTmpFrm, this, FALSE);
+				pTmpFrm = pTmpFrm->GetNext(*pTmpFrm, this, sal_False);
 
 		} while ( pTmpFrm );
         const SwViewOption& rViewOptions = *pTempView->GetWrtShell().GetViewOptions();
-		pTempView->GetWrtShell().CheckBrowseView( TRUE );
+		pTempView->GetWrtShell().CheckBrowseView( sal_True );
 		pTempView->CheckVisArea();
 		if( bSet )
         {

File sw/source/ui/config/viewopt.cxx

     bStarOneSetting(sal_False),
     bIsPagePreview(sal_False),
     bSelectionInReadonly(sal_False),
-    // --> FME 2004-06-29 #114856# Formular view
-    bFormView(sal_False),
-    // <--
-    bBookview(sal_False),
+    mbFormView(sal_False),
 	mbBrowseMode(sal_False),
+    mbBookView(sal_False),
     mbViewLayoutBookMode(sal_False),
     bShowPlaceHolderFields( sal_True ),
 
 	sSymbolFont 	= rVOpt.sSymbolFont;
 	nShdwCrsrFillMode = rVOpt.nShdwCrsrFillMode;
 	bStarOneSetting = rVOpt.bStarOneSetting;
-	mbBookview		= rVOpt.mbBookview;
+	mbBookView	    = rVOpt.mbBookView;
 	mbBrowseMode	= rVOpt.mbBrowseMode;
     mbViewLayoutBookMode = rVOpt.mbViewLayoutBookMode;
     bShowPlaceHolderFields = rVOpt.bShowPlaceHolderFields;
 	sSymbolFont 	= rVOpt.sSymbolFont;
 	nShdwCrsrFillMode = rVOpt.nShdwCrsrFillMode;
 	bStarOneSetting = rVOpt.bStarOneSetting;
-	mbBookview		= rVOpt.mbBookview;
+	mbBookView	    = rVOpt.mbBookView;
 	mbBrowseMode	= rVOpt.mbBrowseMode;
     mbViewLayoutBookMode = rVOpt.mbViewLayoutBookMode;
     bShowPlaceHolderFields = rVOpt.bShowPlaceHolderFields;

File sw/source/ui/uiview/view.cxx

 
 SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
 	: SfxViewShell( _pFrame, SWVIEWFLAGS ),
-
 	aPageStr( SW_RES( STR_PAGE )),
     nNewPage(USHRT_MAX),
     pNumRuleNodeFromDoc(0), // #i23726#
 
     //! get lingu options without loading lingu DLL
     SvtLinguOptions aLinguOpt;
-
     SvtLinguConfig().GetOptions( aLinguOpt );
-
     aUsrPref.SetOnlineSpell( aLinguOpt.bIsSpellAuto );
 
 	sal_Bool bOldShellWasSrcView = sal_False;
     if ( pOldSh )
     {
         pExistingSh = pOldSh;
-    // determine type of existing view
+        // determine type of existing view
         if( pExistingSh->IsA( TYPE( SwPagePreView ) ) )
-    {
-        sSwViewData = ((SwPagePreView*)pExistingSh)->GetPrevSwViewData();
-        sNewCrsrPos = ((SwPagePreView*)pExistingSh)->GetNewCrsrPos();
-        nNewPage = ((SwPagePreView*)pExistingSh)->GetNewPage();
-        bOldShellWasPagePreView = sal_True;
+        {
+            sSwViewData = ((SwPagePreView*)pExistingSh)->GetPrevSwViewData();
+            sNewCrsrPos = ((SwPagePreView*)pExistingSh)->GetNewCrsrPos();
+            nNewPage = ((SwPagePreView*)pExistingSh)->GetNewPage();
+            bOldShellWasPagePreView = sal_True;
+        }
+        else if( pExistingSh->IsA( TYPE( SwSrcView ) ) )
+            bOldShellWasSrcView = sal_True;
     }
-    else if( pExistingSh->IsA( TYPE( SwSrcView ) ) )
-        bOldShellWasSrcView = sal_True;
 
 	RTL_LOGFILE_CONTEXT_TRACE( aLog, "before create WrtShell" );
     if(PTR_CAST( SwView, pExistingSh))
 		SwDoc& rDoc = *((SwDocShell*)pDocSh)->GetDoc();
 
         if( !bOldShellWasSrcView && pWebDShell && !bOldShellWasPagePreView )
-			aUsrPref.setBrowseMode( TRUE );
+			aUsrPref.setBrowseMode( sal_True );
         else if( rDoc.IsLoaded() )
             aUsrPref.setBrowseMode( rDoc.get(IDocumentSettingAccess::BROWSE_MODE) );
 
 	}
 
 
-    /*uno::Reference< awt::XWindow >  aTmpRef;
-	_pFrame->GetFrame().GetFrameInterface()->setComponent( aTmpRef,
-                                            pViewImpl->GetUNOObject_Impl());*/
-
    uno::Reference< frame::XFrame >  xFrame = pVFrame->GetFrame().GetFrameInterface();
 
     uno::Reference< frame::XFrame >  xBeamerFrame = xFrame->findFrame(
     if(bOldModifyFlag)
         pDocSh->EnableSetModified( sal_True );
     InvalidateBorder();
-
 }
 
-/*--------------------------------------------------------------------
-	Beschreibung:
- --------------------------------------------------------------------*/
-
-
 SwView::~SwView()
 {
     delete mpPostItMgr;
     delete pFormatClipboard;
 }
 
-/*--------------------------------------------------------------------
-	Beschreibung:	DocShell rausgrabbeln ueber das FrameWindow
- --------------------------------------------------------------------*/
-
-
 SwDocShell* SwView::GetDocShell()
 {
 	SfxObjectShell* pDocShell = GetViewFrame()->GetObjectShell();

File sw/source/ui/uiview/view0.cxx

 void SwView::RecheckBrowseMode()
 {
     // OS: numerische Reihenfolge beachten!
-    static USHORT __READONLY_DATA aInva[] =
+    static sal_uInt16 __READONLY_DATA aInva[] =
         {
             //SID_NEWWINDOW,/*5620*/
             SID_BROWSER_MODE, /*6313*/