diff options
Diffstat (limited to 'sw/source/ui/uiview')
26 files changed, 428 insertions, 428 deletions
diff --git a/sw/source/ui/uiview/formatclipboard.cxx b/sw/source/ui/uiview/formatclipboard.cxx index 4f2c09fbc38e..fd6303e29a92 100644 --- a/sw/source/ui/uiview/formatclipboard.cxx +++ b/sw/source/ui/uiview/formatclipboard.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ #include <paratr.hxx> #include <fmtpdsc.hxx> #include <fmtrowsplt.hxx> -#include <swundo.hxx> // fuer die UndoIds +#include <swundo.hxx> // fuer die UndoIds #include <boost/shared_ptr.hpp> //#define FORMAT_PAINTBRUSH_ALSO_COPY_NUMBERFORMAT_FOR_TABLES 1 @@ -114,9 +114,9 @@ SfxItemSet* lcl_CreateEmptyItemSet( int nSelectionType, SfxItemPool& rPool else if( nSelectionType == nsSelectionType::SEL_TBL ) { pItemSet = new SfxItemSet(rPool, - SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_SHADOW, //SID_ATTR_BORDER_OUTER is inbetween + SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_SHADOW, //SID_ATTR_BORDER_OUTER is inbetween RES_BACKGROUND, RES_SHADOW, //RES_BOX is inbetween - SID_ATTR_BRUSH_ROW, SID_ATTR_BRUSH_TABLE, + SID_ATTR_BRUSH_ROW, SID_ATTR_BRUSH_TABLE, RES_BREAK, RES_BREAK, RES_PAGEDESC, RES_PAGEDESC, RES_LAYOUT_SPLIT, RES_LAYOUT_SPLIT, diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx index 7e54dd7ce12d..45da8eadada1 100644 --- a/sw/source/ui/uiview/pview.cxx +++ b/sw/source/ui/uiview/pview.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -154,16 +154,16 @@ void lcl_InvalidateZoomSlots(SfxBindings& rBindings) // erstmal der Zoom-Dialog class SwPreViewZoomDlg : public SvxStandardDialog { - FixedText aRowLbl; - NumericField aRowEdit; - FixedText aColLbl; - NumericField aColEdit; + FixedText aRowLbl; + NumericField aRowEdit; + FixedText aColLbl; + NumericField aColEdit; - OKButton aOkBtn; - CancelButton aCancelBtn; - HelpButton aHelpBtn; + OKButton aOkBtn; + CancelButton aCancelBtn; + HelpButton aHelpBtn; - virtual void Apply(); + virtual void Apply(); public: SwPreViewZoomDlg( SwPagePreViewWin& rParent ); @@ -565,7 +565,7 @@ void SwPagePreViewWin::MouseButtonDown( const MouseEvent& rMEvt ) } /****************************************************************************** - * Beschreibung: Userprefs bzw Viewoptions setzen + * Beschreibung: Userprefs bzw Viewoptions setzen ******************************************************************************/ void SwPagePreViewWin::SetPagePreview( BYTE nRow, BYTE nCol ) { @@ -919,7 +919,7 @@ 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 ); @@ -963,9 +963,9 @@ MOVEPAGE: return; case FN_CLOSE_PAGEPREVIEW: case SID_PRINTPREVIEW: - // print preview is now always in the same frame as the tab view - // -> always switch this frame back to normal view - // (ScTabViewShell ctor reads stored view data) + // print preview is now always in the same frame as the tab view + // -> always switch this frame back to normal view + // (ScTabViewShell ctor reads stored view data) GetViewFrame()->GetDispatcher()->Execute( SID_VIEWSHELL0, 0, 0, SFX_CALLMODE_ASYNCHRON ); break; case FN_INSERT_BREAK: @@ -998,7 +998,7 @@ void SwPagePreView::GetState( SfxItemSet& rSet ) OSL_ENSURE(nWhich, "empty set"); SwPagePreviewLayout* pPagePrevwLay = GetViewShell()->PagePreviewLayout(); //#106746# zoom has to be disabled if Accessibility support is switched on - // MT 2010/01, see #110498# + // MT 2010/01, see #110498# BOOL bZoomEnabled = TRUE; // !Application::GetSettings().GetMiscSettings().GetEnableATToolSupport(); while(nWhich) @@ -1137,7 +1137,7 @@ void SwPagePreView::GetState( SfxItemSet& rSet ) case SID_PRINTDOC: case SID_PRINTDOCDIRECT: - GetSlotState( nWhich, SfxViewShell::GetInterface(), &rSet ); + GetSlotState( nWhich, SfxViewShell::GetInterface(), &rSet ); break; } nWhich = aIter.NextWhich(); @@ -1172,7 +1172,7 @@ void SwPagePreView::Init(const SwViewOption * pPrefs) // die Felder aktualisieren // ACHTUNG: hochcasten auf die EditShell, um die SS zu nutzen. - // In den Methoden wird auf die akt. Shell abgefragt! + // In den Methoden wird auf die akt. Shell abgefragt! SwEditShell* pESh = (SwEditShell*)GetViewShell(); BOOL bIsModified = pESh->IsModified(); @@ -1338,9 +1338,9 @@ int SwPagePreView::_CreateScrollbar( BOOL bHori ) if( !bHori ) { - pPageUpBtn = new ImageButton(pMDI, SW_RES( BTN_PAGEUP ) ); + pPageUpBtn = new ImageButton(pMDI, SW_RES( BTN_PAGEUP ) ); pPageUpBtn->SetHelpId(FN_PAGEUP); - pPageDownBtn = new ImageButton(pMDI, SW_RES( BTN_PAGEDOWN ) ); + pPageDownBtn = new ImageButton(pMDI, SW_RES( BTN_PAGEDOWN ) ); pPageDownBtn->SetHelpId(FN_PAGEDOWN); Link aLk( LINK( this, SwPagePreView, BtnPage ) ); pPageUpBtn->SetClickHdl( aLk ); @@ -1409,7 +1409,7 @@ int SwPagePreView::ChgPage( int eMvMode, int bUpdateScrollbar ) // ab hier alles aus der SwView uebernommen void SwPagePreView::CalcAndSetBorderPixel( SvBorder &rToFill, BOOL /*bInner*/ ) { -// const long nAdd = bInner ? 0 : ScrollBar::GetWindowOverlapPixel(); +// const long nAdd = bInner ? 0 : ScrollBar::GetWindowOverlapPixel(); const StyleSettings &rSet = aViewWin.GetSettings().GetStyleSettings(); const long nTmp = rSet.GetScrollBarSize();// - nAdd; if ( pVScrollbar->IsVisible( FALSE )) @@ -1452,7 +1452,7 @@ void SwPagePreView::OuterResizePixel( const Point &rOfst, const Size &rSize ) //Aufruf der DocSzChgd-Methode der Scrollbars ist noetig, da vom maximalen //Scrollrange immer die halbe Hoehe der VisArea abgezogen wird. if ( pVScrollbar && - aTmpSize.Width() > 0 && aTmpSize.Height() > 0 ) + aTmpSize.Width() > 0 && aTmpSize.Height() > 0 ) { ScrollDocSzChg(); } @@ -1527,10 +1527,10 @@ IMPL_LINK( SwPagePreView, ScrollHdl, SwScrollbar *, pScrollbar ) aPos.Y() = pScrollbar->OutputToScreenPixel(pScrollbar->GetPointerPosPixel()).Y(); Size aSize = pScrollbar->GetSizePixel(); Rectangle aRect; - aRect.Left() = aPos.X() -8; - aRect.Right() = aRect.Left(); - aRect.Top() = aPos.Y(); - aRect.Bottom() = aRect.Top(); + aRect.Left() = aPos.X() -8; + aRect.Right() = aRect.Left(); + aRect.Top() = aPos.Y(); + aRect.Bottom() = aRect.Top(); Help::ShowQuickHelp(pScrollbar, aRect, sStateStr, QUICKHELP_RIGHT|QUICKHELP_VCENTER); @@ -1746,7 +1746,7 @@ USHORT SwPagePreView::SetPrinter( SfxPrinter *pNew, USHORT nDiffFlags, bool ) if ( pOld && pOld->IsPrinting() ) return SFX_PRINTERROR_BUSY; - SwEditShell &rESh = (SwEditShell&)rSh; //Buh... + SwEditShell &rESh = (SwEditShell&)rSh; //Buh... if( ( SFX_PRINTER_PRINTER | SFX_PRINTER_JOBSETUP ) & nDiffFlags ) { rSh.getIDocumentDeviceAccess()->setPrinter( pNew, true, true ); @@ -1948,7 +1948,7 @@ BOOL SwPagePreView::HandleWheelCommands( const CommandEvent& rCEvt ) uno::Reference< ::com::sun::star::accessibility::XAccessible > SwPagePreViewWin::CreateAccessible() { - SolarMutexGuard aGuard; // this should have + SolarMutexGuard aGuard; // this should have // happend already!!! OSL_ENSURE( GetViewShell() != NULL, "We need a view shell" ); diff --git a/sw/source/ui/uiview/pview.hrc b/sw/source/ui/uiview/pview.hrc index 3724789431ed..d30f90e396f4 100644 --- a/sw/source/ui/uiview/pview.hrc +++ b/sw/source/ui/uiview/pview.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,24 +26,24 @@ ************************************************************************/ #include "view.hrc" -#define FT_COL 1 -#define FT_ROW 2 -#define ED_COL 4 -#define ED_ROW 5 +#define FT_COL 1 +#define FT_ROW 2 +#define ED_COL 4 +#define ED_ROW 5 -#define BT_OK 20 -#define BT_CANCEL 21 -#define BT_HELP 22 +#define BT_OK 20 +#define BT_CANCEL 21 +#define BT_HELP 22 // Grenzwerte fuers Zooming (werden auch im piew.cxx benutzt!) -#define PVIEW_MIN_ROW 1 -#define PVIEW_MAX_ROW 10 -#define PVIEW_MIN_COL 1 -#define PVIEW_MAX_COL 20 +#define PVIEW_MIN_ROW 1 +#define PVIEW_MAX_ROW 10 +#define PVIEW_MIN_COL 1 +#define PVIEW_MAX_COL 20 //Dialog Druckoptionen #define FL_ROWCOL 1 -#define FT_ROWS 2 +#define FT_ROWS 2 #define NF_ROWS 3 #define FT_COLS 4 #define NF_COLS 5 @@ -68,5 +68,5 @@ #define MF_VMARGIN 23 #define PB_STANDARD 24 -#define RB_LANDSCAPE 24 +#define RB_LANDSCAPE 24 #define RB_PORTRAIT 25 diff --git a/sw/source/ui/uiview/pview.src b/sw/source/ui/uiview/pview.src index 1a8833e76b34..4b97c83c432b 100644 --- a/sw/source/ui/uiview/pview.src +++ b/sw/source/ui/uiview/pview.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/uiview/scroll.cxx b/sw/source/ui/uiview/scroll.cxx index 15d596f5633b..a5e2ea954175 100644 --- a/sw/source/ui/uiview/scroll.cxx +++ b/sw/source/ui/uiview/scroll.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,7 +56,7 @@ SwScrollbar::SwScrollbar( Window *pWin, BOOL bHoriz ) : SwScrollbar::~SwScrollbar() {} /*------------------------------------------------------------------------ - Beschreibung: wird nach einer Aenderung der Dokumentgroesse gerufen, um den + Beschreibung: wird nach einer Aenderung der Dokumentgroesse gerufen, um den Range des Scrollbars neu einzustellen. ------------------------------------------------------------------------*/ @@ -71,7 +71,7 @@ void SwScrollbar::DocSzChgd( const Size &rSize ) } /*------------------------------------------------------------------------ - Beschreibung: wird nach einer Veraenderung des sichtbaren Ausschnittes + Beschreibung: wird nach einer Veraenderung des sichtbaren Ausschnittes gerufen. ------------------------------------------------------------------------*/ @@ -134,7 +134,7 @@ void SwScrollbar::SetAuto(BOOL bSet) if(!bAuto && bVisible && !ScrollBar::IsVisible()) ExtendedShow(TRUE); else if(bAuto) - AutoShow(); // oder automatisch verstecken + AutoShow(); // oder automatisch verstecken } } /*-----------------14.04.98 11:43------------------- @@ -151,7 +151,7 @@ void SwScrollbar::AutoShow() ScrollBar::Show(FALSE); } else if ( !ScrollBar::IsVisible() && - (!bHori || nVis) ) //Optimierung fuer Browser. + (!bHori || nVis) ) //Optimierung fuer Browser. //Horizontaler Scrollbar per //default aus. { diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx index 8d5dc09d6377..bea24340dded 100644 --- a/sw/source/ui/uiview/srcview.cxx +++ b/sw/source/ui/uiview/srcview.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -118,11 +118,11 @@ using ::com::sun::star::util::SearchOptions; #define SRC_SEARCHOPTIONS (0xFFFF & ~(SEARCH_OPTIONS_FORMAT|SEARCH_OPTIONS_FAMILIES|SEARCH_OPTIONS_SEARCH_ALL)) // Druckraender -> wie Basic - Ide -#define LMARGPRN 1700 -#define RMARGPRN 900 -#define TMARGPRN 2000 -#define BMARGPRN 1000 -#define BORDERPRN 300 +#define LMARGPRN 1700 +#define RMARGPRN 900 +#define TMARGPRN 2000 +#define BMARGPRN 1000 +#define BORDERPRN 300 SFX_IMPL_NAMED_VIEWFACTORY(SwSrcView, "SourceView") { @@ -132,7 +132,7 @@ SFX_IMPL_NAMED_VIEWFACTORY(SwSrcView, "SourceView") SFX_IMPL_INTERFACE( SwSrcView, SfxViewShell, SW_RES(0) ) { SFX_POPUPMENU_REGISTRATION(SW_RES(MN_SRCVIEW_POPUPMENU)); - SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_TOOLS| + SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_TOOLS| SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER, SW_RES(RID_WEBTOOLS_TOOLBOX) ); SFX_CHILDWINDOW_REGISTRATION(SvxSearchDialogWrapper::GetChildWindowId()); @@ -142,7 +142,7 @@ TYPEINIT1(SwSrcView, SfxViewShell) void lcl_PrintHeader( OutputDevice &rOutDev, USHORT nPages, USHORT nCurPage, const String& rTitle ) { - short nLeftMargin = LMARGPRN; + short nLeftMargin = LMARGPRN; Size aSz = rOutDev.GetOutputSize(); short nBorder = BORDERPRN; @@ -224,7 +224,7 @@ void lcl_ConvertTabsToSpaces( String& rLine ) rLine.Insert( aBlanker, nPos ); nMax = rLine.Len(); } - nPos++; // Nicht optimal, falls Tab, aber auch nicht verkehrt... + nPos++; // Nicht optimal, falls Tab, aber auch nicht verkehrt... } } } @@ -254,7 +254,7 @@ SwSrcView::~SwSrcView() sal_Int32 delay = xDocProps->getAutoloadSecs(); pDocShell->SetAutoLoad(INetURLObject(url), delay, (delay != 0) || !url.equalsAscii("")); -// EndListening(*GetViewFrame()); +// EndListening(*GetViewFrame()); EndListening(*pDocShell); delete pSearchItem; } @@ -281,11 +281,11 @@ void SwSrcView::Init() aEditWin.SetReadonly(TRUE); } -// StartListening(*GetViewFrame()); +// StartListening(*GetViewFrame()); StartListening(*pDocShell,TRUE); } -SwDocShell* SwSrcView::GetDocShell() +SwDocShell* SwSrcView::GetDocShell() { SfxObjectShell* pObjShell = GetViewFrame()->GetObjectShell(); return PTR_CAST(SwDocShell, pObjShell); @@ -293,7 +293,7 @@ SwDocShell* SwSrcView::GetDocShell() void SwSrcView::SaveContent(const String& rTmpFile) { - SfxMedium aMedium( rTmpFile, STREAM_WRITE, TRUE); + SfxMedium aMedium( rTmpFile, STREAM_WRITE, TRUE); SvStream* pOutStream = aMedium.GetOutStream(); pOutStream->SetStreamCharSet( lcl_GetStreamCharSet(eLoadEncoding) ); aEditWin.Write(*pOutStream);//, EE_FORMAT_TEXT); @@ -314,7 +314,7 @@ void SwSrcView::Execute(SfxRequest& rReq) TemplateDescription::FILESAVE_AUTOEXTENSION, TemplateDescription::FILESAVE_SIMPLE ); uno::Reference < XFilePicker > xFP = aDlgHelper.GetFilePicker(); -// pFileDlg->SetHelpId(HID_FILEDLG_SRCVIEW); +// pFileDlg->SetHelpId(HID_FILEDLG_SRCVIEW); uno::Reference<XFilterManager> xFltMgr(xFP, UNO_QUERY); // search for an html filter for export @@ -681,7 +681,7 @@ USHORT SwSrcView::SetPrinter(SfxPrinter* pNew, USHORT nDiffFlags, bool ) } return 0; } - + SfxPrinter* SwSrcView::GetPrinter( BOOL bCreate ) { return GetDocShell()->GetDoc()->getPrinter( bCreate ); @@ -689,7 +689,7 @@ SfxPrinter* SwSrcView::GetPrinter( BOOL bCreate ) sal_Int32 SwSrcView::PrintSource( OutputDevice *pOutDev, - sal_Int32 nPage, + sal_Int32 nPage, bool bCalcNumPagesOnly ) { if (!pOutDev || nPage <= 0) @@ -754,7 +754,7 @@ sal_Int32 SwSrcView::PrintSource( } aPos.Y() += nParaSpace; } - + pOutDev->Pop(); OSL_ENSURE( bCalcNumPagesOnly || nPage <= nCurPage, "page number out of range" ); diff --git a/sw/source/ui/uiview/swcli.cxx b/sw/source/ui/uiview/swcli.cxx index 7a93bbaa7212..2966c0058a0a 100644 --- a/sw/source/ui/uiview/swcli.cxx +++ b/sw/source/ui/uiview/swcli.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,7 +65,7 @@ void SwOleClient::RequestNewObjectArea( Rectangle& aLogRect ) // the aLogRect will get the preliminary size now aLogRect.SetSize( rSh.RequestObjectResize( SwRect( aLogRect ), GetObject() ) ); - + // the EndAllAction() call will trigger CalcAndSetScale() call, // so the embedded object must get the correct size before if ( aLogRect.GetSize() != GetScaledObjArea().GetSize() ) @@ -137,11 +137,11 @@ void SwOleClient::ViewChanged() // this is an error OSL_ENSURE( sal_False, "Something goes wrong on requesting object size!\n" ); } - + Size aVisSize( aSz.Width, aSz.Height ); // Bug 24833: solange keine vernuenftige Size vom Object kommt, - // kann nichts skaliert werden + // kann nichts skaliert werden if( !aVisSize.Width() || !aVisSize.Height() ) return; @@ -156,7 +156,7 @@ void SwOleClient::ViewChanged() aVisSize.Height()= Fraction( aVisSize.Height() ) * GetScaleHeight(); SwRect aRect( Point( LONG_MIN, LONG_MIN ), aVisSize ); - rSh.LockView( TRUE ); //Scrollen im EndAction verhindern + rSh.LockView( TRUE ); //Scrollen im EndAction verhindern rSh.StartAllAction(); rSh.RequestObjectResize( aRect, GetObject() ); rSh.EndAllAction(); diff --git a/sw/source/ui/uiview/uivwimp.cxx b/sw/source/ui/uiview/uivwimp.cxx index 51ff90209e9e..3350d8db1ab4 100644 --- a/sw/source/ui/uiview/uivwimp.cxx +++ b/sw/source/ui/uiview/uivwimp.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -114,12 +114,12 @@ void SwView_Impl::SetShellMode(ShellModes eSet) eShellMode = eSet; } -view::XSelectionSupplier* SwView_Impl::GetUNOObject() +view::XSelectionSupplier* SwView_Impl::GetUNOObject() { return pxXTextView->get(); } -SwXTextView* SwView_Impl::GetUNOObject_Impl() +SwXTextView* SwView_Impl::GetUNOObject_Impl() { view::XSelectionSupplier* pTextView = pxXTextView->get(); return ((SwXTextView*)pTextView); diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx index 77b6c83b681a..b129da7c4a49 100644 --- a/sw/source/ui/uiview/view.cxx +++ b/sw/source/ui/uiview/view.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -127,31 +127,31 @@ using ::rtl::OUString; using ::rtl::OUStringBuffer; -extern sal_Bool bNoInterrupt; // in mainwn.cxx +extern sal_Bool bNoInterrupt; // in mainwn.cxx -#define SWVIEWFLAGS ( SFX_VIEW_CAN_PRINT| \ +#define SWVIEWFLAGS ( SFX_VIEW_CAN_PRINT| \ SFX_VIEW_HAS_PRINTOPTIONS) /*-------------------------------------------------------------------- - Beschreibung: Statics + Beschreibung: Statics --------------------------------------------------------------------*/ int bDocSzUpdated = 1; -SvxSearchItem* SwView::pSrchItem = 0; +SvxSearchItem* SwView::pSrchItem = 0; -sal_uInt16 SwView::nInsertCtrlState = FN_INSERT_TABLE; -sal_uInt16 SwView::nWebInsertCtrlState = FN_INSERT_TABLE; -sal_uInt16 SwView::nInsertObjectCtrlState = SID_INSERT_DIAGRAM; +sal_uInt16 SwView::nInsertCtrlState = FN_INSERT_TABLE; +sal_uInt16 SwView::nWebInsertCtrlState = FN_INSERT_TABLE; +sal_uInt16 SwView::nInsertObjectCtrlState = SID_INSERT_DIAGRAM; -sal_Bool SwView::bExtra = sal_False; -sal_Bool SwView::bFound = sal_False; -sal_Bool SwView::bJustOpened = sal_False; +sal_Bool SwView::bExtra = sal_False; +sal_Bool SwView::bFound = sal_False; +sal_Bool SwView::bJustOpened = sal_False; -SvxSearchDialog* SwView::pSrchDlg = 0; -SearchAttrItemList* SwView::pSrchList = 0; -SearchAttrItemList* SwView::pReplList = 0; +SvxSearchDialog* SwView::pSrchDlg = 0; +SearchAttrItemList* SwView::pSrchList = 0; +SearchAttrItemList* SwView::pReplList = 0; DBG_NAME(viewhdl) @@ -241,7 +241,7 @@ void SwView::SelectShell() { //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! // -// Achtung: SelectShell fuer die WebView mitpflegen +// Achtung: SelectShell fuer die WebView mitpflegen // //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -277,10 +277,10 @@ void SwView::SelectShell() SfxDispatcher &rDispatcher = GetDispatcher(); SwToolbarConfigItem *pBarCfg = SW_MOD()->GetToolbarConfig(); - // DELETEZ(pxSelectionObj); //Selektionsobjekt loeschen + // DELETEZ(pxSelectionObj); //Selektionsobjekt loeschen if ( pShell ) { - rDispatcher.Flush(); // alle gecachten Shells wirklich loeschen + rDispatcher.Flush(); // alle gecachten Shells wirklich loeschen //Zur alten Selektion merken welche Toolbar sichtbar war USHORT nId = static_cast< USHORT >( rDispatcher.GetObjectBarId( SFX_OBJECTBAR_OBJECT )); @@ -503,7 +503,7 @@ IMPL_LINK( SwView, AttrChangedNotify, SwWrtShell *, EMPTYARG ) if( !bAttrChgNotified ) { if ( pWrtShell->BasicActionPend() || bNoInterrupt || - GetDispatcher().IsLocked() || //do not confuse the SFX + GetDispatcher().IsLocked() || //do not confuse the SFX GetViewFrame()->GetBindings().IsInUpdate() )//do not confuse the SFX { bAttrChgNotified = sal_True; @@ -588,7 +588,7 @@ void SwView::_CheckReadonlyState() SfxItemState eStateRO, eStateProtAll; const SfxPoolItem *pItem; // JP 29.04.97: von einem nur uns bekannten Slot den Status abfragen. - // Ansonsten kennen andere den Slot; wie z.B. die BasidIde + // Ansonsten kennen andere den Slot; wie z.B. die BasidIde eStateRO = rDis.QueryState( FN_INSERT_BOOKMARK, pItem ); eStateProtAll = rDis.QueryState( FN_EDIT_REGION, pItem ); sal_Bool bChgd = sal_False; @@ -597,37 +597,37 @@ void SwView::_CheckReadonlyState() { static sal_uInt16 aROIds[] = { - SID_DELETE, FN_BACKSPACE, FN_SHIFT_BACKSPACE, + SID_DELETE, FN_BACKSPACE, FN_SHIFT_BACKSPACE, SID_UNDO, - SID_REDO, SID_REPEAT, SID_PASTE, + SID_REDO, SID_REPEAT, SID_PASTE, SID_PASTE_UNFORMATTED, SID_PASTE_SPECIAL, SID_SBA_BRW_INSERT, SID_BACKGROUND_COLOR, FN_INSERT_BOOKMARK, - SID_CHARMAP, FN_INSERT_SOFT_HYPHEN, - FN_INSERT_HARDHYPHEN, FN_INSERT_HARD_SPACE, FN_INSERT_BREAK, - FN_INSERT_LINEBREAK, FN_INSERT_COLUMN_BREAK, FN_INSERT_BREAK_DLG, - FN_DELETE_SENT, FN_DELETE_BACK_SENT, FN_DELETE_WORD, - FN_DELETE_BACK_WORD, FN_DELETE_LINE, FN_DELETE_BACK_LINE, - FN_DELETE_PARA, FN_DELETE_BACK_PARA, FN_DELETE_WHOLE_LINE, - FN_CALCULATE, FN_FORMAT_RESET, - FN_POSTIT, FN_JAVAEDIT, SID_ATTR_PARA_ADJUST_LEFT, - SID_ATTR_PARA_ADJUST_RIGHT, SID_ATTR_PARA_ADJUST_CENTER,SID_ATTR_PARA_ADJUST_BLOCK, - SID_ATTR_PARA_LINESPACE_10, SID_ATTR_PARA_LINESPACE_15, SID_ATTR_PARA_LINESPACE_20, - SID_ATTR_CHAR_FONT, SID_ATTR_CHAR_FONTHEIGHT, SID_ATTR_CHAR_COLOR_BACKGROUND, - SID_ATTR_CHAR_COLOR_BACKGROUND_EXT, SID_ATTR_CHAR_COLOR_EXT, - SID_ATTR_CHAR_COLOR, SID_ATTR_CHAR_WEIGHT, SID_ATTR_CHAR_POSTURE, + SID_CHARMAP, FN_INSERT_SOFT_HYPHEN, + FN_INSERT_HARDHYPHEN, FN_INSERT_HARD_SPACE, FN_INSERT_BREAK, + FN_INSERT_LINEBREAK, FN_INSERT_COLUMN_BREAK, FN_INSERT_BREAK_DLG, + FN_DELETE_SENT, FN_DELETE_BACK_SENT, FN_DELETE_WORD, + FN_DELETE_BACK_WORD, FN_DELETE_LINE, FN_DELETE_BACK_LINE, + FN_DELETE_PARA, FN_DELETE_BACK_PARA, FN_DELETE_WHOLE_LINE, + FN_CALCULATE, FN_FORMAT_RESET, + FN_POSTIT, FN_JAVAEDIT, SID_ATTR_PARA_ADJUST_LEFT, + SID_ATTR_PARA_ADJUST_RIGHT, SID_ATTR_PARA_ADJUST_CENTER,SID_ATTR_PARA_ADJUST_BLOCK, + SID_ATTR_PARA_LINESPACE_10, SID_ATTR_PARA_LINESPACE_15, SID_ATTR_PARA_LINESPACE_20, + SID_ATTR_CHAR_FONT, SID_ATTR_CHAR_FONTHEIGHT, SID_ATTR_CHAR_COLOR_BACKGROUND, + SID_ATTR_CHAR_COLOR_BACKGROUND_EXT, SID_ATTR_CHAR_COLOR_EXT, + SID_ATTR_CHAR_COLOR, SID_ATTR_CHAR_WEIGHT, SID_ATTR_CHAR_POSTURE, SID_ATTR_CHAR_OVERLINE, - SID_ATTR_CHAR_UNDERLINE, SID_ATTR_FLASH, SID_ATTR_CHAR_STRIKEOUT, - FN_UNDERLINE_DOUBLE, SID_ATTR_CHAR_CONTOUR, SID_ATTR_CHAR_SHADOWED, - SID_ATTR_CHAR_AUTOKERN, SID_ATTR_CHAR_ESCAPEMENT, FN_SET_SUPER_SCRIPT, - FN_SET_SUB_SCRIPT, SID_ATTR_CHAR_CASEMAP, SID_ATTR_CHAR_LANGUAGE, - SID_ATTR_CHAR_KERNING, SID_CHAR_DLG, SID_ATTR_CHAR_WORDLINEMODE, - FN_GROW_FONT_SIZE, FN_SHRINK_FONT_SIZE, FN_TXTATR_INET, - FN_FORMAT_DROPCAPS, SID_ATTR_PARA_ADJUST, SID_ATTR_PARA_LINESPACE, - SID_ATTR_PARA_SPLIT, SID_ATTR_PARA_KEEP, SID_ATTR_PARA_WIDOWS, + SID_ATTR_CHAR_UNDERLINE, SID_ATTR_FLASH, SID_ATTR_CHAR_STRIKEOUT, + FN_UNDERLINE_DOUBLE, SID_ATTR_CHAR_CONTOUR, SID_ATTR_CHAR_SHADOWED, + SID_ATTR_CHAR_AUTOKERN, SID_ATTR_CHAR_ESCAPEMENT, FN_SET_SUPER_SCRIPT, + FN_SET_SUB_SCRIPT, SID_ATTR_CHAR_CASEMAP, SID_ATTR_CHAR_LANGUAGE, + SID_ATTR_CHAR_KERNING, SID_CHAR_DLG, SID_ATTR_CHAR_WORDLINEMODE, + FN_GROW_FONT_SIZE, FN_SHRINK_FONT_SIZE, FN_TXTATR_INET, + FN_FORMAT_DROPCAPS, SID_ATTR_PARA_ADJUST, SID_ATTR_PARA_LINESPACE, + SID_ATTR_PARA_SPLIT, SID_ATTR_PARA_KEEP, SID_ATTR_PARA_WIDOWS, SID_ATTR_PARA_ORPHANS, - SID_ATTR_PARA_MODEL, SID_PARA_DLG, - FN_SELECT_PARA, SID_DEC_INDENT, + SID_ATTR_PARA_MODEL, SID_PARA_DLG, + FN_SELECT_PARA, SID_DEC_INDENT, SID_INC_INDENT }; static sal_Bool bFirst = sal_True; @@ -694,11 +694,11 @@ void SwView::_CheckReadonlySelection() case SHELL_MODE_TABLE_LIST_TEXT: { //JP 22.01.99: temporaere Loesung!!! Sollte bei jeder Cursorbewegung -// den Font von der akt. Einfuegeposition setzen, also ausserhalb -// dieses if's. Aber TH wertet den Font zur Zeit nicht aus und -// das besorgen erscheint mir hier zu teuer zu sein. -// Ausserdem haben wir keinen Font, sondern nur Attribute aus denen -// die Textformatierung dann den richtigen Font zusammen baut. +// den Font von der akt. Einfuegeposition setzen, also ausserhalb +// dieses if's. Aber TH wertet den Font zur Zeit nicht aus und +// das besorgen erscheint mir hier zu teuer zu sein. +// Ausserdem haben wir keinen Font, sondern nur Attribute aus denen +// die Textformatierung dann den richtigen Font zusammen baut. InputContext aCntxt( GetEditWin().GetInputContext() ); aCntxt.SetOptions( SW_DISABLE_ON_PROTECTED_CURSOR & nDisableFlags @@ -847,7 +847,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) pWrtShell = new SwWrtShell( *((SwView*)pExistingSh)->pWrtShell, pEditWin, *this); //MA: Das kann doch nur zu einem GPF fuehren! -// nSelectionType = ((SwView*)pOldSh)->nSelectionType; +// nSelectionType = ((SwView*)pOldSh)->nSelectionType; } else { @@ -900,7 +900,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) // <-- // JP 05.02.99: Bug 61495 - damit unter anderem das HLineal im - // ReadonlyFall nicht angezeigt wird + // ReadonlyFall nicht angezeigt wird aUsrPref.SetReadonly( pWrtShell->GetViewOptions()->IsReadonly() ); //Kein Margin fuer OLE! @@ -1031,7 +1031,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) { SfxRequest aSfxRequest( FN_UPDATE_TOX, SFX_CALLMODE_SLOT, GetPool() ); Execute( aSfxRequest ); - pWrtShell->GetDoc()->SetUpdateTOX( sal_False ); // wieder zurueck setzen + pWrtShell->GetDoc()->SetUpdateTOX( sal_False ); // wieder zurueck setzen pWrtShell->SttEndDoc(TRUE); } @@ -1041,7 +1041,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) // zur Zeit(360) wird die View erst nach dem Ctor eingetragen // der folgende Ausdruck funktioniert auch, wenn sich das aendert //JP 27.07.98: wenn per Undo nicht mehr die Modifizierung aufhebar ist, - // so setze das Modified NICHT zurueck. + // so setze das Modified NICHT zurueck. // --> OD 2005-02-11 #i38810# - no reset of modified state, if document // was already modified. if ( !pWrtShell->GetDoc()->IsUndoNoResetModified() && @@ -1131,7 +1131,7 @@ SwView::~SwView() EndListening(*GetDocShell()); delete pScrollFill; delete pWrtShell; - pWrtShell = 0; // Auf 0 setzen, damit folgende DToren nicht drauf zugreifen + pWrtShell = 0; // Auf 0 setzen, damit folgende DToren nicht drauf zugreifen pShell = 0; delete pHScrollbar; delete pVScrollbar; @@ -1148,7 +1148,7 @@ SwView::~SwView() } /*-------------------------------------------------------------------- - Beschreibung: DocShell rausgrabbeln ueber das FrameWindow + Beschreibung: DocShell rausgrabbeln ueber das FrameWindow --------------------------------------------------------------------*/ SwDocShell* SwView::GetDocShell() { @@ -1157,7 +1157,7 @@ SwDocShell* SwView::GetDocShell() } /*-------------------------------------------------------------------- - Beschreibung: CursorPos merken + Beschreibung: CursorPos merken --------------------------------------------------------------------*/ void SwView::WriteUserData( String &rUserData, sal_Bool bBrowse ) { @@ -1229,8 +1229,8 @@ void SwView::ReadUserData( const String &rUserData, sal_Bool bBrowse ) sal_uInt16 nZoomFactor = static_cast< sal_uInt16 >( rUserData.GetToken(0, ';', nPos ).ToInt32() ); - long nLeft = rUserData.GetToken(0, ';', nPos ).ToInt32(), - nTop = rUserData.GetToken(0, ';', nPos ).ToInt32(), + long nLeft = rUserData.GetToken(0, ';', nPos ).ToInt32(), + nTop = rUserData.GetToken(0, ';', nPos ).ToInt32(), nRight = rUserData.GetToken(0, ';', nPos ).ToInt32(), nBottom= rUserData.GetToken(0, ';', nPos ).ToInt32(); @@ -1606,7 +1606,7 @@ void SwView::ShowCursor( bool bOn ) { //JP 10.10.2001: Bug 90461 - don't scroll the cursor into the visible area BOOL bUnlockView = !pWrtShell->IsViewLocked(); - pWrtShell->LockView( TRUE ); //lock visible section + pWrtShell->LockView( TRUE ); //lock visible section if( !bOn ) pWrtShell->HideCrsr(); @@ -1643,7 +1643,7 @@ String SwView::GetSelectionText( sal_Bool bCompleteWrds ) return GetSelectionTextParam( bCompleteWrds, sal_True ); } -String SwView::GetSelectionTextParam( sal_Bool bCompleteWrds, +String SwView::GetSelectionTextParam( sal_Bool bCompleteWrds, sal_Bool bEraseTrail ) { String sReturn; @@ -1761,8 +1761,8 @@ void SwView::ScannerEventHdl( const EventObject& /*rEventObject*/ ) uno::Reference< XScannerManager > xScanMgr = SW_MOD()->GetScannerManager(); if( xScanMgr.is() ) { - const ScannerContext aContext( xScanMgr->getAvailableScanners().getConstArray()[ 0 ] ); - const ScanError eError = xScanMgr->getError( aContext ); + const ScannerContext aContext( xScanMgr->getAvailableScanners().getConstArray()[ 0 ] ); + const ScanError eError = xScanMgr->getError( aContext ); if( ScanError_ScanErrorNone == eError ) { @@ -1786,7 +1786,7 @@ void SwView::ScannerEventHdl( const EventObject& /*rEventObject*/ ) } #endif -void SwView::StopShellTimer() +void SwView::StopShellTimer() { if(aTimer.IsActive()) { diff --git a/sw/source/ui/uiview/view.hrc b/sw/source/ui/uiview/view.hrc index d2aa60494801..e05b61e75153 100644 --- a/sw/source/ui/uiview/view.hrc +++ b/sw/source/ui/uiview/view.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,14 +36,14 @@ // STR ------------------------------------------------------------------- -#define STR_NUM_LEVEL (RC_VIEW_BEGIN + 3) -#define STR_NUM_OUTLINE (RC_VIEW_BEGIN + 4) +#define STR_NUM_LEVEL (RC_VIEW_BEGIN + 3) +#define STR_NUM_OUTLINE (RC_VIEW_BEGIN + 4) -#define STR_ERROR_NOLANG (RC_VIEW_BEGIN + 6) +#define STR_ERROR_NOLANG (RC_VIEW_BEGIN + 6) -#define STR_EDIT_FOOTNOTE (RC_VIEW_BEGIN + 14) +#define STR_EDIT_FOOTNOTE (RC_VIEW_BEGIN + 14) -//#define RID_PVIEW_TOOLBOX (RC_VIEW_BEGIN + 15) +//#define RID_PVIEW_TOOLBOX (RC_VIEW_BEGIN + 15) #define MSG_NOT_FOUND (RC_VIEW_BEGIN + 16) #define MSG_SEARCH_START (RC_VIEW_BEGIN + 17) #define MSG_SEARCH_END (RC_VIEW_BEGIN + 18) @@ -51,32 +51,32 @@ #define STR_NB_REPLACED (RC_VIEW_BEGIN + 20) #define MSG_SCAN_NOSOURCE (RC_VIEW_BEGIN + 21) -#define STR_SRCVIEW_ROW (RC_VIEW_BEGIN + 22) -#define STR_SRCVIEW_COL (RC_VIEW_BEGIN + 23) +#define STR_SRCVIEW_ROW (RC_VIEW_BEGIN + 22) +#define STR_SRCVIEW_COL (RC_VIEW_BEGIN + 23) #define STR_SAVEAS_SRC (RC_VIEW_BEGIN + 24) #define MSG_NO_MERGE_ENTRY (RC_VIEW_BEGIN + 25) -#define STR_PRINT_TITLE (RC_VIEW_BEGIN + 26) -#define STR_PRINT_MSG (RC_VIEW_BEGIN + 27) -#define STR_PRINT_ALL (RC_VIEW_BEGIN + 28) -#define STR_PRINT_SELECTION (RC_VIEW_BEGIN + 29) -#define STR_READONLY_SEL (RC_VIEW_BEGIN + 30) +#define STR_PRINT_TITLE (RC_VIEW_BEGIN + 26) +#define STR_PRINT_MSG (RC_VIEW_BEGIN + 27) +#define STR_PRINT_ALL (RC_VIEW_BEGIN + 28) +#define STR_PRINT_SELECTION (RC_VIEW_BEGIN + 29) +#define STR_READONLY_SEL (RC_VIEW_BEGIN + 30) -#define RID_PVIEW_TOOLBOX (RC_VIEW_BEGIN + 31) +#define RID_PVIEW_TOOLBOX (RC_VIEW_BEGIN + 31) #define STR_WEBOPTIONS (RC_VIEW_BEGIN + 32) #define STR_TEXTOPTIONS (RC_VIEW_BEGIN + 33) // MSG ------------------------------------------------------------------- #define MSG_ERR_INSERT_GLOS (RC_VIEW_BEGIN) -#define MSG_ERR_NO_FAX (RC_VIEW_BEGIN + 5) -#define MSG_ERR_SRCSTREAM (RC_VIEW_BEGIN + 6) +#define MSG_ERR_NO_FAX (RC_VIEW_BEGIN + 5) +#define MSG_ERR_SRCSTREAM (RC_VIEW_BEGIN + 6) // DLG ------------------------------------------------------------------- -#define DLG_SPECIAL_FORCED (RC_VIEW_BEGIN) -#define DLG_PAGEPREVIEW_ZOOM (RC_VIEW_BEGIN + 1) +#define DLG_SPECIAL_FORCED (RC_VIEW_BEGIN) +#define DLG_PAGEPREVIEW_ZOOM (RC_VIEW_BEGIN + 1) // Ueberlaufpruefung ----------------------------------------------------- diff --git a/sw/source/ui/uiview/view.src b/sw/source/ui/uiview/view.src index 9cf4f910f183..233664b50971 100644 --- a/sw/source/ui/uiview/view.src +++ b/sw/source/ui/uiview/view.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx index cc87cb45f745..f06c991222d1 100644 --- a/sw/source/ui/uiview/view0.cxx +++ b/sw/source/ui/uiview/view0.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,7 +60,7 @@ #include "basesh.hxx" #include "docsh.hxx" #include "globals.hrc" -#include "cmdid.h" // FN_ ... +#include "cmdid.h" // FN_ ... #include "globdoc.hxx" #include "wview.hxx" #include "shells.hrc" @@ -135,7 +135,7 @@ SFX_IMPL_INTERFACE( SwView, SfxViewShell, SW_RES(RID_TOOLS_TOOLBOX) ) TYPEINIT1(SwView,SfxViewShell) -ShellModes SwView::GetShellMode() +ShellModes SwView::GetShellMode() { return pViewImpl->GetShellMode(); } diff --git a/sw/source/ui/uiview/view1.cxx b/sw/source/ui/uiview/view1.cxx index 96074ea29b4a..70aeb587b305 100644 --- a/sw/source/ui/uiview/view1.cxx +++ b/sw/source/ui/uiview/view1.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -81,7 +81,7 @@ void SwView::Activate(BOOL bMDIActivate) if ( bMDIActivate ) { - pWrtShell->ShGetFcs(FALSE); // Selektionen sichtbar + pWrtShell->ShGetFcs(FALSE); // Selektionen sichtbar if( sSwViewData.Len() ) { @@ -133,7 +133,7 @@ void SwView::Deactivate(BOOL bMDIActivate) if( bMDIActivate ) { - pWrtShell->ShLooseFcs(); // Selektionen unsichtbar + pWrtShell->ShLooseFcs(); // Selektionen unsichtbar pHRuler->SetActive( FALSE ); pVRuler->SetActive( FALSE ); diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx index b285b5dceaf9..da75a14be859 100644 --- a/sw/source/ui/uiview/view2.cxx +++ b/sw/source/ui/uiview/view2.cxx @@ -185,7 +185,7 @@ static void lcl_SetAllTextToDefaultLanguage( SwWrtShell &rWrtSh, USHORT nWhichId } /*--------------------------------------------------------------------------- - Beschreibung: String fuer die Seitenanzeige in der Statusbar basteln. + Beschreibung: String fuer die Seitenanzeige in der Statusbar basteln. ----------------------------------------------------------------------------*/ String SwView::GetPageStr( USHORT nPg, USHORT nLogPg, const String& rDisplay ) @@ -542,7 +542,7 @@ void __EXPORT SwView::Execute(SfxRequest &rReq) if( aPasswd.getLength() ) { OSL_ENSURE( !((const SfxBoolItem*)pItem)->GetValue(), "SwView::Execute(): password set an redlining off doesn't match!" ); - // xmlsec05: new password dialog + // xmlsec05: new password dialog Window* pParent; const SfxPoolItem* pParentItem; if( SFX_ITEM_SET == pArgs->GetItemState( SID_ATTR_XWINDOW, FALSE, &pParentItem ) ) @@ -559,7 +559,7 @@ void __EXPORT SwView::Execute(SfxRequest &rReq) if(SvPasswordHelper::CompareHashPassword(aPasswd, sNewPasswd)) pIDRA->SetRedlinePassword(Sequence <sal_Int8> ()); else - { // xmlsec05: message box for wrong password + { // xmlsec05: message box for wrong password break; } } @@ -578,8 +578,8 @@ void __EXPORT SwView::Execute(SfxRequest &rReq) && ((SfxBoolItem*)pItem)->GetValue() == ( aPasswd.getLength() != 0 ) ) break; - // xmlsec05: new password dialog - // message box for wrong password + // xmlsec05: new password dialog + // message box for wrong password Window* pParent; const SfxPoolItem* pParentItem; if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( SID_ATTR_XWINDOW, FALSE, &pParentItem ) ) @@ -937,7 +937,7 @@ void __EXPORT SwView::Execute(SfxRequest &rReq) } } break; - case SID_ATTR_LANGUAGE : + case SID_ATTR_LANGUAGE : if(pArgs && SFX_ITEM_SET == pArgs->GetItemState(SID_ATTR_LANGUAGE, FALSE, &pItem)) { SvxLanguageItem aLang(((SvxLanguageItem*)pItem)->GetLanguage(), RES_CHRATR_LANGUAGE); @@ -1163,7 +1163,7 @@ void __EXPORT SwView::Execute(SfxRequest &rReq) } /*-------------------------------------------------------------------- - Beschreibung: SeitenNr-Feld invalidieren + Beschreibung: SeitenNr-Feld invalidieren --------------------------------------------------------------------*/ void SwView::UpdatePageNums(USHORT nPhyNum, USHORT nVirtNum, const String& rPgStr) { @@ -1175,7 +1175,7 @@ void SwView::UpdatePageNums(USHORT nPhyNum, USHORT nVirtNum, const String& rPgSt } /*-------------------------------------------------------------------- - Beschreibung: Status der Stauszeile + Beschreibung: Status der Stauszeile --------------------------------------------------------------------*/ void SwView::StateStatusLine(SfxItemSet &rSet) { @@ -1193,7 +1193,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet) /* //JP 07.01.00: is a nice feature - show the selektion of DrawObjects if( rShell.IsObjSelected() -//??? || rShell.IsFrmSelected() +//??? || rShell.IsFrmSelected() ) { String sDisplay( rShell.GetDrawView()->GetMarkedObjectList(). @@ -1201,7 +1201,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet) rSet.Put( SfxStringItem( FN_STAT_PAGE, sDisplay )); } else -*/ { +*/ { // Anzahl der Seiten, log. SeitenNr. SeitenNr ermitteln USHORT nPage, nLogPage; String sDisplay; @@ -1210,7 +1210,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet) GetPageStr( nPage, nLogPage, sDisplay) )); USHORT nCnt = GetWrtShell().GetPageCnt(); - if (nPageCnt != nCnt) // Basic benachrichtigen + if (nPageCnt != nCnt) // Basic benachrichtigen { nPageCnt = nCnt; SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_PAGE_COUNT, SwDocShell::GetEventName(STR_SW_EVENT_PAGE_COUNT), GetViewFrame()->GetObjectShell()), FALSE); @@ -1387,40 +1387,40 @@ void SwView::StateStatusLine(SfxItemSet &rSet) //#outline level, removed by zhaojianwei //const SwNumRule* pNumRule = rShell.GetCurNumRule(); - //if (pNumRule) // Cursor in Numerierung + //if (pNumRule) // Cursor in Numerierung //{ - // BYTE nNumLevel = rShell.GetNumLevel(); - // if( IsShowNum(nNumLevel) && MAXLEVEL > - // ( nNumLevel = GetRealLevel( nNumLevel )) ) - // { - // if( sStr.Len() ) - // sStr.AppendAscii(sStatusDelim); - // sStr += SW_RESSTR(STR_NUM_LEVEL); - // sStr += String::CreateFromInt32( nNumLevel + 1 ); - // if(!pNumRule->IsAutoRule()) - // { - // SfxItemSet aSet(GetPool(), - // RES_PARATR_NUMRULE, RES_PARATR_NUMRULE); - // rShell.GetCurAttr(aSet); - // /* const SfxPoolItem* pItem; */ - // if(SFX_ITEM_AVAILABLE <= - // aSet.GetItemState(RES_PARATR_NUMRULE, TRUE - // /*, &pItem */ )) - // { - // const String& rNumStyle = - // ((const SfxStringItem &) - // aSet.Get(RES_PARATR_NUMRULE)).GetValue(); - // /* #i5116# GetItemState does not necessarily - // change pItem */ - // // ((const SfxStringItem*)pItem)->GetValue(); - // if(rNumStyle.Len()) - // { - // sStr.AppendAscii(sStatusDelim); - // sStr += rNumStyle; - // } - // } - // } - // } + // BYTE nNumLevel = rShell.GetNumLevel(); + // if( IsShowNum(nNumLevel) && MAXLEVEL > + // ( nNumLevel = GetRealLevel( nNumLevel )) ) + // { + // if( sStr.Len() ) + // sStr.AppendAscii(sStatusDelim); + // sStr += SW_RESSTR(STR_NUM_LEVEL); + // sStr += String::CreateFromInt32( nNumLevel + 1 ); + // if(!pNumRule->IsAutoRule()) + // { + // SfxItemSet aSet(GetPool(), + // RES_PARATR_NUMRULE, RES_PARATR_NUMRULE); + // rShell.GetCurAttr(aSet); + // /* const SfxPoolItem* pItem; */ + // if(SFX_ITEM_AVAILABLE <= + // aSet.GetItemState(RES_PARATR_NUMRULE, TRUE + // /*, &pItem */ )) + // { + // const String& rNumStyle = + // ((const SfxStringItem &) + // aSet.Get(RES_PARATR_NUMRULE)).GetValue(); + // /* #i5116# GetItemState does not necessarily + // change pItem */ + // // ((const SfxStringItem*)pItem)->GetValue(); + // if(rNumStyle.Len()) + // { + // sStr.AppendAscii(sStatusDelim); + // sStr += rNumStyle; + // } + // } + // } + // } //}//<-removed end ,zhaojianwei //-->#outline level,added by zhaojianwei @@ -1428,7 +1428,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet) const bool bOutlineNum = pNumRule ? pNumRule->IsOutlineRule() : 0; //((SwTxtFmtColl*)rShell.GetCrsr()->GetNode()->GetTxtNode()->GetFmtColl())->IsAssignedToListLevelOfOutlineStyle(); - if (pNumRule && !bOutlineNum ) // Cursor in Numerierung + if (pNumRule && !bOutlineNum ) // Cursor in Numerierung { BYTE nNumLevel = rShell.GetNumLevel(); // --> OD 2008-04-02 #refactorlists# @@ -1521,7 +1521,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet) } /*-------------------------------------------------------------------- - Beschreibung: Execute fuer die Stauszeile + Beschreibung: Execute fuer die Stauszeile --------------------------------------------------------------------*/ void SwView::ExecuteStatusLine(SfxRequest &rReq) { @@ -1689,7 +1689,7 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq) else { const SwNumRule* pNumRule = rSh.GetCurNumRule(); - if( pNumRule ) // Cursor in Numerierung + if( pNumRule ) // Cursor in Numerierung { if( pNumRule->IsAutoRule() ) nId = FN_NUMBER_BULLETS; @@ -1806,7 +1806,7 @@ void SwView::InsFrmMode(USHORT nCols) } /*-------------------------------------------------------------------- - Beschreibung: Links bearbeiten + Beschreibung: Links bearbeiten --------------------------------------------------------------------*/ void SwView::EditLinkDlg() { @@ -1901,7 +1901,7 @@ BOOL SwView::JumpToSwMark( const String& rMark ) BOOL bSearchInNotes = FALSE; if( pWrtShell->SearchPattern( aSearchOpt, bSearchInNotes, DOCPOS_START, DOCPOS_END )) { - pWrtShell->EnterStdMode(); // Selektion wieder aufheben + pWrtShell->EnterStdMode(); // Selektion wieder aufheben bRet = TRUE; } } @@ -1968,7 +1968,7 @@ sal_uInt16 lcl_PageDescWithHeader( const SwDoc& rDoc ) } /*-------------------------------------------------------------------- - Beschreibung: Links bearbeiten + Beschreibung: Links bearbeiten --------------------------------------------------------------------*/ void SwView::ExecuteInsertDoc( SfxRequest& rRequest, const SfxPoolItem* pItem ) { @@ -2078,7 +2078,7 @@ long SwView::InsertMedium( USHORT nSlotId, SfxMedium* pMedium, INT16 nVersion ) } pDocSh->RegisterTransfer( *pMedium ); pMedium->DownLoad(); // ggfs. den DownLoad anstossen - if( aRef.Is() && 1 < aRef->GetRefCount() ) // noch gueltige Ref? + if( aRef.Is() && 1 < aRef->GetRefCount() ) // noch gueltige Ref? { SwReader* pRdr; Reader *pRead = pDocSh->StartConvertFrom( *pMedium, &pRdr, pWrtShell ); @@ -2090,15 +2090,15 @@ long SwView::InsertMedium( USHORT nSlotId, SfxMedium* pMedium, INT16 nVersion ) if( pRead && pDocSh->GetDoc() ) nUndoCheck = lcl_PageDescWithHeader( *pDoc ); ULONG nErrno; - { //Scope for SwWait-Object, to be able to execute slots + { //Scope for SwWait-Object, to be able to execute slots //outside this scope. SwWait aWait( *GetDocShell(), TRUE ); pWrtShell->StartAllAction(); if ( pWrtShell->HasSelection() ) - pWrtShell->DelRight(); // Selektionen loeschen + pWrtShell->DelRight(); // Selektionen loeschen if( pRead ) { - nErrno = pRdr->Read( *pRead ); // und Dokument einfuegen + nErrno = pRdr->Read( *pRead ); // und Dokument einfuegen delete pRdr; } else @@ -2116,7 +2116,7 @@ long SwView::InsertMedium( USHORT nSlotId, SfxMedium* pMedium, INT16 nVersion ) { SfxRequest aReq( FN_UPDATE_TOX, SFX_CALLMODE_SLOT, GetPool() ); Execute( aReq ); - pWrtShell->SetUpdateTOX( FALSE ); // wieder zurueck setzen + pWrtShell->SetUpdateTOX( FALSE ); // wieder zurueck setzen } if( pDoc ) @@ -2154,7 +2154,7 @@ extern int lcl_FindDocShell( SfxObjectShellRef& xDocSh, SwWait aWait( *GetDocShell(), TRUE ); pWrtShell->StartAllAction(); - pWrtShell->EnterStdMode(); // Selektionen loeschen + pWrtShell->EnterStdMode(); // Selektionen loeschen if( bCompare ) nFound = pWrtShell->CompareDoc( *((SwDocShell*)&xDocSh)->GetDoc() ); @@ -2191,9 +2191,9 @@ namespace { Sequence < OUString > aNames = _rDatasourceContext->getElementNames(); - return ( !aNames.getLength() - || ( ( 1 == aNames.getLength() ) - && aNames.getConstArray()[0] == SW_MOD()->GetDBConfig()->GetBibliographySource().sDataSource + return ( !aNames.getLength() + || ( ( 1 == aNames.getLength() ) + && aNames.getConstArray()[0] == SW_MOD()->GetDBConfig()->GetBibliographySource().sDataSource ) ); } diff --git a/sw/source/ui/uiview/viewcoll.cxx b/sw/source/ui/uiview/viewcoll.cxx index 74187a1583cf..c5bbdd2f5a46 100644 --- a/sw/source/ui/uiview/viewcoll.cxx +++ b/sw/source/ui/uiview/viewcoll.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/uiview/viewdlg.cxx b/sw/source/ui/uiview/viewdlg.cxx index 5d83448f0d74..52d00139c798 100644 --- a/sw/source/ui/uiview/viewdlg.cxx +++ b/sw/source/ui/uiview/viewdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/uiview/viewdlg2.cxx b/sw/source/ui/uiview/viewdlg2.cxx index 9a6bd8a0c77d..1c91d20a8fef 100644 --- a/sw/source/ui/uiview/viewdlg2.cxx +++ b/sw/source/ui/uiview/viewdlg2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -178,7 +178,7 @@ void SwView::InsertCaption(const InsCaptionOpt *pOpt) } USHORT nID = USHRT_MAX; - SwFieldType* pType = 0; + SwFieldType* pType = 0; const USHORT nCount = aMgr.GetFldTypeCount(); if( rName.Len() ) { diff --git a/sw/source/ui/uiview/viewdraw.cxx b/sw/source/ui/uiview/viewdraw.cxx index 07c8f7864434..bb472c7188cd 100644 --- a/sw/source/ui/uiview/viewdraw.cxx +++ b/sw/source/ui/uiview/viewdraw.cxx @@ -85,7 +85,7 @@ using namespace ::com::sun::star; /*-------------------------------------------------------------------- - Beschreibung: Drawing-Ids ausfuehren + Beschreibung: Drawing-Ids ausfuehren --------------------------------------------------------------------*/ void SwView::ExecDraw(SfxRequest& rReq) { @@ -136,7 +136,7 @@ void SwView::ExecDraw(SfxRequest& rReq) if (nNewId == nFormSfxId) { bDeselect = sal_True; - GetViewFrame()->GetDispatcher()->Execute(SID_FM_LEAVE_CREATE); // Button soll rauspoppen + GetViewFrame()->GetDispatcher()->Execute(SID_FM_LEAVE_CREATE); // Button soll rauspoppen } } } @@ -179,7 +179,7 @@ void SwView::ExecDraw(SfxRequest& rReq) } else if ( nSlotId == SID_FONTWORK_GALLERY_FLOATER ) { - Window* pWin = &( pWrtShell->GetView().GetViewFrame()->GetWindow() ); + Window* pWin = &( pWrtShell->GetView().GetViewFrame()->GetWindow() ); if ( pWin ) pWin->EnterWait(); @@ -196,11 +196,11 @@ void SwView::ExecDraw(SfxRequest& rReq) aDlg.Execute(); if ( pObj ) { - Size aDocSize( pWrtShell->GetDocSize() ); - const SwRect& rVisArea = pWrtShell->VisArea(); - Point aPos( rVisArea.Center() ); - Size aSize; - Size aPrefSize( pObj->GetSnapRect().GetSize() ); + Size aDocSize( pWrtShell->GetDocSize() ); + const SwRect& rVisArea = pWrtShell->VisArea(); + Point aPos( rVisArea.Center() ); + Size aSize; + Size aPrefSize( pObj->GetSnapRect().GetSize() ); if( rVisArea.Width() > aDocSize.Width()) aPos.X() = aDocSize.Width() / 2 + rVisArea.Left(); @@ -267,7 +267,7 @@ void SwView::ExecDraw(SfxRequest& rReq) LeaveDrawCreate(); if (pWrtShell->IsFrmSelected()) - pWrtShell->EnterStdMode(); // wegen Bug #45639 + pWrtShell->EnterStdMode(); // wegen Bug #45639 SwDrawBase* pFuncPtr = NULL; @@ -409,7 +409,7 @@ void SwView::ExecDraw(SfxRequest& rReq) } /*-------------------------------------------------------------------- - Beschreibung: Drawing beenden + Beschreibung: Drawing beenden --------------------------------------------------------------------*/ void SwView::ExitDraw() { @@ -460,7 +460,7 @@ void SwView::ExitDraw() } /*-------------------------------------------------------------------- - Beschreibung: Rotate-Mode abschalten + Beschreibung: Rotate-Mode abschalten --------------------------------------------------------------------*/ void SwView::NoRotate() { @@ -475,7 +475,7 @@ void SwView::NoRotate() } /****************************************************************************** - * Beschreibung: DrawTextEditMode einschalten + * Beschreibung: DrawTextEditMode einschalten ******************************************************************************/ sal_Bool SwView::EnterDrawTextMode(const Point& aDocPos) { @@ -512,9 +512,9 @@ sal_Bool SwView::EnterDrawTextMode(const Point& aDocPos) } /****************************************************************************** - * Beschreibung: DrawTextEditMode einschalten + * Beschreibung: DrawTextEditMode einschalten ******************************************************************************/ -sal_Bool SwView::BeginTextEdit(SdrObject* pObj, SdrPageView* pPV, Window* pWin, +sal_Bool SwView::BeginTextEdit(SdrObject* pObj, SdrPageView* pPV, Window* pWin, bool bIsNewObj, bool bSetSelectionToStart) { SwWrtShell *pSh = &GetWrtShell(); @@ -613,7 +613,7 @@ sal_Bool SwView::BeginTextEdit(SdrObject* pObj, SdrPageView* pPV, Window* pWin, } /****************************************************************************** - * Beschreibung: Ist ein DrawTextObjekt selektiert? + * Beschreibung: Ist ein DrawTextObjekt selektiert? ******************************************************************************/ sal_Bool SwView::IsTextTool() const { @@ -700,7 +700,7 @@ sal_Bool SwView::HasDrwObj(SdrObject *pSdrObj) const if (pSdrObj->IsGroupObject()) { - SdrObjList* pList = pSdrObj->GetSubList(); + SdrObjList* pList = pSdrObj->GetSubList(); sal_uInt32 nCnt = pList->GetObjCount(); for (sal_uInt32 i = 0; i < nCnt; i++) @@ -719,7 +719,7 @@ sal_Bool SwView::HasOnlyObj(SdrObject *pSdrObj, sal_uInt32 eObjInventor) const if (pSdrObj->IsGroupObject()) { - SdrObjList* pList = pSdrObj->GetSubList(); + SdrObjList* pList = pSdrObj->GetSubList(); sal_uInt32 nCnt = pList->GetObjCount(); for (sal_uInt32 i = 0; i < nCnt; i++) diff --git a/sw/source/ui/uiview/viewfunc.hxx b/sw/source/ui/uiview/viewfunc.hxx index b9841b5def51..64d597a4774d 100644 --- a/sw/source/ui/uiview/viewfunc.hxx +++ b/sw/source/ui/uiview/viewfunc.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sw/source/ui/uiview/viewling.cxx b/sw/source/ui/uiview/viewling.cxx index 163e55ca8f62..bcbcfa1a1cce 100644 --- a/sw/source/ui/uiview/viewling.cxx +++ b/sw/source/ui/uiview/viewling.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,24 +57,24 @@ #include <editeng/SpellPortions.hxx> #include <swmodule.hxx> #include <swwait.hxx> -#include <initui.hxx> // fuer SpellPointer +#include <initui.hxx> // fuer SpellPointer #include <uitool.hxx> #include <view.hxx> #include <wrtsh.hxx> #include <basesh.hxx> -#include <docsh.hxx> // CheckSpellChanges -#include <viewopt.hxx> // Viewoptions +#include <docsh.hxx> // CheckSpellChanges +#include <viewopt.hxx> // Viewoptions #include <swundo.hxx> // fuer Undo-Ids #include <hyp.hxx> // Trennung -#include <olmenu.hxx> // PopupMenu fuer OnlineSpelling -#include <pam.hxx> // Spelling: Multiselektion +#include <olmenu.hxx> // PopupMenu fuer OnlineSpelling +#include <pam.hxx> // Spelling: Multiselektion #include <edtwin.hxx> #include <crsskip.hxx> #include <ndtxt.hxx> #include <vcl/lstbox.hxx> #include <cmdid.h> #include <globals.hrc> -#include <comcore.hrc> // STR_MULT_INTERACT_SPELL_WARN +#include <comcore.hrc> // STR_MULT_INTERACT_SPELL_WARN #include <view.hrc> #include <hhcwrp.hxx> #include <com/sun/star/frame/XStorable.hpp> @@ -113,7 +113,7 @@ using namespace ::com::sun::star::linguistic2; using namespace ::com::sun::star::smarttags; /*-------------------------------------------------------------------- - Beschreibung: Lingu-Dispatcher + Beschreibung: Lingu-Dispatcher --------------------------------------------------------------------*/ void SwView::ExecLingu(SfxRequest &rReq) { @@ -144,7 +144,7 @@ void SwView::ExecLingu(SfxRequest &rReq) Reference< lang::XInitialization > xInit( xDialog, UNO_QUERY ); if( xInit.is() ) { - // initialize dialog + // initialize dialog Reference< awt::XWindow > xDialogParentWindow(0); Sequence<Any> aSeq(1); Any* pArray = aSeq.getArray(); @@ -252,7 +252,7 @@ void SwView::StartTextConversion( { return; } - + SpellKontext(sal_True); const SwViewOption* pVOpt = pWrtShell->GetViewOptions(); @@ -475,7 +475,7 @@ void SwView::HyphenateDocument() Reference< beans::XPropertySet > xProp( ::GetLinguPropertySet() ); - pWrtShell->StartUndo(UNDO_INSATTR); // spaeter gueltig + pWrtShell->StartUndo(UNDO_INSATTR); // spaeter gueltig sal_Bool bHyphSpecial = xProp.is() ? *(sal_Bool*)xProp->getPropertyValue( C2U(UPN_IS_HYPH_SPECIAL) ).getValue() : sal_False; @@ -517,11 +517,11 @@ bool SwView::IsValidSelectionForThesaurus() const { // must not be a multi-selection, and if it is a selection it needs // to be within a single paragraph - + const bool bMultiSel = pWrtShell->GetCrsr() != pWrtShell->GetCrsr()->GetNext(); const sal_Bool bSelection = ((SwCrsrShell*)pWrtShell)->HasSelection(); return !bMultiSel && (!bSelection || pWrtShell->IsSelOnePara() ); -} +} String SwView::GetThesaurusLookUpText( bool bSelection ) const { @@ -569,10 +569,10 @@ void SwView::InsertThesaurusSynonym( const String &rSynonmText, const String &rL pWrtShell->EndAllAction(); pWrtShell->SetInsMode( bOldIns ); -} +} /*-------------------------------------------------------------------- - Beschreibung: Thesaurus starten + Beschreibung: Thesaurus starten --------------------------------------------------------------------*/ void SwView::StartThesaurus() { @@ -611,9 +611,9 @@ void SwView::StartThesaurus() else { // create dialog - { //Scope for SwWait-Object + { //Scope for SwWait-Object SwWait aWait( *GetDocShell(), sal_True ); - // load library with dialog only on demand ... + // load library with dialog only on demand ... SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); pDlg = pFact->CreateThesaurusDialog( &GetEditWin(), xThes, aTmp, eLang ); } @@ -628,7 +628,7 @@ void SwView::StartThesaurus() } /*-------------------------------------------------------------------- - Beschreibung: Online-Vorschlaege anbieten + Beschreibung: Online-Vorschlaege anbieten *--------------------------------------------------------------------*/ //!! Start of extra code for context menu modifying extensions struct ExecuteInfo @@ -641,7 +641,7 @@ struct ExecuteInfo class AsyncExecute { public: - DECL_STATIC_LINK( AsyncExecute, ExecuteHdl_Impl, ExecuteInfo* ); + DECL_STATIC_LINK( AsyncExecute, ExecuteHdl_Impl, ExecuteInfo* ); }; IMPL_STATIC_LINK_NOINSTANCE( AsyncExecute, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo ) @@ -698,7 +698,7 @@ sal_Bool SwView::ExecSpellPopup(const Point& rPt) aMessageText = aGrammarCheckRes.aErrors[ nErrorInResult ].aShortComment; // we like to use the grammar checking context menu if we either get // some suggestions or at least a comment about the error found... - bUseGrammarContext = bCorrectionRes && + bUseGrammarContext = bCorrectionRes && (aSuggestions.getLength() > 0 || aMessageText.getLength() > 0); } @@ -709,11 +709,11 @@ sal_Bool SwView::ExecSpellPopup(const Point& rPt) // get paragraph text String aParaText; SwPosition aPoint( *pWrtShell->GetCrsr()->GetPoint() ); - const SwTxtNode *pNode = dynamic_cast< const SwTxtNode * >( + const SwTxtNode *pNode = dynamic_cast< const SwTxtNode * >( &aPoint.nNode.GetNode() ); if (pNode) - aParaText = pNode->GetTxt(); // this may include hidden text but that should be Ok - else + aParaText = pNode->GetTxt(); // this may include hidden text but that should be Ok + else { OSL_ENSURE(false, "text node expected but not found" ); } @@ -737,11 +737,11 @@ sal_Bool SwView::ExecSpellPopup(const Point& rPt) aEvent.ExecutePosition.Y = aPixPos.Y(); Menu* pMenu = 0; - ::rtl::OUString sMenuName = ::rtl::OUString::createFromAscii( + ::rtl::OUString sMenuName = ::rtl::OUString::createFromAscii( bUseGrammarContext ? "private:resource/GrammarContextMenu" : "private:resource/SpellContextMenu"); if(TryContextMenuInterception( *pPopup, sMenuName, pMenu, aEvent )) { - + //! happy hacking for context menu modifying extensions of this //! 'custom made' menu... *sigh* (code copied from sfx2 and framework) if ( pMenu ) @@ -770,7 +770,7 @@ sal_Bool SwView::ExecSpellPopup(const Point& rPt) uno::Reference< util::XURLTransformer > xURLTransformer; if (xMgr.is()) { - xURLTransformer = uno::Reference< util::XURLTransformer >( xMgr->createInstance( + xURLTransformer = uno::Reference< util::XURLTransformer >( xMgr->createInstance( C2U("com.sun.star.util.URLTransformer")), UNO_QUERY); } @@ -779,7 +779,7 @@ sal_Bool SwView::ExecSpellPopup(const Point& rPt) uno::Sequence< beans::PropertyValue > aArgs; xDispatch = xDispatchProvider->queryDispatch( aURL, rtl::OUString(), 0 ); - + if (xDispatch.is()) { // Execute dispatch asynchronously @@ -789,12 +789,12 @@ sal_Bool SwView::ExecSpellPopup(const Point& rPt) pExecuteInfo->aArgs = aArgs; Application::PostUserEvent( STATIC_LINK(0, AsyncExecute , ExecuteHdl_Impl), pExecuteInfo ); } - } + } catch (Exception &) { - } + } } - } + } else { pPopup->Execute( aToFill.SVRect(), pEditWin ); @@ -826,9 +826,9 @@ sal_Bool SwView::ExecSmartTagPopup( const Point& rPt ) // This data structure maps a smart tag type string to the property bag SwRect aToFill; Sequence< rtl::OUString > aSmartTagTypes; - Sequence< Reference< container::XStringKeyMap > > aStringKeyMaps; + Sequence< Reference< container::XStringKeyMap > > aStringKeyMaps; Reference<text::XTextRange> xRange; - + pWrtShell->GetSmartTagTerm( rPt, aToFill, aSmartTagTypes, aStringKeyMaps, xRange); if ( xRange.is() && aSmartTagTypes.getLength() ) { @@ -860,17 +860,17 @@ public: void *GetImplWin() { return NULL; //FIXME!!! -// return mpImplWin; +// return mpImplWin; } protected: virtual void LoseFocus() { -// printf("ListBox: lose focus!!\n"); +// printf("ListBox: lose focus!!\n"); ListBox::LoseFocus(); - } + } virtual void Select() { -// printf("SELECT!!! IsTravelSelect=%i\n", IsTravelSelect()); +// printf("SELECT!!! IsTravelSelect=%i\n", IsTravelSelect()); ListBox::Select(); } }; @@ -912,10 +912,10 @@ public: aText.SetText(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Cancel"))); Size tSize=aText.GetOptimalSize(WINDOWSIZE_PREFERRED); aText.SetSizePixel(Size(lbSize.Width(), tSize.Height())); - aText.SetPosPixel(Point(0, lbSize.Height())); + aText.SetPosPixel(Point(0, lbSize.Height())); aText.Show(); - SetSizePixel(Size(lbSize.Width(), lbSize.Height()+tSize.Height())); -// SetSizePixel(Size(200, 200)); + SetSizePixel(Size(lbSize.Width(), lbSize.Height()+tSize.Height())); +// SetSizePixel(Size(200, 200)); } int getSelection() { @@ -934,10 +934,10 @@ protected: virtual long PreNotify( NotifyEvent& rNEvt ) { if (rNEvt.GetType() == EVENT_LOSEFOCUS && aListBox.GetImplWin()==rNEvt.GetWindow()) { EndDialog(8); - return 1; + return 1; } if (rNEvt.GetType() == EVENT_KEYINPUT) { -// printf("PreNotify::KEYINPUT\n"); +// printf("PreNotify::KEYINPUT\n"); } return Dialog::PreNotify(rNEvt); } diff --git a/sw/source/ui/uiview/viewmdi.cxx b/sw/source/ui/uiview/viewmdi.cxx index 04309b9821a1..158fc595da66 100644 --- a/sw/source/ui/uiview/viewmdi.cxx +++ b/sw/source/ui/uiview/viewmdi.cxx @@ -66,7 +66,7 @@ #include <IDocumentSettingAccess.hxx> #include <PostItMgr.hxx> -USHORT SwView::nMoveType = NID_PGE; +USHORT SwView::nMoveType = NID_PGE; sal_Int32 SwView::nActMark = 0; @@ -117,7 +117,7 @@ void SwView::_SetZoom( const Size &rEditSize, SvxZoomType eZoomType, const MapMode aTmpMap( MAP_TWIP ); const Size aWindowSize( GetEditWin().PixelToLogic( rEditSize, aTmpMap ) ); - if( nsUseOnPage::PD_MIRROR == rDesc.GetUseOn() ) // gespiegelte Seiten + if( nsUseOnPage::PD_MIRROR == rDesc.GetUseOn() ) // gespiegelte Seiten { const SvxLRSpaceItem &rLeftLRSpace = rDesc.GetLeft().GetLRSpace(); aPageSize.Width() += Abs( long(rLeftLRSpace.GetLeft()) - long(rLRSpace.GetLeft()) ); @@ -165,10 +165,10 @@ void SwView::_SetZoom( const Size &rEditSize, SvxZoomType eZoomType, //MasterUsrPrefs updaten UND DANACH die ViewOptions der aktuellen //View updaten. if ( !bViewOnly && - (USHORT(nFac) != pUsrPref->GetZoom() || + (USHORT(nFac) != pUsrPref->GetZoom() || BYTE (eZoomType) != pUsrPref->GetZoomType()) ) { - pUsrPref->SetZoom ( USHORT(nFac) ); + pUsrPref->SetZoom ( USHORT(nFac) ); pUsrPref->SetZoomType( eZoomType ); SW_MOD()->ApplyUsrPref( *pUsrPref, bViewOnly ? this: 0, @@ -177,7 +177,7 @@ void SwView::_SetZoom( const Size &rEditSize, SvxZoomType eZoomType, } if ( pOpt->GetZoom() != (USHORT) nFac ) { - aOpt.SetZoom ( USHORT(nFac) ); + aOpt.SetZoom ( USHORT(nFac) ); aOpt.SetReadonly(pOpt->IsReadonly()); pWrtShell->ApplyViewOptions( aOpt ); } @@ -204,11 +204,11 @@ void SwView::_SetZoom( const Size &rEditSize, SvxZoomType eZoomType, // OS: Notloesung - in CalcVisArea wird u.U. wieder SetZoom gerufen und // dann werden falsche Werte eingestellt ((SwViewOption*)pWrtShell->GetViewOptions())->SetZoomType( eZoomType ); - CalcVisArea( rEditSize ); //fuer das Neuberechnen des sichtbaren Bereiches + CalcVisArea( rEditSize ); //fuer das Neuberechnen des sichtbaren Bereiches } else if ( USHORT(nFac) != pOpt->GetZoom() ) { - aOpt.SetZoom ( USHORT(nFac) ); + aOpt.SetZoom ( USHORT(nFac) ); pWrtShell->ApplyViewOptions( aOpt ); } @@ -230,7 +230,7 @@ void SwView::_SetZoom( const Size &rEditSize, SvxZoomType eZoomType, // mpPostItMgr->LayoutPostIts(); // } -// eZoom = eZoomType; +// eZoom = eZoomType; } void SwView::SetViewLayout( USHORT nColumns, bool bBookMode, BOOL bViewOnly ) @@ -355,9 +355,9 @@ int SwView::_CreateScrollbar( BOOL bHori ) void SwView::CreatePageButtons(BOOL bShow) { Window *pMDI = &GetViewFrame()->GetWindow(); - pPageUpBtn = new SwHlpImageButton(pMDI, SW_RES( BTN_PAGEUP ), TRUE ); + pPageUpBtn = new SwHlpImageButton(pMDI, SW_RES( BTN_PAGEUP ), TRUE ); pPageUpBtn->SetHelpId(HID_SCRL_PAGEUP); - pPageDownBtn = new SwHlpImageButton(pMDI, SW_RES( BTN_PAGEDOWN ), FALSE ); + pPageDownBtn = new SwHlpImageButton(pMDI, SW_RES( BTN_PAGEDOWN ), FALSE ); pPageDownBtn->SetHelpId(HID_SCRL_PAGEDOWN); Reference< XFrame > xFrame = GetViewFrame()->GetFrame().GetFrameInterface(); pNaviBtn = new SwNaviImageButton(pMDI, xFrame ); diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx index 2e92bc864234..4bdd79d27de0 100644 --- a/sw/source/ui/uiview/viewport.cxx +++ b/sw/source/ui/uiview/viewport.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -99,7 +99,7 @@ void lcl_GetPos(SwView* pView, long lDelta = lPos - rSh.VisArea().Pos().*pPt; const long lSize = aDocSz.*pSz + lBorder; // Bug 11693: sollte rechts oder unten zuviel Wiese sein, dann muss - // diese von der VisArea herausgerechnet werden! + // diese von der VisArea herausgerechnet werden! long nTmp = pView->GetVisArea().Right()+lDelta; if ( bHori && nTmp > lSize ) lDelta -= nTmp - lSize; @@ -113,7 +113,7 @@ void lcl_GetPos(SwView* pView, } /*-------------------------------------------------------------------- - Beschreibung: Nullpunkt Lineal setzen + Beschreibung: Nullpunkt Lineal setzen --------------------------------------------------------------------*/ void SwView::InvalidateRulerPos() { @@ -136,7 +136,7 @@ void SwView::InvalidateRulerPos() } /*-------------------------------------------------------------------- - Beschreibung: begrenzt das Scrollen soweit, dass jeweils nur einen + Beschreibung: begrenzt das Scrollen soweit, dass jeweils nur einen viertel Bildschirm bis vor das Ende des Dokumentes gescrollt werden kann. --------------------------------------------------------------------*/ @@ -154,7 +154,7 @@ long SwView::SetVScrollMax( long lMax ) { const long lBorder = IsDocumentBorder() ? DOCUMENTBORDER : DOCUMENTBORDER * 2; long lSize = GetDocSz().Height() + lBorder - aVisArea.GetHeight(); - return Max( Min( lMax, lSize), 0L ); // siehe horz. + return Max( Min( lMax, lSize), 0L ); // siehe horz. } Point SwView::AlignToPixel(const Point &rPt) const @@ -163,7 +163,7 @@ Point SwView::AlignToPixel(const Point &rPt) const } /*-------------------------------------------------------------------- - Beschreibung: Dokumentgroesse hat sich geaendert + Beschreibung: Dokumentgroesse hat sich geaendert --------------------------------------------------------------------*/ void SwView::DocSzChgd(const Size &rSz) { @@ -173,7 +173,7 @@ extern int bDocSzUpdated; aDocSz = rSz; - if( !pWrtShell || aVisArea.IsEmpty() ) // keine Shell -> keine Aenderung + if( !pWrtShell || aVisArea.IsEmpty() ) // keine Shell -> keine Aenderung { bDocSzUpdated = FALSE; return; @@ -213,13 +213,13 @@ aDocSz = rSz; } /*-------------------------------------------------------------------- - Beschreibung: Visarea neu setzen + Beschreibung: Visarea neu setzen --------------------------------------------------------------------*/ void SwView::SetVisArea( const Rectangle &rRect, BOOL bUpdateScrollbar ) { const Size aOldSz( aVisArea.GetSize() ); - const Point aTopLeft( AlignToPixel( rRect.TopLeft() )); + const Point aTopLeft( AlignToPixel( rRect.TopLeft() )); const Point aBottomRight( AlignToPixel( rRect.BottomRight() )); Rectangle aLR( aTopLeft, aBottomRight ); @@ -306,7 +306,7 @@ void SwView::SetVisArea( const Rectangle &rRect, BOOL bUpdateScrollbar ) } /*-------------------------------------------------------------------- - Beschreibung: Pos VisArea setzen + Beschreibung: Pos VisArea setzen --------------------------------------------------------------------*/ void SwView::SetVisArea( const Point &rPt, BOOL bUpdateScrollbar ) { @@ -318,7 +318,7 @@ void SwView::SetVisArea( const Point &rPt, BOOL bUpdateScrollbar ) //mal sehen wie weit wir mit der halben BrushSize kommen. //TODO: why BRUSH_SIZE? Point aPt( rPt ); -// const long nTmp = GetWrtShell().IsFrameView() ? BRUSH_SIZE/2 : BRUSH_SIZE; +// const long nTmp = GetWrtShell().IsFrameView() ? BRUSH_SIZE/2 : BRUSH_SIZE; const long nTmp = GetWrtShell().IsFrameView() ? 4 : 8; aPt = GetEditWin().LogicToPixel( aPt ); aPt.X() -= aPt.X() % nTmp; @@ -329,7 +329,7 @@ void SwView::SetVisArea( const Point &rPt, BOOL bUpdateScrollbar ) return; const long lXDiff = aVisArea.Left() - aPt.X(); - const long lYDiff = aVisArea.Top() - aPt.Y(); + const long lYDiff = aVisArea.Top() - aPt.Y(); SetVisArea( Rectangle( aPt, Point( aVisArea.Right() - lXDiff, aVisArea.Bottom() - lYDiff ) ), bUpdateScrollbar); @@ -353,13 +353,13 @@ void SwView::CheckVisArea() } /*-------------------------------------------------------------------- - Beschreibung: Sichtbaren Bereich berechnen + Beschreibung: Sichtbaren Bereich berechnen - OUT Point *pPt: neue Position des sichtbaren + OUT Point *pPt: neue Position des sichtbaren Bereiches - IN Rectangle &rRect: Rechteck, das sich innerhalb des neuen + IN Rectangle &rRect: Rechteck, das sich innerhalb des neuen sichtbaren Bereiches befinden soll - USHORT nRange optional exakte Angabe des Bereiches, + USHORT nRange optional exakte Angabe des Bereiches, um den ggfs. gescrollt werden soll --------------------------------------------------------------------*/ void SwView::CalcPt( Point *pPt, const Rectangle &rRect, @@ -377,12 +377,12 @@ void SwView::CalcPt( Point *pPt, const Rectangle &rRect, pPt->Y() = rRect.Top(); pPt->Y() = Max( lMin, pPt->Y() ); } - else if ( rRect.Top() < aVisArea.Top() ) //Verschiebung nach oben + else if ( rRect.Top() < aVisArea.Top() ) //Verschiebung nach oben { pPt->Y() = rRect.Top() - (nRangeY != USHRT_MAX ? nRangeY : nYScroll); pPt->Y() = Max( lMin, pPt->Y() ); } - else if( rRect.Bottom() > aVisArea.Bottom() ) //Verschiebung nach unten + else if( rRect.Bottom() > aVisArea.Bottom() ) //Verschiebung nach unten { pPt->Y() = rRect.Bottom() - (aVisArea.GetHeight()) + ( nRangeY != USHRT_MAX ? @@ -390,14 +390,14 @@ void SwView::CalcPt( Point *pPt, const Rectangle &rRect, pPt->Y() = SetVScrollMax( pPt->Y() ); } long nXScroll = GetXScroll(); - if ( rRect.Right() > aVisArea.Right() ) //Verschiebung nach rechts + if ( rRect.Right() > aVisArea.Right() ) //Verschiebung nach rechts { pPt->X() = rRect.Right() - (aVisArea.GetWidth()) + (nRangeX != USHRT_MAX ? nRangeX : nXScroll); pPt->X() = SetHScrollMax( pPt->X() ); } - else if ( rRect.Left() < aVisArea.Left() ) //Verschiebung nach links + else if ( rRect.Left() < aVisArea.Left() ) //Verschiebung nach links { pPt->X() = rRect.Left() - (nRangeX != USHRT_MAX ? nRangeX : nXScroll); pPt->X() = Max( ::GetLeftMargin( *this ) + nLeftOfst, pPt->X() ); @@ -407,7 +407,7 @@ void SwView::CalcPt( Point *pPt, const Rectangle &rRect, } /*-------------------------------------------------------------------- - Beschreibung: Scrolling + Beschreibung: Scrolling --------------------------------------------------------------------*/ BOOL SwView::IsScroll( const Rectangle &rRect ) const { @@ -446,7 +446,7 @@ void SwView::Scroll( const Rectangle &rRect, USHORT nRangeX, USHORT nRangeY ) if ( nTopDiff < nBottomDiff ) { if ( nBottomDiff > 0 ) // Ist unterhalb ueberhaupt Platz? - { // dann verschieben wir die Oberkante und merken uns dies + { // dann verschieben wir die Oberkante und merken uns dies nDiffY = aDlgRect.Bottom() - aVisArea.Top(); aVisArea.Top() += nDiffY; } @@ -518,7 +518,7 @@ void SwView::Scroll( const Rectangle &rRect, USHORT nRangeX, USHORT nRangeY ) aPnt.Y() += ( rRect.Top() + rRect.Bottom() - aVisArea.Top() - aVisArea.Bottom() ) / 2 - nDiffY; // ... in X-Richtung nur, wenn das Rechteck rechts oder links aus der - // VisArea hinausragt. + // VisArea hinausragt. if ( rRect.Right() > aVisArea.Right() || rRect.Left() < aVisArea.Left() ) { aPnt.X() += ( rRect.Left() + rRect.Right() @@ -537,7 +537,7 @@ void SwView::Scroll( const Rectangle &rRect, USHORT nRangeX, USHORT nRangeY ) } /*-------------------------------------------------------------------- - Beschreibung: Seitenweises Scrollen + Beschreibung: Seitenweises Scrollen Liefern den Wert, um den bei PageUp / -Down gescrollt werden soll --------------------------------------------------------------------*/ BOOL SwView::GetPageScrollUpOffset( SwTwips &rOff ) const @@ -674,7 +674,7 @@ long SwView::PageDownCrsr(BOOL bSelect) } /*------------------------------------------------------------------------ - Beschreibung: Handler der Scrollbars + Beschreibung: Handler der Scrollbars ------------------------------------------------------------------------*/ IMPL_LINK( SwView, ScrollHdl, SwScrollbar *, pScrollbar ) { @@ -689,7 +689,7 @@ IMPL_LINK( SwView, ScrollHdl, SwScrollbar *, pScrollbar ) { //Hier wieder auskommentieren wenn das mitscrollen nicht gewuenscht ist. // JP 21.07.00: the end scrollhandler invalidate the FN_STAT_PAGE, - // so we dont must do it agin. + // so we dont must do it agin. EndScrollHdl(pScrollbar); Point aPos( aVisArea.TopLeft() ); @@ -702,9 +702,9 @@ IMPL_LINK( SwView, ScrollHdl, SwScrollbar *, pScrollbar ) if(pWrtShell->GetPageNumber( aPos.Y(), FALSE, nPhNum, nVirtNum, sDisplay )) { // JP 21.07.00: the end scrollhandler invalidate the FN_STAT_PAGE, - // so we dont must do it agin. + // so we dont must do it agin. // if(!GetViewFrame()->GetFrame().IsInPlace()) -// S F X_BINDINGS().Update(FN_STAT_PAGE); +// S F X_BINDINGS().Update(FN_STAT_PAGE); //QuickHelp: if( pWrtShell->GetPageCnt() > 1 && Help::IsQuickHelpEnabled() ) @@ -716,8 +716,8 @@ IMPL_LINK( SwView, ScrollHdl, SwScrollbar *, pScrollbar ) pScrollbar->GetPosPixel() ).X() -8; aRect.Top() = pScrollbar->OutputToScreenPixel( pScrollbar->GetPointerPosPixel() ).Y(); - aRect.Right() = aRect.Left(); - aRect.Bottom() = aRect.Top(); + aRect.Right() = aRect.Left(); + aRect.Bottom() = aRect.Top(); String sPageStr( GetPageStr( nPhNum, nVirtNum, sDisplay )); SwContentAtPos aCnt( SwContentAtPos::SW_OUTLINE ); @@ -748,7 +748,7 @@ IMPL_LINK( SwView, ScrollHdl, SwScrollbar *, pScrollbar ) } /*------------------------------------------------------------------------ - Beschreibung: Handler der Scrollbars + Beschreibung: Handler der Scrollbars ------------------------------------------------------------------------*/ IMPL_LINK( SwView, EndScrollHdl, SwScrollbar *, pScrollbar ) { @@ -807,8 +807,8 @@ void SwView::CalcVisArea( const Size &rOutPixel ) const long lHeight = GetWrtShell().GetDocSize().Height() + lBorder; if ( aRect.Bottom() > lHeight ) { - long lDelta = aRect.Bottom() - lHeight; - aRect.Top() -= lDelta; + long lDelta = aRect.Bottom() - lHeight; + aRect.Top() -= lDelta; aRect.Bottom() -= lDelta; } } @@ -818,7 +818,7 @@ void SwView::CalcVisArea( const Size &rOutPixel ) } /*-------------------------------------------------------------------- - Beschreibung: Bedienelemente neu anordnen + Beschreibung: Bedienelemente neu anordnen --------------------------------------------------------------------*/ void SwView::CalcAndSetBorderPixel( SvBorder &rToFill, BOOL /*bInner*/ ) { @@ -911,7 +911,7 @@ void ViewResizePixel( const Window &rRef, if(!aSize.Height()) aSize.Height() = pHLineal->GetSizePixel().Height(); pHLineal->SetPosSizePixel( rOfst, aSize ); -// #46802 VCL ruft an unsichtbaren Fenstern kein Resize +// #46802 VCL ruft an unsichtbaren Fenstern kein Resize // fuer das Lineal ist das aber keine gute Idee if(!pHLineal->IsVisible()) pHLineal->Resize(); @@ -958,7 +958,7 @@ void ViewResizePixel( const Window &rRef, if(!bHidePageButtons) aSize.Height() -= nSubSize; else - aImgSz.Width() = 0; // kein Hide, weil das im Update Scrollbar missverstanden wird + aImgSz.Width() = 0; // kein Hide, weil das im Update Scrollbar missverstanden wird if ( nHBSzHeight ) aSize.Height() -= nHBSzHeight; @@ -981,7 +981,7 @@ void ViewResizePixel( const Window &rRef, aScrollFillPos.X() = aPos.X(); rScrollBarBox.SetPosSizePixel( aScrollFillPos, - Size( nHBSzHeight, nVBSzWidth) ); + Size( nHBSzHeight, nVBSzWidth) ); } } } @@ -1052,7 +1052,7 @@ void SwView::InnerResizePixel( const Point &rOfst, const Size &rSize ) const Fraction aFrac( nZoom, 100 ); pVRuler->SetZoom( aFrac ); pHRuler->SetZoom( aFrac ); - InvalidateRulerPos(); //Inhalt invalidieren. + InvalidateRulerPos(); //Inhalt invalidieren. } //CursorStack zuruecksetzen, da die Cursorpositionen fuer PageUp/-Down //nicht mehr zum aktuell sichtbaren Bereich passen @@ -1080,7 +1080,7 @@ void SwView::OuterResizePixel( const Point &rOfst, const Size &rSize ) // FME 22.08.2003 #i16909# - return, if no size (caused by minimize window). if ( bInOuterResizePixel || ( !rSize.Width() && !rSize.Height() ) ) return; - bInOuterResizePixel = TRUE; + bInOuterResizePixel = TRUE; // feststellen, ob Scrollbars angezeigt werden duerfen BOOL bBrowse = pWrtShell->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE); @@ -1151,7 +1151,7 @@ void SwView::OuterResizePixel( const Point &rOfst, const Size &rSize ) ShowAtResize(); if( pHRuler->IsVisible() || pVRuler->IsVisible() ) - InvalidateRulerPos(); //Inhalt invalidieren. + InvalidateRulerPos(); //Inhalt invalidieren. //CursorStack zuruecksetzen, da die Cursorpositionen fuer PageUp/-Down //nicht mehr zum aktuell sichtbaren Bereich passen @@ -1187,7 +1187,7 @@ void SwView::OuterResizePixel( const Point &rOfst, const Size &rSize ) //Nicht endlosschleifen. Moeglichst dann stoppen wenn die //(Auto-)Scrollbars sichtbar sind. - if ( bRepeat && + if ( bRepeat && ( nCnt > 10 || ( nCnt > 3 && bHAuto && bAuto ) ) ) { @@ -1304,7 +1304,7 @@ BOOL SwView::UpdateScrollbars() void SwView::Move() { if ( GetWrtShell().IsInSelect() ) - GetWrtShell().EndSelect(); //#32427# + GetWrtShell().EndSelect(); //#32427# SfxViewShell::Move(); } @@ -1324,7 +1324,7 @@ BOOL SwView::HandleWheelCommands( const CommandEvent& rCEvt ) bOk = TRUE; } else - { + { if (pWData && (COMMAND_WHEEL_SCROLL==pWData->GetMode()) && (((ULONG)0xFFFFFFFF) == pWData->GetScrollLines())) { if (pWData->GetDelta()<0) diff --git a/sw/source/ui/uiview/viewprt.cxx b/sw/source/ui/uiview/viewprt.cxx index 3366fa80db6f..878cb0ff2cae 100644 --- a/sw/source/ui/uiview/viewprt.cxx +++ b/sw/source/ui/uiview/viewprt.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -93,7 +93,7 @@ using namespace ::com::sun::star; /*-------------------------------------------------------------------- - Beschreibung: Drucker an Sfx uebergeben + Beschreibung: Drucker an Sfx uebergeben --------------------------------------------------------------------*/ SfxPrinter* __EXPORT SwView::GetPrinter( BOOL bCreate ) { @@ -109,7 +109,7 @@ SfxPrinter* __EXPORT SwView::GetPrinter( BOOL bCreate ) } /*-------------------------------------------------------------------- - Beschreibung: Druckerwechsel weitermelden + Beschreibung: Druckerwechsel weitermelden --------------------------------------------------------------------*/ void SetPrinter( IDocumentDeviceAccess* pIDDA, SfxPrinter* pNew, BOOL bWeb ) { @@ -168,7 +168,7 @@ USHORT __EXPORT SwView::SetPrinter(SfxPrinter* pNew, USHORT nDiffFlags, bool ) } /*-------------------------------------------------------------------- - Beschreibung: TabPage fuer applikationsspezifische Druckoptionen + Beschreibung: TabPage fuer applikationsspezifische Druckoptionen --------------------------------------------------------------------*/ SfxTabPage* __EXPORT SwView::CreatePrintOptionsPage(Window* pParent, const SfxItemSet& rSet) @@ -177,17 +177,17 @@ SfxTabPage* __EXPORT SwView::CreatePrintOptionsPage(Window* pParent, } /*-------------------------------------------------------------------- - Beschreibung: Druckerdialog + Beschreibung: Druckerdialog --------------------------------------------------------------------*/ PrintDialog* CreatePrintDialog( Window* pParent, USHORT nPg, SwWrtShell* pSh ) { PrintDialog *pDlg = new PrintDialog( pParent, false ); -// pDlg->ChangeFirstPage( 1 ); +// pDlg->ChangeFirstPage( 1 ); if ( !nPg ) nPg = 1; -// pDlg->ChangeLastPage( nPg ); -// pDlg->ChangeMaxPage( 9999 ); +// pDlg->ChangeLastPage( nPg ); +// pDlg->ChangeMaxPage( 9999 ); pDlg->EnableRange( PRINTDIALOG_FROMTO ); if (pSh && (pSh->IsSelection() || pSh->IsFrmSelected() || pSh->IsObjSelected())) @@ -202,13 +202,13 @@ PrintDialog* CreatePrintDialog( Window* pParent, USHORT nPg, SwWrtShell* pSh ) PrintDialog* __EXPORT SwView::CreatePrintDialog( Window* pParent ) { // AMA: Hier sollte vielleicht die virtuelle Seitennummer angezeigt werden, - // aber nur, wenn das Drucken virtuelle Seitennummern und nicht wie - // bisher (auch beim SWG 2.0) physikalische beachtet werden. + // aber nur, wenn das Drucken virtuelle Seitennummern und nicht wie + // bisher (auch beim SWG 2.0) physikalische beachtet werden. return ::CreatePrintDialog( pParent, GetWrtShell().GetPhyPageNum(), &GetWrtShell() ); } /*-------------------------------------------------------------------- - Beschreibung: Print-Dispatcher + Beschreibung: Print-Dispatcher --------------------------------------------------------------------*/ void __EXPORT SwView::ExecutePrint(SfxRequest& rReq) { @@ -277,7 +277,7 @@ void __EXPORT SwView::ExecutePrint(SfxRequest& rReq) short nBtn = SvxPrtQryBox(&GetEditWin()).Execute(); if( RET_CANCEL == nBtn ) return;; - + if( RET_OK == nBtn ) bPrintSelection = true; } @@ -301,7 +301,7 @@ void __EXPORT SwView::ExecutePrint(SfxRequest& rReq) } /*-------------------------------------------------------------------- - Beschreibung: Page Drucker/Zusaetze erzeugen fuer SwView und + Beschreibung: Page Drucker/Zusaetze erzeugen fuer SwView und SwPagePreview --------------------------------------------------------------------*/ SfxTabPage* CreatePrintOptionsPage( Window *pParent, @@ -343,10 +343,10 @@ void SetAppPrintOptions( ViewShell* pSh, BOOL bWeb ) // Applikationseigene Druckoptionen in SfxPrinter schiessen SwAddPrinterItem aAddPrinterItem (FN_PARAM_ADDPRINTER, aPrtData); SfxItemSet aSet( pSh->GetAttrPool(), - FN_PARAM_ADDPRINTER, FN_PARAM_ADDPRINTER, - SID_HTML_MODE, SID_HTML_MODE, - SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN, - SID_PRINTER_CHANGESTODOC, SID_PRINTER_CHANGESTODOC, + FN_PARAM_ADDPRINTER, FN_PARAM_ADDPRINTER, + SID_HTML_MODE, SID_HTML_MODE, + SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN, + SID_PRINTER_CHANGESTODOC, SID_PRINTER_CHANGESTODOC, 0 ); utl::MiscCfg aMisc; diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx index 2342a75c8aa7..dc114248040f 100644 --- a/sw/source/ui/uiview/viewsrch.cxx +++ b/sw/source/ui/uiview/viewsrch.cxx @@ -54,7 +54,7 @@ #include <workctrl.hxx> #include <view.hxx> #include <wrtsh.hxx> -#include <swundo.hxx> // fuer Undo-Ids +#include <swundo.hxx> // fuer Undo-Ids #include <uitool.hxx> #include <cmdid.h> #include <docsh.hxx> @@ -72,12 +72,12 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::util; using namespace ::com::sun::star::i18n; -#define SRCH_ATTR_OFF 0 +#define SRCH_ATTR_OFF 0 #define SRCH_ATTR_ON 1 #define SRCH_ATTR_SET 2 /*-------------------------------------------------------------------- - Beschreibung: Search Parameter + Beschreibung: Search Parameter --------------------------------------------------------------------*/ struct SwSearchOptions @@ -243,7 +243,7 @@ void SwView::ExecSearch(SfxRequest& rReq, BOOL bNoMessage) // 1) Selektion ersetzen (nicht. wenn nur Attribute ersetzt // werden sollen) //JP 27.04.95: warum ? -// was ist, wenn man das gefundene nur attributieren will?? +// was ist, wenn man das gefundene nur attributieren will?? USHORT nCmd = SVX_SEARCHCMD_FIND; if( pSrchItem->GetReplaceString().Len() || @@ -307,7 +307,7 @@ void SwView::ExecSearch(SfxRequest& rReq, BOOL bNoMessage) bExtra = FALSE; ULONG nFound; - { //Scope for SwWait-Object + { //Scope for SwWait-Object SwWait aWait( *GetDocShell(), TRUE ); pWrtShell->StartAllAction(); nFound = FUNC_Search( aOpts ); @@ -352,44 +352,44 @@ void SwView::ExecSearch(SfxRequest& rReq, BOOL bNoMessage) { static const USHORT aNormalAttr[] = { -/* 0 */ RES_CHRATR_CASEMAP, RES_CHRATR_CASEMAP, -/* 2 */ RES_CHRATR_COLOR, RES_CHRATR_POSTURE, -/* 4 */ RES_CHRATR_SHADOWED, RES_CHRATR_WORDLINEMODE, -/* 6 */ RES_CHRATR_BLINK, RES_CHRATR_BLINK, -/* 8 */ RES_CHRATR_BACKGROUND, RES_CHRATR_BACKGROUND, -/*10 */ RES_CHRATR_ROTATE, RES_CHRATR_ROTATE, -/*12 */ RES_CHRATR_SCALEW, RES_CHRATR_RELIEF, +/* 0 */ RES_CHRATR_CASEMAP, RES_CHRATR_CASEMAP, +/* 2 */ RES_CHRATR_COLOR, RES_CHRATR_POSTURE, +/* 4 */ RES_CHRATR_SHADOWED, RES_CHRATR_WORDLINEMODE, +/* 6 */ RES_CHRATR_BLINK, RES_CHRATR_BLINK, +/* 8 */ RES_CHRATR_BACKGROUND, RES_CHRATR_BACKGROUND, +/*10 */ RES_CHRATR_ROTATE, RES_CHRATR_ROTATE, +/*12 */ RES_CHRATR_SCALEW, RES_CHRATR_RELIEF, // insert position for CJK/CTL attributes! -/*14 */ RES_PARATR_LINESPACING, RES_PARATR_HYPHENZONE, -/*16 */ RES_PARATR_REGISTER, RES_PARATR_REGISTER, -/*18 */ RES_PARATR_VERTALIGN, RES_PARATR_VERTALIGN, -/*20 */ RES_LR_SPACE, RES_UL_SPACE, -/*22 */ SID_ATTR_PARA_MODEL, SID_ATTR_PARA_KEEP, -/*24 */ 0 +/*14 */ RES_PARATR_LINESPACING, RES_PARATR_HYPHENZONE, +/*16 */ RES_PARATR_REGISTER, RES_PARATR_REGISTER, +/*18 */ RES_PARATR_VERTALIGN, RES_PARATR_VERTALIGN, +/*20 */ RES_LR_SPACE, RES_UL_SPACE, +/*22 */ SID_ATTR_PARA_MODEL, SID_ATTR_PARA_KEEP, +/*24 */ 0 }; static const USHORT aCJKAttr[] = { - RES_CHRATR_CJK_FONT, RES_CHRATR_CJK_WEIGHT, + RES_CHRATR_CJK_FONT, RES_CHRATR_CJK_WEIGHT, RES_CHRATR_EMPHASIS_MARK, RES_CHRATR_TWO_LINES, RES_PARATR_SCRIPTSPACE, RES_PARATR_FORBIDDEN_RULES }; static const USHORT aCTLAttr[] = { - RES_CHRATR_CTL_FONT, RES_CHRATR_CTL_WEIGHT + RES_CHRATR_CTL_FONT, RES_CHRATR_CTL_WEIGHT }; SvUShorts aArr( 0, 16 ); - aArr.Insert( aNormalAttr, + aArr.Insert( aNormalAttr, SAL_N_ELEMENTS( aNormalAttr ), 0 ); if( SW_MOD()->GetCTLOptions().IsCTLFontEnabled() ) - aArr.Insert( aCTLAttr, + aArr.Insert( aCTLAttr, SAL_N_ELEMENTS( aCTLAttr ), 14 ); SvtCJKOptions aCJKOpt; if( aCJKOpt.IsAnyEnabled() ) - aArr.Insert( aCJKAttr, + aArr.Insert( aCJKAttr, SAL_N_ELEMENTS( aCJKAttr ), 14 ); @@ -668,8 +668,8 @@ ULONG SwView::FUNC_Search( const SwSearchOptions& rOptions ) /* -- Seitenumbruch mit Seitenvorlage */ ::SfxToSwPageDescAttr( *pWrtShell, *pReplSet ); - if( !pReplSet->Count() ) // schade, die Attribute - DELETEZ( pReplSet ); // kennen wir nicht + if( !pReplSet->Count() ) // schade, die Attribute + DELETEZ( pReplSet ); // kennen wir nicht } // @@ -771,16 +771,16 @@ void SwView::StateSearch(SfxItemSet &rSet) } break; -/* case SID_SEARCH_REPLACESET: +/* case SID_SEARCH_REPLACESET: case SID_SEARCH_SEARCHSET: { static USHORT __READONLY_DATA aSearchAttrRange[] = { - RES_CHRATR_CASEMAP, RES_CHRATR_POSTURE, - RES_CHRATR_SHADOWED, RES_CHRATR_WORDLINEMODE, + RES_CHRATR_CASEMAP, RES_CHRATR_POSTURE, + RES_CHRATR_SHADOWED, RES_CHRATR_WORDLINEMODE, RES_PARATR_LINESPACING, RES_PARATR_HYPHENZONE, - RES_LR_SPACE, RES_UL_SPACE, - SID_ATTR_PARA_MODEL, SID_ATTR_PARA_KEEP, + RES_LR_SPACE, RES_UL_SPACE, + SID_ATTR_PARA_MODEL, SID_ATTR_PARA_KEEP, 0 }; diff --git a/sw/source/ui/uiview/viewstat.cxx b/sw/source/ui/uiview/viewstat.cxx index fdaf59ec4742..e693d8d4cfe4 100644 --- a/sw/source/ui/uiview/viewstat.cxx +++ b/sw/source/ui/uiview/viewstat.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -82,7 +82,7 @@ void SwView::GetState(SfxItemSet &rSet) switch(nWhich) { case FN_EDIT_LINK_DLG: - if( !pWrtShell->GetLinkManager().GetLinks().Count() ) + if( !pWrtShell->GetLinkManager().GetLinks().Count() ) rSet.DisableItem(nWhich); else if( pWrtShell->IsSelFrmMode() && pWrtShell->IsSelObjProtected(FLYPROTECT_CONTENT)) @@ -126,7 +126,7 @@ void SwView::GetState(SfxItemSet &rSet) break; case SID_PRINTDOC: case SID_PRINTDOCDIRECT: - GetSlotState( nWhich, SfxViewShell::GetInterface(), &rSet ); + GetSlotState( nWhich, SfxViewShell::GetInterface(), &rSet ); break; case SID_ATTR_PAGE: case SID_ATTR_PAGE_SIZE: @@ -158,7 +158,7 @@ void SwView::GetState(SfxItemSet &rSet) case SID_UNDO: { //JP 21.07.98: Bug 53429 - die muss noch nicht vorhanden sein - // also lasse sie mal anlegen: + // also lasse sie mal anlegen: if( !pShell ) SelectShell(); @@ -293,7 +293,7 @@ void SwView::GetState(SfxItemSet &rSet) case SID_THESAURUS: { SwWrtShell &rSh = GetWrtShell(); - if (2 <= rSh.GetCrsrCnt()) // multi selection? + if (2 <= rSh.GetCrsrCnt()) // multi selection? rSet.DisableItem(nWhich); else { @@ -331,7 +331,7 @@ void SwView::GetState(SfxItemSet &rSet) case SID_DOCUMENT_COMPARE: case SID_DOCUMENT_MERGE: if( GetDocShell()->IsA( SwGlobalDocShell::StaticType() ) || -// pWrtShell->IsAnySectionInDoc( sal_True, sal_True, sal_True )|| +// pWrtShell->IsAnySectionInDoc( sal_True, sal_True, sal_True )|| (SID_DOCUMENT_MERGE == nWhich && pWrtShell->getIDocumentRedlineAccess()->GetRedlinePassword().getLength())) rSet.DisableItem(nWhich); break; diff --git a/sw/source/ui/uiview/viewtab.cxx b/sw/source/ui/uiview/viewtab.cxx index 4bb32d3667a9..2ac3c40a47f5 100644 --- a/sw/source/ui/uiview/viewtab.cxx +++ b/sw/source/ui/uiview/viewtab.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,8 +60,8 @@ #include "cmdid.h" #include "viewopt.hxx" #include "tabcol.hxx" -#include "frmfmt.hxx" // FrameFormat -#include "pagedesc.hxx" // Aktuelles Seitenformat +#include "frmfmt.hxx" // FrameFormat +#include "pagedesc.hxx" // Aktuelles Seitenformat #include "wview.hxx" #include "fmtcol.hxx" #include "section.hxx" @@ -77,11 +77,11 @@ using namespace ::com::sun::star; /*-------------------------------------------------------------------- - Beschreibung: Debug-Methode + Beschreibung: Debug-Methode --------------------------------------------------------------------*/ /*-------------------------------------------------------------------- - Beschreibung: Columns eintueten + Beschreibung: Columns eintueten --------------------------------------------------------------------*/ void lcl_FillSvxColumn(const SwFmtCol& rCol, USHORT nTotalWidth, @@ -122,7 +122,7 @@ void lcl_FillSvxColumn(const SwFmtCol& rCol, } /*-------------------------------------------------------------------- - Beschreibung: ColumnItem in ColumnInfo ueberfuehren + Beschreibung: ColumnItem in ColumnInfo ueberfuehren --------------------------------------------------------------------*/ void lcl_ConvertToCols(const SvxColumnItem& rColItem, USHORT nTotalWidth, @@ -134,7 +134,7 @@ void lcl_ConvertToCols(const SvxColumnItem& rColItem, if(rCols.GetNumCols() != rColItem.Count()) return; - USHORT nLeft = 0; + USHORT nLeft = 0; SwTwips nSumAll= 0; // Summiere alle Spalten und Raender auf SwColumns& rArr = rCols.GetColumns(); @@ -147,7 +147,7 @@ void lcl_ConvertToCols(const SvxColumnItem& rColItem, USHORT nEnd = static_cast< USHORT >(rColItem[i].nEnd); if(nStart < nEnd) nStart = nEnd; - const USHORT nDiff = nStart - nEnd; + const USHORT nDiff = nStart - nEnd; const USHORT nRight = nDiff / 2; USHORT nWidth = static_cast< USHORT >(rColItem[i].nEnd - rColItem[i].nStart); @@ -172,7 +172,7 @@ void lcl_ConvertToCols(const SvxColumnItem& rColItem, } /*-------------------------------------------------------------------- - Beschreibung: Tabs loeschen + Beschreibung: Tabs loeschen --------------------------------------------------------------------*/ void lcl_EraseDefTabs(SvxTabStopItem& rTabStops) { @@ -191,7 +191,7 @@ void lcl_EraseDefTabs(SvxTabStopItem& rTabStops) } /*-------------------------------------------------------------------- - Beschreibung: Seitenrand umdrehen + Beschreibung: Seitenrand umdrehen --------------------------------------------------------------------*/ void SwView::SwapPageMargin(const SwPageDesc& rDesc, SvxLRSpaceItem& rLRSpace) { @@ -207,7 +207,7 @@ void SwView::SwapPageMargin(const SwPageDesc& rDesc, SvxLRSpaceItem& rLRSpace) } /*-------------------------------------------------------------------- - Beschreibung: Wenn der Rahmenrand verschoben wird, sollen die + Beschreibung: Wenn der Rahmenrand verschoben wird, sollen die Spaltentrenner an der gleichen absoluten Position bleiben --------------------------------------------------------------------*/ void lcl_Scale(long& nVal, long nScale) @@ -256,21 +256,21 @@ void ResizeFrameCols(SwFmtCol& rCol, } /*-------------------------------------------------------------------- - Beschreibung: Hier werden alle Aenderungen der Tableiste + Beschreibung: Hier werden alle Aenderungen der Tableiste wieder in das Modell geschossen --------------------------------------------------------------------*/ void SwView::ExecTabWin( SfxRequest& rReq ) { - SwWrtShell &rSh = GetWrtShell(); - const USHORT nFrmType = rSh.IsObjSelected() ? + SwWrtShell &rSh = GetWrtShell(); + const USHORT nFrmType = rSh.IsObjSelected() ? FRMTYPE_DRAWOBJ : rSh.GetFrmType(0,TRUE); - const BOOL bFrmSelection = rSh.IsFrmSelected(); + const BOOL bFrmSelection = rSh.IsFrmSelected(); const BOOL bBrowse = rSh.getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE); - const USHORT nSlot = rReq.GetSlot(); - const USHORT nDescId = rSh.GetCurPageDesc(); + const USHORT nSlot = rReq.GetSlot(); + const USHORT nDescId = rSh.GetCurPageDesc(); const SwPageDesc& rDesc = rSh.GetPageDesc( nDescId ); const BOOL bVerticalWriting = rSh.IsInVerticalText(); @@ -290,7 +290,7 @@ void SwView::ExecTabWin( SfxRequest& rReq ) rSh.StartAllAction(); BOOL bSect = 0 != (nFrmType & FRMTYPE_COLSECT); - switch ( nSlot ) + switch ( nSlot ) { case SID_ATTR_LONG_LRSPACE: { @@ -415,7 +415,7 @@ void SwView::ExecTabWin( SfxRequest& rReq ) rSh.UpdateSection(rSh.GetSectionFmtPos(*pSectFmt), aData, &aSet); } else - { // Seitenraender einstellen + { // Seitenraender einstellen aLR.SetLeft((USHORT)aLongLR.GetLeft()); aLR.SetRight((USHORT)aLongLR.GetRight()); SwapPageMargin( rDesc, aLR ); @@ -505,7 +505,7 @@ void SwView::ExecTabWin( SfxRequest& rReq ) rSh.UpdateSection(rSh.GetSectionFmtPos(*pSectFmt), aData, &aSet); } else - { SwPageDesc aDesc( rDesc ); + { SwPageDesc aDesc( rDesc ); if ( nFrmType & ( FRMTYPE_HEADER | FRMTYPE_FOOTER )) { @@ -569,7 +569,7 @@ void SwView::ExecTabWin( SfxRequest& rReq ) ::MakeDefTabs( nDef, aTabStops ); SwTxtFmtColl* pColl = rSh.GetCurTxtFmtColl(); - if( pColl && pColl->IsAutoUpdateFmt() ) + if( pColl && pColl->IsAutoUpdateFmt() ) { SfxItemSet aTmp(GetPool(), RES_PARATR_TABSTOP, RES_PARATR_TABSTOP); aTmp.Put(aTabStops); @@ -665,7 +665,7 @@ void SwView::ExecTabWin( SfxRequest& rReq ) USHORT nDef = ::GetTabDist(rDefTabs); ::MakeDefTabs( nDef, aTabStops ); - if( pColl && pColl->IsAutoUpdateFmt()) + if( pColl && pColl->IsAutoUpdateFmt()) { SfxItemSet aSetTmp(GetPool(), RES_PARATR_TABSTOP, RES_PARATR_TABSTOP); aSetTmp.Put(aTabStops); @@ -887,20 +887,20 @@ void SwView::ExecTabWin( SfxRequest& rReq ) } /*-------------------------------------------------------------------- - Beschreibung: Hier wird der Status der Tableiste ermittelt + Beschreibung: Hier wird der Status der Tableiste ermittelt sprich alle relevanten Attribute an der CursorPos werden der Tableiste uebermittelt --------------------------------------------------------------------*/ void SwView::StateTabWin(SfxItemSet& rSet) { - SwWrtShell &rSh = GetWrtShell(); + SwWrtShell &rSh = GetWrtShell(); const Point* pPt = IsTabColFromDoc() || IsTabRowFromDoc() ? &aTabColFromDocPos : 0; - const USHORT nFrmType = rSh.IsObjSelected() + const USHORT nFrmType = rSh.IsObjSelected() ? FRMTYPE_DRAWOBJ : rSh.GetFrmType( pPt, TRUE ); - const BOOL bFrmSelection = rSh.IsFrmSelected(); + const BOOL bFrmSelection = rSh.IsFrmSelected(); const BOOL bBrowse = rSh.getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE); // PageOffset/Begrenzer @@ -931,7 +931,7 @@ void SwView::StateTabWin(SfxItemSet& rSet) SwapPageMargin( rDesc, aPageLRSpace ); SfxItemSet aCoreSet( GetPool(), RES_PARATR_TABSTOP, RES_PARATR_TABSTOP, - RES_LR_SPACE, RES_UL_SPACE, 0 ); + RES_LR_SPACE, RES_UL_SPACE, 0 ); // --> OD 2008-01-17 #newlistlevelattrs# // get also the list level indent values merged as LR-SPACE item, if needed. rSh.GetCurAttr( aCoreSet, true ); @@ -1280,7 +1280,7 @@ void SwView::StateTabWin(SfxItemSet& rSet) else if ( bHasTable ) { SwTabCols aTabCols; - USHORT nNum; + USHORT nNum; if ( 0 != ( bSetTabColFromDoc = IsTabColFromDoc() ) ) { rSh.GetMouseTabCols( aTabCols, aTabColFromDocPos ); @@ -1448,7 +1448,7 @@ void SwView::StateTabWin(SfxItemSet& rSet) rSet.DisableItem(nWhich); } else - { // Spalten auf der Seite + { // Spalten auf der Seite const SwFrmFmt& rMaster = rDesc.GetMaster(); SwFmtCol aCol(rMaster.GetCol()); if(rFrameDir.GetValue() == FRMDIR_HORI_RIGHT_TOP) @@ -1568,7 +1568,7 @@ void SwView::StateTabWin(SfxItemSet& rSet) { // PAGES01 SvxPagePosSizeItem aPagePosSize( - Point( rPageRect.Left(), rPageRect.Top()) , nPageWidth, nPageHeight); + Point( rPageRect.Left(), rPageRect.Top()) , nPageWidth, nPageHeight); rSet.Put(aPagePosSize); break; @@ -1700,10 +1700,10 @@ void SwView::StateTabWin(SfxItemSet& rSet) } } else - { //hier nur fuer Tabelle in mehrspaltigen Seiten und Rahmen + { //hier nur fuer Tabelle in mehrspaltigen Seiten und Rahmen BOOL bSectOutTbl = (nFrmType & FRMTYPE_TABLE) ? TRUE : FALSE; BOOL bFrame = (nFrmType & FRMTYPE_FLY_ANY) ? TRUE : FALSE; - BOOL bColSct = (nFrmType & ( bSectOutTbl + BOOL bColSct = (nFrmType & ( bSectOutTbl ? FRMTYPE_COLSECTOUTTAB : FRMTYPE_COLSECT ) ) ? TRUE : FALSE; @@ -1765,7 +1765,7 @@ void SwView::StateTabWin(SfxItemSet& rSet) if( bFrame | bColSct ) { aRectangle.Left() = aRect.Left() - rPageRect.Left() + nStart; - aRectangle.Right() = nPageWidth - aRectangle.Left() - nEnd + nStart; + aRectangle.Right() = nPageWidth - aRectangle.Left() - nEnd + nStart; } else if(!bBrowse) { @@ -1804,9 +1804,9 @@ void SwView::StateTabWin(SfxItemSet& rSet) BYTE nProtect = pWrtShell->IsSelObjProtected( FLYPROTECT_SIZE|FLYPROTECT_POS|FLYPROTECT_CONTENT ); SvxProtectItem aProt(SID_RULER_PROTECT); - aProt.SetCntntProtect((nProtect & FLYPROTECT_CONTENT) != 0); - aProt.SetSizeProtect ((nProtect & FLYPROTECT_SIZE) != 0); - aProt.SetPosProtect ((nProtect & FLYPROTECT_POS) != 0); + aProt.SetCntntProtect((nProtect & FLYPROTECT_CONTENT) != 0); + aProt.SetSizeProtect ((nProtect & FLYPROTECT_SIZE) != 0); + aProt.SetPosProtect ((nProtect & FLYPROTECT_POS) != 0); rSet.Put(aProt); } else |