diff options
Diffstat (limited to 'sw/source/ui/uiview/pview.cxx')
-rw-r--r-- | sw/source/ui/uiview/pview.cxx | 275 |
1 files changed, 131 insertions, 144 deletions
diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx index 785bae4792..293b03022a 100644 --- a/sw/source/ui/uiview/pview.cxx +++ b/sw/source/ui/uiview/pview.cxx @@ -36,7 +36,6 @@ #include <vcl/help.hxx> #include <vcl/cmdevt.hxx> #include <vcl/button.hxx> -#include <svtools/printdlg.hxx> #include <svl/whiter.hxx> #include <svl/stritem.hxx> #include <svl/eitem.hxx> @@ -69,7 +68,7 @@ #include <view.hxx> #include <textsh.hxx> #include <scroll.hxx> -#include <swprtopt.hxx> +#include <prtopt.hxx> #include <docstat.hxx> #include <usrpref.hxx> #include <viewfunc.hxx> @@ -89,8 +88,8 @@ #include <svx/dialogs.hrc> #include <osl/mutex.hxx> -using namespace ::com::sun::star; +using namespace ::com::sun::star; SFX_IMPL_NAMED_VIEWFACTORY(SwPagePreView, "PrintPreview") { SFX_VIEW_REGISTRATION(SwDocShell); @@ -114,13 +113,13 @@ TYPEINIT1(SwPagePreView,SfxViewShell) #define MIN_PREVIEW_ZOOM 25 #define MAX_PREVIEW_ZOOM 600 -USHORT lcl_GetNextZoomStep(USHORT nCurrentZoom, BOOL bZoomIn) +sal_uInt16 lcl_GetNextZoomStep(sal_uInt16 nCurrentZoom, sal_Bool bZoomIn) { - static USHORT aZoomArr[] = + static sal_uInt16 aZoomArr[] = { 25, 50, 75, 100, 150, 200, 400, 600 }; - const sal_uInt16 nZoomArrSize = sizeof(aZoomArr)/sizeof(USHORT); + const sal_uInt16 nZoomArrSize = sizeof(aZoomArr)/sizeof(sal_uInt16); if(bZoomIn) for(int i = nZoomArrSize - 1; i >= 0; --i) { @@ -138,14 +137,14 @@ USHORT lcl_GetNextZoomStep(USHORT nCurrentZoom, BOOL bZoomIn) void lcl_InvalidateZoomSlots(SfxBindings& rBindings) { - static USHORT const aInval[] = + static sal_uInt16 const aInval[] = { SID_ATTR_ZOOM, SID_ZOOM_OUT, SID_ZOOM_IN, SID_ATTR_ZOOMSLIDER, FN_PREVIEW_ZOOM, FN_STAT_ZOOM, 0 }; rBindings.Invalidate( aInval ); } - + // erstmal der Zoom-Dialog class SwPreViewZoomDlg : public SvxStandardDialog { @@ -181,15 +180,12 @@ SwPreViewZoomDlg::SwPreViewZoomDlg( SwPagePreViewWin& rParent ) : aColEdit.SetValue( rParent.GetCol() ); } -SwPreViewZoomDlg::~SwPreViewZoomDlg() -{ -} - +SwPreViewZoomDlg::~SwPreViewZoomDlg() {} void SwPreViewZoomDlg::Apply() { ((SwPagePreViewWin*)GetParent())->CalcWish( - BYTE(aRowEdit.GetValue()), - BYTE(aColEdit.GetValue()) ); + sal_uInt8(aRowEdit.GetValue()), + sal_uInt8(aColEdit.GetValue()) ); } // alles fuers SwPagePreViewWin @@ -206,7 +202,7 @@ SwPagePreViewWin::SwPagePreViewWin( Window *pParent, SwPagePreView& rPView ) SetLineColor( GetBackground().GetColor()); SetMapMode( MapMode(MAP_TWIP) ); - const SwMasterUsrPref *pUsrPref = SW_MOD()->GetUsrPref(FALSE); + const SwMasterUsrPref *pUsrPref = SW_MOD()->GetUsrPref(sal_False); mnRow = pUsrPref->GetPagePrevRow(); // 1 Zeile mnCol = pUsrPref->GetPagePrevCol(); // 1 Spalte mnSttPage = USHRT_MAX; @@ -246,15 +242,15 @@ void SwPagePreViewWin::Paint( const Rectangle& rRect ) } } -void SwPagePreViewWin::CalcWish( BYTE nNewRow, BYTE nNewCol ) +void SwPagePreViewWin::CalcWish( sal_uInt8 nNewRow, sal_uInt8 nNewCol ) { if( !mpViewShell || !mpViewShell->GetLayout() ) return; - USHORT nOldCol = mnCol; + sal_uInt16 nOldCol = mnCol; mnRow = nNewRow; mnCol = nNewCol; - USHORT nPages = mnRow * mnCol, + sal_uInt16 nPages = mnRow * mnCol, nLastSttPg = mrView.GetPageCount()+1 > nPages ? mrView.GetPageCount()+1 - nPages : 0; if( mnSttPage > nLastSttPg ) @@ -274,7 +270,7 @@ void SwPagePreViewWin::CalcWish( BYTE nNewRow, BYTE nNewCol ) // Sortierung muss eingehalten werden!! // additional invalidate page status. - static USHORT const aInval[] = + static sal_uInt16 aInval[] = { SID_ATTR_ZOOM, SID_ZOOM_OUT, SID_ZOOM_IN, FN_PREVIEW_ZOOM, @@ -297,10 +293,10 @@ void SwPagePreViewWin::CalcWish( BYTE nNewRow, BYTE nNewCol ) int SwPagePreViewWin::MovePage( int eMoveMode ) { // soviele Seiten hoch - USHORT nPages = mnRow * mnCol; - USHORT nNewSttPage = mnSttPage; - USHORT nPageCount = mrView.GetPageCount(); - USHORT nDefSttPg = GetDefSttPage(); + sal_uInt16 nPages = mnRow * mnCol; + sal_uInt16 nNewSttPage = mnSttPage; + sal_uInt16 nPageCount = mrView.GetPageCount(); + sal_uInt16 nDefSttPg = GetDefSttPage(); bool bPaintPageAtFirstCol = true; switch( eMoveMode ) @@ -377,13 +373,13 @@ int SwPagePreViewWin::MovePage( int eMoveMode ) maPaintedPreviewDocRect, bPaintPageAtFirstCol ); if( nNewSttPage == mnSttPage && eMoveMode != MV_SELPAGE ) - return FALSE; + return sal_False; SetPagePreview(mnRow, mnCol); mnSttPage = nNewSttPage; // additional invalidate page status. - static USHORT const aInval[] = + static sal_uInt16 aInval[] = { FN_START_OF_DOCUMENT, FN_END_OF_DOCUMENT, FN_PAGEUP, FN_PAGEDOWN, FN_STAT_PAGE, 0 @@ -392,7 +388,7 @@ int SwPagePreViewWin::MovePage( int eMoveMode ) SfxBindings& rBindings = mrView.GetViewFrame()->GetBindings(); rBindings.Invalidate( aInval ); - return TRUE; + return sal_True; } void SwPagePreViewWin::SetWinSize( const Size& rNewSize ) @@ -422,7 +418,7 @@ void SwPagePreViewWin::SetWinSize( const Size& rNewSize ) maScale = GetMapMode().GetScaleX(); } -void SwPagePreViewWin::GetStatusStr( String& rStr, USHORT nPageCnt ) const +void SwPagePreViewWin::GetStatusStr( String& rStr, sal_uInt16 nPageCnt ) const { // show physical and virtual page number of // selected page, if it's visible. @@ -449,11 +445,11 @@ void SwPagePreViewWin::GetStatusStr( String& rStr, USHORT nPageCnt ) const void SwPagePreViewWin::KeyInput( const KeyEvent &rKEvt ) { const KeyCode& rKeyCode = rKEvt.GetKeyCode(); - USHORT nKey = rKeyCode.GetCode(); - BOOL bHandled = FALSE; + sal_uInt16 nKey = rKeyCode.GetCode(); + sal_Bool bHandled = sal_False; if(!rKeyCode.GetModifier()) { - USHORT nSlot = 0; + sal_uInt16 nSlot = 0; switch(nKey) { case KEY_ADD : nSlot = SID_ZOOM_OUT; break; @@ -462,7 +458,7 @@ void SwPagePreViewWin::KeyInput( const KeyEvent &rKEvt ) } if(nSlot) { - bHandled = TRUE; + bHandled = sal_True; mrView.GetViewFrame()->GetDispatcher()->Execute( nSlot, SFX_CALLMODE_ASYNCHRON ); } @@ -473,12 +469,12 @@ void SwPagePreViewWin::KeyInput( const KeyEvent &rKEvt ) void SwPagePreViewWin::Command( const CommandEvent& rCEvt ) { - BOOL bCallBase = TRUE; + sal_Bool bCallBase = sal_True; switch( rCEvt.GetCommand() ) { case COMMAND_CONTEXTMENU: mrView.GetViewFrame()->GetDispatcher()->ExecutePopup(); - bCallBase = FALSE; + bCallBase = sal_False; break; case COMMAND_WHEEL: @@ -542,7 +538,7 @@ void SwPagePreViewWin::MouseButtonDown( const MouseEvent& rMEvt ) mrView.SetVScrollbarThumbPos( nNewSelectedPage ); } // invalidate page status. - static USHORT const aInval[] = + static sal_uInt16 aInval[] = { FN_STAT_PAGE, 0 }; @@ -555,9 +551,9 @@ void SwPagePreViewWin::MouseButtonDown( const MouseEvent& rMEvt ) /****************************************************************************** * Beschreibung: Userprefs bzw Viewoptions setzen ******************************************************************************/ -void SwPagePreViewWin::SetPagePreview( BYTE nRow, BYTE nCol ) +void SwPagePreViewWin::SetPagePreview( sal_uInt8 nRow, sal_uInt8 nCol ) { - SwMasterUsrPref *pOpt = (SwMasterUsrPref *)SW_MOD()->GetUsrPref(FALSE); + SwMasterUsrPref *pOpt = (SwMasterUsrPref *)SW_MOD()->GetUsrPref(sal_False); if (nRow != pOpt->GetPagePrevRow() || nCol != pOpt->GetPagePrevCol()) { @@ -644,7 +640,7 @@ void SwPagePreView::_ExecPgUpAndPgDown( const bool _bPgUp, const int eMvMode = _bPgUp ? SwPagePreViewWin::MV_PAGE_UP : SwPagePreViewWin::MV_PAGE_DOWN; - if ( ChgPage( eMvMode, TRUE ) ) + if ( ChgPage( eMvMode, sal_True ) ) aViewWin.Invalidate(); } else @@ -688,7 +684,7 @@ void SwPagePreView::_ExecPgUpAndPgDown( const bool _bPgUp, } ScrollViewSzChg(); // additional invalidate page status. - static USHORT const aInval[] = + static sal_uInt16 aInval[] = { FN_START_OF_DOCUMENT, FN_END_OF_DOCUMENT, FN_PAGEUP, FN_PAGEDOWN, FN_STAT_PAGE, 0 @@ -707,8 +703,8 @@ void SwPagePreView::_ExecPgUpAndPgDown( const bool _bPgUp, void SwPagePreView::Execute( SfxRequest &rReq ) { int eMvMode; - BYTE nRow = 1; - BOOL bRetVal = FALSE; + sal_uInt8 nRow = 1; + sal_Bool bRetVal = sal_False; bool bRefresh = true; switch(rReq.GetSlot()) @@ -723,9 +719,9 @@ void SwPagePreView::Execute( SfxRequest &rReq ) const SfxItemSet *pArgs = rReq.GetArgs(); if( pArgs && pArgs->Count() >= 2 ) { - BYTE nCols = (BYTE)((SfxUInt16Item &)pArgs->Get( + sal_uInt8 nCols = (sal_uInt8)((SfxUInt16Item &)pArgs->Get( SID_ATTR_TABLE_COLUMN)).GetValue(); - BYTE nRows = (BYTE)((SfxUInt16Item &)pArgs->Get( + sal_uInt8 nRows = (sal_uInt8)((SfxUInt16Item &)pArgs->Get( SID_ATTR_TABLE_ROW)).GetValue(); aViewWin.CalcWish( nRows, nCols ); @@ -740,7 +736,7 @@ void SwPagePreView::Execute( SfxRequest &rReq ) const SfxItemSet* pArgs = rReq.GetArgs(); const SfxPoolItem* pItem; bool bBookPreview = GetViewShell()->GetViewOptions()->IsPagePrevBookview(); - if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( FN_SHOW_BOOKVIEW, FALSE, &pItem ) ) + if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( FN_SHOW_BOOKVIEW, sal_False, &pItem ) ) { bBookPreview = static_cast< const SfxBoolItem* >( pItem )->GetValue(); ( ( SwViewOption* ) GetViewShell()->GetViewOptions() )->SetPagePrevBookview( bBookPreview ); @@ -751,7 +747,7 @@ void SwPagePreView::Execute( SfxRequest &rReq ) // book preview mode changed. Thus, adjust scrollbars and // invalidate corresponding states. ScrollViewSzChg(); - static USHORT const aInval[] = + static sal_uInt16 aInval[] = { FN_START_OF_DOCUMENT, FN_END_OF_DOCUMENT, FN_PAGEUP, FN_PAGEDOWN, FN_STAT_PAGE, FN_SHOW_BOOKVIEW, 0 @@ -803,13 +799,13 @@ void SwPagePreView::Execute( SfxRequest &rReq ) if( pArgs ) { enum SvxZoomType eType = SVX_ZOOM_PERCENT; - USHORT nZoomFactor = USHRT_MAX; - if(SFX_ITEM_SET == pArgs->GetItemState(SID_ATTR_ZOOM, TRUE, &pItem)) + sal_uInt16 nZoomFactor = USHRT_MAX; + if(SFX_ITEM_SET == pArgs->GetItemState(SID_ATTR_ZOOM, sal_True, &pItem)) { eType = ((const SvxZoomItem *)pItem)->GetType(); nZoomFactor = ((const SvxZoomItem *)pItem)->GetValue(); } - else if(SFX_ITEM_SET == pArgs->GetItemState(FN_PREVIEW_ZOOM, TRUE, &pItem)) + else if(SFX_ITEM_SET == pArgs->GetItemState(FN_PREVIEW_ZOOM, sal_True, &pItem)) nZoomFactor = ((const SfxUInt16Item *)pItem)->GetValue(); if(USHRT_MAX != nZoomFactor) SetZoom(eType, nZoomFactor); @@ -822,9 +818,9 @@ void SwPagePreView::Execute( SfxRequest &rReq ) const SfxItemSet *pArgs = rReq.GetArgs(); const SfxPoolItem* pItem; - if ( pArgs && SFX_ITEM_SET == pArgs->GetItemState(SID_ATTR_ZOOMSLIDER, TRUE, &pItem ) ) + if ( pArgs && SFX_ITEM_SET == pArgs->GetItemState(SID_ATTR_ZOOMSLIDER, sal_True, &pItem ) ) { - const USHORT nCurrentZoom = ((const SvxZoomSliderItem *)pItem)->GetValue(); + const sal_uInt16 nCurrentZoom = ((const SvxZoomSliderItem *)pItem)->GetValue(); SetZoom( SVX_ZOOM_PERCENT, nCurrentZoom ); } } @@ -871,12 +867,12 @@ void SwPagePreView::Execute( SfxRequest &rReq ) { aViewWin.SetSelectedPage( nNewSelectedPage ); aViewWin.SetSttPage( nNewStartPage ); - int nRet = ChgPage( SwPagePreViewWin::MV_SELPAGE, TRUE ); + int nRet = ChgPage( SwPagePreViewWin::MV_SELPAGE, sal_True ); bRefresh = 0 != nRet; } GetViewShell()->ShowPreViewSelection( nNewSelectedPage ); // invalidate page status. - static USHORT const aInval[] = + static sal_uInt16 aInval[] = { FN_STAT_PAGE, 0 }; @@ -899,14 +895,14 @@ 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 = sal_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 = sal_True; goto MOVEPAGE; MOVEPAGE: { - int nRet = ChgPage( eMvMode, TRUE ); + int nRet = ChgPage( eMvMode, sal_True ); // return value fuer Basic if(bRetVal) rReq.SetReturnValue(SfxBoolItem(rReq.GetSlot(), nRet == 0)); @@ -922,14 +918,14 @@ MOVEPAGE: // die Sache mit der Orientation if(pPPVPD) { - SfxPrinter* pPrinter = GetPrinter( TRUE ); + SfxPrinter* pPrinter = GetPrinter( sal_True ); if((pPrinter->GetOrientation() == ORIENTATION_LANDSCAPE) != pPPVPD->GetLandscape()) pPrinter->SetOrientation(pPPVPD->GetLandscape() ? ORIENTATION_LANDSCAPE : ORIENTATION_PORTRAIT); } - ::SetAppPrintOptions( aViewWin.GetViewShell(), FALSE ); - bNormalPrint = FALSE; - USHORT nPrtSlot = SID_PRINTDOC; + ::SetAppPrintOptions( aViewWin.GetViewShell(), sal_False ); + bNormalPrint = sal_False; + sal_uInt16 nPrtSlot = SID_PRINTDOC; rReq.SetSlot( nPrtSlot ); SfxViewShell::ExecuteSlot( rReq, SfxViewShell::GetInterface() ); rReq.SetSlot( FN_PRINT_PAGEPREVIEW ); @@ -937,8 +933,8 @@ MOVEPAGE: } case SID_PRINTDOCDIRECT: case SID_PRINTDOC: - ::SetAppPrintOptions( aViewWin.GetViewShell(), FALSE ); - bNormalPrint = TRUE; + ::SetAppPrintOptions( aViewWin.GetViewShell(), sal_False ); + bNormalPrint = sal_True; SfxViewShell::ExecuteSlot( rReq, SfxViewShell::GetInterface() ); return; case FN_CLOSE_PAGEPREVIEW: @@ -950,7 +946,7 @@ MOVEPAGE: break; case FN_INSERT_BREAK: { - USHORT nSelPage = aViewWin.SelectedPage(); + sal_uInt16 nSelPage = aViewWin.SelectedPage(); //if a dummy page is selected (e.g. a non-existing right/left page) //the direct neighbor is used if(GetViewShell()->IsDummyPage( nSelPage ) && GetViewShell()->IsDummyPage( --nSelPage )) @@ -973,12 +969,12 @@ MOVEPAGE: void SwPagePreView::GetState( SfxItemSet& rSet ) { SfxWhichIter aIter(rSet); - BYTE nRow = 1; - USHORT nWhich = aIter.FirstWhich(); + sal_uInt8 nRow = 1; + sal_uInt16 nWhich = aIter.FirstWhich(); OSL_ENSURE(nWhich, "empty set"); SwPagePreviewLayout* pPagePrevwLay = GetViewShell()->PagePreviewLayout(); // zoom has to be disabled if Accessibility support is switched on - BOOL bZoomEnabled = TRUE; // !Application::GetSettings().GetMiscSettings().GetEnableATToolSupport(); + sal_Bool bZoomEnabled = sal_True; // !Application::GetSettings().GetMiscSettings().GetEnableATToolSupport(); while(nWhich) { @@ -1046,7 +1042,7 @@ void SwPagePreView::GetState( SfxItemSet& rSet ) if(bZoomEnabled) { const SwViewOption* pVOpt = GetViewShell()->GetViewOptions(); - const USHORT nCurrentZoom = pVOpt->GetZoom(); + const sal_uInt16 nCurrentZoom = pVOpt->GetZoom(); SvxZoomSliderItem aZoomSliderItem( nCurrentZoom, MINZOOM, MAXZOOM ); aZoomSliderItem.AddSnappingPoint( 100 ); rSet.Put( aZoomSliderItem ); @@ -1082,7 +1078,7 @@ void SwPagePreView::GetState( SfxItemSet& rSet ) break; case FN_SHOW_BOOKVIEW: { - BOOL b = GetViewShell()->GetViewOptions()->IsPagePrevBookview(); + sal_Bool b = GetViewShell()->GetViewOptions()->IsPagePrevBookview(); rSet.Put(SfxBoolItem(nWhich, b)); } break; @@ -1099,10 +1095,10 @@ void SwPagePreView::GetState( SfxItemSet& rSet ) SfxItemSet aSet( *rSet.GetPool(), SID_PRINTDOC, SID_PRINTDOC ); GetSlotState( SID_PRINTDOC, SfxViewShell::GetInterface(), &aSet ); if( SFX_ITEM_DISABLED == aSet.GetItemState( SID_PRINTDOC, - FALSE, &pItem )) + sal_False, &pItem )) rSet.DisableItem( nWhich ); else if( SFX_ITEM_SET == aSet.GetItemState( SID_PRINTDOC, - FALSE, &pItem )) + sal_False, &pItem )) { ((SfxPoolItem*)pItem)->SetWhich( FN_PRINT_PAGEPREVIEW ); rSet.Put( *pItem ); @@ -1111,7 +1107,7 @@ void SwPagePreView::GetState( SfxItemSet& rSet ) break; case SID_PRINTPREVIEW: - rSet.Put( SfxBoolItem( nWhich, TRUE ) ); + rSet.Put( SfxBoolItem( nWhich, sal_True ) ); break; case SID_PRINTDOC: @@ -1126,7 +1122,7 @@ void SwPagePreView::GetState( SfxItemSet& rSet ) void SwPagePreView::StateUndo(SfxItemSet& rSet) { SfxWhichIter aIter(rSet); - USHORT nWhich = aIter.FirstWhich(); + sal_uInt16 nWhich = aIter.FirstWhich(); while (nWhich) { @@ -1138,58 +1134,57 @@ void SwPagePreView::StateUndo(SfxItemSet& rSet) void SwPagePreView::Init(const SwViewOption * pPrefs) { if ( GetViewShell()->HasDrawView() ) - GetViewShell()->GetDrawView()->SetAnimationEnabled( FALSE ); + GetViewShell()->GetDrawView()->SetAnimationEnabled( sal_False ); - bNormalPrint = TRUE; + bNormalPrint = sal_True; // Die DocSize erfragen und verarbeiten. Ueber die Handler konnte // die Shell nicht gefunden werden, weil die Shell innerhalb CTOR-Phase // nicht in der SFX-Verwaltung bekannt ist. if( !pPrefs ) - pPrefs = SW_MOD()->GetUsrPref(FALSE); + pPrefs = SW_MOD()->GetUsrPref(sal_False); // die Felder aktualisieren // ACHTUNG: hochcasten auf die EditShell, um die SS zu nutzen. // In den Methoden wird auf die akt. Shell abgefragt! SwEditShell* pESh = (SwEditShell*)GetViewShell(); - BOOL bIsModified = pESh->IsModified(); + sal_Bool bIsModified = pESh->IsModified(); SwViewOption aOpt( *pPrefs ); - aOpt.SetPagePreview(TRUE); - aOpt.SetTab( FALSE ); - aOpt.SetBlank( FALSE ); - aOpt.SetHardBlank( FALSE ); - aOpt.SetParagraph( FALSE ); - aOpt.SetLineBreak( FALSE ); - aOpt.SetPageBreak( FALSE ); - aOpt.SetColumnBreak( FALSE ); - aOpt.SetSoftHyph( FALSE ); - aOpt.SetFldName( FALSE ); - aOpt.SetPostIts( FALSE ); - aOpt.SetShowHiddenChar( FALSE ); - aOpt.SetShowHiddenField( FALSE ); - aOpt.SetShowHiddenPara( FALSE ); - aOpt.SetViewHRuler( FALSE ); - aOpt.SetViewVRuler( FALSE ); - aOpt.SetGraphic( TRUE ); - aOpt.SetTable( TRUE ); - aOpt.SetSnap( FALSE ); - aOpt.SetGridVisible( FALSE ); + aOpt.SetPagePreview(sal_True); + aOpt.SetTab( sal_False ); + aOpt.SetBlank( sal_False ); + aOpt.SetHardBlank( sal_False ); + aOpt.SetParagraph( sal_False ); + aOpt.SetLineBreak( sal_False ); + aOpt.SetPageBreak( sal_False ); + aOpt.SetColumnBreak( sal_False ); + aOpt.SetSoftHyph( sal_False ); + aOpt.SetFldName( sal_False ); + aOpt.SetPostIts( sal_False ); + aOpt.SetShowHiddenChar( sal_False ); + aOpt.SetShowHiddenField( sal_False ); + aOpt.SetShowHiddenPara( sal_False ); + aOpt.SetViewHRuler( sal_False ); + aOpt.SetViewVRuler( sal_False ); + aOpt.SetGraphic( sal_True ); + aOpt.SetTable( sal_True ); + aOpt.SetSnap( sal_False ); + aOpt.SetGridVisible( sal_False ); GetViewShell()->ApplyViewOptions( aOpt ); GetViewShell()->ApplyAccessiblityOptions(SW_MOD()->GetAccessibilityOptions()); // adjust view shell option to the same as for print - SwPrtOptions aPrintOptions( GetViewFrame()->GetObjectShell()->GetTitle(0) ); - aPrintOptions.MakeOptions( false ); + SwPrintData const aPrintOptions = *SW_MOD()->GetPrtOptions(false); GetViewShell()->AdjustOptionsForPagePreview( aPrintOptions ); IDocumentSettingAccess* pIDSA = pESh->getIDocumentSettingAccess(); if( pIDSA->get(IDocumentSettingAccess::BROWSE_MODE)) { pIDSA->set(IDocumentSettingAccess::BROWSE_MODE, false); - pESh->CheckBrowseView( TRUE ); + pESh->CheckBrowseView( sal_True ); } GetViewShell()->CalcLayout(); @@ -1220,8 +1215,8 @@ SwPagePreView::SwPagePreView(SfxViewFrame *pViewFrame, SfxViewShell* pOldSh): SetName(String::CreateFromAscii("PageView" )); SetWindow( &aViewWin ); SetHelpId(SW_PAGEPREVIEW); - _CreateScrollbar( TRUE ); - _CreateScrollbar( FALSE ); + _CreateScrollbar( sal_True ); + _CreateScrollbar( sal_False ); SfxObjectShell* pObjShell = pViewFrame->GetObjectShell(); if ( !pOldSh ) @@ -1244,15 +1239,15 @@ SwPagePreView::SwPagePreView(SfxViewFrame *pViewFrame, SfxViewShell* pOldSh): { pVS = ((SwView*)pOldSh)->GetWrtShellPtr(); // save the current ViewData of the previous SwView - pOldSh->WriteUserData( sSwViewData, FALSE ); + pOldSh->WriteUserData( sSwViewData, sal_False ); } else pVS = GetDocShell()->GetWrtShell(); if( pVS ) { // setze die akt. Seite als die erste - USHORT nPhysPg, nVirtPg; - ((SwCrsrShell*)pVS)->GetPageNum( nPhysPg, nVirtPg, TRUE, FALSE ); + sal_uInt16 nPhysPg, nVirtPg; + ((SwCrsrShell*)pVS)->GetPageNum( nPhysPg, nVirtPg, sal_True, sal_False ); if( 1 != aViewWin.GetCol() && 1 == nPhysPg ) --nPhysPg; aViewWin.SetSttPage( nPhysPg ); @@ -1296,7 +1291,7 @@ SwDocShell* SwPagePreView::GetDocShell() return PTR_CAST(SwDocShell, GetViewFrame()->GetObjectShell()); } -int SwPagePreView::_CreateScrollbar( BOOL bHori ) +int SwPagePreView::_CreateScrollbar( sal_Bool bHori ) { Window *pMDI = &GetViewFrame()->GetWindow(); SwScrollbar** ppScrollbar = bHori ? &pHScrollbar : &pVScrollbar; @@ -1307,9 +1302,9 @@ int SwPagePreView::_CreateScrollbar( BOOL bHori ) { pPageUpBtn = new ImageButton(pMDI, SW_RES( BTN_PAGEUP ) ); - pPageUpBtn->SetHelpId(FN_PAGEUP); + pPageUpBtn->SetHelpId(GetStaticInterface()->GetSlot(FN_PAGEUP)->GetCommand()); pPageDownBtn = new ImageButton(pMDI, SW_RES( BTN_PAGEDOWN ) ); - pPageDownBtn->SetHelpId(FN_PAGEDOWN); + pPageDownBtn->SetHelpId(GetStaticInterface()->GetSlot(FN_PAGEDOWN)->GetCommand()); Link aLk( LINK( this, SwPagePreView, BtnPage ) ); pPageUpBtn->SetClickHdl( aLk ); pPageDownBtn->SetClickHdl( aLk ); @@ -1320,7 +1315,7 @@ int SwPagePreView::_CreateScrollbar( BOOL bHori ) *ppScrollbar = new SwScrollbar( pMDI, bHori ); ScrollDocSzChg(); - (*ppScrollbar)->EnableDrag( TRUE ); + (*ppScrollbar)->EnableDrag( sal_True ); (*ppScrollbar)->SetEndScrollHdl( LINK( this, SwPagePreView, EndScrollHdl )); @@ -1362,7 +1357,7 @@ int SwPagePreView::ChgPage( int eMvMode, int bUpdateScrollbar ) { ScrollViewSzChg(); - static USHORT const aInval[] = + static sal_uInt16 aInval[] = { FN_START_OF_DOCUMENT, FN_END_OF_DOCUMENT, FN_PAGEUP, FN_PAGEDOWN, 0 @@ -1375,13 +1370,13 @@ int SwPagePreView::ChgPage( int eMvMode, int bUpdateScrollbar ) } // ab hier alles aus der SwView uebernommen -void SwPagePreView::CalcAndSetBorderPixel( SvBorder &rToFill, BOOL /*bInner*/ ) +void SwPagePreView::CalcAndSetBorderPixel( SvBorder &rToFill, sal_Bool /*bInner*/ ) { const StyleSettings &rSet = aViewWin.GetSettings().GetStyleSettings(); const long nTmp = rSet.GetScrollBarSize(); - if ( pVScrollbar->IsVisible( FALSE )) + if ( pVScrollbar->IsVisible( sal_False )) rToFill.Right() = nTmp; - if ( pHScrollbar->IsVisible( FALSE ) ) + if ( pHScrollbar->IsVisible( sal_False ) ) rToFill.Bottom() = nTmp; SetBorderPixel( rToFill ); } @@ -1389,12 +1384,12 @@ void SwPagePreView::CalcAndSetBorderPixel( SvBorder &rToFill, BOOL /*bInner*/ ) void SwPagePreView::InnerResizePixel( const Point &rOfst, const Size &rSize ) { SvBorder aBorder; - CalcAndSetBorderPixel( aBorder, TRUE ); + CalcAndSetBorderPixel( aBorder, sal_True ); Rectangle aRect( rOfst, rSize ); aRect += aBorder; ViewResizePixel( aViewWin, aRect.TopLeft(), aRect.GetSize(), aViewWin.GetOutputSizePixel(), - TRUE, + sal_True, *pVScrollbar, *pHScrollbar, pPageUpBtn, pPageDownBtn, 0, *pScrollFill ); @@ -1405,9 +1400,9 @@ void SwPagePreView::InnerResizePixel( const Point &rOfst, const Size &rSize ) void SwPagePreView::OuterResizePixel( const Point &rOfst, const Size &rSize ) { SvBorder aBorder; - CalcAndSetBorderPixel( aBorder, FALSE ); + CalcAndSetBorderPixel( aBorder, sal_False ); ViewResizePixel( aViewWin, rOfst, rSize, aViewWin.GetOutputSizePixel(), - FALSE, *pVScrollbar, + sal_False, *pVScrollbar, *pHScrollbar, pPageUpBtn, pPageDownBtn, 0, *pScrollFill ); //EditWin niemals einstellen! @@ -1425,7 +1420,7 @@ void SwPagePreView::OuterResizePixel( const Point &rOfst, const Size &rSize ) } } -void SwPagePreView::SetVisArea( const Rectangle &rRect, BOOL bUpdateScrollbar ) +void SwPagePreView::SetVisArea( const Rectangle &rRect, sal_Bool bUpdateScrollbar ) { const Point aTopLeft(AlignToPixel(rRect.TopLeft())); const Point aBottomRight(AlignToPixel(rRect.BottomRight())); @@ -1484,7 +1479,7 @@ IMPL_LINK( SwPagePreView, ScrollHdl, SwScrollbar *, pScrollbar ) { // wieviele Seiten scrollen ?? String sStateStr(sPageStr); - USHORT nThmbPos = (USHORT)pScrollbar->GetThumbPos(); + sal_uInt16 nThmbPos = (sal_uInt16)pScrollbar->GetThumbPos(); if( 1 == aViewWin.GetCol() || !nThmbPos ) ++nThmbPos; sStateStr += String::CreateFromInt32( nThmbPos ); @@ -1521,7 +1516,7 @@ IMPL_LINK( SwPagePreView, EndScrollHdl, SwScrollbar *, pScrollbar ) if ( GetViewShell()->PagePreviewLayout()->DoesPreviewLayoutRowsFitIntoWindow() ) { // wieviele Seiten scrollen ?? - USHORT nThmbPos = (USHORT)pScrollbar->GetThumbPos(); + sal_uInt16 nThmbPos = (sal_uInt16)pScrollbar->GetThumbPos(); // adjust to new preview functionality if( nThmbPos != aViewWin.SelectedPage() ) { @@ -1542,7 +1537,7 @@ IMPL_LINK( SwPagePreView, EndScrollHdl, SwScrollbar *, pScrollbar ) { aViewWin.SetSttPage( nThmbPos ); aViewWin.SetSelectedPage( nThmbPos ); - ChgPage( SwPagePreViewWin::MV_SCROLL, FALSE ); + ChgPage( SwPagePreViewWin::MV_SCROLL, sal_False ); // update scrollbars ScrollViewSzChg(); } @@ -1582,7 +1577,7 @@ IMPL_LINK( SwPagePreView, EndScrollHdl, SwScrollbar *, pScrollbar ) aViewWin.Scroll(nThmbPos - aViewWin.GetPaintedPreviewDocRect().Left(), 0); } // additional invalidate page status. - static USHORT const aInval[] = + static sal_uInt16 aInval[] = { FN_START_OF_DOCUMENT, FN_END_OF_DOCUMENT, FN_PAGEUP, FN_PAGEDOWN, FN_STAT_PAGE, 0 @@ -1616,7 +1611,7 @@ void SwPagePreView::DocSzChgd( const Size &rSz ) if( aVisArea.GetWidth() ) { - ChgPage( SwPagePreViewWin::MV_CALC, TRUE ); + ChgPage( SwPagePreViewWin::MV_CALC, sal_True ); ScrollDocSzChg(); aViewWin.Invalidate(); @@ -1633,7 +1628,7 @@ void SwPagePreView::ScrollViewSzChg() { //vertical scrolling by row // adjust to new preview functionality - USHORT nVisPages = aViewWin.GetRow() * aViewWin.GetCol(); + sal_uInt16 nVisPages = aViewWin.GetRow() * aViewWin.GetCol(); pVScrollbar->SetVisibleSize( nVisPages ); // set selected page as scroll bar position, // if it is visible. @@ -1698,12 +1693,12 @@ void SwPagePreView::ScrollDocSzChg() } // alles zum Thema Drucken -SfxPrinter* SwPagePreView::GetPrinter( BOOL bCreate ) +SfxPrinter* SwPagePreView::GetPrinter( sal_Bool bCreate ) { return aViewWin.GetViewShell()->getIDocumentDeviceAccess()->getPrinter( bCreate ); } -USHORT SwPagePreView::SetPrinter( SfxPrinter *pNew, USHORT nDiffFlags, bool ) +sal_uInt16 SwPagePreView::SetPrinter( SfxPrinter *pNew, sal_uInt16 nDiffFlags, bool ) { ViewShell &rSh = *GetViewShell(); SfxPrinter* pOld = rSh.getIDocumentDeviceAccess()->getPrinter( false ); @@ -1718,15 +1713,15 @@ USHORT SwPagePreView::SetPrinter( SfxPrinter *pNew, USHORT nDiffFlags, bool ) rESh.SetModified(); } if ( ( nDiffFlags & SFX_PRINTER_OPTIONS ) == SFX_PRINTER_OPTIONS ) - ::SetPrinter( rSh.getIDocumentDeviceAccess(), pNew, FALSE ); + ::SetPrinter( rSh.getIDocumentDeviceAccess(), pNew, sal_False ); - const BOOL bChgOri = nDiffFlags & SFX_PRINTER_CHG_ORIENTATION ? TRUE : FALSE; - const BOOL bChgSize= nDiffFlags & SFX_PRINTER_CHG_SIZE ? TRUE : FALSE; + const sal_Bool bChgOri = nDiffFlags & SFX_PRINTER_CHG_ORIENTATION ? sal_True : sal_False; + const sal_Bool bChgSize= nDiffFlags & SFX_PRINTER_CHG_SIZE ? sal_True : sal_False; if ( bChgOri || bChgSize ) { rESh.StartAllAction(); if ( bChgOri ) - rSh.ChgAllPageOrientation( USHORT(pNew->GetOrientation()) ); + rSh.ChgAllPageOrientation( sal_uInt16(pNew->GetOrientation()) ); if ( bChgSize ) { Size aSz( SvxPaperInfo::GetPaperSize( pNew ) ); @@ -1737,14 +1732,14 @@ USHORT SwPagePreView::SetPrinter( SfxPrinter *pNew, USHORT nDiffFlags, bool ) rESh.SetModified(); rESh.EndAllAction(); - static USHORT const aInval[] = + static sal_uInt16 aInval[] = { SID_ATTR_LONG_ULSPACE, SID_ATTR_LONG_LRSPACE, SID_RULER_BORDERS, SID_RULER_PAGE_POS, 0 }; #if OSL_DEBUG_LEVEL > 1 { - const USHORT* pPtr = aInval + 1; + const sal_uInt16* pPtr = aInval + 1; do { OSL_ENSURE( *(pPtr - 1) < *pPtr, "wrong sorting!" ); } while( *++pPtr ); @@ -1763,14 +1758,6 @@ SfxTabPage* SwPagePreView::CreatePrintOptionsPage( Window *pParent, return ::CreatePrintOptionsPage( pParent, rOptions, !bNormalPrint ); } -PrintDialog* SwPagePreView::CreatePrintDialog( Window *pParent ) -{ - PrintDialog *pDlg = ::CreatePrintDialog( pParent, 1, 0 ); - pDlg->DisableRange( PRINTDIALOG_SELECTION ); - return pDlg; -} - -// no longer needed ?? Size SwPagePreView::GetOptimalSizePixel() const { OSL_ENSURE( false, "overloaded virtual method <SwPagePreView::GetOptimalSizePixel()> needed ??" ); @@ -1843,7 +1830,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, USHORT /*nFlags*/) +void SwPagePreViewWin::Scroll(long nXMove, long nYMove, sal_uInt16 /*nFlags*/) { maPaintedPreviewDocRect.Move(nXMove, nYMove); mpPgPrevwLayout->Prepare( 0, maPaintedPreviewDocRect.TopLeft(), @@ -1852,16 +1839,16 @@ void SwPagePreViewWin::Scroll(long nXMove, long nYMove, USHORT /*nFlags*/) } -BOOL SwPagePreView::HandleWheelCommands( const CommandEvent& rCEvt ) +sal_Bool SwPagePreView::HandleWheelCommands( const CommandEvent& rCEvt ) { - BOOL bOk = FALSE; + sal_Bool bOk = sal_False; const CommandWheelData* pWData = rCEvt.GetWheelData(); if( pWData && COMMAND_WHEEL_ZOOM == pWData->GetMode() ) { if(!Application::GetSettings().GetMiscSettings().GetEnableATToolSupport()) { - USHORT nFactor = GetViewShell()->GetViewOptions()->GetZoom(); - const USHORT nOffset = 10; + sal_uInt16 nFactor = GetViewShell()->GetViewOptions()->GetZoom(); + const sal_uInt16 nOffset = 10; if( 0L > pWData->GetDelta() ) { nFactor -= nOffset; @@ -1876,7 +1863,7 @@ BOOL SwPagePreView::HandleWheelCommands( const CommandEvent& rCEvt ) } SetZoom(SVX_ZOOM_PERCENT, nFactor); } - bOk = TRUE; + bOk = sal_True; } else bOk = aViewWin.HandleScrollCommand( rCEvt, pHScrollbar, pVScrollbar ); @@ -1909,7 +1896,7 @@ void SwPagePreView::ShowVScrollbar(sal_Bool bShow) InvalidateBorder(); } -void SwPagePreView::SetZoom(SvxZoomType eType, USHORT nFactor) +void SwPagePreView::SetZoom(SvxZoomType eType, sal_uInt16 nFactor) { ViewShell& rSh = *GetViewShell(); SwViewOption aOpt(*rSh.GetViewOptions()); |