[Libreoffice-commits] core.git: sw/inc sw/source
Miklos Vajna
vmiklos at suse.cz
Sat Feb 23 03:51:57 PST 2013
sw/inc/crsrsh.hxx | 2
sw/inc/viewsh.hxx | 134 +++++-----
sw/source/core/crsr/crsrsh.cxx | 34 +-
sw/source/core/crsr/crstrvl.cxx | 14 -
sw/source/core/crsr/trvltbl.cxx | 2
sw/source/core/doc/notxtfrm.cxx | 2
sw/source/core/edit/edattr.cxx | 12
sw/source/core/edit/edfmt.cxx | 10
sw/source/core/edit/editsh.cxx | 4
sw/source/core/edit/edlingu.cxx | 28 +-
sw/source/core/edit/edtox.cxx | 8
sw/source/core/edit/edws.cxx | 4
sw/source/core/frmedt/fecopy.cxx | 8
sw/source/core/frmedt/fefly1.cxx | 34 +-
sw/source/core/frmedt/feshview.cxx | 4
sw/source/core/frmedt/fews.cxx | 4
sw/source/core/layout/layact.cxx | 4
sw/source/core/layout/paintfrm.cxx | 6
sw/source/core/view/pagepreviewlayout.cxx | 4
sw/source/core/view/viewimp.cxx | 2
sw/source/core/view/viewpg.cxx | 4
sw/source/core/view/viewsh.cxx | 380 +++++++++++++++---------------
sw/source/core/view/vnew.cxx | 192 +++++++--------
sw/source/core/view/vprint.cxx | 42 +--
sw/source/ui/wrtsh/wrtsh1.cxx | 12
25 files changed, 475 insertions(+), 475 deletions(-)
New commits:
commit d0fc2174a731f75799e6fb990cff7b76835361fa
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Sat Feb 23 12:33:14 2013 +0100
sw: rename member variables missing their prefix in ViewShell
Change-Id: I4ec171a42f589826071d6e9ea2c87e9e2c94fdb3
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 8dff3ca..c6ca007 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -737,7 +737,7 @@ public:
// is the whole document protected/hidden (for UI...)
sal_Bool IsAllProtect() const { return bAllProtect; }
- sal_Bool BasicActionPend() const { return nBasicActionCnt != nStartAction; }
+ sal_Bool BasicActionPend() const { return nBasicActionCnt != mnStartAction; }
bool GotoRegion( const String& rName );
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 3ddfbe4..72d7c48 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -111,51 +111,51 @@ class SW_DLLPUBLIC ViewShell : public Ring
// Set SwVisArea in order to enable clean formatting before printing.
friend void SetSwVisArea( ViewShell *pSh, const SwRect &, sal_Bool bPDFExport = sal_False );
- static BitmapEx* pReplaceBmp; // replaced display of still loaded images
- static BitmapEx* pErrorBmp; // error display of missed images
+ static BitmapEx* mpReplaceBmp; ///< replaced display of still loaded images
+ static BitmapEx* mpErrorBmp; ///< error display of missed images
- static sal_Bool bLstAct; // sal_True if EndAction of last Shell
+ static sal_Bool mbLstAct; // sal_True if EndAction of last Shell
// i.e. if the EndActions of the other
// Shells on the document are through.
- Point aPrtOffst; // Ofst for Printer,
+ Point maPrtOffst; // Ofst for Printer,
// non-printable margin.
- Size aBrowseBorder; // Border for frame documents.
- SwRect aInvalidRect;
+ Size maBrowseBorder; // Border for frame documents.
+ SwRect maInvalidRect;
- SfxViewShell *pSfxViewShell;
- SwViewImp *pImp; // Core-internals of ViewShell.
+ SfxViewShell *mpSfxViewShell;
+ SwViewImp *mpImp; // Core-internals of ViewShell.
// The pointer is never 0.
- Window *pWin; // = 0 during printing or pdf export
- OutputDevice *pOut; // Window, Printer, VirtDev, ...
+ Window *mpWin; ///< = 0 during printing or pdf export
+ OutputDevice *mpOut; ///< Window, Printer, VirtDev, ...
OutputDevice* mpTmpRef; // Temporariy reference device. Is used
// during (printer depending) prospect
// and page preview printing
// (because a scaling has to be set at
// the original printer)
- SwViewOption *pOpt;
- SwAccessibilityOptions* pAccOptions;
+ SwViewOption *mpOpt;
+ SwAccessibilityOptions* mpAccOptions;
- sal_Bool bDocSizeChgd :1; // For DocChgNotify(): Announce new DocSize
+ sal_Bool mbDocSizeChgd :1; // For DocChgNotify(): Announce new DocSize
// at EndAction to DocMDI.
- sal_Bool bPaintWorks :1; // Normal Painting if sal_True,
+ sal_Bool mbPaintWorks :1; // Normal Painting if sal_True,
// remember Paint if sal_False.
- sal_Bool bPaintInProgress :1; // Block any double paint.
- sal_Bool bViewLocked :1; // Lock visible range;
+ sal_Bool mbPaintInProgress :1; // Block any double paint.
+ sal_Bool mbViewLocked :1; // Lock visible range;
// in this case MakeVisible is ineffectual.
- sal_Bool bInEndAction :1; // Avoid problems, cf. viewsh.cxx.
- sal_Bool bPreView :1; // If sal_True it is a PreView-ViewShell.
- sal_Bool bFrameView :1; // If sal_True it is a (HTML-)Frame.
- sal_Bool bEnableSmooth :1; // Disable SmoothScroll, e.g. for drag
+ sal_Bool mbInEndAction :1; // Avoid problems, cf. viewsh.cxx.
+ sal_Bool mbPreView :1; // If sal_True it is a PreView-ViewShell.
+ sal_Bool mbFrameView :1; // If sal_True it is a (HTML-)Frame.
+ sal_Bool mbEnableSmooth :1; // Disable SmoothScroll, e.g. for drag
// of scrollbars.
- sal_Bool bEndActionByVirDev:1; // Paints from EndAction always via virtual device
+ sal_Bool mbEndActionByVirDev:1; // Paints from EndAction always via virtual device
// (e.g. when browsing).
- bool bShowHeaderSeparator:1; ///< Flag to say that we are showing the header control
- bool bShowFooterSeparator:1; ///< Flag to say that we are showing the footer control
- bool bHeaderFooterEdit:1; ///< Flag to say that we are editing header or footer (according to the bShow(Header|Footer)Separator above)
+ bool mbShowHeaderSeparator:1; ///< Flag to say that we are showing the header control
+ bool mbShowFooterSeparator:1; ///< Flag to say that we are showing the footer control
+ bool mbHeaderFooterEdit:1; ///< Flag to say that we are editing header or footer (according to the bShow(Header|Footer)Separator above)
// boolean, indicating that class in in constructor.
bool mbInConstructor:1;
@@ -163,7 +163,7 @@ class SW_DLLPUBLIC ViewShell : public Ring
SdrPaintWindow* mpTargetPaintWindow;
OutputDevice* mpBufferedOut;
- SwRootFrmPtr pLayout; //swmod 080116
+ SwRootFrmPtr mpLayout;
// Initialization; called by the diverse constructors.
SW_DLLPRIVATE void Init( const SwViewOption *pNewOpt );
@@ -185,20 +185,20 @@ class SW_DLLPUBLIC ViewShell : public Ring
SW_DLLPRIVATE void ImplApplyViewOptions( const SwViewOption &rOpt );
protected:
- static ShellResource* pShellRes; // Resources for the Shell.
- static Window* pCareWindow; // Avoid this window.
+ static ShellResource* mpShellRes; ///< Resources for the Shell.
+ static Window* mpCareWindow; ///< Avoid this window.
- SwRect aVisArea; // The modern version of VisArea.
- SwDoc *pDoc; // The document; never 0.
+ SwRect maVisArea; ///< The modern version of VisArea.
+ SwDoc *mpDoc; ///< The document; never 0.
- sal_uInt16 nStartAction; // != 0 if at least one ::com::sun::star::chaos::Action is active.
- sal_uInt16 nLockPaint; // != 0 if Paint is locked.
+ sal_uInt16 mnStartAction; ///< != 0 if at least one ::com::sun::star::chaos::Action is active.
+ sal_uInt16 mnLockPaint; ///< != 0 if Paint is locked.
public:
TYPEINFO();
- SwViewImp *Imp() { return pImp; }
- const SwViewImp *Imp() const { return pImp; }
+ SwViewImp *Imp() { return mpImp; }
+ const SwViewImp *Imp() const { return mpImp; }
const SwNodes& GetNodes() const;
@@ -210,19 +210,19 @@ public:
void ImplStartAction();
inline void EndAction( const sal_Bool bIdleEnd = sal_False );
void ImplEndAction( const sal_Bool bIdleEnd = sal_False );
- sal_uInt16 ActionCount() const { return nStartAction; }
- sal_Bool ActionPend() const { return nStartAction != 0; }
- sal_Bool IsInEndAction() const { return bInEndAction; }
+ sal_uInt16 ActionCount() const { return mnStartAction; }
+ sal_Bool ActionPend() const { return mnStartAction != 0; }
+ sal_Bool IsInEndAction() const { return mbInEndAction; }
- void SetEndActionByVirDev( sal_Bool b ) { bEndActionByVirDev = b; }
- sal_Bool IsEndActionByVirDev() { return bEndActionByVirDev; }
+ void SetEndActionByVirDev( sal_Bool b ) { mbEndActionByVirDev = b; }
+ sal_Bool IsEndActionByVirDev() { return mbEndActionByVirDev; }
// The ActionCount for all Shells is temporarily set to zero and then
// restored at the RootFrame via UNO.
void SetRestoreActions(sal_uInt16 nSet);
sal_uInt16 GetRestoreActions() const;
- inline sal_Bool HasInvalidRect() const { return aInvalidRect.HasArea(); }
+ inline sal_Bool HasInvalidRect() const { return maInvalidRect.HasArea(); }
void ChgHyphenation() { Reformat(); }
void ChgNumberDigits();
@@ -244,7 +244,7 @@ public:
//////////////////////////////////////////////////////////////////////////////
virtual void Paint(const Rectangle &rRect);
- sal_Bool IsPaintInProgress() const { return bPaintInProgress; }
+ sal_Bool IsPaintInProgress() const { return mbPaintInProgress; }
bool IsDrawingLayerPaintInProgress() const { return !mPrePostPaintRegions.empty(); }
// Notification that visible area has been changed.
@@ -253,9 +253,9 @@ public:
// in order to avoid pixel errors when scrolling.
virtual void VisPortChgd( const SwRect & );
sal_Bool SmoothScroll( long lXDiff, long lYDiff, const Rectangle* );//Browser
- void EnableSmooth( sal_Bool b ) { bEnableSmooth = b; }
+ void EnableSmooth( sal_Bool b ) { mbEnableSmooth = b; }
- const SwRect& VisArea() const { return aVisArea; }
+ const SwRect& VisArea() const { return maVisArea; }
// If necessary scroll until passed Rect is situated in visible sector.
void MakeVisible( const SwRect & );
@@ -283,7 +283,7 @@ public:
const Size GetPageSize( sal_uInt16 nPageNum, bool bSkipEmptyPages ) const;
- inline SwDoc *GetDoc() const { return pDoc; } //Never 0.
+ inline SwDoc *GetDoc() const { return mpDoc; } //Never 0.
/** Provides access to the document setting interface
*/
@@ -339,10 +339,10 @@ public:
// 2. GetWin: Available if we not printing
// 3. GetOut: Printer, Window or Virtual device
OutputDevice& GetRefDev() const;
- inline Window* GetWin() const { return pWin; }
- inline OutputDevice* GetOut() const { return pOut; }
+ inline Window* GetWin() const { return mpWin; }
+ inline OutputDevice* GetOut() const { return mpOut; }
- static inline sal_Bool IsLstEndAction() { return ViewShell::bLstAct; }
+ static inline sal_Bool IsLstEndAction() { return ViewShell::mbLstAct; }
// Change of all page descriptors.
void ChgAllPageOrientation( sal_uInt16 eOri );
@@ -414,7 +414,7 @@ public:
// Calls Idle-formatter of Layout.
void LayoutIdle();
- inline const SwViewOption *GetViewOptions() const { return pOpt; }
+ inline const SwViewOption *GetViewOptions() const { return mpOpt; }
virtual void ApplyViewOptions( const SwViewOption &rOpt );
void SetUIOptions( const SwViewOption &rOpt );
virtual void SetReadonlyOption(sal_Bool bSet); // Set readonly-bit of ViewOptions.
@@ -422,18 +422,18 @@ public:
void SetPrtFormatOption(sal_Bool bSet); // Set PrtFormat-Bit of ViewOptions.
void SetReadonlySelectionOption(sal_Bool bSet); // Change the selection mode in readonly docs.
- const SwAccessibilityOptions* GetAccessibilityOptions() const { return pAccOptions;}
+ const SwAccessibilityOptions* GetAccessibilityOptions() const { return mpAccOptions;}
- static void SetShellRes( ShellResource* pRes ) { pShellRes = pRes; }
+ static void SetShellRes( ShellResource* pRes ) { mpShellRes = pRes; }
static ShellResource* GetShellRes();
static void SetCareWin( Window* pNew );
static Window* GetCareWin(ViewShell& rVSh)
- { return pCareWindow ? pCareWindow : CareChildWin(rVSh); }
+ { return mpCareWindow ? mpCareWindow : CareChildWin(rVSh); }
static Window* CareChildWin(ViewShell& rVSh);
- inline SfxViewShell *GetSfxViewShell() { return pSfxViewShell; }
- inline void SetSfxViewShell(SfxViewShell *pNew) { pSfxViewShell = pNew; }
+ inline SfxViewShell *GetSfxViewShell() { return mpSfxViewShell; }
+ inline void SetSfxViewShell(SfxViewShell *pNew) { mpSfxViewShell = pNew; }
// Selection of Draw ::com::sun::star::script::Engine has been changed.
virtual void DrawSelChanged();
@@ -452,14 +452,14 @@ public:
*/
void AdjustOptionsForPagePreview( SwPrintData const& rPrintOptions );
- sal_Bool IsViewLocked() const { return bViewLocked; }
- void LockView( sal_Bool b ) { bViewLocked = b; }
+ sal_Bool IsViewLocked() const { return mbViewLocked; }
+ void LockView( sal_Bool b ) { mbViewLocked = b; }
inline void LockPaint();
void ImplLockPaint();
inline void UnlockPaint( sal_Bool bVirDev = sal_False );
void ImplUnlockPaint( sal_Bool bVirDev );
- sal_Bool IsPaintLocked() const { return nLockPaint != 0; }
+ sal_Bool IsPaintLocked() const { return mnLockPaint != 0; }
// Get/set DrawView and PageView.
sal_Bool HasDrawView() const;
@@ -476,11 +476,11 @@ public:
inline const SfxItemPool& GetAttrPool() const;
SfxItemPool& GetAttrPool();
- sal_Bool IsPreView() const { return bPreView; }
+ sal_Bool IsPreView() const { return mbPreView; }
- sal_Bool IsFrameView() const { return bFrameView; }
+ sal_Bool IsFrameView() const { return mbFrameView; }
void SetFrameView( const Size& rBrowseBorder )
- { bFrameView = sal_True; aBrowseBorder = rBrowseBorder; }
+ { mbFrameView = sal_True; maBrowseBorder = rBrowseBorder; }
// Makes the necessary invalidations:
// If BrowseMode has changed bBrowseChgd == sal_True
@@ -561,9 +561,9 @@ public:
/// Acts both for headers / footers, depending on the bShow(Header|Footer)Separator flags
void ToggleHeaderFooterEdit();
/// Acts both for headers / footers, depending on the bShow(Header|Footer)Separator flags
- bool IsHeaderFooterEdit() const { return bHeaderFooterEdit; }
- bool IsShowHeaderFooterSeparator( FrameControlType eControl ) { return (eControl == Header)? bShowHeaderSeparator: bShowFooterSeparator; }
- virtual void SetShowHeaderFooterSeparator( FrameControlType eControl, bool bShow ) { if ( eControl == Header ) bShowHeaderSeparator = bShow; else bShowFooterSeparator = bShow; }
+ bool IsHeaderFooterEdit() const { return mbHeaderFooterEdit; }
+ bool IsShowHeaderFooterSeparator( FrameControlType eControl ) { return (eControl == Header)? mbShowHeaderSeparator: mbShowFooterSeparator; }
+ virtual void SetShowHeaderFooterSeparator( FrameControlType eControl, bool bShow ) { if ( eControl == Header ) mbShowHeaderSeparator = bShow; else mbShowFooterSeparator = bShow; }
};
//---- class CurrShell manages global ShellPointer -------------------
@@ -580,29 +580,29 @@ public:
inline void ViewShell::ResetInvalidRect()
{
- aInvalidRect.Clear();
+ maInvalidRect.Clear();
}
inline void ViewShell::StartAction()
{
- if ( !nStartAction++ )
+ if ( !mnStartAction++ )
ImplStartAction();
}
inline void ViewShell::EndAction( const sal_Bool bIdleEnd )
{
- if( 0 == (nStartAction - 1) )
+ if( 0 == (mnStartAction - 1) )
ImplEndAction( bIdleEnd );
- --nStartAction;
+ --mnStartAction;
}
inline void ViewShell::LockPaint()
{
- if ( !nLockPaint++ )
+ if ( !mnLockPaint++ )
ImplLockPaint();
}
inline void ViewShell::UnlockPaint( sal_Bool bVirDev )
{
- if ( 0 == --nLockPaint )
+ if ( 0 == --mnLockPaint )
ImplUnlockPaint( bVirDev );
}
inline const SfxItemPool& ViewShell::GetAttrPool() const
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 5c8e955..8f0c03c 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -246,7 +246,7 @@ void SwCrsrShell::EndAction( const sal_Bool bIdleEnd )
}
// Update all invalid numberings before the last action
- if( 1 == nStartAction )
+ if( 1 == mnStartAction )
GetDoc()->UpdateNumRule();
// #i76923#: Don't show the cursor in the ViewShell::EndAction() - call.
@@ -400,11 +400,11 @@ void SwCrsrShell::MarkListLevel( const String& sListId,
nListLevel != nMarkedListLevel)
{
if ( sMarkedListId.Len() > 0 )
- pDoc->MarkListLevel( sMarkedListId, nMarkedListLevel, false );
+ mpDoc->MarkListLevel( sMarkedListId, nMarkedListLevel, false );
if ( sListId.Len() > 0 )
{
- pDoc->MarkListLevel( sListId, nListLevel, true );
+ mpDoc->MarkListLevel( sListId, nListLevel, true );
}
sMarkedListId = sListId;
@@ -813,7 +813,7 @@ void SwCrsrShell::ClearMark()
// move content part from mark to nodes array if not all indices
// were moved correctly (e.g. when deleting header/footer)
SwPosition& rPos = *pCurCrsr->GetMark();
- rPos.nNode.Assign( pDoc->GetNodes(), 0 );
+ rPos.nNode.Assign( mpDoc->GetNodes(), 0 );
rPos.nContent.Assign( 0, 0 );
pCurCrsr->DeleteMark();
}
@@ -830,7 +830,7 @@ void SwCrsrShell::ClearMark()
// move content part from mark to nodes array if not all indices
// were moved correctly (e.g. when deleting header/footer)
SwPosition& rPos = *pCurCrsr->GetMark();
- rPos.nNode.Assign( pDoc->GetNodes(), 0 );
+ rPos.nNode.Assign( mpDoc->GetNodes(), 0 );
rPos.nContent.Assign( 0, 0 );
pCurCrsr->DeleteMark();
if( !nCrsrMove )
@@ -1202,7 +1202,7 @@ void SwCrsrShell::VisPortChgd( const SwRect & rRect )
void SwCrsrShell::UpdateCrsrPos()
{
SET_CURR_SHELL( this );
- ++nStartAction;
+ ++mnStartAction;
SwShellCrsr* pShellCrsr = getShellCrsr( true );
Size aOldSz( GetDocSize() );
SwCntntNode *pCNode = pShellCrsr->GetCntntNode();
@@ -1220,7 +1220,7 @@ void SwCrsrShell::UpdateCrsrPos()
IGrammarContact *pGrammarContact = GetDoc() ? GetDoc()->getGrammarContact() : 0;
if( pGrammarContact )
pGrammarContact->updateCursorPosition( *pCurCrsr->GetPoint() );
- --nStartAction;
+ --mnStartAction;
if( aOldSz != GetDocSize() )
SizeChgNotify();
}
@@ -1308,7 +1308,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool bIdleEnd )
// then the table mode is active (also if it is already active: pTblCrsr)
SwPaM* pTstCrsr = getShellCrsr( true );
if( pTstCrsr->HasMark() && !pBlockCrsr &&
- pDoc->IsIdxInTbl( pTstCrsr->GetPoint()->nNode ) &&
+ mpDoc->IsIdxInTbl( pTstCrsr->GetPoint()->nNode ) &&
( pTblCrsr ||
pTstCrsr->GetNode( sal_True )->StartOfSectionNode() !=
pTstCrsr->GetNode( sal_False )->StartOfSectionNode() ) )
@@ -1474,8 +1474,8 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool bIdleEnd )
if( pSectNd && ( pSectNd->GetSection().IsHiddenFlag() ||
( !IsReadOnlyAvailable() &&
pSectNd->GetSection().IsProtectFlag() &&
- ( !pDoc->GetDocShell() ||
- !pDoc->GetDocShell()->IsReadOnly() || bAllProtect )) ) )
+ ( !mpDoc->GetDocShell() ||
+ !mpDoc->GetDocShell()->IsReadOnly() || bAllProtect )) ) )
{
if( !FindValidCntntNode( !HasDrawView() ||
0 == Imp()->GetDrawView()->GetMarkedObjectList().GetMarkCount()))
@@ -1577,8 +1577,8 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool bIdleEnd )
if( !IsReadOnlyAvailable() && pFrm->IsProtected() &&
( !Imp()->GetDrawView() ||
!Imp()->GetDrawView()->GetMarkedObjectList().GetMarkCount() ) &&
- (!pDoc->GetDocShell() ||
- !pDoc->GetDocShell()->IsReadOnly() || bAllProtect ) )
+ (!mpDoc->GetDocShell() ||
+ !mpDoc->GetDocShell()->IsReadOnly() || bAllProtect ) )
{
// look for a valid position
bool bChgState = true;
@@ -2054,7 +2054,7 @@ SwCntntFrm *SwCrsrShell::GetCurrFrm( const sal_Bool bCalcFrm ) const
{
if ( bCalcFrm )
{
- const sal_uInt16* pST = &nStartAction;
+ const sal_uInt16* pST = &mnStartAction;
++(*((sal_uInt16*)pST));
const Size aOldSz( GetDocSize() );
pRet = pNd->getLayoutFrm( GetLayout(), &pCurCrsr->GetPtPos(), pCurCrsr->GetPoint() );
@@ -2670,7 +2670,7 @@ sal_Bool SwCrsrShell::FindValidCntntNode( sal_Bool bOnlyText )
// first check for frames
SwNodeIndex& rNdIdx = pCurCrsr->GetPoint()->nNode;
sal_uLong nNdIdx = rNdIdx.GetIndex(); // keep backup
- SwNodes& rNds = pDoc->GetNodes();
+ SwNodes& rNds = mpDoc->GetNodes();
SwCntntNode* pCNd = rNdIdx.GetNode().GetCntntNode();
const SwCntntFrm * pFrm;
@@ -2701,8 +2701,8 @@ sal_Bool SwCrsrShell::FindValidCntntNode( sal_Bool bOnlyText )
else if( bOnlyText && pCNd && pCNd->IsNoTxtNode() )
{
// set to beginning of document
- rNdIdx = pDoc->GetNodes().GetEndOfExtras();
- pCurCrsr->GetPoint()->nContent.Assign( pDoc->GetNodes().GoNext(
+ rNdIdx = mpDoc->GetNodes().GetEndOfExtras();
+ pCurCrsr->GetPoint()->nContent.Assign( mpDoc->GetNodes().GoNext(
&rNdIdx ), 0 );
nNdIdx = rNdIdx.GetIndex();
}
@@ -2933,7 +2933,7 @@ short SwCrsrShell::GetTextDirection( const Point* pPt ) const
GetLayout()->GetCrsrOfst( &aPos, aPt, &aTmpState );
}
- return pDoc->GetTextDirection( aPos, &aPt );
+ return mpDoc->GetTextDirection( aPos, &aPt );
}
bool SwCrsrShell::IsInVerticalText( const Point* pPt ) const
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 45d39a9..8700c2f 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -637,7 +637,7 @@ sal_Bool SwCrsrShell::MoveFldType( const SwFieldType* pFldType, sal_Bool bNext,
if( RES_INPUTFLD == pFldType->Which() )
{
// there are hidden input fields in the set exp. fields
- const SwFldTypes& rFldTypes = *pDoc->GetFldTypes();
+ const SwFldTypes& rFldTypes = *mpDoc->GetFldTypes();
const sal_uInt16 nSize = rFldTypes.size();
// iterate over all types
@@ -649,7 +649,7 @@ sal_Bool SwCrsrShell::MoveFldType( const SwFieldType* pFldType, sal_Bool bNext,
}
else
{
- const SwFldTypes& rFldTypes = *pDoc->GetFldTypes();
+ const SwFldTypes& rFldTypes = *mpDoc->GetFldTypes();
const sal_uInt16 nSize = rFldTypes.size();
// iterate over all types
@@ -681,15 +681,15 @@ sal_Bool SwCrsrShell::MoveFldType( const SwFieldType* pFldType, sal_Bool bNext,
if( bDelFld )
{
SwFmtFld* pFmtFld = new SwFmtFld( SwDateTimeField(
- (SwDateTimeFieldType*)pDoc->GetSysFldType( RES_DATETIMEFLD ) ) );
+ (SwDateTimeFieldType*)mpDoc->GetSysFldType( RES_DATETIMEFLD ) ) );
pTxtFld = new SwTxtFld( *pFmtFld, rPos.nContent.GetIndex(),
- pDoc->IsClipBoard() );
+ mpDoc->IsClipBoard() );
pTxtFld->ChgTxtNode( pTNd );
}
_SetGetExpFld aSrch( rPos.nNode, pTxtFld, &rPos.nContent );
- if( rPos.nNode.GetIndex() < pDoc->GetNodes().GetEndOfExtras().GetIndex() )
+ if( rPos.nNode.GetIndex() < mpDoc->GetNodes().GetEndOfExtras().GetIndex() )
{
// also at collection use only the first frame
Point aPt;
@@ -798,7 +798,7 @@ bool SwCrsrShell::GotoOutline( const String& rName )
SwCrsrSaveState aSaveState( *pCrsr );
bool bRet = false;
- if( pDoc->GotoOutline( *pCrsr->GetPoint(), rName ) && !pCrsr->IsSelOvr() )
+ if( mpDoc->GotoOutline( *pCrsr->GetPoint(), rName ) && !pCrsr->IsSelOvr() )
{
UpdateCrsr(SwCrsrShell::SCROLLWIN|SwCrsrShell::CHKRANGE|SwCrsrShell::READONLY);
bRet = true;
@@ -1659,7 +1659,7 @@ bool SwCrsrShell::GotoINetAttr( const SwTxtINetFmt& rAttr )
const SwFmtINetFmt* SwCrsrShell::FindINetAttr( const String& rName ) const
{
- return pDoc->FindINetAttr( rName );
+ return mpDoc->FindINetAttr( rName );
}
sal_Bool SwCrsrShell::GetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode,
diff --git a/sw/source/core/crsr/trvltbl.cxx b/sw/source/core/crsr/trvltbl.cxx
index 5c424f5..57b944f 100644
--- a/sw/source/core/crsr/trvltbl.cxx
+++ b/sw/source/core/crsr/trvltbl.cxx
@@ -90,7 +90,7 @@ sal_Bool SwCrsrShell::GoNextCell( sal_Bool bAppendLine )
// the document might change; w/o Action views would not be notified
((SwEditShell*)this)->StartAllAction();
- bRet = pDoc->InsertRow( pTblNd->GetTable().
+ bRet = mpDoc->InsertRow( pTblNd->GetTable().
SelLineFromBox( pTableBox, aBoxes, false ));
((SwEditShell*)this)->EndAllAction();
}
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 0d89707..f0b041f 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -194,7 +194,7 @@ SwNoTxtFrm::~SwNoTxtFrm()
void SetOutDev( ViewShell *pSh, OutputDevice *pOut )
{
- pSh->pOut = pOut;
+ pSh->mpOut = pOut;
}
diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx
index 964fcda..d478ae6 100644
--- a/sw/source/core/edit/edattr.cxx
+++ b/sw/source/core/edit/edattr.cxx
@@ -303,7 +303,7 @@ bool SwEditShell::SetCurFtn( const SwFmtFtn& rFillFtn )
SwPaM* pCrsr = GetCrsr(), *pFirst = pCrsr;
do {
- bChgd |= pDoc->SetCurFtn( *pCrsr, rFillFtn.GetNumStr(),
+ bChgd |= mpDoc->SetCurFtn( *pCrsr, rFillFtn.GetNumStr(),
rFillFtn.GetNumber(),
rFillFtn.IsEndNote() );
@@ -316,7 +316,7 @@ bool SwEditShell::SetCurFtn( const SwFmtFtn& rFillFtn )
bool SwEditShell::HasFtns( bool bEndNotes ) const
{
- const SwFtnIdxs &rIdxs = pDoc->GetFtnIdxs();
+ const SwFtnIdxs &rIdxs = mpDoc->GetFtnIdxs();
for ( sal_uInt16 i = 0; i < rIdxs.size(); ++i )
{
const SwFmtFtn &rFtn = rIdxs[i]->GetFtn();
@@ -332,11 +332,11 @@ sal_uInt16 SwEditShell::GetSeqFtnList( SwSeqFldList& rList, bool bEndNotes )
{
rList.Clear();
- sal_uInt16 n, nFtnCnt = pDoc->GetFtnIdxs().size();
+ sal_uInt16 n, nFtnCnt = mpDoc->GetFtnIdxs().size();
SwTxtFtn* pTxtFtn;
for( n = 0; n < nFtnCnt; ++n )
{
- pTxtFtn = pDoc->GetFtnIdxs()[ n ];
+ pTxtFtn = mpDoc->GetFtnIdxs()[ n ];
const SwFmtFtn& rFtn = pTxtFtn->GetFtn();
if ( rFtn.IsEndNote() != bEndNotes )
continue;
@@ -347,11 +347,11 @@ sal_uInt16 SwEditShell::GetSeqFtnList( SwSeqFldList& rList, bool bEndNotes )
SwNodeIndex aIdx( *pIdx, 1 );
SwTxtNode* pTxtNd = aIdx.GetNode().GetTxtNode();
if( !pTxtNd )
- pTxtNd = (SwTxtNode*)pDoc->GetNodes().GoNext( &aIdx );
+ pTxtNd = (SwTxtNode*)mpDoc->GetNodes().GoNext( &aIdx );
if( pTxtNd )
{
- String sTxt( rFtn.GetViewNumStr( *pDoc ));
+ String sTxt( rFtn.GetViewNumStr( *mpDoc ));
if( sTxt.Len() )
sTxt += ' ';
sTxt += pTxtNd->GetExpandTxt( 0, USHRT_MAX );
diff --git a/sw/source/core/edit/edfmt.cxx b/sw/source/core/edit/edfmt.cxx
index af04306..3e2e035 100644
--- a/sw/source/core/edit/edfmt.cxx
+++ b/sw/source/core/edit/edfmt.cxx
@@ -105,7 +105,7 @@ void SwEditShell::FillByEx(SwCharFmt* pCharFmt, sal_Bool bReset)
else
nStt = nEnd = pPam->GetPoint()->nContent.GetIndex();
- SfxItemSet aSet( pDoc->GetAttrPool(),
+ SfxItemSet aSet( mpDoc->GetAttrPool(),
pCharFmt->GetAttrSet().GetRanges() );
pTxtNode->GetAttr( aSet, nStt, nEnd );
pCharFmt->SetFmtAttr( aSet );
@@ -165,22 +165,22 @@ SwPageDesc* SwEditShell::GetPageDescFromPool( sal_uInt16 nId )
bool SwEditShell::IsUsed( const SwModify& rModify ) const
{
- return pDoc->IsUsed( rModify );
+ return mpDoc->IsUsed( rModify );
}
const SwFlyFrmFmt* SwEditShell::FindFlyByName( const String& rName, sal_uInt8 nNdTyp ) const
{
- return pDoc->FindFlyByName(rName, nNdTyp);
+ return mpDoc->FindFlyByName(rName, nNdTyp);
}
SwCharFmt* SwEditShell::FindCharFmtByName( const String& rName ) const
{
- return pDoc->FindCharFmtByName( rName );
+ return mpDoc->FindCharFmtByName( rName );
}
SwTxtFmtColl* SwEditShell::FindTxtFmtCollByName( const String& rName ) const
{
- return pDoc->FindTxtFmtCollByName( rName );
+ return mpDoc->FindTxtFmtCollByName( rName );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx
index 91d3e4e..2b33da0 100644
--- a/sw/source/core/edit/editsh.cxx
+++ b/sw/source/core/edit/editsh.cxx
@@ -340,7 +340,7 @@ void SwEditShell::ReRead( const String& rGrfName, const String& rFltName,
const Graphic* pGraphic, const GraphicObject* pGrfObj )
{
StartAllAction();
- pDoc->ReRead( *GetCrsr(), rGrfName, rFltName, pGraphic, pGrfObj );
+ mpDoc->ReRead( *GetCrsr(), rGrfName, rFltName, pGraphic, pGrfObj );
EndAllAction();
}
@@ -653,7 +653,7 @@ String SwEditShell::Calculate()
sfx2::LinkManager& SwEditShell::GetLinkManager()
{
- return pDoc->GetLinkManager();
+ return mpDoc->GetLinkManager();
}
diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx
index ef15045..a8af36d 100644
--- a/sw/source/core/edit/edlingu.cxx
+++ b/sw/source/core/edit/edlingu.cxx
@@ -806,7 +806,7 @@ uno::Any SwEditShell::SpellContinue(
//JP 18.07.95: verhinder bei Fehlermeldungen die Anzeige der Selektionen
// KEIN StartAction, da damit auch die Paints abgeschaltet
// werden !!!!!
- ++nStartAction;
+ ++mnStartAction;
rtl::OUString aRet;
uno::Reference< uno::XInterface > xRet;
if (pConvArgs)
@@ -819,7 +819,7 @@ uno::Any SwEditShell::SpellContinue(
pSpellIter->Continue( pPageCnt, pPageSt ) >>= xRet;
aRes <<= xRet;
}
- --nStartAction;
+ --mnStartAction;
if( !aRet.isEmpty() || xRet.is() )
{
@@ -923,10 +923,10 @@ uno::Reference< uno::XInterface >
//JP 18.07.95: verhinder bei Fehlermeldungen die Anzeige der Selektionen
// KEIN StartAction, da damit auch die Paints abgeschaltet
// werden !!!!!
- ++nStartAction;
+ ++mnStartAction;
uno::Reference< uno::XInterface > xRet;
pHyphIter->Continue( pPageCnt, pPageSt ) >>= xRet;
- --nStartAction;
+ --mnStartAction;
if( xRet.is() )
pHyphIter->ShowSelection();
@@ -962,9 +962,9 @@ void SwEditShell::HyphIgnore()
//JP 18.07.95: verhinder bei Fehlermeldungen die Anzeige der Selektionen
// KEIN StartAction, da damit auch die Paints abgeschaltet
// werden !!!!!
- ++nStartAction;
+ ++mnStartAction;
pHyphIter->Ignore();
- --nStartAction;
+ --mnStartAction;
pHyphIter->ShowSelection();
}
@@ -1115,11 +1115,11 @@ bool SwEditShell::GetGrammarCorrection(
{
String const aText(pNode->GetTxt().copy(nBegin, nLen));
- uno::Reference< linguistic2::XProofreadingIterator > xGCIterator( pDoc->GetGCIterator() );
+ uno::Reference< linguistic2::XProofreadingIterator > xGCIterator( mpDoc->GetGCIterator() );
if (xGCIterator.is())
{
// LanguageType eActLang = (LanguageType)pNode->GetLang( nBegin, nLen );
- uno::Reference< lang::XComponent > xDoc( pDoc->GetDocShell()->GetBaseModel(), uno::UNO_QUERY );
+ uno::Reference< lang::XComponent > xDoc( mpDoc->GetDocShell()->GetBaseModel(), uno::UNO_QUERY );
// Expand the string:
const ModelToViewHelper aConversionMap(*pNode);
@@ -1280,7 +1280,7 @@ void SwEditShell::ApplyChangedSentence(const ::svx::SpellPortions& rNewPortions,
// iterate over the new portions, beginning at the end to take advantage of the previously
// saved content positions
- pDoc->GetIDocumentUndoRedo().StartUndo( UNDO_UI_TEXT_CORRECTION, NULL );
+ mpDoc->GetIDocumentUndoRedo().StartUndo( UNDO_UI_TEXT_CORRECTION, NULL );
StartAction();
SwPaM *pCrsr = GetCrsr();
@@ -1334,11 +1334,11 @@ void SwEditShell::ApplyChangedSentence(const ::svx::SpellPortions& rNewPortions,
if(aCurrentNewPortion->sText != aCurrentOldPortion->sText)
{
//change text ...
- pDoc->DeleteAndJoin(*pCrsr);
+ mpDoc->DeleteAndJoin(*pCrsr);
// ... and apply language if necessary
if(aCurrentNewPortion->eLanguage != aCurrentOldPortion->eLanguage)
SetAttr( SvxLanguageItem(aCurrentNewPortion->eLanguage, nLangWhichId), nLangWhichId );
- pDoc->InsertString(*pCrsr, aCurrentNewPortion->sText);
+ mpDoc->InsertString(*pCrsr, aCurrentNewPortion->sText);
}
else if(aCurrentNewPortion->eLanguage != aCurrentOldPortion->eLanguage)
{
@@ -1368,7 +1368,7 @@ void SwEditShell::ApplyChangedSentence(const ::svx::SpellPortions& rNewPortions,
pCrsr->GetMark()->nContent = aCurrentEndPosition->nRight;
//delete the sentence completely
- pDoc->DeleteAndJoin(*pCrsr);
+ mpDoc->DeleteAndJoin(*pCrsr);
svx::SpellPortions::const_iterator aCurrentNewPortion = rNewPortions.begin();
while(aCurrentNewPortion != rNewPortions.end())
{
@@ -1386,7 +1386,7 @@ void SwEditShell::ApplyChangedSentence(const ::svx::SpellPortions& rNewPortions,
if(rLang.GetLanguage() != aCurrentNewPortion->eLanguage)
SetAttr( SvxLanguageItem(aCurrentNewPortion->eLanguage, nLangWhichId) );
//insert the new string
- pDoc->InsertString(*pCrsr, aCurrentNewPortion->sText);
+ mpDoc->InsertString(*pCrsr, aCurrentNewPortion->sText);
//set the cursor to the end of the inserted string
*pCrsr->Start() = *pCrsr->End();
@@ -1409,7 +1409,7 @@ void SwEditShell::ApplyChangedSentence(const ::svx::SpellPortions& rNewPortions,
// set continuation position for spell/grammar checking to the end of this sentence
pSpellIter->SetCurr( new SwPosition( *pCrsr->Start() ) );
- pDoc->GetIDocumentUndoRedo().EndUndo( UNDO_UI_TEXT_CORRECTION, NULL );
+ mpDoc->GetIDocumentUndoRedo().EndUndo( UNDO_UI_TEXT_CORRECTION, NULL );
EndAction();
}
}
diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx
index 18ba1df..8737885 100644
--- a/sw/source/core/edit/edtox.cxx
+++ b/sw/source/core/edit/edtox.cxx
@@ -89,7 +89,7 @@ void SwEditShell::DeleteTOXMark( SwTOXMark* pMark )
SET_CURR_SHELL( this );
StartAllAction();
- pDoc->DeleteTOXMark( pMark );
+ mpDoc->DeleteTOXMark( pMark );
EndAllAction();
}
@@ -147,7 +147,7 @@ void SwEditShell::InsertTableOf( const SwTOXBase& rTOX, const SfxItemSet* pSet )
::SetProgressText( STR_STATSTR_TOX_INSERT, pDocSh );
// Einfuegen des Verzeichnisses
- const SwTOXBaseSection* pTOX = pDoc->InsertTableOf(
+ const SwTOXBaseSection* pTOX = mpDoc->InsertTableOf(
*GetCrsr()->GetPoint(), rTOX, pSet, true );
OSL_ENSURE(pTOX, "Kein aktuelles Verzeichnis");
@@ -160,7 +160,7 @@ void SwEditShell::InsertTableOf( const SwTOXBase& rTOX, const SfxItemSet* pSet )
pTOX->SetPosAtStartEnd( *GetCrsr()->GetPoint() );
// Fix fuer leere Verzeichnisse
- InvalidateWindows( aVisArea );
+ InvalidateWindows( maVisArea );
::EndProgress( pDocSh );
EndAllAction();
}
@@ -233,7 +233,7 @@ bool SwEditShell::DeleteTOX( const SwTOXBase& rTOXBase, bool bDelNodes )
const SwTOXType* SwEditShell::GetTOXType(TOXTypes eTyp, sal_uInt16 nId) const
{
- return pDoc->GetTOXType(eTyp, nId);
+ return mpDoc->GetTOXType(eTyp, nId);
}
/*--------------------------------------------------------------------
diff --git a/sw/source/core/edit/edws.cxx b/sw/source/core/edit/edws.cxx
index 4ee35e4..5490252 100644
--- a/sw/source/core/edit/edws.cxx
+++ b/sw/source/core/edit/edws.cxx
@@ -234,13 +234,13 @@ SwFrmFmt *SwEditShell::GetTableFmt() // OPT: schnellster Test auf Tabelle?
sal_uInt16 SwEditShell::GetTOXTypeCount(TOXTypes eTyp) const
{
- return pDoc->GetTOXTypeCount(eTyp);
+ return mpDoc->GetTOXTypeCount(eTyp);
}
void SwEditShell::InsertTOXType(const SwTOXType& rTyp)
{
- pDoc->InsertTOXType(rTyp);
+ mpDoc->InsertTOXType(rTyp);
}
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index 18b3414..48bb0f8 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -456,10 +456,10 @@ sal_Bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
pDestShell->GetDoc()->LockExpFlds();
// Shift references
- sal_Bool bCopyIsMove = pDoc->IsCopyIsMove();
+ sal_Bool bCopyIsMove = mpDoc->IsCopyIsMove();
if( bIsMove )
// set a flag in Doc, handled in TextNodes
- pDoc->SetCopyIsMove( sal_True );
+ mpDoc->SetCopyIsMove( sal_True );
RedlineMode_t eOldRedlMode = pDestShell->GetDoc()->GetRedlineMode();
pDestShell->GetDoc()->SetRedlineMode_intern( (RedlineMode_t)(eOldRedlMode | nsRedlineMode_t::REDLINE_DELETE_REDLINES));
@@ -644,7 +644,7 @@ sal_Bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
}
pDestShell->GetDoc()->SetRedlineMode_intern( eOldRedlMode );
- pDoc->SetCopyIsMove( bCopyIsMove );
+ mpDoc->SetCopyIsMove( bCopyIsMove );
// have new table formules been inserted?
if( pTblFldTyp->GetDepends() )
@@ -1413,7 +1413,7 @@ void SwFEShell::Paste( SvStream& rStrm, sal_uInt16 nAction, const Point* pPt )
if( pOldObj->ISA(SwVirtFlyDrawObj) )
{
// store attributes, then set SdrObject
- SfxItemSet aFrmSet( pDoc->GetAttrPool(),
+ SfxItemSet aFrmSet( mpDoc->GetAttrPool(),
RES_SURROUND, RES_ANCHOR );
aFrmSet.Set( pFmt->GetAttrSet() );
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index f59d6d9..a6e003c 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -890,7 +890,7 @@ void SwFEShell::InsertDrawObj( SdrObject& rDrawObj,
rDrawObj.SetLayer( getIDocumentDrawModelAccess()->GetHeavenId() );
// find anchor position
- SwPaM aPam( pDoc->GetNodes() );
+ SwPaM aPam( mpDoc->GetNodes() );
{
SwCrsrMoveState aState( MV_SETONLYTEXT );
Point aTmpPt( rInsertPosition );
@@ -932,9 +932,9 @@ void SwFEShell::GetPageObjs( std::vector<SwFrmFmt*>& rFillArr )
{
rFillArr.clear();
- for( sal_uInt16 n = 0; n < pDoc->GetSpzFrmFmts()->size(); ++n )
+ for( sal_uInt16 n = 0; n < mpDoc->GetSpzFrmFmts()->size(); ++n )
{
- SwFrmFmt* pFmt = (*pDoc->GetSpzFrmFmts())[n];
+ SwFrmFmt* pFmt = (*mpDoc->GetSpzFrmFmts())[n];
if (FLY_AT_PAGE == pFmt->GetAnchor().GetAnchorId())
{
rFillArr.push_back( pFmt );
@@ -962,7 +962,7 @@ void SwFEShell::SetPageObjsNewPage( std::vector<SwFrmFmt*>& rFillArr, int nOffse
for( sal_uInt16 n = 0; n < rFillArr.size(); ++n )
{
SwFrmFmt* pFmt = rFillArr[n];
- if( pDoc->GetSpzFrmFmts()->Contains( pFmt ))
+ if( mpDoc->GetSpzFrmFmts()->Contains( pFmt ))
{
// FlyFmt is still valid, therefore process
@@ -986,7 +986,7 @@ void SwFEShell::SetPageObjsNewPage( std::vector<SwFrmFmt*>& rFillArr, int nOffse
bTmpAssert = true;
}
aNewAnchor.SetPageNum( sal_uInt16(nNewPage) );
- pDoc->SetAttr( aNewAnchor, *pFmt );
+ mpDoc->SetAttr( aNewAnchor, *pFmt );
}
}
@@ -1478,12 +1478,12 @@ SwFrmFmt* SwFEShell::WizzardGetFly()
{
// do not search the Fly via the layout. Now we can delete a frame
// without a valid layout. ( e.g. for the wizards )
- SwFrmFmts& rSpzArr = *pDoc->GetSpzFrmFmts();
+ SwFrmFmts& rSpzArr = *mpDoc->GetSpzFrmFmts();
sal_uInt16 nCnt = rSpzArr.size();
if( nCnt )
{
SwNodeIndex& rCrsrNd = GetCrsr()->GetPoint()->nNode;
- if( rCrsrNd.GetIndex() > pDoc->GetNodes().GetEndOfExtras().GetIndex() )
+ if( rCrsrNd.GetIndex() > mpDoc->GetNodes().GetEndOfExtras().GetIndex() )
// Cursor is in the body area!
return 0;
@@ -1848,7 +1848,7 @@ sal_Bool SwFEShell::ReplaceSdrObj( const String& rGrfName, const String& rFltNam
SwFrmFmt *pFmt = FindFrmFmt( pObj );
// store attributes, then set the graphic
- SfxItemSet aFrmSet( pDoc->GetAttrPool(),
+ SfxItemSet aFrmSet( mpDoc->GetAttrPool(),
pFmt->GetAttrSet().GetRanges() );
aFrmSet.Set( pFmt->GetAttrSet() );
@@ -1923,21 +1923,21 @@ void SwFEShell::GetConnectableFrmFmts(SwFrmFmt & rFmt,
SwFrmFmt * pOldChainPrev = (SwFrmFmt *) rChain.GetPrev();
if (pOldChainNext)
- pDoc->Unchain(rFmt);
+ mpDoc->Unchain(rFmt);
if (pOldChainPrev)
- pDoc->Unchain(*pOldChainPrev);
+ mpDoc->Unchain(*pOldChainPrev);
- sal_uInt16 nCnt = pDoc->GetFlyCount(FLYCNTTYPE_FRM);
+ sal_uInt16 nCnt = mpDoc->GetFlyCount(FLYCNTTYPE_FRM);
/* potential successors resp. predecessors */
::std::vector< const SwFrmFmt * > aTmpSpzArray;
- pDoc->FindFlyByName(rReference);
+ mpDoc->FindFlyByName(rReference);
for (sal_uInt16 n = 0; n < nCnt; n++)
{
- const SwFrmFmt & rFmt1 = *(pDoc->GetFlyNum(n, FLYCNTTYPE_FRM));
+ const SwFrmFmt & rFmt1 = *(mpDoc->GetFlyNum(n, FLYCNTTYPE_FRM));
/*
pFmt is a potential successor of rFmt if it is chainable after
@@ -1950,9 +1950,9 @@ void SwFEShell::GetConnectableFrmFmts(SwFrmFmt & rFmt,
int nChainState;
if (bSuccessors)
- nChainState = pDoc->Chainable(rFmt, rFmt1);
+ nChainState = mpDoc->Chainable(rFmt, rFmt1);
else
- nChainState = pDoc->Chainable(rFmt1, rFmt);
+ nChainState = mpDoc->Chainable(rFmt1, rFmt);
if (nChainState == SW_CHAIN_OK)
{
@@ -1999,10 +1999,10 @@ void SwFEShell::GetConnectableFrmFmts(SwFrmFmt & rFmt,
}
if (pOldChainNext)
- pDoc->Chain(rFmt, *pOldChainNext);
+ mpDoc->Chain(rFmt, *pOldChainNext);
if (pOldChainPrev)
- pDoc->Chain(*pOldChainPrev, rFmt);
+ mpDoc->Chain(*pOldChainPrev, rFmt);
EndAction();
}
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index 09b418b..4982e43 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -2383,7 +2383,7 @@ sal_Bool SwFEShell::GotoFly( const String& rName, FlyCntType eType, sal_Bool bSe
/* FLYCNTTYPE_OLE */ ND_OLENODE
};
- const SwFlyFrmFmt* pFlyFmt = pDoc->FindFlyByName( rName, aChkArr[ eType]);
+ const SwFlyFrmFmt* pFlyFmt = mpDoc->FindFlyByName( rName, aChkArr[ eType]);
if( pFlyFmt )
{
SET_CURR_SHELL( this );
@@ -2484,7 +2484,7 @@ sal_uInt8 SwFEShell::IsSelObjProtected( sal_uInt16 eType ) const
// set FLYPROTECT_POS if it is a Math object anchored 'as char' and baseline alignment is activated
const bool bProtectMathPos = SotExchange::IsMath( xObj->getClassID() )
&& FLY_AS_CHAR == pFly->GetFmt()->GetAnchor().GetAnchorId()
- && pDoc->get( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT );
+ && mpDoc->get( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT );
if ((FLYPROTECT_POS & eType) && bProtectMathPos)
nChk |= FLYPROTECT_POS;
}
diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx
index c421f67..cb89b35 100644
--- a/sw/source/core/frmedt/fews.cxx
+++ b/sw/source/core/frmedt/fews.cxx
@@ -566,7 +566,7 @@ sal_Bool SwFEShell::Sort(const SwSortOptions& rOpt)
}
// call sorting on document
- bRet = pDoc->SortTbl(aBoxes, rOpt) ? sal_True : sal_False;
+ bRet = mpDoc->SortTbl(aBoxes, rOpt) ? sal_True : sal_False;
}
else
{
@@ -583,7 +583,7 @@ sal_Bool SwFEShell::Sort(const SwSortOptions& rOpt)
xub_StrLen nCntStt = pStart->nContent.GetIndex();
// Sorting
- bRet = pDoc->SortText(*pPam, rOpt) ? sal_True : sal_False;
+ bRet = mpDoc->SortText(*pPam, rOpt) ? sal_True : sal_False;
// put selection again
pPam->DeleteMark();
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 6fd3a4a..79f8f56 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -2315,7 +2315,7 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) :
std::vector<bool> aBools;
ViewShell *pSh = pImp->GetShell();
do
- { ++pSh->nStartAction;
+ { ++pSh->mnStartAction;
sal_Bool bVis = sal_False;
if ( pSh->ISA(SwCrsrShell) )
{
@@ -2337,7 +2337,7 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) :
sal_uInt16 nBoolIdx = 0;
do
{
- --pSh->nStartAction;
+ --pSh->mnStartAction;
if ( pSh->Imp()->GetRegion() )
bActions = sal_True;
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index e1d8354..a23f3f6 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -7129,9 +7129,9 @@ sal_Bool SwFrm::GetBackgroundBrush( const SvxBrushItem* & rpBrush,
void SetOutDevAndWin( ViewShell *pSh, OutputDevice *pO,
Window *pW, sal_uInt16 nZoom )
{
- pSh->pOut = pO;
- pSh->pWin = pW;
- pSh->pOpt->SetZoom( nZoom );
+ pSh->mpOut = pO;
+ pSh->mpWin = pW;
+ pSh->mpOpt->SetZoom( nZoom );
}
Graphic SwFrmFmt::MakeGraphic( ImageMap* )
diff --git a/sw/source/core/view/pagepreviewlayout.cxx b/sw/source/core/view/pagepreviewlayout.cxx
index 4e758c6..06cf8fe 100644
--- a/sw/source/core/view/pagepreviewlayout.cxx
+++ b/sw/source/core/view/pagepreviewlayout.cxx
@@ -1152,7 +1152,7 @@ bool SwPagePreviewLayout::Paint( const Rectangle _aOutRect ) const
}
else
{
- mrParentViewShell.aVisArea = aPageRect;
+ mrParentViewShell.maVisArea = aPageRect;
aPxPaintRect.Intersection( aPxOutRect );
Rectangle aPaintRect = pOutputDev->PixelToLogic( aPxPaintRect );
mrParentViewShell.Paint( aPaintRect );
@@ -1197,7 +1197,7 @@ bool SwPagePreviewLayout::Paint( const Rectangle _aOutRect ) const
}
pOutputDev->SetMapMode( aSavedMapMode );
- mrParentViewShell.aVisArea.Clear();
+ mrParentViewShell.maVisArea.Clear();
// OD 07.11.2003 #i22014#
mbInPaint = false;
diff --git a/sw/source/core/view/viewimp.cxx b/sw/source/core/view/viewimp.cxx
index 0ec764d..a9ba921 100644
--- a/sw/source/core/view/viewimp.cxx
+++ b/sw/source/core/view/viewimp.cxx
@@ -176,7 +176,7 @@ sal_Bool SwViewImp::IsUpdateExpFlds()
void SwViewImp::SetFirstVisPage()
{
- if ( pSh->bDocSizeChgd && pSh->VisArea().Top() > pSh->GetLayout()->Frm().Height() )
+ if ( pSh->mbDocSizeChgd && pSh->VisArea().Top() > pSh->GetLayout()->Frm().Height() )
{
//We are in an action and because of erase actions the VisArea is
//after the first visible page.
diff --git a/sw/source/core/view/viewpg.cxx b/sw/source/core/view/viewpg.cxx
index 5cb4d5f..6b2362b 100644
--- a/sw/source/core/view/viewpg.cxx
+++ b/sw/source/core/view/viewpg.cxx
@@ -213,10 +213,10 @@ void ViewShell::PrintProspect(
if( pStPage )
{
aShell.Imp()->SetFirstVisPageInvalid();
- aShell.aVisArea = pStPage->Frm();
+ aShell.maVisArea = pStPage->Frm();
Point aPos( aSttPt );
- aPos -= aShell.aVisArea.Pos();
+ aPos -= aShell.maVisArea.Pos();
// aPos -= aPrtOff;
aMapMode.SetOrigin( aPos );
pPrinter->SetMapMode( aMapMode );
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 37fd1e1..02c6431 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -71,11 +71,11 @@
#include <svx/sdrpaintwindow.hxx>
-sal_Bool ViewShell::bLstAct = sal_False;
-ShellResource *ViewShell::pShellRes = 0;
-Window *ViewShell::pCareWindow = 0;
-BitmapEx* ViewShell::pErrorBmp = NULL;
-BitmapEx* ViewShell::pReplaceBmp = NULL;
+sal_Bool ViewShell::mbLstAct = sal_False;
+ShellResource *ViewShell::mpShellRes = 0;
+Window *ViewShell::mpCareWindow = 0;
+BitmapEx* ViewShell::mpErrorBmp = NULL;
+BitmapEx* ViewShell::mpReplaceBmp = NULL;
bool bInSizeNotify = false;
@@ -87,8 +87,8 @@ using namespace ::com::sun::star;
void ViewShell::ToggleHeaderFooterEdit()
{
- bHeaderFooterEdit = !bHeaderFooterEdit;
- if ( !bHeaderFooterEdit )
+ mbHeaderFooterEdit = !mbHeaderFooterEdit;
+ if ( !mbHeaderFooterEdit )
{
SetShowHeaderFooterSeparator( Header, false );
SetShowHeaderFooterSeparator( Footer, false );
@@ -98,7 +98,7 @@ void ViewShell::ToggleHeaderFooterEdit()
if ( !IsShowHeaderFooterSeparator( Header ) &&
!IsShowHeaderFooterSeparator( Footer ) )
{
- bHeaderFooterEdit = false;
+ mbHeaderFooterEdit = false;
}
// Repaint everything
@@ -132,7 +132,7 @@ void ViewShell::DLPrePaint2(const Region& rRegion)
if ( !HasDrawView() )
MakeDrawView();
- // Prefer window; if tot available, get pOut (e.g. printer)
+ // Prefer window; if tot available, get mpOut (e.g. printer)
mpPrePostOutDev = (GetWin() ? GetWin() : GetOut());
// #i74769# use SdrPaintWindow now direct
@@ -142,12 +142,12 @@ void ViewShell::DLPrePaint2(const Region& rRegion)
// #i74769# if prerender, save OutDev and redirect to PreRenderDevice
if(mpTargetPaintWindow->GetPreRenderDevice())
{
- mpBufferedOut = pOut;
- pOut = &(mpTargetPaintWindow->GetTargetOutputDevice());
+ mpBufferedOut = mpOut;
+ mpOut = &(mpTargetPaintWindow->GetTargetOutputDevice());
}
// remember original paint MapMode for wrapped FlyFrame paints
- maPrePostMapMode = pOut->GetMapMode();
+ maPrePostMapMode = mpOut->GetMapMode();
}
else
{
@@ -176,7 +176,7 @@ void ViewShell::DLPostPaint2(bool bPaintFormLayer)
// #i74769# restore buffered OutDev
if(mpTargetPaintWindow->GetPreRenderDevice())
{
- pOut = mpBufferedOut;
+ mpOut = mpBufferedOut;
}
// #i74769# use SdrPaintWindow now direct
@@ -193,21 +193,21 @@ void ViewShell::ImplEndAction( const sal_Bool bIdleEnd )
// Nothing to do for the printer?
if ( !GetWin() || IsPreView() )
{
- bPaintWorks = sal_True;
+ mbPaintWorks = sal_True;
UISizeNotify();
return;
}
- bInEndAction = sal_True;
+ mbInEndAction = sal_True;
//will this put the EndAction of the last shell in the sequence?
- ViewShell::bLstAct = sal_True;
+ ViewShell::mbLstAct = sal_True;
ViewShell *pSh = (ViewShell*)this->GetNext();
while ( pSh != this )
{
if ( pSh->ActionPend() )
{
- ViewShell::bLstAct = sal_False;
+ ViewShell::mbLstAct = sal_False;
pSh = this;
}
else
@@ -229,36 +229,36 @@ void ViewShell::ImplEndAction( const sal_Bool bIdleEnd )
{
SwLayAction aAction( GetLayout(), Imp() );
aAction.SetComplete( sal_False );
- if ( nLockPaint )
+ if ( mnLockPaint )
aAction.SetPaint( sal_False );
aAction.SetInputType( VCL_INPUT_KEYBOARD );
aAction.Action();
}
if ( bIsShellForCheckViewLayout )
- GetLayout()->CheckViewLayout( GetViewOptions(), &aVisArea );
+ GetLayout()->CheckViewLayout( GetViewOptions(), &maVisArea );
//If we don't call Paints, we wait for the Paint of the system.
//Then the clipping is set correctly; e.g. shifting of a Draw object
if ( Imp()->GetRegion() ||
- aInvalidRect.HasArea() ||
+ maInvalidRect.HasArea() ||
bExtraData )
{
- if ( !nLockPaint )
+ if ( !mnLockPaint )
{
SolarMutexGuard aGuard;
- sal_Bool bPaintsFromSystem = aInvalidRect.HasArea();
+ sal_Bool bPaintsFromSystem = maInvalidRect.HasArea();
GetWin()->Update();
- if ( aInvalidRect.HasArea() )
+ if ( maInvalidRect.HasArea() )
{
if ( bPaintsFromSystem )
- Imp()->AddPaintRect( aInvalidRect );
+ Imp()->AddPaintRect( maInvalidRect );
ResetInvalidRect();
bPaintsFromSystem = sal_True;
}
- bPaintWorks = sal_True;
+ mbPaintWorks = sal_True;
SwRegionRects *pRegion = Imp()->GetRegion();
@@ -322,7 +322,7 @@ void ViewShell::ImplEndAction( const sal_Bool bIdleEnd )
bPaint = false;
// --> OD 2007-07-26 #i79947#
- // #i72754# start Pre/PostPaint encapsulation before pOut is changed to the buffering VDev
+ // #i72754# start Pre/PostPaint encapsulation before mpOut is changed to the buffering VDev
const Region aRepaintRegion(aRect.SVRect());
DLPrePaint2(aRepaintRegion);
// <--
@@ -335,15 +335,15 @@ void ViewShell::ImplEndAction( const sal_Bool bIdleEnd )
aMapMode.SetOrigin( aOrigin );
pVout->SetMapMode( aMapMode );
- pOut = pVout;
+ mpOut = pVout;
if ( bPaintsFromSystem )
PaintDesktop( aRect );
pCurrentLayout->Paint( aRect );
pOld->DrawOutDev( aRect.Pos(), aRect.SSize(),
aRect.Pos(), aRect.SSize(), *pVout );
- pOut = pOld;
+ mpOut = pOld;
- // #i72754# end Pre/PostPaint encapsulation when pOut is back and content is painted
+ // #i72754# end Pre/PostPaint encapsulation when mpOut is back and content is painted
DLPostPaint2(true);
}
}
@@ -410,14 +410,14 @@ void ViewShell::ImplEndAction( const sal_Bool bIdleEnd )
else
{
Imp()->DelRegion();
- bPaintWorks = sal_True;
+ mbPaintWorks = sal_True;
}
}
else
- bPaintWorks = sal_True;
+ mbPaintWorks = sal_True;
- bInEndAction = sal_False;
- ViewShell::bLstAct = sal_False;
+ mbInEndAction = sal_False;
+ ViewShell::mbLstAct = sal_False;
Imp()->EndAction();
@@ -425,9 +425,9 @@ void ViewShell::ImplEndAction( const sal_Bool bIdleEnd )
//to adjust themselves correctly
//EndAction sends a Notify, and that must call Start-/EndAction to
//adjust the scrollbars correctly
- --nStartAction;
+ --mnStartAction;
UISizeNotify();
- ++nStartAction;
+ ++mnStartAction;
if( Imp()->IsAccessible() )
Imp()->FireAccessibleEvents();
@@ -436,7 +436,7 @@ void ViewShell::ImplEndAction( const sal_Bool bIdleEnd )
void ViewShell::ImplStartAction()
{
- bPaintWorks = sal_False;
+ mbPaintWorks = sal_False;
Imp()->StartAction();
}
@@ -457,8 +457,8 @@ void ViewShell::ImplUnlockPaint( sal_Bool bVirDev )
if ( (bInSizeNotify || bVirDev ) && VisArea().HasArea() )
{
//Refresh with virtual device to avoid flickering.
- VirtualDevice *pVout = new VirtualDevice( *pOut );
- pVout->SetMapMode( pOut->GetMapMode() );
+ VirtualDevice *pVout = new VirtualDevice( *mpOut );
+ pVout->SetMapMode( mpOut->GetMapMode() );
Size aSize( VisArea().SSize() );
aSize.Width() += 20;
aSize.Height()+= 20;
@@ -468,21 +468,21 @@ void ViewShell::ImplUnlockPaint( sal_Bool bVirDev )
GetWin()->Validate();
Imp()->UnlockPaint();
- pVout->SetLineColor( pOut->GetLineColor() );
- pVout->SetFillColor( pOut->GetFillColor() );
+ pVout->SetLineColor( mpOut->GetLineColor() );
+ pVout->SetFillColor( mpOut->GetFillColor() );
- // #i72754# start Pre/PostPaint encapsulation before pOut is changed to the buffering VDev
+ // #i72754# start Pre/PostPaint encapsulation before mpOut is changed to the buffering VDev
const Region aRepaintRegion(VisArea().SVRect());
DLPrePaint2(aRepaintRegion);
- OutputDevice *pOld = pOut;
- pOut = pVout;
+ OutputDevice *pOld = mpOut;
+ mpOut = pVout;
Paint( VisArea().SVRect() );
- pOut = pOld;
- pOut->DrawOutDev( VisArea().Pos(), aSize,
+ mpOut = pOld;
+ mpOut->DrawOutDev( VisArea().Pos(), aSize,
VisArea().Pos(), aSize, *pVout );
- // #i72754# end Pre/PostPaint encapsulation when pOut is back and content is painted
+ // #i72754# end Pre/PostPaint encapsulation when mpOut is back and content is painted
DLPostPaint2(true);
}
else
@@ -551,7 +551,7 @@ void ViewShell::MakeVisible( const SwRect &rRect )
{
if ( !IsViewLocked() )
{
- if( pWin )
+ if( mpWin )
{
const SwFrm* pRoot = GetLayout();
int nLoopCnt = 3;
@@ -578,10 +578,10 @@ void ViewShell::MakeVisible( const SwRect &rRect )
Window* ViewShell::CareChildWin(ViewShell& rVSh)
{
- if(rVSh.pSfxViewShell)
+ if(rVSh.mpSfxViewShell)
{
const sal_uInt16 nId = SvxSearchDialogWrapper::GetChildWindowId();
- SfxViewFrame* pVFrame = rVSh.pSfxViewShell->GetViewFrame();
+ SfxViewFrame* pVFrame = rVSh.mpSfxViewShell->GetViewFrame();
const SfxChildWindow* pChWin = pVFrame->GetChildWindow( nId );
Window *pWin = pChWin ? pChWin->GetWindow() : NULL;
if ( pWin && pWin->IsVisible() )
@@ -667,7 +667,7 @@ void ViewShell::LayoutIdle()
//for TCV-version: end of start phase of the application
TCovCall::Idle();
#endif
- if( !pOpt->IsIdle() || !GetWin() ||
+ if( !mpOpt->IsIdle() || !GetWin() ||
( Imp()->HasDrawView() && Imp()->GetDrawView()->IsDragObj() ) )
return;
@@ -684,7 +684,7 @@ void ViewShell::LayoutIdle()
#ifdef DBG_UTIL
// When Test5 has been printed, the IdleFormatter is ended.
- if( pOpt->IsTest5() )
+ if( mpOpt->IsTest5() )
return;
#endif
@@ -994,11 +994,11 @@ void ViewShell::SetFirstVisPageInvalid()
void ViewShell::SizeChgNotify()
{
- if ( !pWin )
- bDocSizeChgd = sal_True;
- else if( ActionPend() || Imp()->IsCalcLayoutProgress() || bPaintInProgress )
+ if ( !mpWin )
+ mbDocSizeChgd = sal_True;
+ else if( ActionPend() || Imp()->IsCalcLayoutProgress() || mbPaintInProgress )
{
- bDocSizeChgd = sal_True;
+ mbDocSizeChgd = sal_True;
if ( !Imp()->IsCalcLayoutProgress() && ISA( SwCrsrShell ) )
{
@@ -1015,7 +1015,7 @@ void ViewShell::SizeChgNotify()
}
else
{
- bDocSizeChgd = sal_False;
+ mbDocSizeChgd = sal_False;
::SizeNotify( this, GetDocSize() );
}
}
@@ -1042,13 +1042,13 @@ void ViewShell::VisPortChgd( const SwRect &rRect)
const SwRect aPrevArea( VisArea() );
const sal_Bool bFull = aPrevArea.IsEmpty();
- aVisArea = rRect;
+ maVisArea = rRect;
SetFirstVisPageInvalid();
//When there a PaintRegion still exists and the VisArea has changed,
//the PaintRegion is at least by now obsolete. The PaintRegion can
//have been created by RootFrm::Paint.
- if ( !bInEndAction &&
+ if ( !mbInEndAction &&
Imp()->GetRegion() && Imp()->GetRegion()->GetOrigin() != VisArea() )
Imp()->DelRegion();
@@ -1139,26 +1139,26 @@ void ViewShell::VisPortChgd( const SwRect &rRect)
Rectangle aRect( aPrevArea.SVRect() );
aRect.Left() = nMinLeft;
aRect.Right() = nMaxRight;
- if( VisArea().IsOver( aPrevArea ) && !nLockPaint )
+ if( VisArea().IsOver( aPrevArea ) && !mnLockPaint )
{
bScrolled = true;
- aVisArea.Pos() = aPrevArea.Pos();
+ maVisArea.Pos() = aPrevArea.Pos();
if ( SmoothScroll( nXDiff, nYDiff, &aRect ) )
return;
- aVisArea.Pos() = rRect.Pos();
+ maVisArea.Pos() = rRect.Pos();
}
else
GetWin()->Invalidate( aRect );
}
- else if ( !nLockPaint ) //will be released in Unlock
+ else if ( !mnLockPaint ) //will be released in Unlock
{
if( VisArea().IsOver( aPrevArea ) )
{
bScrolled = true;
- aVisArea.Pos() = aPrevArea.Pos();
+ maVisArea.Pos() = aPrevArea.Pos();
if ( SmoothScroll( nXDiff, nYDiff, 0 ) )
return;
- aVisArea.Pos() = rRect.Pos();
+ maVisArea.Pos() = rRect.Pos();
}
else
GetWin()->Invalidate();
@@ -1197,7 +1197,7 @@ void ViewShell::VisPortChgd( const SwRect &rRect)
sal_Bool ViewShell::SmoothScroll( long lXDiff, long lYDiff, const Rectangle *pRect )
{
- const sal_uLong nColCnt = pOut->GetColorCount();
+ const sal_uLong nColCnt = mpOut->GetColorCount();
long lMult = 1, lMax = LONG_MAX;
if ( nColCnt == 65536 )
{
@@ -1224,7 +1224,7 @@ sal_Bool ViewShell::SmoothScroll( long lXDiff, long lYDiff, const Rectangle *pRe
(void) bOnlyYScroll;
(void) bAllowedWithChildWindows;
#else
- const bool bSmoothScrollAllowed(bOnlyYScroll && bEnableSmooth && GetViewOptions()->IsSmoothScroll() && bAllowedWithChildWindows);
+ const bool bSmoothScrollAllowed(bOnlyYScroll && mbEnableSmooth && GetViewOptions()->IsSmoothScroll() && bAllowedWithChildWindows);
#endif
// <-
const bool bIAmCursorShell(ISA(SwCrsrShell));
@@ -1249,12 +1249,12 @@ sal_Bool ViewShell::SmoothScroll( long lXDiff, long lYDiff, const Rectangle *pRe
pVout->SetFillColor( GetWin()->GetFillColor() );
MapMode aMapMode( GetWin()->GetMapMode() );
pVout->SetMapMode( aMapMode );
- Size aSize( aVisArea.Width()+2*aPixSz.Width(), Abs(lYDiff)+(2*aPixSz.Height()) );
+ Size aSize( maVisArea.Width()+2*aPixSz.Width(), Abs(lYDiff)+(2*aPixSz.Height()) );
if ( pRect )
aSize.Width() = Min(aSize.Width(), pRect->GetWidth()+2*aPixSz.Width());
if ( pVout->SetOutputSize( aSize ) )
{
- nLockPaint++;
+ mnLockPaint++;
//First Paint everything in the virtual device.
SwRect aRect( VisArea() );
@@ -1271,12 +1271,12 @@ sal_Bool ViewShell::SmoothScroll( long lXDiff, long lYDiff, const Rectangle *pRe
aRect.Pos().X() = Max( 0L, aRect.Left()-aPixSz.Width() );
aRect.Pos() = GetWin()->PixelToLogic( GetWin()->LogicToPixel( aRect.Pos()));
aRect.SSize()= GetWin()->PixelToLogic( GetWin()->LogicToPixel( aRect.SSize()));
- aVisArea = aRect;
+ maVisArea = aRect;
const Point aPt( -aRect.Left(), -aRect.Top() );
aMapMode.SetOrigin( aPt );
pVout->SetMapMode( aMapMode );
- OutputDevice *pOld = pOut;
- pOut = pVout;
+ OutputDevice *pOld = mpOut;
+ mpOut = pVout;
{
// #i75172# To get a clean repaint, a new ObjectContact is needed here. Without, the
@@ -1291,27 +1291,27 @@ sal_Bool ViewShell::SmoothScroll( long lXDiff, long lYDiff, const Rectangle *pRe
SdrView* pDrawView = GetDrawView();
pDrawView->AddWindowToPaintView(pVout);
- // clear pWin during DLPrePaint2 to get paint preparation for pOut, but set it again
+ // clear mpWin during DLPrePaint2 to get paint preparation for mpOut, but set it again
// immediately afterwards. There are many decisions in SW which imply that Printing
- // is used when pWin == 0 (wrong but widely used).
- Window* pOldWin = pWin;
- pWin = 0;
+ // is used when mpWin == 0 (wrong but widely used).
+ Window* pOldWin = mpWin;
+ mpWin = 0;
DLPrePaint2(Region(aRect.SVRect()));
- pWin = pOldWin;
+ mpWin = pOldWin;
// SW paint stuff
PaintDesktop( aRect );
- ViewShell::bLstAct = sal_True;
+ ViewShell::mbLstAct = sal_True;
GetLayout()->Paint( aRect );
- ViewShell::bLstAct = sal_False;
+ ViewShell::mbLstAct = sal_False;
// end paint and destroy ObjectContact again
DLPostPaint2(true);
pDrawView->DeleteWindowFromPaintView(pVout);
}
- pOut = pOld;
- aVisArea = aOldVis;
+ mpOut = pOld;
+ maVisArea = aOldVis;
//Now shift in parts and copy the new Pixel from the virtual device.
@@ -1320,7 +1320,7 @@ sal_Bool ViewShell::SmoothScroll( long lXDiff, long lYDiff, const Rectangle *pRe
// as option?
// ??????????????????????
long lMaDelta = aPixSz.Height();
- if ( Abs(lYDiff) > ( aVisArea.Height() / 3 ) )
+ if ( Abs(lYDiff) > ( maVisArea.Height() / 3 ) )
lMaDelta *= 6;
else
lMaDelta *= 2;
@@ -1346,8 +1346,8 @@ sal_Bool ViewShell::SmoothScroll( long lXDiff, long lYDiff, const Rectangle *pRe
}
const SwRect aTmpOldVis = VisArea();
- aVisArea.Pos().Y() -= lScroll;
- aVisArea.Pos() = GetWin()->PixelToLogic( GetWin()->LogicToPixel( VisArea().Pos()));
+ maVisArea.Pos().Y() -= lScroll;
+ maVisArea.Pos() = GetWin()->PixelToLogic( GetWin()->LogicToPixel( VisArea().Pos()));
lScroll = aTmpOldVis.Top() - VisArea().Top();
if ( pRect )
{
@@ -1418,21 +1418,21 @@ sal_Bool ViewShell::SmoothScroll( long lXDiff, long lYDiff, const Rectangle *pRe
DLPostPaint2(true);
}
else
- --nLockPaint;
+ --mnLockPaint;
}
}
delete pVout;
GetWin()->Update();
if ( !Imp()->bStopSmooth )
- --nLockPaint;
+ --mnLockPaint;
SetFirstVisPageInvalid();
return sal_True;
}
delete pVout;
}
- aVisArea.Pos().X() -= lXDiff;
- aVisArea.Pos().Y() -= lYDiff;
+ maVisArea.Pos().X() -= lXDiff;
+ maVisArea.Pos().Y() -= lYDiff;
if ( pRect )
GetWin()->Scroll( lXDiff, lYDiff, *pRect, SCROLL_CHILDREN);
else
@@ -1608,9 +1608,9 @@ sal_Bool ViewShell::CheckInvalidForPaint( const SwRect &rRect )
// A recursive call of actions is no good idea because the inner action
// can't format frames which are locked by the outer action. This may
// cause and endless loop.
- ++nStartAction;
+ ++mnStartAction;
aAction.Action();
- --nStartAction;
+ --mnStartAction;
SwRegionRects *pRegion = Imp()->GetRegion();
if ( pRegion && aAction.IsBrowseActionStop() )
@@ -1660,10 +1660,10 @@ sal_Bool ViewShell::CheckInvalidForPaint( const SwRect &rRect )
//rRect == VisArea is the special case for new or
//Shift-Ctrl-R, when it shouldn't be necessary to
//hold the rRect again in Document coordinates.
- if ( aInvalidRect.IsEmpty() )
- aInvalidRect = rRect;
+ if ( maInvalidRect.IsEmpty() )
+ maInvalidRect = rRect;
else
- aInvalidRect.Union( rRect );
+ maInvalidRect.Union( rRect );
}
}
}
@@ -1680,7 +1680,7 @@ sal_Bool ViewShell::CheckInvalidForPaint( const SwRect &rRect )
void ViewShell::Paint(const Rectangle &rRect)
{
- if ( nLockPaint )
+ if ( mnLockPaint )
{
if ( Imp()->bSmoothUpdate )
{
@@ -1706,18 +1706,18 @@ void ViewShell::Paint(const Rectangle &rRect)
//With !nStartAction I try to protect me against erroneous code at other places.
//Hopefully it will not lead to problems!?
- if ( bPaintWorks && !nStartAction )
+ if ( mbPaintWorks && !mnStartAction )
{
if( GetWin() && GetWin()->IsVisible() )
{
SwRect aRect( rRect );
- if ( bPaintInProgress ) //Guard against double Paints!
+ if ( mbPaintInProgress ) //Guard against double Paints!
{
GetWin()->Invalidate( rRect );
return;
}
- bPaintInProgress = sal_True;
+ mbPaintInProgress = sal_True;
SET_CURR_SHELL( this );
SwRootFrm::SetNoVirDev( sal_True );
@@ -1732,11 +1732,11 @@ void ViewShell::Paint(const Rectangle &rRect)
if ( IsPreView() )
{
//When useful, process or destroy the old InvalidRect.
- if ( aRect.IsInside( aInvalidRect ) )
+ if ( aRect.IsInside( maInvalidRect ) )
ResetInvalidRect();
- ViewShell::bLstAct = sal_True;
+ ViewShell::mbLstAct = sal_True;
GetLayout()->Paint( aRect );
- ViewShell::bLstAct = sal_False;
+ ViewShell::mbLstAct = sal_False;
}
else
{
@@ -1753,11 +1753,11 @@ void ViewShell::Paint(const Rectangle &rRect)
PaintDesktop( aRect );
//When useful, process or destroy the old InvalidRect.
- if ( aRect.IsInside( aInvalidRect ) )
+ if ( aRect.IsInside( maInvalidRect ) )
ResetInvalidRect();
- ViewShell::bLstAct = sal_True;
+ ViewShell::mbLstAct = sal_True;
GetLayout()->Paint( aRect );
- ViewShell::bLstAct = sal_False;
+ ViewShell::mbLstAct = sal_False;
// --> OD 2009-08-12 #i101192#
// end Pre/PostPaint encapsulation
DLPostPaint2(true);
@@ -1765,18 +1765,18 @@ void ViewShell::Paint(const Rectangle &rRect)
}
}
SwRootFrm::SetNoVirDev( sal_False );
- bPaintInProgress = sal_False;
+ mbPaintInProgress = sal_False;
UISizeNotify();
}
}
else
{
- if ( aInvalidRect.IsEmpty() )
- aInvalidRect = SwRect( rRect );
+ if ( maInvalidRect.IsEmpty() )
+ maInvalidRect = SwRect( rRect );
else
- aInvalidRect.Union( SwRect( rRect ) );
+ maInvalidRect.Union( SwRect( rRect ) );
- if ( bInEndAction && GetWin() )
+ if ( mbInEndAction && GetWin() )
{
Region aRegion( GetWin()->GetPaintRegion() );
RegionHandle hHdl( aRegion.BeginEnumRects() );
@@ -1792,11 +1792,11 @@ void ViewShell::Paint(const Rectangle &rRect)
const Region aDLRegion(rRect);
DLPrePaint2(aDLRegion);
- pOut->Push( PUSH_FILLCOLOR|PUSH_LINECOLOR );
- pOut->SetFillColor( Imp()->GetRetoucheColor() );
- pOut->SetLineColor();
- pOut->DrawRect( rRect );
- pOut->Pop();
+ mpOut->Push( PUSH_FILLCOLOR|PUSH_LINECOLOR );
+ mpOut->SetFillColor( Imp()->GetRetoucheColor() );
+ mpOut->SetLineColor();
+ mpOut->DrawRect( rRect );
+ mpOut->Pop();
// #i68597#
DLPostPaint2(true);
}
@@ -1806,17 +1806,17 @@ void ViewShell::Paint(const Rectangle &rRect)
void ViewShell::SetBrowseBorder( const Size& rNew )
{
- if( rNew != aBrowseBorder )
+ if( rNew != maBrowseBorder )
{
- aBrowseBorder = rNew;
- if ( aVisArea.HasArea() )
+ maBrowseBorder = rNew;
+ if ( maVisArea.HasArea() )
CheckBrowseView( sal_False );
}
}
const Size& ViewShell::GetBrowseBorder() const
{
- return aBrowseBorder;
+ return maBrowseBorder;
}
sal_Int32 ViewShell::GetBrowseWidth() const
@@ -1824,13 +1824,13 @@ sal_Int32 ViewShell::GetBrowseWidth() const
const SwPostItMgr* pPostItMgr = GetPostItMgr();
if ( pPostItMgr && pPostItMgr->HasNotes() && pPostItMgr->ShowNotes() )
{
- Size aBorder( aBrowseBorder );
- aBorder.Width() += aBrowseBorder.Width();
+ Size aBorder( maBrowseBorder );
+ aBorder.Width() += maBrowseBorder.Width();
aBorder.Width() += pPostItMgr->GetSidebarWidth(true) + pPostItMgr->GetSidebarBorderWidth(true);
- return aVisArea.Width() - GetOut()->PixelToLogic(aBorder).Width();
+ return maVisArea.Width() - GetOut()->PixelToLogic(aBorder).Width();
}
else
- return aVisArea.Width() - 2 * GetOut()->PixelToLogic(aBrowseBorder).Width();
+ return maVisArea.Width() - 2 * GetOut()->PixelToLogic(maBrowseBorder).Width();
}
@@ -1893,7 +1893,7 @@ void ViewShell::CheckBrowseView( sal_Bool bBrowseChgd )
SwRootFrm *ViewShell::GetLayout() const
{
- return pLayout.get(); //swmod 080116
+ return mpLayout.get();
}
/***********************************************************************/
@@ -1914,7 +1914,7 @@ OutputDevice& ViewShell::GetRefDev() const
const SwNodes& ViewShell::GetNodes() const
{
- return pDoc->GetNodes();
+ return mpDoc->GetNodes();
}
@@ -1981,7 +1981,7 @@ void ViewShell::ApplyViewOptions( const SwViewOption &rOpt )
void ViewShell::ImplApplyViewOptions( const SwViewOption &rOpt )
{
- if (*pOpt == rOpt)
+ if (*mpOpt == rOpt)
return;
Window *pMyWin = GetWin();
@@ -1995,13 +1995,13 @@ void ViewShell::ImplApplyViewOptions( const SwViewOption &rOpt )
sal_Bool bReformat = sal_False;
- if( pOpt->IsShowHiddenField() != rOpt.IsShowHiddenField() )
+ if( mpOpt->IsShowHiddenField() != rOpt.IsShowHiddenField() )
{
- ((SwHiddenTxtFieldType*)pDoc->GetSysFldType( RES_HIDDENTXTFLD ))->
+ ((SwHiddenTxtFieldType*)mpDoc->GetSysFldType( RES_HIDDENTXTFLD ))->
SetHiddenFlag( !rOpt.IsShowHiddenField() );
bReformat = sal_True;
}
- if ( pOpt->IsShowHiddenPara() != rOpt.IsShowHiddenPara() )
+ if ( mpOpt->IsShowHiddenPara() != rOpt.IsShowHiddenPara() )
{
SwHiddenParaFieldType* pFldType = (SwHiddenParaFieldType*)GetDoc()->
GetSysFldType(RES_HIDDENPARAFLD);
@@ -2012,7 +2012,7 @@ void ViewShell::ImplApplyViewOptions( const SwViewOption &rOpt )
}
bReformat = sal_True;
}
- if ( !bReformat && pOpt->IsShowHiddenChar() != rOpt.IsShowHiddenChar() )
+ if ( !bReformat && mpOpt->IsShowHiddenChar() != rOpt.IsShowHiddenChar() )
{
bReformat = GetDoc()->ContainsHiddenChars();
}
@@ -2021,10 +2021,10 @@ void ViewShell::ImplApplyViewOptions( const SwViewOption &rOpt )
// - fieldnames apply or not ...
// ( - SwEndPortion must _no_ longer be generated. )
// - Of course, the screen is something completely different than the printer ...
- bReformat = bReformat || pOpt->IsFldName() != rOpt.IsFldName();
+ bReformat = bReformat || mpOpt->IsFldName() != rOpt.IsFldName();
// The map mode is changed, minima/maxima will be attended by UI
- if( pOpt->GetZoom() != rOpt.GetZoom() && !IsPreView() )
+ if( mpOpt->GetZoom() != rOpt.GetZoom() && !IsPreView() )
{
MapMode aMode( pMyWin->GetMapMode() );
Fraction aNewFactor( rOpt.GetZoom(), 100 );
@@ -2033,17 +2033,17 @@ void ViewShell::ImplApplyViewOptions( const SwViewOption &rOpt )
pMyWin->SetMapMode( aMode );
// if not a reference device (printer) is used for formatting,
// but the screen, new formatting is needed for zoomfactor changes.
- if( pOpt->getBrowseMode() )
+ if( mpOpt->getBrowseMode() )
bReformat = sal_True;
}
bool bBrowseModeChanged = false;
- if( pOpt->getBrowseMode() != rOpt.getBrowseMode() )
+ if( mpOpt->getBrowseMode() != rOpt.getBrowseMode() )
{
bBrowseModeChanged = true;
bReformat = sal_True;
}
- else if( pOpt->getBrowseMode() && pOpt->IsPrtFormat() != rOpt.IsPrtFormat() )
+ else if( mpOpt->getBrowseMode() && mpOpt->IsPrtFormat() != rOpt.IsPrtFormat() )
bReformat = sal_True;
if ( HasDrawView() || rOpt.IsGridVisible() )
@@ -2076,18 +2076,18 @@ void ViewShell::ImplApplyViewOptions( const SwViewOption &rOpt )
pDView->SetMarkHdlSizePixel(9);
}
- bool bOnlineSpellChgd = pOpt->IsOnlineSpell() != rOpt.IsOnlineSpell();
+ bool bOnlineSpellChgd = mpOpt->IsOnlineSpell() != rOpt.IsOnlineSpell();
- *pOpt = rOpt; // First the options are taken.
- pOpt->SetUIOptions(rOpt);
+ *mpOpt = rOpt; // First the options are taken.
+ mpOpt->SetUIOptions(rOpt);
- pDoc->set(IDocumentSettingAccess::HTML_MODE, 0 != ::GetHtmlMode(pDoc->GetDocShell()));
+ mpDoc->set(IDocumentSettingAccess::HTML_MODE, 0 != ::GetHtmlMode(mpDoc->GetDocShell()));
if( bBrowseModeChanged )
{
// #i44963# Good occasion to check if page sizes in
// page descriptions are still set to (LONG_MAX, LONG_MAX) (html import)
- pDoc->CheckDefaultPageFmt();
+ mpDoc->CheckDefaultPageFmt();
CheckBrowseView( sal_True );
}
@@ -2106,7 +2106,7 @@ void ViewShell::ImplApplyViewOptions( const SwViewOption &rOpt )
ViewShell *pSh = (ViewShell*)this->GetNext();
sal_Bool bOnlineSpl = rOpt.IsOnlineSpell();
while( pSh != this )
- { pSh->pOpt->SetOnlineSpell( bOnlineSpl );
+ { pSh->mpOpt->SetOnlineSpell( bOnlineSpl );
Window *pTmpWin = pSh->GetWin();
if( pTmpWin )
pTmpWin->Invalidate();
@@ -2119,13 +2119,13 @@ void ViewShell::ImplApplyViewOptions( const SwViewOption &rOpt )
void ViewShell::SetUIOptions( const SwViewOption &rOpt )
{
- pOpt->SetUIOptions(rOpt);
+ mpOpt->SetUIOptions(rOpt);
//the API-Flag of the view options is set but never reset
//it is required to set scroll bars in readonly documents
if(rOpt.IsStarOneSetting())
- pOpt->SetStarOneSetting(sal_True);
+ mpOpt->SetStarOneSetting(sal_True);
- pOpt->SetSymbolFont(rOpt.GetSymbolFont());
+ mpOpt->SetSymbolFont(rOpt.GetSymbolFont());
}
@@ -2135,14 +2135,14 @@ void ViewShell::SetReadonlyOption(sal_Bool bSet)
// and if need be format; Bug 61335
// Are we switching from readonly to edit?
- if( bSet != pOpt->IsReadonly() )
+ if( bSet != mpOpt->IsReadonly() )
{
// so that the flags can be queried properly.
- pOpt->SetReadonly( sal_False );
+ mpOpt->SetReadonly( sal_False );
- sal_Bool bReformat = pOpt->IsFldName();
+ sal_Bool bReformat = mpOpt->IsFldName();
- pOpt->SetReadonly( bSet );
+ mpOpt->SetReadonly( bSet );
if( bReformat )
{
@@ -2162,35 +2162,35 @@ void ViewShell::SetReadonlyOption(sal_Bool bSet)
void ViewShell::SetPDFExportOption(sal_Bool bSet)
{
- if( bSet != pOpt->IsPDFExport() )
+ if( bSet != mpOpt->IsPDFExport() )
{
- if( bSet && pOpt->getBrowseMode() )
- pOpt->SetPrtFormat( sal_True );
- pOpt->SetPDFExport(bSet);
+ if( bSet && mpOpt->getBrowseMode() )
+ mpOpt->SetPrtFormat( sal_True );
+ mpOpt->SetPDFExport(bSet);
}
}
void ViewShell::SetReadonlySelectionOption(sal_Bool bSet)
{
- if( bSet != pOpt->IsSelectionInReadonly() )
+ if( bSet != mpOpt->IsSelectionInReadonly() )
{
- pOpt->SetSelectionInReadonly(bSet);
+ mpOpt->SetSelectionInReadonly(bSet);
}
}
void ViewShell::SetPrtFormatOption( sal_Bool bSet )
{
- pOpt->SetPrtFormat( bSet );
+ mpOpt->SetPrtFormat( bSet );
}
void ViewShell::UISizeNotify()
{
- if ( bDocSizeChgd )
+ if ( mbDocSizeChgd )
{
- bDocSizeChgd = sal_False;
+ mbDocSizeChgd = sal_False;
bool bOld = bInSizeNotify;
bInSizeNotify = true;
::SizeNotify( this, GetDocSize() );
@@ -2219,10 +2219,10 @@ uno::Reference< ::com::sun::star::accessibility::XAccessible > ViewShell::Create
uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc;
// We require a layout and an XModel to be accessible.
- OSL_ENSURE( pLayout, "no layout, no access" );
+ OSL_ENSURE( mpLayout, "no layout, no access" );
OSL_ENSURE( GetWin(), "no window, no access" );
- if( pDoc->GetCurrentViewShell() && GetWin() ) //swmod 071108
+ if( mpDoc->GetCurrentViewShell() && GetWin() ) //swmod 071108
xAcc = Imp()->GetAccessibleMap().GetDocumentView();
return xAcc;
@@ -2235,7 +2235,7 @@ ViewShell::CreateAccessiblePreview()
"Can't create accessible preview for non-preview ViewShell" );
// We require a layout and an XModel to be accessible.
- OSL_ENSURE( pLayout, "no layout, no access" );
+ OSL_ENSURE( mpLayout, "no layout, no access" );
OSL_ENSURE( GetWin(), "no window, no access" );
if ( IsPreView() && GetLayout()&& GetWin() )
@@ -2302,32 +2302,32 @@ SwAccessibleMap* ViewShell::GetAccessibleMap()
void ViewShell::ApplyAccessiblityOptions(SvtAccessibilityOptions& rAccessibilityOptions)
{
- if(pOpt->IsPagePreview() && !rAccessibilityOptions.GetIsForPagePreviews())
+ if(mpOpt->IsPagePreview() && !rAccessibilityOptions.GetIsForPagePreviews())
{
- pAccOptions->SetAlwaysAutoColor(sal_False);
- pAccOptions->SetStopAnimatedGraphics(sal_False);
- pAccOptions->SetStopAnimatedText(sal_False);
+ mpAccOptions->SetAlwaysAutoColor(sal_False);
+ mpAccOptions->SetStopAnimatedGraphics(sal_False);
+ mpAccOptions->SetStopAnimatedText(sal_False);
}
else
{
- pAccOptions->SetAlwaysAutoColor(rAccessibilityOptions.GetIsAutomaticFontColor());
- pAccOptions->SetStopAnimatedGraphics(! rAccessibilityOptions.GetIsAllowAnimatedGraphics());
- pAccOptions->SetStopAnimatedText(! rAccessibilityOptions.GetIsAllowAnimatedText());
+ mpAccOptions->SetAlwaysAutoColor(rAccessibilityOptions.GetIsAutomaticFontColor());
+ mpAccOptions->SetStopAnimatedGraphics(! rAccessibilityOptions.GetIsAllowAnimatedGraphics());
+ mpAccOptions->SetStopAnimatedText(! rAccessibilityOptions.GetIsAllowAnimatedText());
// Formular view
// Always set this option, not only if document is read-only:
- pOpt->SetSelectionInReadonly(rAccessibilityOptions.IsSelectionInReadonly());
+ mpOpt->SetSelectionInReadonly(rAccessibilityOptions.IsSelectionInReadonly());
}
}
ShellResource* ViewShell::GetShellRes()
{
- return pShellRes;
+ return mpShellRes;
}
void ViewShell::SetCareWin( Window* pNew )
{
- pCareWindow = pNew;
+ mpCareWindow = pNew;
}
sal_uInt16 ViewShell::GetPageCount() const
@@ -2394,12 +2394,12 @@ const BitmapEx& ViewShell::GetReplacementBitmap( bool bIsErrorState )
sal_uInt16 nResId = 0;
if( bIsErrorState )
{
- ppRet = &pErrorBmp;
+ ppRet = &mpErrorBmp;
nResId = RID_GRAPHIC_ERRORBMP;
}
else
{
- ppRet = &pReplaceBmp;
+ ppRet = &mpReplaceBmp;
nResId = RID_GRAPHIC_REPLACEBMP;
}
@@ -2412,8 +2412,8 @@ const BitmapEx& ViewShell::GetReplacementBitmap( bool bIsErrorState )
void ViewShell::DeleteReplacementBitmaps()
{
- DELETEZ( pErrorBmp );
- DELETEZ( pReplaceBmp );
+ DELETEZ( mpErrorBmp );
+ DELETEZ( mpReplaceBmp );
}
SwPostItMgr* ViewShell::GetPostItMgr()
@@ -2428,35 +2428,35 @@ SwPostItMgr* ViewShell::GetPostItMgr()
/*
* Document Interface Access
*/
-const IDocumentSettingAccess* ViewShell::getIDocumentSettingAccess() const { return pDoc; }
-IDocumentSettingAccess* ViewShell::getIDocumentSettingAccess() { return pDoc; }
-const IDocumentDeviceAccess* ViewShell::getIDocumentDeviceAccess() const { return pDoc; }
-IDocumentDeviceAccess* ViewShell::getIDocumentDeviceAccess() { return pDoc; }
-const IDocumentMarkAccess* ViewShell::getIDocumentMarkAccess() const { return pDoc->getIDocumentMarkAccess(); }
-IDocumentMarkAccess* ViewShell::getIDocumentMarkAccess() { return pDoc->getIDocumentMarkAccess(); }
-const IDocumentDrawModelAccess* ViewShell::getIDocumentDrawModelAccess() const { return pDoc; }
-IDocumentDrawModelAccess* ViewShell::getIDocumentDrawModelAccess() { return pDoc; }
-const IDocumentRedlineAccess* ViewShell::getIDocumentRedlineAccess() const { return pDoc; }
-IDocumentRedlineAccess* ViewShell::getIDocumentRedlineAccess() { return pDoc; }
-const IDocumentLayoutAccess* ViewShell::getIDocumentLayoutAccess() const { return pDoc; }
-IDocumentLayoutAccess* ViewShell::getIDocumentLayoutAccess() { return pDoc; }
-IDocumentContentOperations* ViewShell::getIDocumentContentOperations() { return pDoc; }
-IDocumentStylePoolAccess* ViewShell::getIDocumentStylePoolAccess() { return pDoc; }
-const IDocumentStatistics* ViewShell::getIDocumentStatistics() const { return pDoc; }
+const IDocumentSettingAccess* ViewShell::getIDocumentSettingAccess() const { return mpDoc; }
+IDocumentSettingAccess* ViewShell::getIDocumentSettingAccess() { return mpDoc; }
+const IDocumentDeviceAccess* ViewShell::getIDocumentDeviceAccess() const { return mpDoc; }
+IDocumentDeviceAccess* ViewShell::getIDocumentDeviceAccess() { return mpDoc; }
+const IDocumentMarkAccess* ViewShell::getIDocumentMarkAccess() const { return mpDoc->getIDocumentMarkAccess(); }
+IDocumentMarkAccess* ViewShell::getIDocumentMarkAccess() { return mpDoc->getIDocumentMarkAccess(); }
+const IDocumentDrawModelAccess* ViewShell::getIDocumentDrawModelAccess() const { return mpDoc; }
+IDocumentDrawModelAccess* ViewShell::getIDocumentDrawModelAccess() { return mpDoc; }
+const IDocumentRedlineAccess* ViewShell::getIDocumentRedlineAccess() const { return mpDoc; }
+IDocumentRedlineAccess* ViewShell::getIDocumentRedlineAccess() { return mpDoc; }
+const IDocumentLayoutAccess* ViewShell::getIDocumentLayoutAccess() const { return mpDoc; }
+IDocumentLayoutAccess* ViewShell::getIDocumentLayoutAccess() { return mpDoc; }
+IDocumentContentOperations* ViewShell::getIDocumentContentOperations() { return mpDoc; }
+IDocumentStylePoolAccess* ViewShell::getIDocumentStylePoolAccess() { return mpDoc; }
+const IDocumentStatistics* ViewShell::getIDocumentStatistics() const { return mpDoc; }
IDocumentUndoRedo & ViewShell::GetIDocumentUndoRedo()
-{ return pDoc->GetIDocumentUndoRedo(); }
+{ return mpDoc->GetIDocumentUndoRedo(); }
IDocumentUndoRedo const& ViewShell::GetIDocumentUndoRedo() const
-{ return pDoc->GetIDocumentUndoRedo(); }
+{ return mpDoc->GetIDocumentUndoRedo(); }
// --> OD 2007-11-14 #i83479#
const IDocumentListItems* ViewShell::getIDocumentListItemsAccess() const
{
- return pDoc;
+ return mpDoc;
}
const IDocumentOutlineNodes* ViewShell::getIDocumentOutlineNodesAccess() const
{
- return pDoc;
+ return mpDoc;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/view/vnew.cxx b/sw/source/core/view/vnew.cxx
index 56b4882..3b27367 100644
--- a/sw/source/core/view/vnew.cxx
+++ b/sw/source/core/view/vnew.cxx
@@ -50,7 +50,7 @@ void ViewShell::Init( const SwViewOption *pNewOpt )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722", "ViewShell::Init" );
- bDocSizeChgd = sal_False;
+ mbDocSizeChgd = sal_False;
// Wir gehen auf Nummer sicher:
// Wir muessen die alten Fontinformationen wegschmeissen,
@@ -60,48 +60,48 @@ void ViewShell::Init( const SwViewOption *pNewOpt )
// ViewOptions werden dynamisch angelegt
- if( !pOpt )
+ if( !mpOpt )
{
- pOpt = new SwViewOption;
+ mpOpt = new SwViewOption;
// Ein ApplyViewOptions braucht nicht gerufen zu werden
if( pNewOpt )
{
- *pOpt = *pNewOpt;
+ *mpOpt = *pNewOpt;
// Der Zoomfaktor muss eingestellt werden, weil in der CTOR-
// phase aus Performancegruenden kein ApplyViewOptions gerufen wird.
- if( GetWin() && 100 != pOpt->GetZoom() )
+ if( GetWin() && 100 != mpOpt->GetZoom() )
{
- MapMode aMode( pWin->GetMapMode() );
- const Fraction aNewFactor( pOpt->GetZoom(), 100 );
+ MapMode aMode( mpWin->GetMapMode() );
+ const Fraction aNewFactor( mpOpt->GetZoom(), 100 );
aMode.SetScaleX( aNewFactor );
aMode.SetScaleY( aNewFactor );
- pWin->SetMapMode( aMode );
+ mpWin->SetMapMode( aMode );
}
}
}
- SwDocShell* pDShell = pDoc->GetDocShell();
- pDoc->set(IDocumentSettingAccess::HTML_MODE, 0 != ::GetHtmlMode( pDShell ) );
+ SwDocShell* pDShell = mpDoc->GetDocShell();
+ mpDoc->set(IDocumentSettingAccess::HTML_MODE, 0 != ::GetHtmlMode( pDShell ) );
// JP 02.02.99: Bug 61335 - Readonly-Flag an den ViewOptions setzen,
// bevor das Layout angelegt wird. Ansonsten muesste man
// nochmals durchformatieren!!
if( pDShell && pDShell->IsReadOnly() )
- pOpt->SetReadonly( sal_True );
+ mpOpt->SetReadonly( sal_True );
RTL_LOGFILE_CONTEXT_TRACE( aLog, "View::Init - before InitPrt" );
// --> FME 2007-11-06 #i82967#
OutputDevice* pPDFOut = 0;
- if ( pOut && pOut->GetPDFWriter() )
- pPDFOut = pOut;
+ if ( mpOut && mpOut->GetPDFWriter() )
+ pPDFOut = mpOut;
// <--
// --> FME 2005-01-21 #i41075#
// Only setup the printer if we need one:
- const bool bBrowseMode = pOpt->getBrowseMode();
+ const bool bBrowseMode = mpOpt->getBrowseMode();
if( pPDFOut )
InitPrt( pPDFOut );
// <--
@@ -110,7 +110,7 @@ void ViewShell::Init( const SwViewOption *pNewOpt )
// page descriptions are still set to (LONG_MAX, LONG_MAX) (html import)
if ( !bBrowseMode )
{
- pDoc->CheckDefaultPageFmt();
+ mpDoc->CheckDefaultPageFmt();
}
// <--
@@ -118,27 +118,27 @@ void ViewShell::Init( const SwViewOption *pNewOpt )
if( GetWin() )
{
- pOpt->Init( GetWin() );
+ mpOpt->Init( GetWin() );
GetWin()->SetFillColor();
GetWin()->SetBackground();
GetWin()->SetLineColor();
}
// Create a new layout, if there is no one available
- if( !pLayout )
+ if( !mpLayout )
{
// Here's the code which disables the usage of "multiple" layouts at the moment
// If the problems with controls and groups objects are solved,
// this code can be removed...
ViewShell *pCurrShell = GetDoc()->GetCurrentViewShell();
if( pCurrShell )
- pLayout = pCurrShell->pLayout;
+ mpLayout = pCurrShell->mpLayout;
// end of "disable multiple layouts"
- if( !pLayout )
+ if( !mpLayout )
{
// switched to two step construction because creating the layout in SwRootFrm needs a valid pLayout set
- pLayout = SwRootFrmPtr(new SwRootFrm( pDoc->GetDfltFrmFmt(), this ));//swmod081016
- pLayout->Init( pDoc->GetDfltFrmFmt() );
+ mpLayout = SwRootFrmPtr(new SwRootFrm( mpDoc->GetDfltFrmFmt(), this ));
+ mpLayout->Init( mpDoc->GetDfltFrmFmt() );
// mba: the layout refactoring overlooked an important detail
// prior to that change, the layout always was destroyed in the dtor of swdoc
@@ -149,7 +149,7 @@ void ViewShell::Init( const SwViewOption *pNewOpt )
// "pDoc->IsInDtor()" means what is says or in fact should check for "pRootFrm->IsInDtor()". As this will take some time, I decided
// to postpone that investigations and the changes it will bring to the 3.5 release and for 3.4 make sure
// that the layout still gets destroyed in the doc dtor. This is done by sharing "the" layout (that we still have) with the doc.
- GetDoc()->ShareLayout( pLayout );
+ GetDoc()->ShareLayout( mpLayout );
}
}
SizeChgNotify(); //swmod 071108
@@ -161,7 +161,7 @@ void ViewShell::Init( const SwViewOption *pNewOpt )
{
if( ! HasDrawView() )
MakeDrawView();
- pOpt->SetFormView( ! GetDrawView()->IsDesignMode() );
+ mpOpt->SetFormView( ! GetDrawView()->IsDesignMode() );
}
// <-- #i31958#
}
@@ -178,24 +178,24 @@ ViewShell::ViewShell( SwDoc& rDocument, Window *pWindow,
const SwViewOption *pNewOpt, OutputDevice *pOutput,
long nFlags )
:
- aBrowseBorder(),
- pSfxViewShell( 0 ),
- pImp( new SwViewImp( this ) ),
- pWin( pWindow ),
- pOut( pOutput ? pOutput
+ maBrowseBorder(),
+ mpSfxViewShell( 0 ),
+ mpImp( new SwViewImp( this ) ),
+ mpWin( pWindow ),
+ mpOut( pOutput ? pOutput
: pWindow ? (OutputDevice*)pWindow
: (OutputDevice*)rDocument.getPrinter( true )),
mpTmpRef( 0 ),
- pOpt( 0 ),
- pAccOptions( new SwAccessibilityOptions ),
- bShowHeaderSeparator( false ),
- bShowFooterSeparator( false ),
- bHeaderFooterEdit( false ),
+ mpOpt( 0 ),
+ mpAccOptions( new SwAccessibilityOptions ),
+ mbShowHeaderSeparator( false ),
+ mbShowFooterSeparator( false ),
+ mbHeaderFooterEdit( false ),
mpTargetPaintWindow(0), // #i74769#
mpBufferedOut(0), // #i74769#
- pDoc( &rDocument ),
- nStartAction( 0 ),
- nLockPaint( 0 ),
+ mpDoc( &rDocument ),
+ mnStartAction( 0 ),
+ mnLockPaint( 0 ),
mpPrePostOutDev(0), // #i72754#
maPrePostMapMode()
{
@@ -205,45 +205,45 @@ ViewShell::ViewShell( SwDoc& rDocument, Window *pWindow,
// <SwDrawContact::Changed> during contruction of <ViewShell> instance
mbInConstructor = true;
- bPaintInProgress = bViewLocked = bInEndAction = bFrameView =
- bEndActionByVirDev = sal_False;
- bPaintWorks = bEnableSmooth = sal_True;
- bPreView = 0 !=( VSHELLFLAG_ISPREVIEW & nFlags );
+ mbPaintInProgress = mbViewLocked = mbInEndAction = mbFrameView =
+ mbEndActionByVirDev = sal_False;
+ mbPaintWorks = mbEnableSmooth = sal_True;
+ mbPreView = 0 !=( VSHELLFLAG_ISPREVIEW & nFlags );
// --> OD 2005-02-11 #i38810# - Do not reset modified state of document,
// if it's already been modified.
- const bool bIsDocModified( pDoc->IsModified() );
- pDoc->acquire();
- pOutput = pOut;
+ const bool bIsDocModified( mpDoc->IsModified() );
+ mpDoc->acquire();
+ pOutput = mpOut;
Init( pNewOpt ); //verstellt ggf. das Outdev (InitPrt())
- pOut = pOutput;
+ mpOut = pOutput;
// OD 28.03.2003 #108470# - initialize print preview layout after layout
// is created in <ViewShell::Init(..)> - called above.
- if ( bPreView )
+ if ( mbPreView )
{
// OD 12.12.2002 #103492# - init page preview layout
- pImp->InitPagePreviewLayout();
+ mpImp->InitPagePreviewLayout();
}
SET_CURR_SHELL( this );
- ((SwHiddenTxtFieldType*)pDoc->GetSysFldType( RES_HIDDENTXTFLD ))->
- SetHiddenFlag( !pOpt->IsShowHiddenField() );
+ ((SwHiddenTxtFieldType*)mpDoc->GetSysFldType( RES_HIDDENTXTFLD ))->
+ SetHiddenFlag( !mpOpt->IsShowHiddenField() );
//In Init wird ein Standard-FrmFmt angelegt.
// --> OD 2005-02-11 #i38810#
- if ( !pDoc->GetIDocumentUndoRedo().IsUndoNoResetModified()
+ if ( !mpDoc->GetIDocumentUndoRedo().IsUndoNoResetModified()
&& !bIsDocModified )
// <--
{
- pDoc->ResetModified();
+ mpDoc->ResetModified();
}
//Format-Cache erweitern.
if ( SwTxtFrm::GetTxtCache()->GetCurMax() < 2550 )
SwTxtFrm::GetTxtCache()->IncreaseMax( 100 );
- if( pOpt->IsGridVisible() || getIDocumentDrawModelAccess()->GetDrawModel() )
+ if( mpOpt->IsGridVisible() || getIDocumentDrawModelAccess()->GetDrawModel() )
Imp()->MakeDrawView();
// OD 2004-06-01 #i26791#
@@ -261,24 +261,24 @@ ViewShell::ViewShell( SwDoc& rDocument, Window *pWindow,
ViewShell::ViewShell( ViewShell& rShell, Window *pWindow,
OutputDevice *pOutput, long nFlags ) :
Ring( &rShell ),
- aBrowseBorder( rShell.aBrowseBorder ),
- pSfxViewShell( 0 ),
- pImp( new SwViewImp( this ) ),
- pWin( pWindow ),
- pOut( pOutput ? pOutput
+ maBrowseBorder( rShell.maBrowseBorder ),
+ mpSfxViewShell( 0 ),
+ mpImp( new SwViewImp( this ) ),
+ mpWin( pWindow ),
+ mpOut( pOutput ? pOutput
: pWindow ? (OutputDevice*)pWindow
: (OutputDevice*)rShell.GetDoc()->getPrinter( true )),
mpTmpRef( 0 ),
- pOpt( 0 ),
- pAccOptions( new SwAccessibilityOptions ),
- bShowHeaderSeparator( false ),
- bShowFooterSeparator( false ),
- bHeaderFooterEdit( false ),
+ mpOpt( 0 ),
+ mpAccOptions( new SwAccessibilityOptions ),
+ mbShowHeaderSeparator( false ),
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list