diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2013-10-16 16:36:45 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2013-10-16 16:57:22 +0200 |
| commit | 66013a154bd2dccc0db1edd14197ce419ba9a614 (patch) | |
| tree | 0698af88b8d236e98bafa6848f73851e0b752f15 /sw | |
| parent | d62b71bddedccb6ff29090f621cc0803565332ec (diff) | |
[API CHANGE]: PreView -> Preview, including .uno:PrintPagePreView.
Will be .uno:PrintPagePreview going forward.
Change-Id: Ie5a35467917a54a60dab9eaacf0690c9df27e6f6
Diffstat (limited to 'sw')
46 files changed, 262 insertions, 262 deletions
diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx index f1fafe6b3532..e5ad23f6af13 100644 --- a/sw/inc/accmap.hxx +++ b/sw/inc/accmap.hxx @@ -171,7 +171,7 @@ public: @return an object of class <Size> */ - Size GetPreViewPageSize( sal_uInt16 _nPreviewPageNum ) const; + Size GetPreviewPageSize( sal_uInt16 _nPreviewPageNum ) const; void RemoveContext( const SwFrm *pFrm ); void RemoveContext( const SdrObject *pObj ); @@ -240,7 +240,7 @@ public: const SwPageFrm* _pSelectedPageFrm, const Size& _rPreviewWinSize ); - void InvalidatePreViewSelection( sal_uInt16 nSelPage ); + void InvalidatePreviewSelection( sal_uInt16 nSelPage ); bool IsPageSelected( const SwPageFrm *pPageFrm ) const; void FireEvents(); diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 2ce96053c30d..42379e40d686 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -142,7 +142,7 @@ class SwNodes; class SwNumRule; class SwNumRuleTbl; class SwPageDesc; -class SwPagePreViewPrtData; +class SwPagePreviewPrtData; class SwRedline; class SwRedlineTbl; class SwRootFrm; @@ -362,7 +362,7 @@ class SW_DLLPUBLIC SwDoc : SwUnoCrsrTbl *mpUnoCrsrTbl; - SwPagePreViewPrtData *mpPgPViewPrtData; ///< Indenting / spacing for printing of page view. + SwPagePreviewPrtData *mpPgPViewPrtData; ///< Indenting / spacing for printing of page view. SwPaM *mpExtInputRing; SwLayouter *mpLayouter; /**< ::com::sun::star::frame::Controller for complex layout formatting @@ -1866,13 +1866,13 @@ public: /// Only for SW-textbloxks! Does not pay any attention to layout! void ClearDoc(); // Deletes all content! - /// Query /set data for PagePreView. - const SwPagePreViewPrtData* GetPreViewPrtData() const { return mpPgPViewPrtData; } + /// Query /set data for PagePreview. + const SwPagePreviewPrtData* GetPreviewPrtData() const { return mpPgPViewPrtData; } // If pointer == 0 destroy pointer in document. // Else copy object. // Pointer is not transferred to ownership by document! - void SetPreViewPrtData( const SwPagePreViewPrtData* pData ); + void SetPreviewPrtData( const SwPagePreviewPrtData* pData ); /** update all modified OLE-Objects. The modification is called over the StarOne - Interface */ diff --git a/sw/inc/pvprtdat.hxx b/sw/inc/pvprtdat.hxx index 513b1b3dabe3..65d0adf41c13 100644 --- a/sw/inc/pvprtdat.hxx +++ b/sw/inc/pvprtdat.hxx @@ -23,14 +23,14 @@ #include <tools/solar.h> -class SwPagePreViewPrtData +class SwPagePreviewPrtData { sal_uLong nLeftSpace, nRightSpace, nTopSpace, nBottomSpace, nHorzSpace, nVertSpace; sal_uInt8 nRow, nCol; sal_Bool bLandscape : 1; public: - SwPagePreViewPrtData() + SwPagePreviewPrtData() : nLeftSpace(0), nRightSpace(0), nTopSpace(0), nBottomSpace(0), nHorzSpace(0), nVertSpace(0), nRow(1), nCol(1), bLandscape(0) diff --git a/sw/inc/swcommands.h b/sw/inc/swcommands.h index 6722b2d5d8f4..6649063481a0 100644 --- a/sw/inc/swcommands.h +++ b/sw/inc/swcommands.h @@ -75,7 +75,7 @@ #define CMD_FN_FORMAT_PAGE_DLG ".uno:PageDialog" #define CMD_FN_PAGEDOWN ".uno:PageDown" #define CMD_FN_PAGEUP ".uno:PageUp" -#define CMD_FN_PRINT_PAGEPREVIEW ".uno:PrintPagePreView" +#define CMD_FN_PRINT_PAGEPREVIEW ".uno:PrintPagePreview" #define CMD_FN_TABLE_SET_READ_ONLY_CELLS ".uno:Protect" #define CMD_FN_REMOVE_CUR_TOX ".uno:RemoveTableOf" #define CMD_FN_FORMAT_RESET ".uno:ResetAttributes" diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx index 7fcd7d135ba0..a106b9657afb 100644 --- a/sw/inc/viewsh.hxx +++ b/sw/inc/viewsh.hxx @@ -59,7 +59,7 @@ class SfxViewShell; class SwViewOption; class SwViewImp; class SwPrintData; -class SwPagePreViewPrtData; +class SwPagePreviewPrtData; class Window; class OutputDevice; class SwLayIdle; @@ -90,7 +90,7 @@ enum FrameControlType }; // Define for flags needed in ctor or layers below. -// Currently the PreView flag is needed for DrawPage. +// Currently the Preview flag is needed for DrawPage. #define VSHELLFLAG_ISPREVIEW ((long)0x1) #define VSHELLFLAG_SHARELAYOUT ((long)0x2)//swmod 080125 flag typedef boost::shared_ptr<SwRootFrm> SwRootFrmPtr; @@ -147,7 +147,7 @@ class SW_DLLPUBLIC ViewShell : public Ring sal_Bool mbViewLocked :1; // Lock visible range; // in this case MakeVisible is ineffectual. sal_Bool mbInEndAction :1; // Avoid problems, cf. viewsh.cxx. - sal_Bool mbPreView :1; // If sal_True it is a PreView-ViewShell. + 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. @@ -174,7 +174,7 @@ class SW_DLLPUBLIC ViewShell : public Ring SW_DLLPRIVATE void PaintDesktop( const SwRect & ); // Collect values for painting of desktop // and calling. - // PaintDesktop split. This pars is also used by PreViewPage. + // PaintDesktop split. This pars is also used by PreviewPage. SW_DLLPRIVATE void _PaintDesktop( const SwRegionRects &rRegion ); SW_DLLPRIVATE sal_Bool CheckInvalidForPaint( const SwRect & ); // Direct Paint or rather @@ -477,7 +477,7 @@ public: inline const SfxItemPool& GetAttrPool() const; SfxItemPool& GetAttrPool(); - sal_Bool IsPreView() const { return mbPreView; } + sal_Bool IsPreview() const { return mbPreview; } sal_Bool IsFrameView() const { return mbFrameView; } void SetFrameView( const Size& rBrowseBorder ) @@ -499,7 +499,7 @@ public: ::com::sun::star::accessibility::XAccessible > CreateAccessiblePreview(); - void ShowPreViewSelection( sal_uInt16 nSelPage ); + void ShowPreviewSelection( sal_uInt16 nSelPage ); void InvalidateAccessibleFocus(); // Apply Accessiblity options. diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi index 04fb941f7616..9cb8c62c7b03 100644 --- a/sw/sdi/swriter.sdi +++ b/sw/sdi/swriter.sdi @@ -6421,7 +6421,7 @@ SfxBoolItem PrintLayout FN_PRINT_LAYOUT ] //-------------------------------------------------------------------------- -SfxVoidItem PrintPagePreView FN_PRINT_PAGEPREVIEW +SfxVoidItem PrintPagePreview FN_PRINT_PAGEPREVIEW () [ /* flags: */ diff --git a/sw/sdi/viewsh.sdi b/sw/sdi/viewsh.sdi index be91750350ba..3cbc05f135b7 100644 --- a/sw/sdi/viewsh.sdi +++ b/sw/sdi/viewsh.sdi @@ -314,7 +314,7 @@ interface TextPrintPreview //========================================================================= -shell SwPagePreView +shell SwPagePreview { import TextPrintPreview[Automation]; } diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx index 734abdaad117..79b2616da960 100644 --- a/sw/source/core/access/acccell.cxx +++ b/sw/source/core/access/acccell.cxx @@ -138,7 +138,7 @@ sal_Bool SwAccessibleCell::_InvalidateChildrenCursorPos( const SwFrm *pFrm ) const SwFrm *pLower = rLower.GetSwFrm(); if( pLower ) { - if( rLower.IsAccessible( GetMap()->GetShell()->IsPreView() ) ) + if( rLower.IsAccessible( GetMap()->GetShell()->IsPreview() ) ) { ::rtl::Reference< SwAccessibleContext > xAccImpl( GetMap()->GetContextImpl( pLower, sal_False ) ); diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx index 88f5ddd37e4d..9639d70748bd 100644 --- a/sw/source/core/access/acccontext.cxx +++ b/sw/source/core/access/acccontext.cxx @@ -136,7 +136,7 @@ void SwAccessibleContext::ChildrenScrolled( const SwFrm *pFrm, { const SwAccessibleChild& rLower = *aIter; const SwRect aBox( rLower.GetBox( *(GetMap()) ) ); - if( rLower.IsAccessible( GetShell()->IsPreView() ) ) + if( rLower.IsAccessible( GetShell()->IsPreview() ) ) { Action eAction = NONE; if( aBox.IsOver( rNewVisArea ) ) @@ -367,7 +367,7 @@ void SwAccessibleContext::InvalidateChildrenStates( const SwFrm* _pFrm, if( pLower ) { ::rtl::Reference< SwAccessibleContext > xAccImpl; - if( rLower.IsAccessible( GetShell()->IsPreView() ) ) + if( rLower.IsAccessible( GetShell()->IsPreview() ) ) xAccImpl = GetMap()->GetContextImpl( pLower, sal_False ); if( xAccImpl.is() ) xAccImpl->InvalidateStates( _nStates ); @@ -399,7 +399,7 @@ void SwAccessibleContext::DisposeChildren( const SwFrm *pFrm, if( pLower ) { ::rtl::Reference< SwAccessibleContext > xAccImpl; - if( rLower.IsAccessible( GetShell()->IsPreView() ) ) + if( rLower.IsAccessible( GetShell()->IsPreview() ) ) xAccImpl = GetMap()->GetContextImpl( pLower, sal_False ); if( xAccImpl.is() ) xAccImpl->Dispose( bRecursive ); @@ -514,7 +514,7 @@ SwAccessibleContext::SwAccessibleContext( SwAccessibleMap *pM, sal_Int16 nR, const SwFrm *pF ) : SwAccessibleFrame( pM->GetVisArea().SVRect(), pF, - pM->GetShell()->IsPreView() ) + pM->GetShell()->IsPreview() ) , pMap( pM ) , nClientId(0) , nRole( nR ) @@ -826,13 +826,13 @@ awt::Rectangle SAL_CALL SwAccessibleContext::getBoundsImpl(sal_Bool bRelative) if( GetFrm()->IsPageFrm() && static_cast < const SwPageFrm * >( GetFrm() )->IsEmptyPage() ) { - OSL_ENSURE( GetShell()->IsPreView(), "empty page accessible?" ); - if( GetShell()->IsPreView() ) + OSL_ENSURE( GetShell()->IsPreview(), "empty page accessible?" ); + if( GetShell()->IsPreview() ) { - // adjust method call <GetMap()->GetPreViewPageSize()> + // adjust method call <GetMap()->GetPreviewPageSize()> sal_uInt16 nPageNum = static_cast < const SwPageFrm * >( GetFrm() )->GetPhyPageNum(); - aLogBounds.SSize( GetMap()->GetPreViewPageSize( nPageNum ) ); + aLogBounds.SSize( GetMap()->GetPreviewPageSize( nPageNum ) ); } } if( !aLogBounds.IsEmpty() ) diff --git a/sw/source/core/access/accframe.cxx b/sw/source/core/access/accframe.cxx index 154cd7d06dbc..14ae6472d5bd 100644 --- a/sw/source/core/access/accframe.cxx +++ b/sw/source/core/access/accframe.cxx @@ -348,7 +348,7 @@ sal_Bool SwAccessibleFrame::IsEditable( ViewShell *pVSh ) const OSL_ENSURE( pVSh, "no view shell" ); if( pVSh && (pVSh->GetViewOptions()->IsReadonly() || - pVSh->IsPreView()) ) + pVSh->IsPreview()) ) return sal_False; if( !pFrm->IsRootFrm() && pFrm->IsProtected() ) diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx index 0c03d97b8c6b..198b24e76467 100644 --- a/sw/source/core/access/accmap.cxx +++ b/sw/source/core/access/accmap.cxx @@ -1026,7 +1026,7 @@ void SwAccessibleMap::DoInvalidateShapeSelection() { const SwFrm* pParent = SwAccessibleFrame::GetParent( SwAccessibleChild( pShape->first ), - GetShell()->IsPreView() ); + GetShell()->IsPreview() ); aParents.push_back( pParent ); } } @@ -1387,7 +1387,7 @@ uno::Reference< XAccessible> SwAccessibleMap::GetContext( const SwFrm *pFrm, static_cast< const SwTabFrm *>( pFrm ) ); break; case FRM_PAGE: - OSL_ENSURE( GetShell()->IsPreView(), + OSL_ENSURE( GetShell()->IsPreview(), "accessible page frames only in PagePreview" ); pAcc = new SwAccessiblePage( this, pFrm ); break; @@ -1611,7 +1611,7 @@ void SwAccessibleMap::Dispose( const SwFrm *pFrm, OSL_ENSURE( !aFrmOrObj.GetSwFrm() || aFrmOrObj.GetSwFrm()->IsAccessibleFrm(), "non accessible frame should be disposed" ); - if( aFrmOrObj.IsAccessible( GetShell()->IsPreView() ) ) + if( aFrmOrObj.IsAccessible( GetShell()->IsPreview() ) ) { ::rtl::Reference< SwAccessibleContext > xAccImpl; ::rtl::Reference< SwAccessibleContext > xParentAccImpl; @@ -1637,7 +1637,7 @@ void SwAccessibleMap::Dispose( const SwFrm *pFrm, // If there is none, look if the parent is accessible. const SwFrm *pParent = SwAccessibleFrame::GetParent( aFrmOrObj, - GetShell()->IsPreView()); + GetShell()->IsPreview()); if( pParent ) { @@ -1730,7 +1730,7 @@ void SwAccessibleMap::InvalidatePosOrSize( const SwFrm *pFrm, const SwRect& rOldBox ) { SwAccessibleChild aFrmOrObj( pFrm, pObj, pWindow ); - if( aFrmOrObj.IsAccessible( GetShell()->IsPreView() ) ) + if( aFrmOrObj.IsAccessible( GetShell()->IsPreview() ) ) { ::rtl::Reference< SwAccessibleContext > xAccImpl; ::rtl::Reference< SwAccessibleContext > xParentAccImpl; @@ -1758,7 +1758,7 @@ void SwAccessibleMap::InvalidatePosOrSize( const SwFrm *pFrm, // If not, there is nothing to do. const SwFrm *pParent = SwAccessibleFrame::GetParent( aFrmOrObj, - GetShell()->IsPreView()); + GetShell()->IsPreview()); if( pParent ) { @@ -1812,7 +1812,7 @@ void SwAccessibleMap::InvalidatePosOrSize( const SwFrm *pFrm, void SwAccessibleMap::InvalidateContent( const SwFrm *pFrm ) { SwAccessibleChild aFrmOrObj( pFrm ); - if( aFrmOrObj.IsAccessible( GetShell()->IsPreView() ) ) + if( aFrmOrObj.IsAccessible( GetShell()->IsPreview() ) ) { uno::Reference < XAccessible > xAcc; { @@ -1850,7 +1850,7 @@ void SwAccessibleMap::InvalidateContent( const SwFrm *pFrm ) void SwAccessibleMap::InvalidateAttr( const SwTxtFrm& rTxtFrm ) { SwAccessibleChild aFrmOrObj( &rTxtFrm ); - if( aFrmOrObj.IsAccessible( GetShell()->IsPreView() ) ) + if( aFrmOrObj.IsAccessible( GetShell()->IsPreview() ) ) { uno::Reference < XAccessible > xAcc; { @@ -1916,7 +1916,7 @@ void SwAccessibleMap::InvalidateCursorPosition( const SwFrm *pFrm ) } } - OSL_ENSURE( bShapeSelected || aFrmOrObj.IsAccessible(GetShell()->IsPreView()), + OSL_ENSURE( bShapeSelected || aFrmOrObj.IsAccessible(GetShell()->IsPreview()), "frame is not accessible" ); uno::Reference < XAccessible > xOldAcc; @@ -2013,7 +2013,7 @@ void SwAccessibleMap::InvalidateStates( tAccessibleStates _nStates, // Start with the frame or the first upper that is accessible SwAccessibleChild aFrmOrObj( _pFrm ); while( aFrmOrObj.GetSwFrm() && - !aFrmOrObj.IsAccessible( GetShell()->IsPreView() ) ) + !aFrmOrObj.IsAccessible( GetShell()->IsPreview() ) ) aFrmOrObj = aFrmOrObj.GetSwFrm()->GetUpper(); if( !aFrmOrObj.GetSwFrm() ) aFrmOrObj = GetShell()->GetLayout(); @@ -2041,7 +2041,7 @@ void SwAccessibleMap::_InvalidateRelationSet( const SwFrm* pFrm, { // first, see if this frame is accessible, and if so, get the respective SwAccessibleChild aFrmOrObj( pFrm ); - if( aFrmOrObj.IsAccessible( GetShell()->IsPreView() ) ) + if( aFrmOrObj.IsAccessible( GetShell()->IsPreview() ) ) { uno::Reference < XAccessible > xAcc; { @@ -2102,7 +2102,7 @@ void SwAccessibleMap::InvalidateParaTextSelection( const SwTxtFrm& _rTxtFrm ) { // first, see if this frame is accessible, and if so, get the respective SwAccessibleChild aFrmOrObj( &_rTxtFrm ); - if( aFrmOrObj.IsAccessible( GetShell()->IsPreView() ) ) + if( aFrmOrObj.IsAccessible( GetShell()->IsPreview() ) ) { uno::Reference < XAccessible > xAcc; { @@ -2148,7 +2148,7 @@ sal_Int32 SwAccessibleMap::GetChildIndex( const SwFrm& rParentFrm, sal_Int32 nIndex( -1 ); SwAccessibleChild aFrmOrObj( &rParentFrm ); - if( aFrmOrObj.IsAccessible( GetShell()->IsPreView() ) ) + if( aFrmOrObj.IsAccessible( GetShell()->IsPreview() ) ) { uno::Reference < XAccessible > xAcc; { @@ -2183,7 +2183,7 @@ void SwAccessibleMap::UpdatePreview( const std::vector<PreviewPage*>& _rPreviewP const SwPageFrm* _pSelectedPageFrm, const Size& _rPreviewWinSize ) { - OSL_ENSURE( GetShell()->IsPreView(), "no preview?" ); + OSL_ENSURE( GetShell()->IsPreview(), "no preview?" ); OSL_ENSURE( mpPreview != NULL, "no preview data?" ); mpPreview->Update( *this, _rPreviewPages, _rScale, _pSelectedPageFrm, _rPreviewWinSize ); @@ -2218,9 +2218,9 @@ void SwAccessibleMap::UpdatePreview( const std::vector<PreviewPage*>& _rPreviewP InvalidateCursorPosition( xAcc ); } -void SwAccessibleMap::InvalidatePreViewSelection( sal_uInt16 nSelPage ) +void SwAccessibleMap::InvalidatePreviewSelection( sal_uInt16 nSelPage ) { - OSL_ENSURE( GetShell()->IsPreView(), "no preview?" ); + OSL_ENSURE( GetShell()->IsPreview(), "no preview?" ); OSL_ENSURE( mpPreview != NULL, "no preview data?" ); mpPreview->InvalidateSelection( GetShell()->GetLayout()->GetPageByPageNum( nSelPage ) ); @@ -2515,7 +2515,7 @@ void SwAccessibleMap::GetMapMode( const Point& _rPoint, MapMode& _orMapMode ) const { MapMode aMapMode = GetShell()->GetWin()->GetMapMode(); - if( GetShell()->IsPreView() ) + if( GetShell()->IsPreview() ) { OSL_ENSURE( mpPreview != NULL, "need preview data" ); @@ -2524,12 +2524,12 @@ void SwAccessibleMap::GetMapMode( const Point& _rPoint, _orMapMode = aMapMode; } -Size SwAccessibleMap::GetPreViewPageSize( sal_uInt16 _nPreviewPageNum ) const +Size SwAccessibleMap::GetPreviewPageSize( sal_uInt16 _nPreviewPageNum ) const { - OSL_ENSURE( mpVSh->IsPreView(), "no page preview accessible." ); - OSL_ENSURE( mpVSh->IsPreView() && ( mpPreview != NULL ), + OSL_ENSURE( mpVSh->IsPreview(), "no page preview accessible." ); + OSL_ENSURE( mpVSh->IsPreview() && ( mpPreview != NULL ), "missing accessible preview data at page preview" ); - if ( mpVSh->IsPreView() && ( mpPreview != NULL ) ) + if ( mpVSh->IsPreview() && ( mpPreview != NULL ) ) { return mpVSh->PagePreviewLayout()->GetPreviewPageSizeByPageNum( _nPreviewPageNum ); } @@ -2737,10 +2737,10 @@ void SwAccessibleMap::InvalidateTextSelectionOfAllParas() const SwRect& SwAccessibleMap::GetVisArea() const { - OSL_ENSURE( !GetShell()->IsPreView() || (mpPreview != NULL), + OSL_ENSURE( !GetShell()->IsPreview() || (mpPreview != NULL), "preview without preview data?" ); - return GetShell()->IsPreView() + return GetShell()->IsPreview() ? mpPreview->GetVisArea() : GetShell()->VisArea(); } diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx index c4af46822c21..ea4095f397a9 100644 --- a/sw/source/core/doc/docnew.cxx +++ b/sw/source/core/doc/docnew.cxx @@ -909,14 +909,14 @@ void SwDoc::ClearDoc() DelPageDesc( nDummyPgDsc ); } -void SwDoc::SetPreViewPrtData( const SwPagePreViewPrtData* pNew ) +void SwDoc::SetPreviewPrtData( const SwPagePreviewPrtData* pNew ) { if( pNew ) { if( mpPgPViewPrtData ) *mpPgPViewPrtData = *pNew; else - mpPgPViewPrtData = new SwPagePreViewPrtData( *pNew ); + mpPgPViewPrtData = new SwPagePreviewPrtData( *pNew ); } else if( mpPgPViewPrtData ) DELETEZ( mpPgPViewPrtData ); diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx index 71abd3594a1d..f162a0130d2f 100644 --- a/sw/source/core/doc/notxtfrm.cxx +++ b/sw/source/core/doc/notxtfrm.cxx @@ -202,7 +202,7 @@ void SwNoTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const { StopAnimation(); // #i6467# - no paint of placeholder for page preview - if ( pSh->GetWin() && !pSh->IsPreView() ) + if ( pSh->GetWin() && !pSh->IsPreview() ) { const SwNoTxtNode* pNd = GetNode()->GetNoTxtNode(); OUString aTxt( pNd->GetTitle() ); @@ -573,7 +573,7 @@ void SwNoTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) SET_CURR_SHELL( pSh ); if( pSh->GetWin() ) { - if( pSh->IsPreView() ) + if( pSh->IsPreview() ) ::RepaintPagePreview( pSh, Frm().SVRect() ); else pSh->GetWin()->Invalidate( Frm().SVRect() ); @@ -627,7 +627,7 @@ void SwNoTxtFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) ViewShell *pSh = pVSh; do { SET_CURR_SHELL( pSh ); - if( pSh->IsPreView() ) + if( pSh->IsPreview() ) { if( pSh->GetWin() ) ::RepaintPagePreview( pSh, aRect ); @@ -874,7 +874,7 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons if( bSwappedIn && rGrfObj.GetGraphic().IsSupportedGraphic()) { const bool bAnimate = rGrfObj.IsAnimated() && - !pShell->IsPreView() && + !pShell->IsPreview() && !pShell->GetAccessibilityOptions()->IsStopAnimatedGraphics() && // #i9684# Stop animation during printing/pdf export pShell->GetWin(); diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx index 3d5f69d8bbad..c36a23315dff 100644 --- a/sw/source/core/draw/dview.cxx +++ b/sw/source/core/draw/dview.cxx @@ -114,7 +114,7 @@ SwDrawView::SwDrawView( SwViewImp &rI, SdrModel *pMd, OutputDevice *pOutDev) : SetHitTolerancePixel( GetMarkHdlSizePixel()/2 ); - SetPrintPreview( rI.GetShell()->IsPreView() ); + SetPrintPreview( rI.GetShell()->IsPreview() ); // #i73602# Use default from the configuration SetBufferedOverlayAllowed(getOptionsDrawinglayer().IsOverlayBuffer_Writer()); diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx index dc38ce694f98..ae1e5d0e8e59 100644 --- a/sw/source/core/inc/flyfrm.hxx +++ b/sw/source/core/inc/flyfrm.hxx @@ -225,7 +225,7 @@ public: const sal_Bool _bForPaint = sal_False ) const; - // Paint on this shell (consider PreView, print flag, etc. recursively)? + // Paint on this shell (consider Preview, print flag, etc. recursively)? static sal_Bool IsPaint( SdrObject *pObj, const ViewShell *pSh ); /** SwFlyFrm::IsBackgroundTransparent diff --git a/sw/source/core/inc/viewimp.hxx b/sw/source/core/inc/viewimp.hxx index 87c39cc93ae4..8a8f9aacc865 100644 --- a/sw/source/core/inc/viewimp.hxx +++ b/sw/source/core/inc/viewimp.hxx @@ -281,7 +281,7 @@ public: const SwPageFrm* _pSelectedPageFrm, const Size& _rPreviewWinSize ); - void InvalidateAccessiblePreViewSelection( sal_uInt16 nSelPage ); + void InvalidateAccessiblePreviewSelection( sal_uInt16 nSelPage ); // Fire all accessible events that have been collected so far void FireAccessibleEvents(); diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index ccd82264189f..bd1f89c1a95f 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -1514,7 +1514,7 @@ static void lcl_SubtractFlys( const SwFrm *pFrm, const SwPageFrm *pPage, if ( !pFly->GetFmt()->GetPrint().GetValue() && (OUTDEV_PRINTER == pGlobalShell->GetOut()->GetOutDevType() || - pGlobalShell->IsPreView())) + pGlobalShell->IsPreview())) continue; const bool bLowerOfSelf = pSelfFly && pFly->IsLowerOf( pSelfFly ); @@ -3553,7 +3553,7 @@ void SwPageFrm::PaintBreak( ) const if ( pGlobalShell->GetOut()->GetOutDevType() != OUTDEV_PRINTER && !pGlobalShell->GetViewOptions()->IsPDFExport() && !pGlobalShell->GetViewOptions()->IsReadonly() && - !pGlobalShell->IsPreView() ) + !pGlobalShell->IsPreview() ) { const SwFrm* pBodyFrm = Lower(); while ( pBodyFrm && !pBodyFrm->IsBodyFrm() ) @@ -3590,7 +3590,7 @@ void SwColumnFrm::PaintBreak( ) const if ( pGlobalShell->GetOut()->GetOutDevType() != OUTDEV_PRINTER && !pGlobalShell->GetViewOptions()->IsPDFExport() && !pGlobalShell->GetViewOptions()->IsReadonly() && - !pGlobalShell->IsPreView() ) + !pGlobalShell->IsPreview() ) { const SwFrm* pBodyFrm = Lower(); while ( pBodyFrm && !pBodyFrm->IsBodyFrm() ) @@ -3697,7 +3697,7 @@ void SwPageFrm::PaintDecorators( ) const if ( pGlobalShell->GetOut()->GetOutDevType() != OUTDEV_PRINTER && !pGlobalShell->GetViewOptions()->IsPDFExport() && - !pGlobalShell->IsPreView() && + !pGlobalShell->IsPreview() && !pGlobalShell->GetViewOptions()->IsReadonly() && !pGlobalShell->GetViewOptions()->getBrowseMode() && ( pGlobalShell->IsShowHeaderFooterSeparator( Header ) || @@ -3826,11 +3826,11 @@ sal_Bool SwFlyFrm::IsPaint( SdrObject *pObj, const ViewShell *pSh ) if ( 0 == ( pUserCall = GetUserCall(pObj) ) ) return sal_True; - //Attribute dependant, don't paint for printer or PreView + //Attribute dependant, don't paint for printer or Preview sal_Bool bPaint = pFlyOnlyDraw || ((SwContact*)pUserCall)->GetFmt()->GetPrint().GetValue(); if ( !bPaint ) - bPaint = pSh->GetWin() && !pSh->IsPreView(); + bPaint = pSh->GetWin() && !pSh->IsPreview(); if ( bPaint ) { @@ -4214,7 +4214,7 @@ void SwTabFrm::Paint(SwRect const& rRect, SwPrintData const*const) const SwLayoutFrm::Paint( rRect ); } // OD 10.01.2003 #i6467# - no light grey rectangle for page preview - else if ( pGlobalShell->GetWin() && !pGlobalShell->IsPreView() ) + else if ( pGlobalShell->GetWin() && !pGlobalShell->IsPreview() ) { // OD 10.01.2003 #i6467# - intersect output rectangle with table frame SwRect aTabRect( Prt() ); diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index cbb7ee626f97..0e8db3d7715b 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -554,7 +554,7 @@ void SwTxtPaintInfo::_DrawText( const OUString &rText, const SwLinePortion &rPor // check if accessibility options allow blinking portions: const ViewShell* pSh = GetTxtFrm()->getRootFrm()->GetCurrShell(); if ( pSh && ! pSh->GetAccessibilityOptions()->IsStopAnimatedText() && - ! pSh->IsPreView() ) + ! pSh->IsPreview() ) { if( !pBlink ) pBlink = new SwBlink(); diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx index 4ea781fb9f60..7e7d4c7ac7fb 100644 --- a/sw/source/core/text/itrpaint.cxx +++ b/sw/source/core/text/itrpaint.cxx @@ -431,7 +431,7 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip, const SwTwips nOldY = GetInfo().Y(); if( !GetNextLine() && - GetInfo().GetVsh() && !GetInfo().GetVsh()->IsPreView() && + GetInfo().GetVsh() && !GetInfo().GetVsh()->IsPreview() && GetInfo().GetOpt().IsParagraph() && !GetTxtFrm()->GetFollow() && GetInfo().GetIdx() >= GetInfo().GetTxt().getLength() ) { @@ -445,7 +445,7 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip, aEnd.Paint( GetInfo() ); GetInfo().Y( nOldY ); } - if( GetInfo().GetVsh() && !GetInfo().GetVsh()->IsPreView() ) + if( GetInfo().GetVsh() && !GetInfo().GetVsh()->IsPreview() ) { const sal_Bool bNextUndersized = ( GetTxtFrm()->GetNext() && diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx index ee8d6daeeb51..2774cf1036cb 100644 --- a/sw/source/core/text/porfld.cxx +++ b/sw/source/core/text/porfld.cxx @@ -988,7 +988,7 @@ void SwGrfNumPortion::Paint( const SwTxtPaintInfo &rInf ) const else if ( pViewShell && !pViewShell->GetAccessibilityOptions()->IsStopAnimatedGraphics() && - !pViewShell->IsPreView() && + !pViewShell->IsPreview() && // #i9684# Stop animation during printing/pdf export. pViewShell->GetWin() ) { diff --git a/sw/source/core/view/vdraw.cxx b/sw/source/core/view/vdraw.cxx index 9ede6c5a6cb1..b3bb4efa2f81 100644 --- a/sw/source/core/view/vdraw.cxx +++ b/sw/source/core/view/vdraw.cxx @@ -95,7 +95,7 @@ void SwViewImp::PaintLayer( const SdrLayerID _nLayerID, sal_uLong nOldDrawMode = pOutDev->GetDrawMode(); if( GetShell()->GetWin() && Application::GetSettings().GetStyleSettings().GetHighContrastMode() && - (!GetShell()->IsPreView()||SW_MOD()->GetAccessibilityOptions().GetIsForPagePreviews())) + (!GetShell()->IsPreview()||SW_MOD()->GetAccessibilityOptions().GetIsForPagePreviews())) { pOutDev->SetDrawMode( nOldDrawMode | DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT ); diff --git a/sw/source/core/view/viewimp.cxx b/sw/source/core/view/viewimp.cxx index 20e6be354c44..b48df50bb12a 100644 --- a/sw/source/core/view/viewimp.cxx +++ b/sw/source/core/view/viewimp.cxx @@ -78,7 +78,7 @@ void SwViewImp::Init( const SwViewOption *pNewOpt ) if ( pRoot->Frm().HasArea() ) pDrawView->SetWorkArea( pRoot->Frm().SVRect() ); - if ( GetShell()->IsPreView() ) + if ( GetShell()->IsPreview() ) pDrawView->SetAnimationEnabled( sal_False ); pDrawView->SetUseIncompatiblePathCreateInterface( sal_False ); @@ -443,10 +443,10 @@ void SwViewImp::UpdateAccessiblePreview( const std::vector<PreviewPage*>& _rPrev _pSelectedPageFrm, _rPreviewWinSize ); } -void SwViewImp::InvalidateAccessiblePreViewSelection( sal_uInt16 nSelPage ) +void SwViewImp::InvalidateAccessiblePreviewSelection( sal_uInt16 nSelPage ) { if( IsAccessible() ) - GetAccessibleMap().InvalidatePreViewSelection( nSelPage ); + GetAccessibleMap().InvalidatePreviewSelection( nSelPage ); } SwAccessibleMap *SwViewImp::CreateAccessibleMap() diff --git a/sw/source/core/view/viewpg.cxx b/sw/source/core/view/viewpg.cxx index 61d82f1c99d3..909558e95ba0 100644 --- a/sw/source/core/view/viewpg.cxx +++ b/sw/source/core/view/viewpg.cxx @@ -54,9 +54,9 @@ SwPagePreviewLayout* ViewShell::PagePreviewLayout() return Imp()->PagePreviewLayout(); } -void ViewShell::ShowPreViewSelection( sal_uInt16 nSelPage ) +void ViewShell::ShowPreviewSelection( sal_uInt16 nSelPage ) { - Imp()->InvalidateAccessiblePreViewSelection( nSelPage ); + Imp()->InvalidateAccessiblePreviewSelection( nSelPage ); } /** adjust view options for page preview @@ -65,7 +65,7 @@ void ViewShell::ShowPreViewSelection( sal_uInt16 nSelPage ) */ void ViewShell::AdjustOptionsForPagePreview(SwPrintData const& rPrintOptions) { - if ( !IsPreView() ) + if ( !IsPreview() ) { OSL_FAIL( "view shell doesn't belongs to a page preview - no adjustment of its view options"); return; diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index b21fffe48cbf..a59df5205c5a 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -195,7 +195,7 @@ void ViewShell::DLPostPaint2(bool bPaintFormLayer) void ViewShell::ImplEndAction( const sal_Bool bIdleEnd ) { // Nothing to do for the printer? - if ( !GetWin() || IsPreView() ) + if ( !GetWin() || IsPreview() ) { mbPaintWorks = sal_True; UISizeNotify(); @@ -482,7 +482,7 @@ sal_Bool ViewShell::AddPaintRect( const SwRect & rRect ) { if( pSh->Imp() ) { - if ( pSh->IsPreView() && pSh->GetWin() ) + if ( pSh->IsPreview() && pSh->GetWin() ) ::RepaintPagePreview( pSh, rRect ); else bRet |= pSh->Imp()->AddPaintRect( rRect ); @@ -501,7 +501,7 @@ void ViewShell::InvalidateWindows( const SwRect &rRect ) { if ( pSh->GetWin() ) { - if ( pSh->IsPreView() ) + if ( pSh->IsPreview() ) ::RepaintPagePreview( pSh, rRect ); else if ( pSh->VisArea().IsOver( rRect ) ) pSh->GetWin()->Invalidate( rRect.SVRect() ); @@ -1454,7 +1454,7 @@ void ViewShell::PaintDesktop( const SwRect &rRect ) _PaintDesktop( aRegion ); } -// PaintDesktop is split in two, this part is also used by PreViewPage +// PaintDesktop is split in two, this part is also used by PreviewPage void ViewShell::_PaintDesktop( const SwRegionRects &rRegion ) { // OD 2004-04-23 #116347# @@ -1658,7 +1658,7 @@ void ViewShell::Paint(const Rectangle &rRect) if( !GetOut()->GetConnectMetaFile() && GetOut()->IsClipRegion()) GetOut()->SetClipRegion(); - if ( IsPreView() ) + if ( IsPreview() ) { //When useful, process or destroy the old InvalidRect. if ( aRect.IsInside( maInvalidRect ) ) @@ -1953,7 +1953,7 @@ void ViewShell::ImplApplyViewOptions( const SwViewOption &rOpt ) bReformat = bReformat || mpOpt->IsFldName() != rOpt.IsFldName(); // The map mode is changed, minima/maxima will be attended by UI - if( mpOpt->GetZoom() != rOpt.GetZoom() && !IsPreView() ) + if( mpOpt->GetZoom() != rOpt.GetZoom() && !IsPreview() ) { MapMode aMode( pMyWin->GetMapMode() ); Fraction aNewFactor( rOpt.GetZoom(), 100 ); @@ -2153,14 +2153,14 @@ uno::Reference< ::com::sun::star::accessibility::XAccessible > ViewShell::Create uno::Reference< ::com::sun::star::accessibility::XAccessible > ViewShell::CreateAccessiblePreview() { - OSL_ENSURE( IsPreView(), + OSL_ENSURE( IsPreview(), "Can't create accessible preview for non-preview ViewShell" ); // We require a layout and an XModel to be accessible. OSL_ENSURE( mpLayout, "no layout, no access" ); OSL_ENSURE( GetWin(), "no window, no access" ); - if ( IsPreView() && GetLayout()&& GetWin() ) + if ( IsPreview() && GetLayout()&& GetWin() ) { return Imp()->GetAccessibleMap().GetDocumentPreview( PagePreviewLayout()->maPreviewPages, diff --git a/sw/source/core/view/vnew.cxx b/sw/source/core/view/vnew.cxx index 19a589f2a16d..b3e7ab9b839e 100644 --- a/sw/source/core/view/vnew.cxx +++ b/sw/source/core/view/vnew.cxx @@ -173,7 +173,7 @@ ViewShell::ViewShell( SwDoc& rDocument, Window *pWindow, mbPaintInProgress = mbViewLocked = mbInEndAction = mbFrameView = mbEndActionByVirDev = sal_False; mbPaintWorks = mbEnableSmooth = sal_True; - mbPreView = 0 !=( VSHELLFLAG_ISPREVIEW & nFlags ); + mbPreview = 0 !=( VSHELLFLAG_ISPREVIEW & nFlags ); // --> OD 2005-02-11 #i38810# - Do not reset modified state of document, // if it's already been modified. @@ -185,7 +185,7 @@ ViewShell::ViewShell( SwDoc& rDocument, Window *pWindow, // OD 28.03.2003 #108470# - initialize print preview layout after layout // is created in <ViewShell::Init(..)> - called above. - if ( mbPreView ) + if ( mbPreview ) { // OD 12.12.2002 #103492# - init page preview layout mpImp->InitPagePreviewLayout(); @@ -248,7 +248,7 @@ ViewShell::ViewShell( ViewShell& rShell, Window *pWindow, mbPaintWorks = mbEnableSmooth = sal_True; mbPaintInProgress = mbViewLocked = mbInEndAction = mbFrameView = mbEndActionByVirDev = sal_False; - mbPreView = 0 !=( VSHELLFLAG_ISPREVIEW & nFlags ); + mbPreview = 0 !=( VSHELLFLAG_ISPREVIEW & nFlags ); // OD 12.12.2002 #103492# if( nFlags & VSHELLFLAG_SHARELAYOUT ) //swmod 080125 mpLayout = rShell.mpLayout; @@ -263,7 +263,7 @@ ViewShell::ViewShell( ViewShell& rShell, Window *pWindow, mpOut = pOutput; // OD 12.12.2002 #103492# - if ( mbPreView ) + if ( mbPreview ) mpImp->InitPagePreviewLayout(); ((SwHiddenTxtFieldType*)mpDoc->GetSysFldType( RES_HIDDENTXTFLD ))-> diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx index de212163967b..fdd997174e0e 100644 --- a/sw/source/core/view/vprint.cxx +++ b/sw/source/core/view/vprint.cxx @@ -128,7 +128,7 @@ void SwPaintQueue::Repaint() do { ViewShell *pSh = pPt->pSh; SET_CURR_SHELL( pSh ); - if ( pSh->IsPreView() ) + if ( pSh->IsPreview() ) { if ( pSh->GetWin() ) { @@ -615,7 +615,7 @@ void ViewShell::PrepareForPrint( const SwPrintData &rOptions ) OUString sLayerNm; sLayerNm = "Controls"; // OD 09.01.2003 #i6467# - consider, if view shell belongs to page preview - if ( !IsPreView() ) + if ( !IsPreview() ) { pDrawView->SetLayerPrintable( sLayerNm, rOptions.bPrintControl ); } diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx index 0f6c57c1d602..cf21d0f3fb06 100644 --- a/sw/source/ui/app/apphdl.cxx +++ b/sw/source/ui/app/apphdl.cxx @@ -761,7 +761,7 @@ void SwModule::ConfigurationChanged( utl::ConfigurationBroadcaster* pBrdCst, sal //invalidate all edit windows const TypeId aSwViewTypeId = TYPE(SwView); - const TypeId aSwPreViewTypeId = TYPE(SwPagePreView); + const TypeId aSwPreviewTypeId = TYPE(SwPagePreview); const TypeId aSwSrcViewTypeId = TYPE(SwSrcView); SfxViewShell* pViewShell = SfxViewShell::GetFirst(); while(pViewShell) @@ -769,15 +769,15 @@ void SwModule::ConfigurationChanged( utl::ConfigurationBroadcaster* pBrdCst, sal if(pViewShell->GetWindow()) { if((pViewShell->IsA(aSwViewTypeId) || - pViewShell->IsA(aSwPreViewTypeId) || + pViewShell->IsA(aSwPreviewTypeId) || pViewShell->IsA(aSwSrcViewTypeId))) { if(bAccessibility) { if(pViewShell->IsA(aSwViewTypeId)) ((SwView*)pViewShell)->ApplyAccessiblityOptions(*pAccessibilityOptions); - else if(pViewShell->IsA(aSwPreViewTypeId)) - ((SwPagePreView*)pViewShell)->ApplyAccessiblityOptions(*pAccessibilityOptions); + else if(pViewShell->IsA(aSwPreviewTypeId)) + ((SwPagePreview*)pViewShell)->ApplyAccessiblityOptions(*pAccessibilityOptions); } pViewShell->GetWindow()->Invalidate(); } diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx index ea719eace8fb..238229ee05e5 100644 --- a/sw/source/ui/app/appopt.cxx +++ b/sw/source/ui/app/appopt.cxx @@ -169,7 +169,7 @@ SfxItemSet* SwModule::CreateItemSet( sal_uInt16 nId ) } if(bTextDialog) pRet->Put(SwPtrItem(FN_PARAM_STDFONTS, GetStdFontConfig())); - if( PTR_CAST( SwPagePreView, SfxViewShell::Current())!=0) + if( PTR_CAST( SwPagePreview, SfxViewShell::Current())!=0) { SfxBoolItem aBool(SfxBoolItem(SID_PRINTPREVIEW, sal_True)); pRet->Put(aBool); diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx index da74ba9afdb0..617e2e9ad779 100644 --- a/sw/source/ui/app/docsh.cxx +++ b/sw/source/ui/app/docsh.cxx @@ -832,7 +832,7 @@ Rectangle SwDocShell::GetVisArea( sal_uInt16 nAspect ) const { if ( nAspect == ASPECT_THUMBNAIL ) { - // PreView: set VisArea to the first page. + // Preview: set VisArea to the first page. SwNodeIndex aIdx( pDoc->GetNodes().GetEndOfExtras(), 1 ); SwCntntNode* pNd = pDoc->GetNodes().GoNext( &aIdx ); @@ -933,7 +933,7 @@ void SwDocShell::GetState(SfxItemSet& rSet) else { SfxBoolItem aBool( SID_PRINTPREVIEW, sal_False ); - if( PTR_CAST( SwPagePreView, SfxViewShell::Current()) ) + if( PTR_CAST( SwPagePreview, SfxViewShell::Current()) ) aBool.SetValue( sal_True ); rSet.Put( aBool ); } diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx index 82341c7f7472..25140295dbeb 100644 --- a/sw/source/ui/app/docsh2.cxx +++ b/sw/source/ui/app/docsh2.cxx @@ -403,13 +403,13 @@ void SwDocShell::Execute(SfxRequest& rReq) SfxViewFrame *pTmpFrm = SfxViewFrame::GetFirst(this); SfxViewShell* pViewShell = SfxViewShell::Current(); SwView* pCurrView = dynamic_cast< SwView *> ( pViewShell ); - sal_Bool bCurrent = IS_TYPE( SwPagePreView, pViewShell ); + sal_Bool bCurrent = IS_TYPE( SwPagePreview, pViewShell ); - while( pTmpFrm ) // search PreView + while( pTmpFrm ) // search Preview { if( IS_TYPE( SwView, pTmpFrm->GetViewShell()) ) bOnly = false; - else if( IS_TYPE( SwPagePreView, pTmpFrm->GetViewShell())) + else if( IS_TYPE( SwPagePreview, pTmpFrm->GetViewShell())) { pTmpFrm->GetFrame().Appear(); bFound = true; @@ -433,7 +433,7 @@ void SwDocShell::Execute(SfxRequest& rReq) if( nSlotId ) { - // PagePreView in the WebDocShell + // PagePreview in the WebDocShell // is found under Id ViewShell2. if( ISA(SwWebDocShell) && SID_VIEWSHELL1 == nSlotId ) nSlotId = SID_VIEWSHELL2; diff --git a/sw/source/ui/app/swmodul1.cxx b/sw/source/ui/app/swmodul1.cxx index 235410ecc81c..0bda79bb447c 100644 --- a/sw/source/ui/app/swmodul1.cxx +++ b/sw/source/ui/app/swmodul1.cxx @@ -152,9 +152,9 @@ void SwModule::ApplyUsrPref(const SwViewOption &rUsrPref, SwView* pActView, // with Uno, only sdbcx::View, but not the Module should be changed bool bViewOnly = VIEWOPT_DEST_VIEW_ONLY == nDest; - // fob PreView off - SwPagePreView* pPPView; - if( !pCurrView && 0 != (pPPView = PTR_CAST( SwPagePreView, SfxViewShell::Current())) ) + // fob Preview off + SwPagePreview* pPPView; + if( !pCurrView && 0 != (pPPView = PTR_CAST( SwPagePreview, SfxViewShell::Current())) ) { if(!bViewOnly) pPref->SetUIOptions( rUsrPref ); diff --git a/sw/source/ui/app/swmodule.cxx b/sw/source/ui/app/swmodule.cxx index 72f745f58a0c..cab58197017d 100644 --- a/sw/source/ui/app/swmodule.cxx +++ b/sw/source/ui/app/swmodule.cxx @@ -248,7 +248,7 @@ void SwDLL::RegisterFactories() if ( SvtModuleOptions().IsWriter() ) { SwSrcView::RegisterFactory ( 6 ); - SwPagePreView::RegisterFactory ( 7 ); + SwPagePreview::RegisterFactory ( 7 ); } } @@ -262,7 +262,7 @@ void SwDLL::RegisterInterfaces() SwWebGlosDocShell::RegisterInterface( pMod ); SwView::RegisterInterface( pMod ); SwWebView::RegisterInterface( pMod ); - SwPagePreView::RegisterInterface( pMod ); + SwPagePreview::RegisterInterface( pMod ); SwSrcView::RegisterInterface( pMod ); diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx index 8e3f0acfc511..a109c8af1258 100644 --- a/sw/source/ui/dialog/docstdlg.cxx +++ b/sw/source/ui/dialog/docstdlg.cxx @@ -117,8 +117,8 @@ void SwDocStatPage::Update() ViewShell *pSh = 0; if ( pVSh->ISA(SwView) ) pSh = ((SwView*)pVSh)->GetWrtShellPtr(); - else if ( pVSh->ISA(SwPagePreView) ) - pSh = ((SwPagePreView*)pVSh)->GetViewShell(); + else if ( pVSh->ISA(SwPagePreview) ) + pSh = ((SwPagePreview*)pVSh)->GetViewShell(); OSL_ENSURE( pSh, "Shell not found" ); diff --git a/sw/source/ui/docvw/edtwin3.cxx b/sw/source/ui/docvw/edtwin3.cxx index 29fd6332a93b..edc3bd0cb45e 100644 --- a/sw/source/ui/docvw/edtwin3.cxx +++ b/sw/source/ui/docvw/edtwin3.cxx @@ -63,8 +63,8 @@ void SizeNotify(ViewShell* pVwSh, const Size &rSize) { if (pSfxVwSh->ISA(SwView)) ((SwView *)pSfxVwSh)->DocSzChgd(rSize); - else if (pSfxVwSh->ISA(SwPagePreView)) - ((SwPagePreView *)pSfxVwSh)->DocSzChgd( rSize ); + else if (pSfxVwSh->ISA(SwPagePreview)) + ((SwPagePreview *)pSfxVwSh)->DocSzChgd( rSize ); } } @@ -117,8 +117,8 @@ TblChgMode GetTblChgDefaultMode() void RepaintPagePreview( ViewShell* pVwSh, const SwRect& rRect ) { SfxViewShell *pSfxVwSh = pVwSh->GetSfxViewShell(); - if (pSfxVwSh && pSfxVwSh->ISA( SwPagePreView )) - ((SwPagePreView *)pSfxVwSh)->RepaintCoreRect( rRect ); + if (pSfxVwSh && pSfxVwSh->ISA( SwPagePreview )) + ((SwPagePreview *)pSfxVwSh)->RepaintCoreRect( rRect ); } bool JumpToSwMark( ViewShell* pVwSh, const OUString& rMark ) diff --git a/sw/source/ui/inc/pview.hxx b/sw/source/ui/inc/pview.hxx index 12bc22cc56e8..7cf9e832dfca 100644 --- a/sw/source/ui/inc/pview.hxx +++ b/sw/source/ui/inc/pview.hxx @@ -32,7 +32,7 @@ class SwViewOption; class SwDocShell; class SwScrollbar; class ViewShell; -class SwPagePreView; +class SwPagePreview; class ImageButton; class Button; class SwRect; @@ -42,14 +42,14 @@ class SvtAccessibilityOptions; class SwPagePreviewLayout; // Delete member <mnVirtPage> and its accessor -class SwPagePreViewWin : public Window +class SwPagePreviewWin : public Window { ViewShell* mpViewShell; sal_uInt16 mnSttPage; sal_uInt8 mnRow, mnCol; Size maPxWinSize; Fraction maScale; - SwPagePreView& mrView; + SwPagePreview& mrView; bool mbCalcScaleForPreviewLayout; Rectangle maPaintedPreviewDocRect; SwPagePreviewLayout* mpPgPreviewLayout; @@ -59,8 +59,8 @@ class SwPagePreViewWin : public Window using Window::Scroll; public: - SwPagePreViewWin( Window* pParent, SwPagePreView& rView ); - ~SwPagePreViewWin(); + SwPagePreviewWin( Window* pParent, SwPagePreview& rView ); + ~SwPagePreviewWin(); // calls ViewShell::Paint virtual void Paint( const Rectangle& rRect ); @@ -145,14 +145,14 @@ public: /** * View of a document */ -class SW_DLLPUBLIC SwPagePreView: public SfxViewShell +class SW_DLLPUBLIC SwPagePreview: public SfxViewShell { // ViewWindow and handle to core // current dispatcher shell - SwPagePreViewWin aViewWin; + SwPagePreviewWin aViewWin; //viewdata of the previous SwView and the new crsrposition OUString sSwViewData; - //and the new cursor position if the user double click in the PagePreView + //and the new cursor position if the user double click in the PagePreview OUString sNewCrsrPos; // to support keyboard the number of the page to go to can be set too sal_uInt16 nNewPage; @@ -216,7 +216,7 @@ protected: void SetZoom(SvxZoomType eSet, sal_uInt16 nFactor); public: - SFX_DECL_VIEWFACTORY(SwPagePreView); + SFX_DECL_VIEWFACTORY(SwPagePreview); SFX_DECL_INTERFACE(SW_PAGEPREVIEW) TYPEINFO(); @@ -286,12 +286,12 @@ public: */ void SetVScrollbarThumbPos( const sal_uInt16 _nNewThumbPos ); - SwPagePreView( SfxViewFrame* pFrame, SfxViewShell* ); - ~SwPagePreView(); + SwPagePreview( SfxViewFrame* pFrame, SfxViewShell* ); + ~SwPagePreview(); }; // ----------------- inline methods ---------------------- -inline void SwPagePreView::AdjustEditWin() +inline void SwPagePreview::AdjustEditWin() { OuterResizePixel( Point(), GetFrameWindow()->GetOutputSizePixel() ); } diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx index d6f9d9a365b3..3bad33f9ae0f 100644 --- a/sw/source/ui/inc/view.hxx +++ b/sw/source/ui/inc/view.hxx @@ -178,7 +178,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell Timer m_aTimer; // for delayed ChgLnks during an action OUString m_aPageStr; // status view, current page OUString m_sSwViewData, - //and the new cursor position if the user double click in the PagePreView + //and the new cursor position if the user double click in the PagePreview m_sNewCrsrPos; // to support keyboard the number of the page to go to can be set too sal_uInt16 m_nNewPage; @@ -265,7 +265,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell m_bPasteSpecialState : 1, m_bInMailMerge : 1, m_bInDtor : 1, //detect destructor to prevent creating of sub shells while closing - m_bOldShellWasPagePreView : 1, + m_bOldShellWasPagePreview : 1, m_bIsPreviewDoubleClick : 1, // #i114045# m_bMakeSelectionVisible : 1, // transport the bookmark selection m_bAnnotationMode; ///< The real cursor position is inside an annotation. diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx index 2d9c3cc11b3f..a594d09160bd 100644 --- a/sw/source/ui/uiview/pview.cxx +++ b/sw/source/ui/uiview/pview.cxx @@ -68,7 +68,7 @@ #include <popup.hrc> #include <view.hrc> -#define SwPagePreView +#define SwPagePreview #include <sfx2/msg.hxx> #include <swslots.hxx> #include <pagepreviewlayout.hxx> @@ -79,14 +79,14 @@ using namespace ::com::sun::star; -SFX_IMPL_NAMED_VIEWFACTORY(SwPagePreView, "PrintPreview") +SFX_IMPL_NAMED_VIEWFACTORY(SwPagePreview, "PrintPreview") { SFX_VIEW_REGISTRATION(SwDocShell); SFX_VIEW_REGISTRATION(SwWebDocShell); SFX_VIEW_REGISTRATION(SwGlobalDocShell); } -SFX_IMPL_INTERFACE(SwPagePreView, SfxViewShell, SW_RES(RID_PVIEW_TOOLBOX)) +SFX_IMPL_INTERFACE(SwPagePreview, SfxViewShell, SW_RES(RID_PVIEW_TOOLBOX)) { SFX_POPUPMENU_REGISTRATION(SW_RES(MN_PPREVIEW_POPUPMENU)); SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD| @@ -95,7 +95,7 @@ SFX_IMPL_INTERFACE(SwPagePreView, SfxViewShell, SW_RES(RID_PVIEW_TOOLBOX)) SW_RES(RID_PVIEW_TOOLBOX)); } -TYPEINIT1(SwPagePreView,SfxViewShell) +TYPEINIT1(SwPagePreview,SfxViewShell) #define SWVIEWFLAGS ( SFX_VIEW_CAN_PRINT|SFX_VIEW_HAS_PRINTOPTIONS ) @@ -135,7 +135,7 @@ static void lcl_InvalidateZoomSlots(SfxBindings& rBindings) } // At first the zoom dialog -class SwPreViewZoomDlg : public SvxStandardDialog +class SwPreviewZoomDlg : public SvxStandardDialog { NumericField* m_pRowEdit; NumericField* m_pColEdit; @@ -143,10 +143,10 @@ class SwPreViewZoomDlg : public SvxStandardDialog virtual void Apply(); public: - SwPreViewZoomDlg( SwPagePreViewWin& rParent ); + SwPreviewZoomDlg( SwPagePreviewWin& rParent ); }; -SwPreViewZoomDlg::SwPreViewZoomDlg( SwPagePreViewWin& rParent ) +SwPreviewZoomDlg::SwPreviewZoomDlg( SwPagePreviewWin& rParent ) : SvxStandardDialog(&rParent, "PreviewZoomDialog", "modules/swriter/ui/previewzoomdialog.ui") { get(m_pRowEdit, "rows"); @@ -156,15 +156,15 @@ SwPreViewZoomDlg::SwPreViewZoomDlg( SwPagePreViewWin& rParent ) m_pColEdit->SetValue( rParent.GetCol() ); } -void SwPreViewZoomDlg::Apply() +void SwPreviewZoomDlg::Apply() { - ((SwPagePreViewWin*)GetParent())->CalcWish( + ((SwPagePreviewWin*)GetParent())->CalcWish( sal_uInt8(m_pRowEdit->GetValue()), sal_uInt8(m_pColEdit->GetValue()) ); } -// all for SwPagePreViewWin -SwPagePreViewWin::SwPagePreViewWin( Window *pParent, SwPagePreView& rPView ) +// all for SwPagePreviewWin +SwPagePreviewWin::SwPagePreviewWin( Window *pParent, SwPagePreview& rPView ) : Window( pParent, WinBits( WB_CLIPCHILDREN) ), mpViewShell( 0 ), mrView( rPView ), @@ -183,12 +183,12 @@ SwPagePreViewWin::SwPagePreViewWin( Window *pParent, SwPagePreView& rPView ) mnSttPage = USHRT_MAX; } -SwPagePreViewWin::~SwPagePreViewWin() +SwPagePreviewWin::~SwPagePreviewWin() { delete mpViewShell; } -void SwPagePreViewWin::Paint( const Rectangle& rRect ) +void SwPagePreviewWin::Paint( const Rectangle& rRect ) { if( !mpViewShell || !mpViewShell->GetLayout() ) return; @@ -216,7 +216,7 @@ void SwPagePreViewWin::Paint( const Rectangle& rRect ) } } -void SwPagePreViewWin::CalcWish( sal_uInt8 nNewRow, sal_uInt8 nNewCol ) +void SwPagePreviewWin::CalcWish( sal_uInt8 nNewRow, sal_uInt8 nNewCol ) { if( !mpViewShell || !mpViewShell->GetLayout() ) return; @@ -262,7 +262,7 @@ void SwPagePreViewWin::CalcWish( sal_uInt8 nNewRow, sal_uInt8 nNewCol ) } // mnSttPage is Absolute -int SwPagePreViewWin::MovePage( int eMoveMode ) +int SwPagePreviewWin::MovePage( int eMoveMode ) { // number of pages up sal_uInt16 nPages = mnRow * mnCol; @@ -363,7 +363,7 @@ int SwPagePreViewWin::MovePage( int eMoveMode ) return sal_True; } -void SwPagePreViewWin::SetWinSize( const Size& rNewSize ) +void SwPagePreviewWin::SetWinSize( const Size& rNewSize ) { // We always want the size as pixel units. maPxWinSize = LogicToPixel( rNewSize ); @@ -390,7 +390,7 @@ void SwPagePreViewWin::SetWinSize( const Size& rNewSize ) maScale = GetMapMode().GetScaleX(); } -OUString SwPagePreViewWin::GetStatusStr( sal_uInt16 nPageCnt ) const +OUString SwPagePreviewWin::GetStatusStr( sal_uInt16 nPageCnt ) const { // show physical and virtual page number of // selected page, if it's visible. @@ -413,7 +413,7 @@ OUString SwPagePreViewWin::GetStatusStr( sal_uInt16 nPageCnt ) const return aStatusStr.makeStringAndClear(); } -void SwPagePreViewWin::KeyInput( const KeyEvent &rKEvt ) +void SwPagePreviewWin::KeyInput( const KeyEvent &rKEvt ) { const KeyCode& rKeyCode = rKEvt.GetKeyCode(); sal_uInt16 nKey = rKeyCode.GetCode(); @@ -438,7 +438,7 @@ void SwPagePreViewWin::KeyInput( const KeyEvent &rKEvt ) Window::KeyInput( rKEvt ); } -void SwPagePreViewWin::Command( const CommandEvent& rCEvt ) +void SwPagePreviewWin::Command( const CommandEvent& rCEvt ) { bool bCallBase = true; switch( rCEvt.GetCommand() ) @@ -472,7 +472,7 @@ void SwPagePreViewWin::Command( const CommandEvent& rCEvt ) Window::Command( rCEvt ); } -void SwPagePreViewWin::MouseButtonDown( const MouseEvent& rMEvt ) +void SwPagePreviewWin::MouseButtonDown( const MouseEvent& rMEvt ) { // consider single-click to set selected page if( MOUSE_LEFT == ( rMEvt.GetModifier() + rMEvt.GetButtons() ) ) @@ -500,7 +500,7 @@ void SwPagePreViewWin::MouseButtonDown( const MouseEvent& rMEvt ) { // show clicked page as the selected one mpPgPreviewLayout->MarkNewSelectedPage( nNewSelectedPage ); - GetViewShell()->ShowPreViewSelection( nNewSelectedPage ); + GetViewShell()->ShowPreviewSelection( nNewSelectedPage ); // adjust position at vertical scrollbar. if ( mpPgPreviewLayout->DoesPreviewLayoutRowsFitIntoWindow() ) { @@ -519,7 +519,7 @@ void SwPagePreViewWin::MouseButtonDown( const MouseEvent& rMEvt ) // Set user prefs or view options -void SwPagePreViewWin::SetPagePreview( sal_uInt8 nRow, sal_uInt8 nCol ) +void SwPagePreviewWin::SetPagePreview( sal_uInt8 nRow, sal_uInt8 nCol ) { SwMasterUsrPref *pOpt = (SwMasterUsrPref *)SW_MOD()->GetUsrPref(sal_False); @@ -538,7 +538,7 @@ void SwPagePreViewWin::SetPagePreview( sal_uInt8 nRow, sal_uInt8 nCol ) @author OD */ -sal_uInt16 SwPagePreViewWin::SelectedPage() const +sal_uInt16 SwPagePreviewWin::SelectedPage() const { return mpPgPreviewLayout->SelectedPage(); } @@ -547,7 +547,7 @@ sal_uInt16 SwPagePreViewWin::SelectedPage() const @author OD */ -void SwPagePreViewWin::SetSelectedPage( sal_uInt16 _nSelectedPageNum ) +void SwPagePreviewWin::SetSelectedPage( sal_uInt16 _nSelectedPageNum ) { mpPgPreviewLayout->SetSelectedPage( _nSelectedPageNum ); } @@ -556,14 +556,14 @@ void SwPagePreViewWin::SetSelectedPage( sal_uInt16 _nSelectedPageNum ) @author OD */ -bool SwPagePreViewWin::SetBookPreviewMode( const bool _bBookPreview ) +bool SwPagePreviewWin::SetBookPreviewMode( const bool _bBookPreview ) { return mpPgPreviewLayout->SetBookPreviewMode( _bBookPreview, mnSttPage, maPaintedPreviewDocRect ); } -void SwPagePreViewWin::DataChanged( const DataChangedEvent& rDCEvt ) +void SwPagePreviewWin::DataChanged( const DataChangedEvent& rDCEvt ) { Window::DataChanged( rDCEvt ); @@ -595,7 +595,7 @@ void SwPagePreViewWin::DataChanged( const DataChangedEvent& rDCEvt ) @author OD */ -void SwPagePreView::_ExecPgUpAndPgDown( const bool _bPgUp, +void SwPagePreview::_ExecPgUpAndPgDown( const bool _bPgUp, SfxRequest* _pReq ) { SwPagePreviewLayout* pPagePreviewLay = GetViewShell()->PagePreviewLayout(); @@ -606,8 +606,8 @@ void SwPagePreView::_ExecPgUpAndPgDown( const bool _bPgUp, pPagePreviewLay->DoesPreviewLayoutColsFitIntoWindow() ) { const int eMvMode = _bPgUp ? - SwPagePreViewWin::MV_PAGE_UP : - SwPagePreViewWin::MV_PAGE_DOWN; + SwPagePreviewWin::MV_PAGE_UP : + SwPagePreviewWin::MV_PAGE_DOWN; if ( ChgPage( eMvMode, sal_True ) ) aViewWin.Invalidate(); } @@ -667,8 +667,8 @@ void SwPagePreView::_ExecPgUpAndPgDown( const bool _bPgUp, _pReq->Done(); } -// Then all for the SwPagePreView -void SwPagePreView::Execute( SfxRequest &rReq ) +// Then all for the SwPagePreview +void SwPagePreview::Execute( SfxRequest &rReq ) { int eMvMode; sal_uInt8 nRow = 1; @@ -695,7 +695,7 @@ void SwPagePreView::Execute( SfxRequest &rReq ) } else - SwPreViewZoomDlg( aViewWin ).Execute(); + SwPreviewZoomDlg( aViewWin ).Execute(); } break; @@ -835,10 +835,10 @@ void SwPagePreView::Execute( SfxRequest &rReq ) { aViewWin.SetSelectedPage( nNewSelectedPage ); aViewWin.SetSttPage( nNewStartPage ); - int nRet = ChgPage( SwPagePreViewWin::MV_SELPAGE, sal_True ); + int nRet = ChgPage( SwPagePreviewWin::MV_SELPAGE, sal_True ); bRefresh = 0 != nRet; } - GetViewShell()->ShowPreViewSelection( nNewSelectedPage ); + GetViewShell()->ShowPreviewSelection( nNewSelectedPage ); // invalidate page status. static sal_uInt16 aInval[] = { @@ -863,11 +863,11 @@ void SwPagePreView::Execute( SfxRequest &rReq ) case FN_START_OF_LINE: case FN_START_OF_DOCUMENT: aViewWin.SetSelectedPage( 1 ); - eMvMode = SwPagePreViewWin::MV_DOC_STT; bRetVal = true; goto MOVEPAGE; + eMvMode = SwPagePreviewWin::MV_DOC_STT; bRetVal = true; goto MOVEPAGE; case FN_END_OF_LINE: case FN_END_OF_DOCUMENT: aViewWin.SetSelectedPage( mnPageCount ); - eMvMode = SwPagePreViewWin::MV_DOC_END; bRetVal = true; goto MOVEPAGE; + eMvMode = SwPagePreviewWin::MV_DOC_END; bRetVal = true; goto MOVEPAGE; MOVEPAGE: { int nRet = ChgPage( eMvMode, sal_True ); @@ -882,7 +882,7 @@ MOVEPAGE: case FN_PRINT_PAGEPREVIEW: { - const SwPagePreViewPrtData* pPPVPD = aViewWin.GetViewShell()->GetDoc()->GetPreViewPrtData(); + const SwPagePreviewPrtData* pPPVPD = aViewWin.GetViewShell()->GetDoc()->GetPreviewPrtData(); // The thing with the orientation if(pPPVPD) { @@ -934,7 +934,7 @@ MOVEPAGE: aViewWin.Invalidate(); } -void SwPagePreView::GetState( SfxItemSet& rSet ) +void SwPagePreview::GetState( SfxItemSet& rSet ) { SfxWhichIter aIter(rSet); sal_uInt8 nRow = 1; @@ -1069,7 +1069,7 @@ void SwPagePreView::GetState( SfxItemSet& rSet ) } } -void SwPagePreView::StateUndo(SfxItemSet& rSet) +void SwPagePreview::StateUndo(SfxItemSet& rSet) { SfxWhichIter aIter(rSet); sal_uInt16 nWhich = aIter.FirstWhich(); @@ -1081,7 +1081,7 @@ void SwPagePreView::StateUndo(SfxItemSet& rSet) } } -void SwPagePreView::Init(const SwViewOption * pPrefs) +void SwPagePreview::Init(const SwViewOption * pPrefs) { if ( GetViewShell()->HasDrawView() ) GetViewShell()->GetDrawView()->SetAnimationEnabled( sal_False ); @@ -1141,7 +1141,7 @@ void SwPagePreView::Init(const SwViewOption * pPrefs) pESh->ResetModified(); } -SwPagePreView::SwPagePreView(SfxViewFrame *pViewFrame, SfxViewShell* pOldSh): +SwPagePreview::SwPagePreview(SfxViewFrame *pViewFrame, SfxViewShell* pOldSh): SfxViewShell( pViewFrame, SWVIEWFLAGS ), aViewWin( &pViewFrame->GetWindow(), *this ), nNewPage(USHRT_MAX), @@ -1175,8 +1175,8 @@ SwPagePreView::SwPagePreView(SfxViewFrame *pViewFrame, SfxViewShell* pOldSh): ViewShell *pVS, *pNew; - if( pOldSh && pOldSh->IsA( TYPE( SwPagePreView ) ) ) - pVS = ((SwPagePreView*)pOldSh)->GetViewShell(); + if( pOldSh && pOldSh->IsA( TYPE( SwPagePreview ) ) ) + pVS = ((SwPagePreview*)pOldSh)->GetViewShell(); else { if( pOldSh && pOldSh->IsA( TYPE( SwView ) ) ) @@ -1218,7 +1218,7 @@ SwPagePreView::SwPagePreView(SfxViewFrame *pViewFrame, SfxViewShell* pOldSh): Init(); } -SwPagePreView::~SwPagePreView() +SwPagePreview::~SwPagePreview() { SetWindow( 0 ); @@ -1230,12 +1230,12 @@ SwPagePreView::~SwPagePreView() } -SwDocShell* SwPagePreView::GetDocShell() +SwDocShell* SwPagePreview::GetDocShell() { return PTR_CAST(SwDocShell, GetViewFrame()->GetObjectShell()); } -int SwPagePreView::_CreateScrollbar( sal_Bool bHori ) +int SwPagePreview::_CreateScrollbar( sal_Bool bHori ) { Window *pMDI = &GetViewFrame()->GetWindow(); SwScrollbar** ppScrollbar = bHori ? &pHScrollbar : &pVScrollbar; @@ -1249,7 +1249,7 @@ int SwPagePreView::_CreateScrollbar( sal_Bool bHori ) pPageUpBtn->SetHelpId(GetStaticInterface()->GetSlot(FN_PAGEUP)->GetCommand()); pPageDownBtn = new ImageButton(pMDI, SW_RES( BTN_PAGEDOWN ) ); pPageDownBtn->SetHelpId(GetStaticInterface()->GetSlot(FN_PAGEDOWN)->GetCommand()); - Link aLk( LINK( this, SwPagePreView, BtnPage ) ); + Link aLk( LINK( this, SwPagePreview, BtnPage ) ); pPageUpBtn->SetClickHdl( aLk ); pPageDownBtn->SetClickHdl( aLk ); pPageUpBtn->Show(); @@ -1260,10 +1260,10 @@ int SwPagePreView::_CreateScrollbar( sal_Bool bHori ) ScrollDocSzChg(); (*ppScrollbar)->EnableDrag( sal_True ); - (*ppScrollbar)->SetEndScrollHdl( LINK( this, SwPagePreView, EndScrollHdl )); + (*ppScrollbar)->SetEndScrollHdl( LINK( this, SwPagePreview, EndScrollHdl )); - (*ppScrollbar)->SetScrollHdl( LINK( this, SwPagePreView, ScrollHdl )); + (*ppScrollbar)->SetScrollHdl( LINK( this, SwPagePreview, ScrollHdl )); InvalidateBorder(); (*ppScrollbar)->ExtendedShow(); @@ -1272,21 +1272,21 @@ int SwPagePreView::_CreateScrollbar( sal_Bool bHori ) // Button-Handler -IMPL_LINK_INLINE_START( SwPagePreView, BtnPage, Button *, pButton ) +IMPL_LINK_INLINE_START( SwPagePreview, BtnPage, Button *, pButton ) { // use new helper method to perform page up // respectively page down. _ExecPgUpAndPgDown( pButton == pPageUpBtn ); return 0; } -IMPL_LINK_INLINE_END( SwPagePreView, BtnPage, Button *, pButton ) +IMPL_LINK_INLINE_END( SwPagePreview, BtnPage, Button *, pButton ) -int SwPagePreView::ChgPage( int eMvMode, int bUpdateScrollbar ) +int SwPagePreview::ChgPage( int eMvMode, int bUpdateScrollbar ) { Rectangle aPixVisArea( aViewWin.LogicToPixel( aVisArea ) ); int bChg = aViewWin.MovePage( eMvMode ) || - eMvMode == SwPagePreViewWin::MV_CALC || - eMvMode == SwPagePreViewWin::MV_NEWWINSIZE; + eMvMode == SwPagePreviewWin::MV_CALC || + eMvMode == SwPagePreviewWin::MV_NEWWINSIZE; aVisArea = aViewWin.PixelToLogic( aPixVisArea ); if( bChg ) @@ -1312,7 +1312,7 @@ int SwPagePreView::ChgPage( int eMvMode, int bUpdateScrollbar ) } // From here, everything was taken from the SwView. -void SwPagePreView::CalcAndSetBorderPixel( SvBorder &rToFill, sal_Bool /*bInner*/ ) +void SwPagePreview::CalcAndSetBorderPixel( SvBorder &rToFill, sal_Bool /*bInner*/ ) { const StyleSettings &rSet = aViewWin.GetSettings().GetStyleSettings(); const long nTmp = rSet.GetScrollBarSize(); @@ -1323,7 +1323,7 @@ void SwPagePreView::CalcAndSetBorderPixel( SvBorder &rToFill, sal_Bool /*bInner* SetBorderPixel( rToFill ); } -void SwPagePreView::InnerResizePixel( const Point &rOfst, const Size &rSize ) +void SwPagePreview::InnerResizePixel( const Point &rOfst, const Size &rSize ) { SvBorder aBorder; CalcAndSetBorderPixel( aBorder, sal_True ); @@ -1339,7 +1339,7 @@ void SwPagePreView::InnerResizePixel( const Point &rOfst, const Size &rSize ) // Never set VisArea ! } -void SwPagePreView::OuterResizePixel( const Point &rOfst, const Size &rSize ) +void SwPagePreview::OuterResizePixel( const Point &rOfst, const Size &rSize ) { SvBorder aBorder; CalcAndSetBorderPixel( aBorder, sal_False ); @@ -1365,7 +1365,7 @@ void SwPagePreView::OuterResizePixel( const Point &rOfst, const Size &rSize ) *pHScrollbar, pPageUpBtn, pPageDownBtn, 0, *pScrollFill ); } -void SwPagePreView::SetVisArea( const Rectangle &rRect, sal_Bool bUpdateScrollbar ) +void SwPagePreview::SetVisArea( const Rectangle &rRect, sal_Bool bUpdateScrollbar ) { const Point aTopLeft(AlignToPixel(rRect.TopLeft())); const Point aBottomRight(AlignToPixel(rRect.BottomRight())); @@ -1408,12 +1408,12 @@ void SwPagePreView::SetVisArea( const Rectangle &rRect, sal_Bool bUpdateScrollba // Set at View-Win the current size aVisArea = aLR; aViewWin.SetWinSize( aLR.GetSize() ); - ChgPage( SwPagePreViewWin::MV_NEWWINSIZE, bUpdateScrollbar ); + ChgPage( SwPagePreviewWin::MV_NEWWINSIZE, bUpdateScrollbar ); aViewWin.Invalidate(); } -IMPL_LINK( SwPagePreView, ScrollHdl, SwScrollbar *, pScrollbar ) +IMPL_LINK( SwPagePreview, ScrollHdl, SwScrollbar *, pScrollbar ) { if(!GetViewShell()) return 0; @@ -1446,7 +1446,7 @@ IMPL_LINK( SwPagePreView, ScrollHdl, SwScrollbar *, pScrollbar ) return 0; } -IMPL_LINK( SwPagePreView, EndScrollHdl, SwScrollbar *, pScrollbar ) +IMPL_LINK( SwPagePreview, EndScrollHdl, SwScrollbar *, pScrollbar ) { if(!GetViewShell()) return 0; @@ -1482,7 +1482,7 @@ IMPL_LINK( SwPagePreView, EndScrollHdl, SwScrollbar *, pScrollbar ) { aViewWin.SetSttPage( nThmbPos ); aViewWin.SetSelectedPage( nThmbPos ); - ChgPage( SwPagePreViewWin::MV_SCROLL, sal_False ); + ChgPage( SwPagePreviewWin::MV_SCROLL, sal_False ); // update scrollbars ScrollViewSzChg(); } @@ -1502,7 +1502,7 @@ IMPL_LINK( SwPagePreView, EndScrollHdl, SwScrollbar *, pScrollbar ) } } // update accessibility - GetViewShell()->ShowPreViewSelection( nThmbPos ); + GetViewShell()->ShowPreviewSelection( nThmbPos ); } else { @@ -1537,12 +1537,12 @@ IMPL_LINK( SwPagePreView, EndScrollHdl, SwScrollbar *, pScrollbar ) return 0; } -Point SwPagePreView::AlignToPixel(const Point &rPt) const +Point SwPagePreview::AlignToPixel(const Point &rPt) const { return aViewWin.PixelToLogic( aViewWin.LogicToPixel( rPt ) ); } -void SwPagePreView::DocSzChgd( const Size &rSz ) +void SwPagePreview::DocSzChgd( const Size &rSz ) { if( aDocSz == rSz ) return; @@ -1556,14 +1556,14 @@ void SwPagePreView::DocSzChgd( const Size &rSz ) if( aVisArea.GetWidth() ) { - ChgPage( SwPagePreViewWin::MV_CALC, sal_True ); + ChgPage( SwPagePreviewWin::MV_CALC, sal_True ); ScrollDocSzChg(); aViewWin.Invalidate(); } } -void SwPagePreView::ScrollViewSzChg() +void SwPagePreview::ScrollViewSzChg() { if(!GetViewShell()) return ; @@ -1656,18 +1656,18 @@ void SwPagePreView::ScrollViewSzChg() pScrollFill->Show(bShowVScrollbar && bShowHScrollbar); } -void SwPagePreView::ScrollDocSzChg() +void SwPagePreview::ScrollDocSzChg() { ScrollViewSzChg(); } // All about printing -SfxPrinter* SwPagePreView::GetPrinter( sal_Bool bCreate ) +SfxPrinter* SwPagePreview::GetPrinter( sal_Bool bCreate ) { return aViewWin.GetViewShell()->getIDocumentDeviceAccess()->getPrinter( bCreate ); } -sal_uInt16 SwPagePreView::SetPrinter( SfxPrinter *pNew, sal_uInt16 nDiffFlags, bool ) +sal_uInt16 SwPagePreview::SetPrinter( SfxPrinter *pNew, sal_uInt16 nDiffFlags, bool ) { ViewShell &rSh = *GetViewShell(); SfxPrinter* pOld = rSh.getIDocumentDeviceAccess()->getPrinter( false ); @@ -1721,27 +1721,27 @@ sal_uInt16 SwPagePreView::SetPrinter( SfxPrinter *pNew, sal_uInt16 nDiffFlags, return 0; } -bool SwPagePreView::HasPrintOptionsPage() const +bool SwPagePreview::HasPrintOptionsPage() const { return true; } -SfxTabPage* SwPagePreView::CreatePrintOptionsPage( Window *pParent, +SfxTabPage* SwPagePreview::CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions ) { return ::CreatePrintOptionsPage( pParent, rOptions, !bNormalPrint ); } -void SwPagePreViewWin::SetViewShell( ViewShell* pShell ) +void SwPagePreviewWin::SetViewShell( ViewShell* pShell ) { mpViewShell = pShell; - if ( mpViewShell && mpViewShell->IsPreView() ) + if ( mpViewShell && mpViewShell->IsPreview() ) { mpPgPreviewLayout = mpViewShell->PagePreviewLayout(); } } -void SwPagePreViewWin::RepaintCoreRect( const SwRect& rRect ) +void SwPagePreviewWin::RepaintCoreRect( const SwRect& rRect ) { // #i24183# if ( mpPgPreviewLayout->PreviewLayoutValid() ) @@ -1754,7 +1754,7 @@ void SwPagePreViewWin::RepaintCoreRect( const SwRect& rRect ) #i19975# also consider zoom type - adding parameter <_eZoomType> */ -void SwPagePreViewWin::AdjustPreviewToNewZoom( const sal_uInt16 _nZoomFactor, +void SwPagePreviewWin::AdjustPreviewToNewZoom( const sal_uInt16 _nZoomFactor, const SvxZoomType _eZoomType ) { // #i19975# consider zoom type @@ -1798,7 +1798,7 @@ void SwPagePreViewWin::AdjustPreviewToNewZoom( const sal_uInt16 _nZoomFactor, * when less than the desired number of rows fits into * the view */ -void SwPagePreViewWin::Scroll(long nXMove, long nYMove, sal_uInt16 /*nFlags*/) +void SwPagePreviewWin::Scroll(long nXMove, long nYMove, sal_uInt16 /*nFlags*/) { maPaintedPreviewDocRect.Move(nXMove, nYMove); mpPgPreviewLayout->Prepare( 0, maPaintedPreviewDocRect.TopLeft(), @@ -1807,7 +1807,7 @@ void SwPagePreViewWin::Scroll(long nXMove, long nYMove, sal_uInt16 /*nFlags*/) } -sal_Bool SwPagePreView::HandleWheelCommands( const CommandEvent& rCEvt ) +sal_Bool SwPagePreview::HandleWheelCommands( const CommandEvent& rCEvt ) { sal_Bool bOk = sal_False; const CommandWheelData* pWData = rCEvt.GetWheelData(); @@ -1839,7 +1839,7 @@ sal_Bool SwPagePreView::HandleWheelCommands( const CommandEvent& rCEvt ) } uno::Reference< ::com::sun::star::accessibility::XAccessible > - SwPagePreViewWin::CreateAccessible() + SwPagePreviewWin::CreateAccessible() { SolarMutexGuard aGuard; // this should have happened already!!! @@ -1847,24 +1847,24 @@ uno::Reference< ::com::sun::star::accessibility::XAccessible > return GetViewShell()->CreateAccessiblePreview(); } -void SwPagePreView::ApplyAccessiblityOptions(SvtAccessibilityOptions& rAccessibilityOptions) +void SwPagePreview::ApplyAccessiblityOptions(SvtAccessibilityOptions& rAccessibilityOptions) { GetViewShell()->ApplyAccessiblityOptions(rAccessibilityOptions); } -void SwPagePreView::ShowHScrollbar(sal_Bool bShow) +void SwPagePreview::ShowHScrollbar(sal_Bool bShow) { pHScrollbar->Show(bShow); InvalidateBorder(); } -void SwPagePreView::ShowVScrollbar(sal_Bool bShow) +void SwPagePreview::ShowVScrollbar(sal_Bool bShow) { pVScrollbar->Show(bShow); InvalidateBorder(); } -void SwPagePreView::EnableHScrollbar(bool bEnable) +void SwPagePreview::EnableHScrollbar(bool bEnable) { if (mbHScrollbarEnabled != bEnable) { @@ -1873,7 +1873,7 @@ void SwPagePreView::EnableHScrollbar(bool bEnable) } } -void SwPagePreView::EnableVScrollbar(bool bEnable) +void SwPagePreview::EnableVScrollbar(bool bEnable) { if (mbVScrollbarEnabled != bEnable) { @@ -1882,7 +1882,7 @@ void SwPagePreView::EnableVScrollbar(bool bEnable) } } -void SwPagePreView::SetZoom(SvxZoomType eType, sal_uInt16 nFactor) +void SwPagePreview::SetZoom(SvxZoomType eType, sal_uInt16 nFactor) { ViewShell& rSh = *GetViewShell(); SwViewOption aOpt(*rSh.GetViewOptions()); @@ -1904,7 +1904,7 @@ void SwPagePreView::SetZoom(SvxZoomType eType, sal_uInt16 nFactor) @author OD */ -void SwPagePreView::SetVScrollbarThumbPos( const sal_uInt16 _nNewThumbPos ) +void SwPagePreview::SetVScrollbarThumbPos( const sal_uInt16 _nNewThumbPos ) { if ( pVScrollbar ) { diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx index 5737625dba9e..e775097cc320 100644 --- a/sw/source/ui/uiview/view.cxx +++ b/sw/source/ui/uiview/view.cxx @@ -727,7 +727,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) m_bWheelScrollInProgress(false), m_bInMailMerge(sal_False), m_bInDtor(sal_False), - m_bOldShellWasPagePreView(sal_False), + m_bOldShellWasPagePreview(sal_False), m_bIsPreviewDoubleClick(sal_False), m_bAnnotationMode(false) { @@ -784,12 +784,12 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) { pExistingSh = pOldSh; // determine type of existing view - if( pExistingSh->IsA( TYPE( SwPagePreView ) ) ) + if( pExistingSh->IsA( TYPE( SwPagePreview ) ) ) { - m_sSwViewData = ((SwPagePreView*)pExistingSh)->GetPrevSwViewData(); - m_sNewCrsrPos = ((SwPagePreView*)pExistingSh)->GetNewCrsrPos(); - m_nNewPage = ((SwPagePreView*)pExistingSh)->GetNewPage(); - m_bOldShellWasPagePreView = sal_True; + m_sSwViewData = ((SwPagePreview*)pExistingSh)->GetPrevSwViewData(); + m_sNewCrsrPos = ((SwPagePreview*)pExistingSh)->GetNewCrsrPos(); + m_nNewPage = ((SwPagePreview*)pExistingSh)->GetNewPage(); + m_bOldShellWasPagePreview = sal_True; m_bIsPreviewDoubleClick = !m_sNewCrsrPos.isEmpty() || m_nNewPage != USHRT_MAX; } else if( pExistingSh->IsA( TYPE( SwSrcView ) ) ) @@ -811,7 +811,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) { SwDoc& rDoc = *((SwDocShell*)pDocSh)->GetDoc(); - if( !bOldShellWasSrcView && pWebDShell && !m_bOldShellWasPagePreView ) + if( !bOldShellWasSrcView && pWebDShell && !m_bOldShellWasPagePreview ) aUsrPref.setBrowseMode( sal_True ); else aUsrPref.setBrowseMode( rDoc.get(IDocumentSettingAccess::BROWSE_MODE) ); @@ -829,26 +829,26 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) aUsrPref.SetViewLayoutColumns( 1 ); } m_pWrtShell = new SwWrtShell( rDoc, m_pEditWin, *this, &aUsrPref ); - // creating an SwView from a SwPagePreView needs to + // creating an SwView from a SwPagePreview needs to // add the ViewShell to the ring of the other ViewShell(s) - if(m_bOldShellWasPagePreView) + if(m_bOldShellWasPagePreview) { - ViewShell& rPreviewViewShell = *((SwPagePreView*)pExistingSh)->GetViewShell(); + ViewShell& rPreviewViewShell = *((SwPagePreview*)pExistingSh)->GetViewShell(); m_pWrtShell->MoveTo(&rPreviewViewShell); // to update the field command et.al. if necessary - const SwViewOption* pPreViewOpt = rPreviewViewShell.GetViewOptions(); - if( pPreViewOpt->IsFldName() != aUsrPref.IsFldName() || - pPreViewOpt->IsShowHiddenField() != aUsrPref.IsShowHiddenField() || - pPreViewOpt->IsShowHiddenPara() != aUsrPref.IsShowHiddenPara() || - pPreViewOpt->IsShowHiddenChar() != aUsrPref.IsShowHiddenChar() ) + const SwViewOption* pPreviewOpt = rPreviewViewShell.GetViewOptions(); + if( pPreviewOpt->IsFldName() != aUsrPref.IsFldName() || + pPreviewOpt->IsShowHiddenField() != aUsrPref.IsShowHiddenField() || + pPreviewOpt->IsShowHiddenPara() != aUsrPref.IsShowHiddenPara() || + pPreviewOpt->IsShowHiddenChar() != aUsrPref.IsShowHiddenChar() ) rPreviewViewShell.ApplyViewOptions(aUsrPref); // reset design mode at draw view for form // shell, if needed. - if ( ((SwPagePreView*)pExistingSh)->ResetFormDesignMode() && + if ( ((SwPagePreview*)pExistingSh)->ResetFormDesignMode() && m_pWrtShell->HasDrawView() ) { SdrView* pDrawView = m_pWrtShell->GetDrawView(); - pDrawView->SetDesignMode( ((SwPagePreView*)pExistingSh)->FormDesignModeToReset() ); + pDrawView->SetDesignMode( ((SwPagePreview*)pExistingSh)->FormDesignModeToReset() ); } } } @@ -1185,7 +1185,7 @@ void SwView::ReadUserData( const OUString &rUserData, bool bBrowse ) m_pWrtShell->SetMacroExecAllowed( false ); // os: changed: The user data has to be read if the view is switched back from page preview // go to the last editing position when opening own files - if(m_bOldShellWasPagePreView || bIsOwnDocument) + if(m_bOldShellWasPagePreview || bIsOwnDocument) { m_pWrtShell->SwCrsrShell::SetCrsr( aCrsrPos, !bSelectObj ); if( bSelectObj ) @@ -1203,7 +1203,7 @@ void SwView::ReadUserData( const OUString &rUserData, bool bBrowse ) // is lost. // os: changed: The user data has to be read if the view is switched back from page preview // go to the last editing position when opening own files - if(m_bOldShellWasPagePreView || bIsOwnDocument ) + if(m_bOldShellWasPagePreview || bIsOwnDocument ) { if ( bBrowse ) SetVisArea( aVis.TopLeft() ); @@ -1367,7 +1367,7 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue > // os: changed: The user data has to be read if the view is switched back from page preview // go to the last editing position when opening own files m_pViewImpl->SetRestorePosition(aCrsrPos, bSelectObj); - if(m_bOldShellWasPagePreView|| bIsOwnDocument) + if(m_bOldShellWasPagePreview|| bIsOwnDocument) { m_pWrtShell->SwCrsrShell::SetCrsr( aCrsrPos, !bSelectObj ); @@ -1434,7 +1434,7 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue > // os: changed: The user data has to be read if the view is switched back from page preview // go to the last editing position when opening own files - if(m_bOldShellWasPagePreView||bIsOwnDocument) + if(m_bOldShellWasPagePreview||bIsOwnDocument) { if ( bBrowse && bGotVisibleLeft && bGotVisibleTop ) { diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx index a5fb8de8f962..cc1a90143d87 100644 --- a/sw/source/ui/uiview/viewport.cxx +++ b/sw/source/ui/uiview/viewport.cxx @@ -841,7 +841,7 @@ void ViewResizePixel( const Window &rRef, sal_Bool bWebView, sal_Bool bVRulerRight ) { -// ViewResizePixel is also used by PreView!!! +// ViewResizePixel is also used by Preview!!! const sal_Bool bHRuler = pHRuler && pHRuler->IsVisible(); const long nHLinSzHeight = bHRuler ? diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx index 671a27d3678d..a051c7014f3a 100644 --- a/sw/source/ui/uno/unotxdoc.cxx +++ b/sw/source/ui/uno/unotxdoc.cxx @@ -180,10 +180,10 @@ static SwPrintUIOptions * lcl_GetPrintUIOptions( } else if (!bSwSrcView) { - const SwPagePreView* pPreView = dynamic_cast< const SwPagePreView* >(pView); - OSL_ENSURE(pPreView, "Unexpected type of the view shell"); - if (pPreView) - nCurrentPage = pPreView->GetSelectedPage(); + const SwPagePreview* pPreview = dynamic_cast< const SwPagePreview* >(pView); + OSL_ENSURE(pPreview, "Unexpected type of the view shell"); + if (pPreview) + nCurrentPage = pPreview->GetSelectedPage(); } return new SwPrintUIOptions( nCurrentPage, bWebDoc, bSwSrcView, bHasSelection, bHasPostIts, rPrintData ); } @@ -989,8 +989,8 @@ Sequence< beans::PropertyValue > SwXTextDocument::getPagePrintSettings(void) if(IsValid()) { beans::PropertyValue* pArray = aSeq.getArray(); - SwPagePreViewPrtData aData; - const SwPagePreViewPrtData* pData = pDocShell->GetDoc()->GetPreViewPrtData(); + SwPagePreviewPrtData aData; + const SwPagePreviewPrtData* pData = pDocShell->GetDoc()->GetPreviewPrtData(); if(pData) aData = *pData; Any aVal; @@ -1066,9 +1066,9 @@ void SwXTextDocument::setPagePrintSettings(const Sequence< beans::PropertyValue SolarMutexGuard aGuard; if(IsValid()) { - SwPagePreViewPrtData aData; + SwPagePreviewPrtData aData; //if only a few properties are coming, then use the current settings - const SwPagePreViewPrtData* pData = pDocShell->GetDoc()->GetPreViewPrtData(); + const SwPagePreviewPrtData* pData = pDocShell->GetDoc()->GetPreviewPrtData(); if(pData) aData = *pData; const beans::PropertyValue* pProperties = aSettings.getConstArray(); @@ -1125,7 +1125,7 @@ void SwXTextDocument::setPagePrintSettings(const Sequence< beans::PropertyValue if(bException) throw RuntimeException(); } - pDocShell->GetDoc()->SetPreViewPrtData(&aData); + pDocShell->GetDoc()->SetPreviewPrtData(&aData); } else throw RuntimeException(); @@ -2554,7 +2554,7 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount( pViewShell = ((SwView*)m_pHiddenViewFrame->GetViewShell())->GetWrtShellPtr(); } else - pViewShell = ((SwPagePreView*)pView)->GetViewShell(); + pViewShell = ((SwPagePreview*)pView)->GetViewShell(); } if (!pViewShell || !pViewShell->GetLayout()) @@ -2716,7 +2716,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwXTextDocument::getRenderer( if ( pSwView ) pVwSh = pSwView->GetWrtShellPtr(); else - pVwSh = ((SwPagePreView*)pView)->GetViewShell(); + pVwSh = ((SwPagePreview*)pView)->GetViewShell(); sal_Int32 nMaxRenderer = 0; if (!bIsSwSrcView && m_pRenderData) @@ -2837,8 +2837,8 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwXTextDocument::getRenderer( // #i117783# if ( bApplyPagePrintSettingsFromXPagePrintable ) { - const SwPagePreViewPrtData* pPagePrintSettings = - pDocShell->GetDoc()->GetPreViewPrtData(); + const SwPagePreviewPrtData* pPagePrintSettings = + pDocShell->GetDoc()->GetPreviewPrtData(); if ( pPagePrintSettings && ( pPagePrintSettings->GetRow() > 1 || pPagePrintSettings->GetCol() > 1 ) ) @@ -2904,20 +2904,20 @@ SfxViewShell * SwXTextDocument::GuessViewShell( // SfxViewShell *pView = 0; SwView *pSwView = 0; - SwPagePreView *pSwPagePreView = 0; + SwPagePreview *pSwPagePreview = 0; SwSrcView *pSwSrcView = 0; SfxViewFrame *pFrame = SfxViewFrame::GetFirst( pDocShell, sal_False ); // look for the view shell with the same controller in use, // otherwise look for a suitable view, preferably a SwView, - // if that one is not found use a SwPagePreView if found. + // if that one is not found use a SwPagePreview if found. while (pFrame) { pView = pFrame->GetViewShell(); pSwView = dynamic_cast< SwView * >(pView); pSwSrcView = dynamic_cast< SwSrcView * >(pView); - if (!pSwPagePreView) - pSwPagePreView = dynamic_cast< SwPagePreView * >(pView); + if (!pSwPagePreview) + pSwPagePreview = dynamic_cast< SwPagePreview * >(pView); if (xController.is()) { if (pView && pView->GetController() == xController) @@ -2928,7 +2928,7 @@ SfxViewShell * SwXTextDocument::GuessViewShell( pFrame = SfxViewFrame::GetNext( *pFrame, pDocShell, sal_False ); } - OSL_ENSURE( pSwView || pSwPagePreView || pSwSrcView, "failed to get view shell" ); + OSL_ENSURE( pSwView || pSwPagePreview || pSwSrcView, "failed to get view shell" ); if (pView) rbIsSwSrcView = pSwSrcView != 0; return pView; @@ -2992,7 +2992,7 @@ void SAL_CALL SwXTextDocument::render( else { // the view shell should be SwView for documents PDF export - // or SwPagePreView for PDF export of the page preview + // or SwPagePreview for PDF export of the page preview //!! (check for SwView first as in GuessViewShell) !! OSL_ENSURE( pView, "!! view missing !!" ); const TypeId aSwViewTypeId = TYPE(SwView); @@ -3004,7 +3004,7 @@ void SAL_CALL SwXTextDocument::render( if ( pSwView ) pVwSh = pSwView->GetWrtShellPtr(); else - pVwSh = ((SwPagePreView*)pView)->GetViewShell(); + pVwSh = ((SwPagePreview*)pView)->GetViewShell(); } // get output device to use diff --git a/sw/uiconfig/sglobal/toolbar/previewobjectbar.xml b/sw/uiconfig/sglobal/toolbar/previewobjectbar.xml index 97caad7789cb..36db7df7507a 100644 --- a/sw/uiconfig/sglobal/toolbar/previewobjectbar.xml +++ b/sw/uiconfig/sglobal/toolbar/previewobjectbar.xml @@ -35,7 +35,7 @@ <toolbar:toolbaritem xlink:href=".uno:ZoomMinus" toolbar:helpid="10098"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:FullScreen" toolbar:helpid="5627"/> - <toolbar:toolbaritem xlink:href=".uno:PrintPagePreView" toolbar:helpid="21253"/> + <toolbar:toolbaritem xlink:href=".uno:PrintPagePreview" toolbar:helpid="21253"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:ClosePreview" toolbar:helpid="5325"/> </toolbar:toolbar> diff --git a/sw/uiconfig/sweb/toolbar/previewobjectbar.xml b/sw/uiconfig/sweb/toolbar/previewobjectbar.xml index 4d1223321731..1cd4f9b9f723 100644 --- a/sw/uiconfig/sweb/toolbar/previewobjectbar.xml +++ b/sw/uiconfig/sweb/toolbar/previewobjectbar.xml @@ -35,7 +35,7 @@ <toolbar:toolbaritem xlink:href=".uno:ZoomMinus" toolbar:helpid="10098"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:FullScreen" toolbar:helpid="5627"/> - <toolbar:toolbaritem xlink:href=".uno:PrintPagePreView" toolbar:helpid="21253"/> + <toolbar:toolbaritem xlink:href=".uno:PrintPagePreview" toolbar:helpid="21253"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:ClosePreview" toolbar:helpid="5325"/> </toolbar:toolbar> diff --git a/sw/uiconfig/swform/toolbar/previewobjectbar.xml b/sw/uiconfig/swform/toolbar/previewobjectbar.xml index 97caad7789cb..36db7df7507a 100644 --- a/sw/uiconfig/swform/toolbar/previewobjectbar.xml +++ b/sw/uiconfig/swform/toolbar/previewobjectbar.xml @@ -35,7 +35,7 @@ <toolbar:toolbaritem xlink:href=".uno:ZoomMinus" toolbar:helpid="10098"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:FullScreen" toolbar:helpid="5627"/> - <toolbar:toolbaritem xlink:href=".uno:PrintPagePreView" toolbar:helpid="21253"/> + <toolbar:toolbaritem xlink:href=".uno:PrintPagePreview" toolbar:helpid="21253"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:ClosePreview" toolbar:helpid="5325"/> </toolbar:toolbar> diff --git a/sw/uiconfig/swreport/toolbar/previewobjectbar.xml b/sw/uiconfig/swreport/toolbar/previewobjectbar.xml index 97caad7789cb..36db7df7507a 100644 --- a/sw/uiconfig/swreport/toolbar/previewobjectbar.xml +++ b/sw/uiconfig/swreport/toolbar/previewobjectbar.xml @@ -35,7 +35,7 @@ <toolbar:toolbaritem xlink:href=".uno:ZoomMinus" toolbar:helpid="10098"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:FullScreen" toolbar:helpid="5627"/> - <toolbar:toolbaritem xlink:href=".uno:PrintPagePreView" toolbar:helpid="21253"/> + <toolbar:toolbaritem xlink:href=".uno:PrintPagePreview" toolbar:helpid="21253"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:ClosePreview" toolbar:helpid="5325"/> </toolbar:toolbar> diff --git a/sw/uiconfig/swriter/toolbar/previewobjectbar.xml b/sw/uiconfig/swriter/toolbar/previewobjectbar.xml index 97caad7789cb..36db7df7507a 100644 --- a/sw/uiconfig/swriter/toolbar/previewobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/previewobjectbar.xml @@ -35,7 +35,7 @@ <toolbar:toolbaritem xlink:href=".uno:ZoomMinus" toolbar:helpid="10098"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:FullScreen" toolbar:helpid="5627"/> - <toolbar:toolbaritem xlink:href=".uno:PrintPagePreView" toolbar:helpid="21253"/> + <toolbar:toolbaritem xlink:href=".uno:PrintPagePreview" toolbar:helpid="21253"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:ClosePreview" toolbar:helpid="5325"/> </toolbar:toolbar> diff --git a/sw/uiconfig/swxform/toolbar/previewobjectbar.xml b/sw/uiconfig/swxform/toolbar/previewobjectbar.xml index 97caad7789cb..36db7df7507a 100644 --- a/sw/uiconfig/swxform/toolbar/previewobjectbar.xml +++ b/sw/uiconfig/swxform/toolbar/previewobjectbar.xml @@ -35,7 +35,7 @@ <toolbar:toolbaritem xlink:href=".uno:ZoomMinus" toolbar:helpid="10098"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:FullScreen" toolbar:helpid="5627"/> - <toolbar:toolbaritem xlink:href=".uno:PrintPagePreView" toolbar:helpid="21253"/> + <toolbar:toolbaritem xlink:href=".uno:PrintPagePreview" toolbar:helpid="21253"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:ClosePreview" toolbar:helpid="5325"/> </toolbar:toolbar> |