diff options
Diffstat (limited to 'sw/source/ui/shells')
28 files changed, 332 insertions, 332 deletions
diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx index 475d1fecddd1..bcd0dcd5fade 100644 --- a/sw/source/ui/shells/annotsh.cxx +++ b/sw/source/ui/shells/annotsh.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 @@ -621,7 +621,7 @@ void SwAnnotationShell::GetState(SfxItemSet& rSet) case SID_ATTR_CHAR_COLOR: nEEWhich = EE_CHAR_COLOR; break; case SID_ATTR_CHAR_UNDERLINE: nEEWhich = EE_CHAR_UNDERLINE;break; case SID_ATTR_CHAR_OVERLINE: nEEWhich = EE_CHAR_OVERLINE;break; - case SID_ATTR_CHAR_CONTOUR: nEEWhich = EE_CHAR_OUTLINE; break; + case SID_ATTR_CHAR_CONTOUR: nEEWhich = EE_CHAR_OUTLINE; break; case SID_ATTR_CHAR_SHADOWED: nEEWhich = EE_CHAR_SHADOW;break; case SID_ATTR_CHAR_STRIKEOUT: nEEWhich = EE_CHAR_STRIKEOUT;break; case SID_ATTR_CHAR_LANGUAGE : nEEWhich = EE_CHAR_LANGUAGE;break; @@ -819,7 +819,7 @@ void SwAnnotationShell::ExecClpbrd(SfxRequest &rReq) SfxAbstractPasteDialog* pDlg = pFact->CreatePasteDialog( &rView.GetEditWin() ); pDlg->Insert( SOT_FORMAT_STRING, aEmptyStr ); - pDlg->Insert( SOT_FORMAT_RTF, aEmptyStr ); + pDlg->Insert( SOT_FORMAT_RTF, aEmptyStr ); TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( &rView.GetEditWin() ) ); @@ -1134,7 +1134,7 @@ void SwAnnotationShell::ExecLingu(SfxRequest &rReq) aOldSelection = pOLV->GetSelection(); if (!pOLV->GetEditView().HasSelection()) { - bRestoreSelection = true; + bRestoreSelection = true; pOLV->GetEditView().SelectCurrentWord(); } @@ -1150,7 +1150,7 @@ void SwAnnotationShell::ExecLingu(SfxRequest &rReq) if (aReplaceText.Len() > 0) ReplaceTextWithSynonym( pOLV->GetEditView(), aReplaceText ); break; - } + } case SID_THESAURUS: { pOLV->StartThesaurus(); @@ -1259,7 +1259,7 @@ void SwAnnotationShell::GetLinguState(SfxItemSet &rSet) SwLangHelper::GetLanguageStatus(pOLV,rSet); break; } - + case SID_THES: { String aStatusVal; @@ -1274,8 +1274,8 @@ void SwAnnotationShell::GetLinguState(SfxItemSet &rSet) !xThes.is() || nLang == LANGUAGE_NONE || !xThes->hasLocale( aLocale )) rSet.DisableItem( SID_THES ); break; - } - + } + // disable "Thesaurus" if the language is not supported case SID_THESAURUS: { @@ -1651,7 +1651,7 @@ void SwAnnotationShell::InsertSymbol(SfxRequest& rReq) // attributieren (Font setzen) SfxItemSet aSetFont( *aFontSet.GetPool(), aFontSet.GetRanges() ); - SvxFontItem aFontItem (aFont.GetFamily(), aFont.GetName(), + SvxFontItem aFontItem (aFont.GetFamily(), aFont.GetName(), aFont.GetStyleName(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO ); diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx index b23744a8bcd9..71a212c18bf7 100644 --- a/sw/source/ui/shells/basesh.cxx +++ b/sw/source/ui/shells/basesh.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 @@ -141,12 +141,12 @@ static BYTE nFooterPos; #include <sfx2/msg.hxx> #include "swslots.hxx" -#define SWCONTOURDLG(rView) ( (SvxContourDlg*) ( rView.GetViewFrame()->GetChildWindow( \ - SvxContourDlgChildWindow::GetChildWindowId() )-> \ +#define SWCONTOURDLG(rView) ( (SvxContourDlg*) ( rView.GetViewFrame()->GetChildWindow( \ + SvxContourDlgChildWindow::GetChildWindowId() )-> \ GetWindow() ) ) -#define SWIMAPDLG(rView) ( (SvxIMapDlg*) ( rView.GetViewFrame()->GetChildWindow( \ - SvxIMapDlgChildWindow::GetChildWindowId() )-> \ +#define SWIMAPDLG(rView) ( (SvxIMapDlg*) ( rView.GetViewFrame()->GetChildWindow( \ + SvxIMapDlgChildWindow::GetChildWindowId() )-> \ GetWindow() ) ) @@ -164,7 +164,7 @@ SFX_IMPL_INTERFACE(SwBaseShell, SfxShell, SW_RES(0)) TYPEINIT1(SwBaseShell,SfxShell) /*-------------------------------------------------------------------- - Beschreibung: statics + Beschreibung: statics --------------------------------------------------------------------*/ void lcl_UpdateIMapDlg( SwWrtShell& rSh ) { @@ -209,7 +209,7 @@ BOOL lcl_UpdateContourDlg( SwWrtShell &rSh, int nSel ) } /*-------------------------------------------------------------------- - Beschreibung: loeschen + Beschreibung: loeschen --------------------------------------------------------------------*/ void SwBaseShell::ExecDelete(SfxRequest &rReq) { @@ -237,8 +237,8 @@ void SwBaseShell::ExecDelete(SfxRequest &rReq) } else // JP 15.07.96: wenns nicht mehr nach vorne geht, die - // Numerierung aufheben. Z.B. am Doc-/ - // Rahmen-/Tabellen-/Bereichs-Anfang + // Numerierung aufheben. Z.B. am Doc-/ + // Rahmen-/Tabellen-/Bereichs-Anfang rSh.DelNumRules(); rSh.EndCrsrMove(); @@ -422,7 +422,7 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq) } /*-------------------------------------------------------------------- - Beschreibung: ClipBoard-Status + Beschreibung: ClipBoard-Status --------------------------------------------------------------------*/ void SwBaseShell::StateClpbrd(SfxItemSet &rSet) { @@ -478,7 +478,7 @@ void SwBaseShell::StateClpbrd(SfxItemSet &rSet) } /*-------------------------------------------------------------------- - Beschreibung: Undo ausfuehren + Beschreibung: Undo ausfuehren --------------------------------------------------------------------*/ void SwBaseShell::ExecUndo(SfxRequest &rReq) { @@ -518,7 +518,7 @@ void SwBaseShell::ExecUndo(SfxRequest &rReq) } /*-------------------------------------------------------------------- - Beschreibung: Zustand Undo + Beschreibung: Zustand Undo --------------------------------------------------------------------*/ void SwBaseShell::StateUndo(SfxItemSet &rSet) { @@ -548,7 +548,7 @@ void SwBaseShell::StateUndo(SfxItemSet &rSet) break; } case SID_REPEAT: - { // Repeat nur moeglich wenn kein REDO moeglich - UI-Restriktion + { // Repeat nur moeglich wenn kein REDO moeglich - UI-Restriktion if(rSh.GetRedoIds() == UNDO_EMPTY && !rSh.IsSelFrmMode() && rSh.GetRepeatIds() ) @@ -585,7 +585,7 @@ void SwBaseShell::StateUndo(SfxItemSet &rSet) } /*-------------------------------------------------------------------- - Beschreibung: Slot-Id auswerten bzw. Dispatchen + Beschreibung: Slot-Id auswerten bzw. Dispatchen --------------------------------------------------------------------*/ void SwBaseShell::Execute(SfxRequest &rReq) { @@ -945,7 +945,7 @@ void SwBaseShell::Execute(SfxRequest &rReq) break; case SID_IMAP: { - USHORT nId = SvxIMapDlgChildWindow::GetChildWindowId(); + USHORT nId = SvxIMapDlgChildWindow::GetChildWindowId(); SfxViewFrame* pVFrame = GetView().GetViewFrame(); pVFrame->ToggleChildWindow( nId ); @@ -957,7 +957,7 @@ void SwBaseShell::Execute(SfxRequest &rReq) break; case SID_IMAP_EXEC: { - SvxIMapDlg* pDlg = SWIMAPDLG(GetView()); + SvxIMapDlg* pDlg = SWIMAPDLG(GetView()); // Kontrolle, ob Zuweisung ueberhaupt sinnvoll/erlaubt if ( rSh.IsFrmSelected() && @@ -1186,7 +1186,7 @@ void SwBaseShell::Execute(SfxRequest &rReq) case RES_SHADOW: { rSh.StartAllAction(); - SfxItemSet aSet( rSh.GetAttrPool(), + SfxItemSet aSet( rSh.GetAttrPool(), RES_SHADOW, RES_SHADOW, RES_BACKGROUND, RES_BACKGROUND, 0 ); @@ -1403,7 +1403,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet ) break; case RES_SHADOW: { - SfxItemSet aSet( rSh.GetAttrPool(), + SfxItemSet aSet( rSh.GetAttrPool(), RES_SHADOW, RES_SHADOW ); // Tabellenzelle(n) selektiert? @@ -1794,7 +1794,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet ) } /*-------------------------------------------------------------------- - Beschreibung: Slots mit dieser Statusmethode disablen + Beschreibung: Slots mit dieser Statusmethode disablen --------------------------------------------------------------------*/ void SwBaseShell::StateDisableItems( SfxItemSet &rSet ) { @@ -1809,7 +1809,7 @@ void SwBaseShell::StateDisableItems( SfxItemSet &rSet ) } /*-------------------------------------------------------------------- - Beschreibung: Slots mit dieser Statusmethode disablen + Beschreibung: Slots mit dieser Statusmethode disablen --------------------------------------------------------------------*/ void SwBaseShell::StateStyle( SfxItemSet &rSet ) { @@ -1924,7 +1924,7 @@ void SwBaseShell::SetWrapMode( USHORT nSlot ) } /*-------------------------------------------------------------------- - Beschreibung: Update der Statuszeile erzwingen + Beschreibung: Update der Statuszeile erzwingen --------------------------------------------------------------------*/ void SwBaseShell::SetFrmMode(FlyMode eMode, SwWrtShell *pSh ) { @@ -1935,7 +1935,7 @@ void SwBaseShell::SetFrmMode(FlyMode eMode, SwWrtShell *pSh ) (pSh && (pSh->IsFrmSelected() || pSh->IsObjSelected())) ) { const SfxPointItem aTmp1( SID_ATTR_POSITION, pSh->GetAnchorObjDiff()); - const SvxSizeItem aTmp2( SID_ATTR_SIZE, pSh->GetObjSize()); + const SvxSizeItem aTmp2( SID_ATTR_SIZE, pSh->GetObjSize()); rBnd.SetState( aTmp1 ); rBnd.SetState( aTmp2 ); } @@ -1950,7 +1950,7 @@ void SwBaseShell::SetFrmMode(FlyMode eMode, SwWrtShell *pSh ) } /*-------------------------------------------------------------------- - Beschreibung: Ctor + Beschreibung: Ctor --------------------------------------------------------------------*/ SwBaseShell::SwBaseShell(SwView& rVw) : SfxShell( &rVw ), @@ -2192,7 +2192,7 @@ void SwBaseShell::GetBckColState(SfxItemSet &rSet) USHORT nWhich = aIter.FirstWhich(); int nSelType = rSh.GetSelectionType(); -// if ( nSelType & nsSelectionType::SEL_GRF || +// if ( nSelType & nsSelectionType::SEL_GRF || if( nSelType & nsSelectionType::SEL_OLE ) { rSet.DisableItem( SID_BACKGROUND_COLOR ); @@ -2272,7 +2272,7 @@ void SwBaseShell::ExecBckCol(SfxRequest& rReq) aBrushItem = (const SvxBrushItem&)aCoreSet.Get(RES_BACKGROUND); } -// BOOL bMsgOk = FALSE; +// BOOL bMsgOk = FALSE; switch (nSlot) { @@ -2285,7 +2285,7 @@ void SwBaseShell::ExecBckCol(SfxRequest& rReq) //Brush &rBrush = aBrushItem.GetBrush(); if(pArgs) { - const SvxColorItem& rNewColorItem = (const SvxColorItem&) + const SvxColorItem& rNewColorItem = (const SvxColorItem&) pArgs->Get(SID_BACKGROUND_COLOR); const Color& rNewColor = rNewColorItem.GetValue(); aBrushItem.SetColor( rNewColor ); @@ -2308,7 +2308,7 @@ void SwBaseShell::ExecBckCol(SfxRequest& rReq) } break; default: -// bMsgOk = FALSE; +// bMsgOk = FALSE; rReq.Ignore(); OSL_ENSURE(false, "unknown message in ExecuteAttr!" ); return; @@ -2333,7 +2333,7 @@ void SwBaseShell::ExecBckCol(SfxRequest& rReq) else { SwTxtFmtColl* pColl = rSh.GetCurTxtFmtColl(); - if( pColl && pColl->IsAutoUpdateFmt()) + if( pColl && pColl->IsAutoUpdateFmt()) { SfxItemSet aSet(GetPool(), RES_BACKGROUND, RES_BACKGROUND ); aSet.Put(aBrushItem); @@ -2421,8 +2421,8 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq) break; case FN_FORMAT_BORDER_DLG: { - SfxItemSet aSet( rSh.GetAttrPool(), - RES_BOX , RES_SHADOW, + SfxItemSet aSet( rSh.GetAttrPool(), + RES_BOX , RES_SHADOW, SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER, 0 ); SfxAbstractDialog * pDlg = 0; @@ -2702,7 +2702,7 @@ void SwBaseShell::InsertTable( SfxRequest& _rRequest ) aRewriter.AddRule(UNDO_ARG3, SW_RES(STR_END_QUOTE)); } - rSh.EndUndo(UNDO_INSTABLE, &aRewriter); // wegen moegl. Shellwechsel + rSh.EndUndo(UNDO_INSTABLE, &aRewriter); // wegen moegl. Shellwechsel } } } @@ -2721,7 +2721,7 @@ void SwBaseShell::GetGalleryState( SfxItemSet &rSet ) List *pLst = aLst.GetList(); nParagraphPos = nGraphicPos = nOlePos = nFramePos = nTablePos = nTableRowPos = nTableCellPos = nPagePos = - nHeaderPos = nFooterPos = 0; + nHeaderPos = nFooterPos = 0; BYTE nPos = 1; pLst->Insert( (void*) new SW_RESSTR( STR_SWBG_PAGE ), pLst->Count() ); nPagePos = nPos++; diff --git a/sw/source/ui/shells/beziersh.cxx b/sw/source/ui/shells/beziersh.cxx index 25ff17cd7551..37ecf90a424f 100644 --- a/sw/source/ui/shells/beziersh.cxx +++ b/sw/source/ui/shells/beziersh.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 @@ -70,17 +70,17 @@ SwBezierShell::SwBezierShell(SwView &_rView): SetHelpId(SW_BEZIERSHELL); SwWrtShell *pSh = &GetShell(); - SdrView* pSdrView = pSh->GetDrawView(); + SdrView* pSdrView = pSh->GetDrawView(); pSdrView->SetEliminatePolyPointLimitAngle(1500L); } void SwBezierShell::Execute(SfxRequest &rReq) { SwWrtShell *pSh = &GetShell(); - SdrView* pSdrView = pSh->GetDrawView(); + SdrView* pSdrView = pSh->GetDrawView(); const SfxItemSet *pArgs = rReq.GetArgs(); - USHORT nSlotId = rReq.GetSlot(); - BOOL bChanged = pSdrView->GetModel()->IsChanged(); + USHORT nSlotId = rReq.GetSlot(); + BOOL bChanged = pSdrView->GetModel()->IsChanged(); pSdrView->GetModel()->SetChanged(FALSE); const SfxPoolItem* pItem; if(pArgs) diff --git a/sw/source/ui/shells/drawdlg.cxx b/sw/source/ui/shells/drawdlg.cxx index 496c218d6982..6caa02e5ba92 100644 --- a/sw/source/ui/shells/drawdlg.cxx +++ b/sw/source/ui/shells/drawdlg.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 @@ -51,10 +51,10 @@ void SwDrawShell::ExecDrawDlg(SfxRequest& rReq) { - SwWrtShell* pSh = &GetShell(); - SdrView* pView = pSh->GetDrawView(); - SdrModel* pDoc = pView->GetModel(); - BOOL bChanged = pDoc->IsChanged(); + SwWrtShell* pSh = &GetShell(); + SdrView* pView = pSh->GetDrawView(); + SdrModel* pDoc = pView->GetModel(); + BOOL bChanged = pDoc->IsChanged(); pDoc->SetChanged(FALSE); SfxItemSet aNewAttr( pDoc->GetItemPool() ); @@ -178,9 +178,9 @@ void SwDrawShell::ExecDrawDlg(SfxRequest& rReq) void SwDrawShell::ExecDrawAttrArgs(SfxRequest& rReq) { SwWrtShell* pSh = &GetShell(); - SdrView* pView = pSh->GetDrawView(); + SdrView* pView = pSh->GetDrawView(); const SfxItemSet* pArgs = rReq.GetArgs(); - BOOL bChanged = pView->GetModel()->IsChanged(); + BOOL bChanged = pView->GetModel()->IsChanged(); pView->GetModel()->SetChanged(FALSE); GetView().NoRotate(); diff --git a/sw/source/ui/shells/drawsh.cxx b/sw/source/ui/shells/drawsh.cxx index 0e22efaa6a60..9744c07df768 100644 --- a/sw/source/ui/shells/drawsh.cxx +++ b/sw/source/ui/shells/drawsh.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 @@ -86,12 +86,12 @@ TYPEINIT1(SwDrawShell,SwDrawBaseShell) void SwDrawShell::Execute(SfxRequest &rReq) { - SwWrtShell &rSh = GetShell(); - SdrView *pSdrView = rSh.GetDrawView(); - const SfxItemSet *pArgs = rReq.GetArgs(); - SfxBindings &rBnd = GetView().GetViewFrame()->GetBindings(); - USHORT nSlotId = rReq.GetSlot(); - BOOL bChanged = pSdrView->GetModel()->IsChanged(); + SwWrtShell &rSh = GetShell(); + SdrView *pSdrView = rSh.GetDrawView(); + const SfxItemSet *pArgs = rReq.GetArgs(); + SfxBindings &rBnd = GetView().GetViewFrame()->GetBindings(); + USHORT nSlotId = rReq.GetSlot(); + BOOL bChanged = pSdrView->GetModel()->IsChanged(); pSdrView->GetModel()->SetChanged(FALSE); @@ -302,7 +302,7 @@ void SwDrawShell::GetState(SfxItemSet& rSet) USHORT nWhich = aIter.FirstWhich(); BOOL bProtected = rSh.IsSelObjProtected(FLYPROTECT_CONTENT); - if (!bProtected) // Im Parent nachsehen + if (!bProtected) // Im Parent nachsehen bProtected |= rSh.IsSelObjProtected( FLYPROTECT_CONTENT|FLYPROTECT_PARENT ) != 0; while( nWhich ) @@ -382,8 +382,8 @@ SwDrawShell::SwDrawShell(SwView &_rView) : void SwDrawShell::ExecFormText(SfxRequest& rReq) { SwWrtShell &rSh = GetShell(); - SdrView* pDrView = rSh.GetDrawView(); - BOOL bChanged = pDrView->GetModel()->IsChanged(); + SdrView* pDrView = rSh.GetDrawView(); + BOOL bChanged = pDrView->GetModel()->IsChanged(); pDrView->GetModel()->SetChanged(FALSE); const SdrMarkList& rMarkList = pDrView->GetMarkedObjectList(); @@ -450,7 +450,7 @@ void SwDrawShell::GetFormTextState(SfxItemSet& rSet) if ( pObj == NULL || !pObj->ISA(SdrTextObj) || !((SdrTextObj*) pObj)->HasText() ) { -#define XATTR_ANZ 12 +#define XATTR_ANZ 12 static const USHORT nXAttr[ XATTR_ANZ ] = { XATTR_FORMTXTSTYLE, XATTR_FORMTXTADJUST, XATTR_FORMTXTDISTANCE, diff --git a/sw/source/ui/shells/drformsh.cxx b/sw/source/ui/shells/drformsh.cxx index fca6bb3aaf07..afd4585286de 100644 --- a/sw/source/ui/shells/drformsh.cxx +++ b/sw/source/ui/shells/drformsh.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 @@ -115,7 +115,7 @@ void SwDrawFormShell::Execute(SfxRequest &rReq) //issue a new command to insert the link rTempView.GetViewFrame()->GetDispatcher()->Execute( SID_HYPERLINK_SETLINK, SFX_CALLMODE_ASYNCHRON, &rHLinkItem, 0); - } + } else { uno::Reference< awt::XControlModel > xControlModel = pUnoCtrl->GetUnoControlModel(); diff --git a/sw/source/ui/shells/drwbassh.cxx b/sw/source/ui/shells/drwbassh.cxx index 5945e8d327d4..e7d461b82c6f 100644 --- a/sw/source/ui/shells/drwbassh.cxx +++ b/sw/source/ui/shells/drwbassh.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 @@ -111,10 +111,10 @@ SwDrawBaseShell::~SwDrawBaseShell() void SwDrawBaseShell::Execute(SfxRequest &rReq) { SwWrtShell *pSh = &GetShell(); - SdrView* pSdrView = pSh->GetDrawView(); + SdrView* pSdrView = pSh->GetDrawView(); const SfxItemSet *pArgs = rReq.GetArgs(); - USHORT nSlotId = rReq.GetSlot(); - BOOL bChanged = pSdrView->GetModel()->IsChanged(); + USHORT nSlotId = rReq.GetSlot(); + BOOL bChanged = pSdrView->GetModel()->IsChanged(); pSdrView->GetModel()->SetChanged(FALSE); const SfxPoolItem* pItem = 0; if(pArgs) @@ -146,7 +146,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq) const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); if( rMarkList.GetMark(0) != 0 ) { - SfxItemSet aSet(GetPool(), RES_SURROUND, RES_SURROUND, + SfxItemSet aSet(GetPool(), RES_SURROUND, RES_SURROUND, RES_ANCHOR, RES_ANCHOR, RES_LR_SPACE, RES_UL_SPACE, SID_HTML_MODE, SID_HTML_MODE, @@ -400,7 +400,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq) GetView().GetDrawFuncPtr()->Deactivate(); GetView().SetDrawFuncPtr(NULL); } - GetView().LeaveDrawCreate(); // In Selektionsmode wechseln + GetView().LeaveDrawCreate(); // In Selektionsmode wechseln } if (pSh->IsSelFrmMode()) @@ -416,7 +416,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq) case SID_GROUP: if (pSh->IsObjSelected() > 1 && pSh->IsGroupAllowed()) { - pSh->GroupSelection(); // Objekt gruppieren + pSh->GroupSelection(); // Objekt gruppieren rBind.Invalidate(SID_UNGROUP); } break; @@ -424,7 +424,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq) case SID_UNGROUP: if (pSh->IsGroupSelected()) { - pSh->UnGroupSelection(); // Objektgruppierung aufheben + pSh->UnGroupSelection(); // Objektgruppierung aufheben rBind.Invalidate(SID_GROUP); } break; @@ -457,7 +457,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); if( rMarkList.GetMarkCount() == 1 && bAlignPossible ) - { // Objekte nicht aneinander ausrichten + { // Objekte nicht aneinander ausrichten USHORT nAnchor = pSh->GetAnchorId(); if (nAnchor == FLY_AS_CHAR) @@ -491,7 +491,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq) break; } if (nAnchor == FLY_AT_PARA) - break; // Absatzverankerte Rahmen nicht ausrichten + break; // Absatzverankerte Rahmen nicht ausrichten } pSh->StartAction(); @@ -674,7 +674,7 @@ void SwDrawBaseShell::GetState(SfxItemSet& rSet) USHORT nWhich = aIter.FirstWhich(); BOOL bProtected = rSh.IsSelObjProtected(FLYPROTECT_CONTENT); - if (!bProtected) // Im Parent nachsehen + if (!bProtected) // Im Parent nachsehen bProtected |= rSh.IsSelObjProtected( FLYPROTECT_CONTENT|FLYPROTECT_PARENT ) != 0; while( nWhich ) diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx index 6b831509558b..a3598f97808e 100644 --- a/sw/source/ui/shells/drwtxtex.cxx +++ b/sw/source/ui/shells/drwtxtex.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 @@ -160,14 +160,14 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) aOldSelection = pOLV->GetSelection(); if (!pOLV->GetEditView().HasSelection()) { - bRestoreSelection = true; + bRestoreSelection = true; pOLV->GetEditView().SelectCurrentWord(); } bRestoreSelection = SwLangHelper::SetLanguageStatus(pOLV,rReq,GetView(),rSh); break; } - + case SID_THES: { String aReplaceText; @@ -177,8 +177,8 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) if (aReplaceText.Len() > 0) ReplaceTextWithSynonym( pOLV->GetEditView(), aReplaceText ); break; - } - + } + case SID_ATTR_CHAR_FONT: case SID_ATTR_CHAR_FONTHEIGHT: case SID_ATTR_CHAR_WEIGHT: @@ -442,8 +442,8 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) break; case SID_AUTOSPELL_CHECK: { -//!! JP 16.03.2001: why?? pSdrView = rSh.GetDrawView(); -//!! JP 16.03.2001: why?? pOutliner = pSdrView->GetTextEditOutliner(); +//!! JP 16.03.2001: why?? pSdrView = rSh.GetDrawView(); +//!! JP 16.03.2001: why?? pOutliner = pSdrView->GetTextEditOutliner(); SdrOutliner * pOutliner = pSdrView->GetTextEditOutliner(); sal_uInt32 nCtrl = pOutliner->GetControlWord(); @@ -574,7 +574,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) void SwDrawTextShell::GetState(SfxItemSet& rSet) { - if (!IsTextEdit()) // Sonst manchmal Absturz! + if (!IsTextEdit()) // Sonst manchmal Absturz! return; OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView(); @@ -596,30 +596,30 @@ void SwDrawTextShell::GetState(SfxItemSet& rSet) nSlotId = SwLangHelper::GetLanguageStatus(pOLV,rSet);; break; } - + case SID_THES: { String aStatusVal; LanguageType nLang = LANGUAGE_NONE; bool bIsLookUpWord = GetStatusValueForThesaurusFromContext( aStatusVal, nLang, pOLV->GetEditView() ); rSet.Put( SfxStringItem( SID_THES, aStatusVal ) ); - + // disable "Thesaurus" context menu entry if there is nothing to look up uno::Reference< linguistic2::XThesaurus > xThes( ::GetThesaurus() ); lang::Locale aLocale( SvxCreateLocale( nLang ) ); if (!bIsLookUpWord || !xThes.is() || nLang == LANGUAGE_NONE || !xThes->hasLocale( aLocale )) rSet.DisableItem( SID_THES ); - + //! avoid puting the same item as SfxBoolItem at the end of this function nSlotId = 0; break; - } - + } + case SID_ATTR_PARA_ADJUST_LEFT: eAdjust = SVX_ADJUST_LEFT; goto ASK_ADJUST; - case SID_ATTR_PARA_ADJUST_RIGHT: eAdjust = SVX_ADJUST_RIGHT; goto ASK_ADJUST; - case SID_ATTR_PARA_ADJUST_CENTER: eAdjust = SVX_ADJUST_CENTER; goto ASK_ADJUST; - case SID_ATTR_PARA_ADJUST_BLOCK: eAdjust = SVX_ADJUST_BLOCK; goto ASK_ADJUST; + case SID_ATTR_PARA_ADJUST_RIGHT: eAdjust = SVX_ADJUST_RIGHT; goto ASK_ADJUST; + case SID_ATTR_PARA_ADJUST_CENTER: eAdjust = SVX_ADJUST_CENTER; goto ASK_ADJUST; + case SID_ATTR_PARA_ADJUST_BLOCK: eAdjust = SVX_ADJUST_BLOCK; goto ASK_ADJUST; ASK_ADJUST: { if( !pAdjust ) @@ -632,9 +632,9 @@ ASK_ADJUST: } break; - case SID_ATTR_PARA_LINESPACE_10: nLSpace = 100; goto ASK_LINESPACE; - case SID_ATTR_PARA_LINESPACE_15: nLSpace = 150; goto ASK_LINESPACE; - case SID_ATTR_PARA_LINESPACE_20: nLSpace = 200; goto ASK_LINESPACE; + case SID_ATTR_PARA_LINESPACE_10: nLSpace = 100; goto ASK_LINESPACE; + case SID_ATTR_PARA_LINESPACE_15: nLSpace = 150; goto ASK_LINESPACE; + case SID_ATTR_PARA_LINESPACE_20: nLSpace = 200; goto ASK_LINESPACE; ASK_LINESPACE: { if( !pLSpace ) @@ -650,9 +650,9 @@ ASK_LINESPACE: } break; - case FN_SET_SUPER_SCRIPT: nEsc = SVX_ESCAPEMENT_SUPERSCRIPT; + case FN_SET_SUPER_SCRIPT: nEsc = SVX_ESCAPEMENT_SUPERSCRIPT; goto ASK_ESCAPE; - case FN_SET_SUB_SCRIPT: nEsc = SVX_ESCAPEMENT_SUBSCRIPT; + case FN_SET_SUB_SCRIPT: nEsc = SVX_ESCAPEMENT_SUBSCRIPT; goto ASK_ESCAPE; ASK_ESCAPE: { @@ -783,7 +783,7 @@ ASK_ESCAPE: } break; default: - nSlotId = 0; // don't know this slot + nSlotId = 0; // don't know this slot break; } @@ -796,7 +796,7 @@ ASK_ESCAPE: void SwDrawTextShell::GetDrawTxtCtrlState(SfxItemSet& rSet) { - if (!IsTextEdit()) // Sonst Absturz! + if (!IsTextEdit()) // Sonst Absturz! return; OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView(); @@ -860,7 +860,7 @@ void SwDrawTextShell::GetDrawTxtCtrlState(SfxItemSet& rSet) void SwDrawTextShell::ExecClpbrd(SfxRequest &rReq) { - if (!IsTextEdit()) // Sonst Absturz! + if (!IsTextEdit()) // Sonst Absturz! return; OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView(); @@ -891,11 +891,11 @@ void SwDrawTextShell::ExecClpbrd(SfxRequest &rReq) } /*-------------------------------------------------------------------- - Beschreibung: ClipBoard-Status + Beschreibung: ClipBoard-Status --------------------------------------------------------------------*/ void SwDrawTextShell::StateClpbrd(SfxItemSet &rSet) { - if (!IsTextEdit()) // Sonst Absturz! + if (!IsTextEdit()) // Sonst Absturz! return; OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView(); @@ -943,11 +943,11 @@ void SwDrawTextShell::StateClpbrd(SfxItemSet &rSet) } /*-------------------------------------------------------------------- - Beschreibung: Hyperlink-Status + Beschreibung: Hyperlink-Status --------------------------------------------------------------------*/ void SwDrawTextShell::StateInsert(SfxItemSet &rSet) { - if (!IsTextEdit()) // Sonst Absturz! + if (!IsTextEdit()) // Sonst Absturz! return; OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView(); diff --git a/sw/source/ui/shells/drwtxtsh.cxx b/sw/source/ui/shells/drwtxtsh.cxx index 99632ad2de45..3ef80c8b6003 100644 --- a/sw/source/ui/shells/drwtxtsh.cxx +++ b/sw/source/ui/shells/drwtxtsh.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 @@ -110,8 +110,8 @@ void SwDrawTextShell::Init() SwWrtShell &rSh = GetShell(); pSdrView = rSh.GetDrawView(); SdrOutliner * pOutliner = pSdrView->GetTextEditOutliner(); - //#97471# mouse click _and_ key input at the same time - if( !pOutliner ) + //#97471# mouse click _and_ key input at the same time + if( !pOutliner ) return ; OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView(); ULONG nCtrl = pOutliner->GetControlWord(); @@ -160,7 +160,7 @@ __EXPORT SwDrawTextShell::~SwDrawTextShell() //DrawTextShell zerstoert. // OSL_ENSURE( !pSdrView->IsTextEdit(), "TextEdit in DTor DrwTxtSh?" ); // if (pSdrView->IsTextEdit()) -// GetShell().EndTextEdit(); // Danebengeklickt, Ende mit Edit +// GetShell().EndTextEdit(); // Danebengeklickt, Ende mit Edit // GetShell().Edit(); } @@ -171,7 +171,7 @@ SwWrtShell& SwDrawTextShell::GetShell() } /*-------------------------------------------------------------------- - Beschreibung: Slots mit dieser Statusmethode disablen + Beschreibung: Slots mit dieser Statusmethode disablen --------------------------------------------------------------------*/ void SwDrawTextShell::StateDisableItems( SfxItemSet &rSet ) { @@ -199,7 +199,7 @@ void SwDrawTextShell::SetAttrToMarked(const SfxItemSet& rAttr) if (aNullRect != aOutRect) { GetShell().GetDrawView()->SetAttributes(rAttr); -// Init(); +// Init(); } } @@ -306,9 +306,9 @@ void SwDrawTextShell::GetFormTextState(SfxItemSet& rSet) if ( pObj == NULL || !pObj->ISA(SdrTextObj) || !((SdrTextObj*) pObj)->HasText() ) { -#define XATTR_ANZ 12 +#define XATTR_ANZ 12 static const USHORT nXAttr[ XATTR_ANZ ] = - { XATTR_FORMTXTSTYLE, XATTR_FORMTXTADJUST, XATTR_FORMTXTDISTANCE, + { XATTR_FORMTXTSTYLE, XATTR_FORMTXTADJUST, XATTR_FORMTXTDISTANCE, XATTR_FORMTXTSTART, XATTR_FORMTXTMIRROR, XATTR_FORMTXTSTDFORM, XATTR_FORMTXTHIDEFORM, XATTR_FORMTXTOUTLINE, XATTR_FORMTXTSHADOW, XATTR_FORMTXTSHDWCOLOR, XATTR_FORMTXTSHDWXVAL, XATTR_FORMTXTSHDWYVAL @@ -479,7 +479,7 @@ void SwDrawTextShell::ExecDraw(SfxRequest &rReq) } break; - case FN_FORMAT_RESET: // delete hard text attributes + case FN_FORMAT_RESET: // delete hard text attributes { pOLV->RemoveAttribsKeepLanguages( true ); pOLV->GetEditView().GetEditEngine()->RemoveFields(TRUE); @@ -537,7 +537,7 @@ void SwDrawTextShell::ExecDraw(SfxRequest &rReq) } /*-------------------------------------------------------------------- - Beschreibung: Undo ausfuehren + Beschreibung: Undo ausfuehren --------------------------------------------------------------------*/ void SwDrawTextShell::ExecUndo(SfxRequest &rReq) { @@ -582,7 +582,7 @@ void SwDrawTextShell::ExecUndo(SfxRequest &rReq) } /*-------------------------------------------------------------------- - Beschreibung: Zustand Undo + Beschreibung: Zustand Undo --------------------------------------------------------------------*/ void SwDrawTextShell::StateUndo(SfxItemSet &rSet) { @@ -692,7 +692,7 @@ void SwDrawTextShell::ExecTransliteration( SfxRequest & rReq ) } /*-------------------------------------------------------------------- - Beschreibung: Sonderzeichen einfuegen (siehe SDraw: FUBULLET.CXX) + Beschreibung: Sonderzeichen einfuegen (siehe SDraw: FUBULLET.CXX) --------------------------------------------------------------------*/ void SwDrawTextShell::InsertSymbol(SfxRequest& rReq) { @@ -794,7 +794,7 @@ void SwDrawTextShell::InsertSymbol(SfxRequest& rReq) // attributieren (Font setzen) SfxItemSet aFontAttribSet( *aFontSet.GetPool(), aFontSet.GetRanges() ); - SvxFontItem aFontItem (aFont.GetFamily(), aFont.GetName(), + SvxFontItem aFontItem (aFont.GetFamily(), aFont.GetName(), aFont.GetStyleName(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO ); diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx index 4362e8eedd0d..0c5bea7a0f1d 100644 --- a/sw/source/ui/shells/frmsh.cxx +++ b/sw/source/ui/shells/frmsh.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 @@ -393,18 +393,18 @@ void SwFrameShell::Execute(SfxRequest &rReq) } else { - SfxItemSet aSet(GetPool(), RES_FRMATR_BEGIN, RES_FRMATR_END-1, - SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER, - FN_GET_PRINT_AREA, FN_GET_PRINT_AREA, - SID_ATTR_PAGE_SIZE, SID_ATTR_PAGE_SIZE, - SID_ATTR_BRUSH, SID_ATTR_BRUSH, - SID_ATTR_LRSPACE, SID_ATTR_ULSPACE, - FN_SURROUND, FN_HORI_ORIENT, - FN_SET_FRM_NAME, FN_SET_FRM_NAME, - FN_KEEP_ASPECT_RATIO, FN_KEEP_ASPECT_RATIO, - SID_DOCFRAME, SID_DOCFRAME, - SID_HTML_MODE, SID_HTML_MODE, - FN_SET_FRM_ALT_NAME, FN_SET_FRM_ALT_NAME, + SfxItemSet aSet(GetPool(), RES_FRMATR_BEGIN, RES_FRMATR_END-1, + SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER, + FN_GET_PRINT_AREA, FN_GET_PRINT_AREA, + SID_ATTR_PAGE_SIZE, SID_ATTR_PAGE_SIZE, + SID_ATTR_BRUSH, SID_ATTR_BRUSH, + SID_ATTR_LRSPACE, SID_ATTR_ULSPACE, + FN_SURROUND, FN_HORI_ORIENT, + FN_SET_FRM_NAME, FN_SET_FRM_NAME, + FN_KEEP_ASPECT_RATIO, FN_KEEP_ASPECT_RATIO, + SID_DOCFRAME, SID_DOCFRAME, + SID_HTML_MODE, SID_HTML_MODE, + FN_SET_FRM_ALT_NAME, FN_SET_FRM_ALT_NAME, FN_PARAM_CHAIN_PREVIOUS, FN_PARAM_CHAIN_NEXT, 0); @@ -493,9 +493,9 @@ void SwFrameShell::Execute(SfxRequest &rReq) // gesetzt werden if(SFX_ITEM_SET == pOutSet->GetItemState(FN_SET_FRM_NAME, FALSE, &pItem)) rSh.SetFlyName(((SfxStringItem*)pItem)->GetValue()); - SfxItemSet aShellSet(GetPool(), RES_FRM_SIZE, RES_FRM_SIZE, - RES_SURROUND, RES_SURROUND, - RES_ANCHOR, RES_ANCHOR, + SfxItemSet aShellSet(GetPool(), RES_FRM_SIZE, RES_FRM_SIZE, + RES_SURROUND, RES_SURROUND, + RES_ANCHOR, RES_ANCHOR, RES_VERT_ORIENT,RES_HORI_ORIENT, 0); aShellSet.Put(*pOutSet); @@ -737,10 +737,10 @@ void SwFrameShell::GetState(SfxItemSet& rSet) { case SID_OBJECT_ALIGN_UP : case FN_FRAME_ALIGN_VERT_TOP: - nId = STR_TOP_BASE; break; + nId = STR_TOP_BASE; break; case SID_OBJECT_ALIGN_MIDDLE : case FN_FRAME_ALIGN_VERT_CENTER: - nId = STR_CENTER_BASE; break; + nId = STR_CENTER_BASE; break; case SID_OBJECT_ALIGN_DOWN : case FN_FRAME_ALIGN_VERT_BOTTOM: if(!bHtmlMode) @@ -885,7 +885,7 @@ void SwFrameShell::GetState(SfxItemSet& rSet) } /*-------------------------------------------------------------------- - Beschreibung: Ctor fuer FrameShell + Beschreibung: Ctor fuer FrameShell --------------------------------------------------------------------*/ SwFrameShell::SwFrameShell(SwView &_rView) : SwBaseShell( _rView ) diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/ui/shells/grfsh.cxx index 0fe336f2f006..bb6481c5b0aa 100644 --- a/sw/source/ui/shells/grfsh.cxx +++ b/sw/source/ui/shells/grfsh.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 @@ -123,20 +123,20 @@ void SwGrfShell::Execute(SfxRequest &rReq) SwViewOption aUsrPref( *pVOpt ); SfxItemSet aSet(GetPool(), RES_FRMATR_BEGIN, RES_FRMATR_END-1, - RES_GRFATR_MIRRORGRF, RES_GRFATR_CROPGRF, - SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER, + RES_GRFATR_MIRRORGRF, RES_GRFATR_CROPGRF, + SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER, SID_ATTR_GRAF_KEEP_ZOOM, SID_ATTR_GRAF_KEEP_ZOOM, SID_ATTR_GRAF_FRMSIZE, SID_ATTR_GRAF_FRMSIZE, SID_ATTR_GRAF_FRMSIZE_PERCENT, SID_ATTR_GRAF_FRMSIZE_PERCENT, SID_ATTR_GRAF_GRAPHIC, SID_ATTR_GRAF_GRAPHIC, - FN_PARAM_GRF_CONNECT, FN_PARAM_GRF_CONNECT, - SID_ATTR_PAGE_SIZE, SID_ATTR_PAGE_SIZE, - FN_GET_PRINT_AREA, FN_GET_PRINT_AREA, - FN_SET_FRM_NAME, FN_KEEP_ASPECT_RATIO, - FN_PARAM_GRF_DIALOG, FN_PARAM_GRF_DIALOG, - SID_DOCFRAME, SID_DOCFRAME, - SID_HTML_MODE, SID_HTML_MODE, - FN_SET_FRM_ALT_NAME, FN_SET_FRM_ALT_NAME, + FN_PARAM_GRF_CONNECT, FN_PARAM_GRF_CONNECT, + SID_ATTR_PAGE_SIZE, SID_ATTR_PAGE_SIZE, + FN_GET_PRINT_AREA, FN_GET_PRINT_AREA, + FN_SET_FRM_NAME, FN_KEEP_ASPECT_RATIO, + FN_PARAM_GRF_DIALOG, FN_PARAM_GRF_DIALOG, + SID_DOCFRAME, SID_DOCFRAME, + SID_HTML_MODE, SID_HTML_MODE, + FN_SET_FRM_ALT_NAME, FN_SET_FRM_ALT_NAME, 0); USHORT nHtmlMode = ::GetHtmlMode(GetView().GetDocShell()); @@ -180,7 +180,7 @@ void SwGrfShell::Execute(SfxRequest &rReq) aSet.Put( aSzItm ); Size aSz( aSizeCopy.GetWidthPercent(), aSizeCopy.GetHeightPercent() ); - if( 0xff == aSz.Width() ) aSz.Width() = 0; + if( 0xff == aSz.Width() ) aSz.Width() = 0; if( 0xff == aSz.Height() ) aSz.Height() = 0; aSzItm.SetSize( aSz ); @@ -264,9 +264,9 @@ void SwGrfShell::Execute(SfxRequest &rReq) if(pFmt && pFmt->IsAutoUpdateFmt()) { pFmt->SetFmtAttr(*pSet); - SfxItemSet aShellSet(GetPool(), RES_FRM_SIZE, RES_FRM_SIZE, - RES_SURROUND, RES_SURROUND, - RES_ANCHOR, RES_ANCHOR, + SfxItemSet aShellSet(GetPool(), RES_FRM_SIZE, RES_FRM_SIZE, + RES_SURROUND, RES_SURROUND, + RES_ANCHOR, RES_ANCHOR, RES_VERT_ORIENT,RES_HORI_ORIENT, 0); aShellSet.Put(*pSet); diff --git a/sw/source/ui/shells/grfshex.cxx b/sw/source/ui/shells/grfshex.cxx index a654536a4ce3..7d00f174c05c 100644 --- a/sw/source/ui/shells/grfshex.cxx +++ b/sw/source/ui/shells/grfshex.cxx @@ -77,10 +77,10 @@ using ::rtl::OUString; bool SwTextShell::InsertMediaDlg( SfxRequest& rReq ) { - ::rtl::OUString aURL; - const SfxItemSet* pReqArgs = rReq.GetArgs(); - Window* pWindow = &GetView().GetViewFrame()->GetWindow(); - bool bAPI = false, bRet = false; + ::rtl::OUString aURL; + const SfxItemSet* pReqArgs = rReq.GetArgs(); + Window* pWindow = &GetView().GetViewFrame()->GetWindow(); + bool bAPI = false, bRet = false; if( pReqArgs ) { @@ -110,15 +110,15 @@ bool SwTextShell::InsertMediaDlg( SfxRequest& rReq ) } else { - SwWrtShell& rSh = GetShell(); + SwWrtShell& rSh = GetShell(); if( !rSh.HasDrawView() ) rSh.MakeDrawView(); - Size aDocSz( rSh.GetDocSize() ); - const SwRect& rVisArea = rSh.VisArea(); - Point aPos( rVisArea.Center() ); - Size aSize; + Size aDocSz( rSh.GetDocSize() ); + const SwRect& rVisArea = rSh.VisArea(); + Point aPos( rVisArea.Center() ); + Size aSize; if( rVisArea.Width() > aDocSz.Width()) aPos.X() = aDocSz.Width() / 2 + rVisArea.Left(); diff --git a/sw/source/ui/shells/langhelper.cxx b/sw/source/ui/shells/langhelper.cxx index aa82348a74c1..4385146ec4fa 100644 --- a/sw/source/ui/shells/langhelper.cxx +++ b/sw/source/ui/shells/langhelper.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 @@ -75,20 +75,20 @@ namespace SwLangHelper EditEngine* pEditEngine=rEditView.GetEditEngine(); // the value of used script types - const USHORT nScriptType =pOLV->GetSelectedScriptType(); + const USHORT nScriptType =pOLV->GetSelectedScriptType(); String aScriptTypesInUse( String::CreateFromInt32( nScriptType ) );//pEditEngine->GetScriptType(aSelection) SvtLanguageTable aLangTable; - + // get keyboard language String aKeyboardLang; LanguageType nLang = LANGUAGE_DONTKNOW; - + Window* pWin = rEditView.GetWindow(); if(pWin) nLang = pWin->GetInputLanguage(); if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_SYSTEM) - aKeyboardLang = aLangTable.GetString( nLang ); + aKeyboardLang = aLangTable.GetString( nLang ); // get the language that is in use const String aMultipleLanguages = String::CreateFromAscii("*"); @@ -97,14 +97,14 @@ namespace SwLangHelper nLang = SwLangHelper::GetCurrentLanguage( aSet,nScriptType ); if (nLang != LANGUAGE_DONTKNOW) aCurrentLang = aLangTable.GetString( nLang ); - + // build sequence for status value uno::Sequence< ::rtl::OUString > aSeq( 4 ); aSeq[0] = aCurrentLang; aSeq[1] = aScriptTypesInUse; aSeq[2] = aKeyboardLang; aSeq[3] = SwLangHelper::GetTextForLanguageGuessing( pEditEngine, aSelection ); - + // set sequence as status value SfxStringListItem aItem( SID_LANGUAGE_STATUS ); aItem.SetStringList( aSeq ); @@ -122,7 +122,7 @@ namespace SwLangHelper // get the language String aNewLangTxt; - + SFX_REQUEST_ARG( rReq, pItem, SfxStringItem, SID_LANGUAGE_STATUS , sal_False ); if (pItem) aNewLangTxt = pItem->GetValue(); @@ -131,15 +131,15 @@ namespace SwLangHelper //!! (call to GetView().GetViewFrame() will break if the //!! SwTextShell got destroyed meanwhile.) SfxViewFrame *pViewFrame = rView.GetViewFrame(); - + if (aNewLangTxt.EqualsAscii( "*" )) { // open the dialog "Tools/Options/Language Settings - Language" SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); if (pFact) - { - VclAbstractDialog* pDlg = pFact->CreateVclDialog( rView.GetWindow(), SID_LANGUAGE_OPTIONS ); - pDlg->Execute(); + { + VclAbstractDialog* pDlg = pFact->CreateVclDialog( rView.GetWindow(), SID_LANGUAGE_OPTIONS ); + pDlg->Execute(); delete pDlg; } } @@ -188,22 +188,22 @@ namespace SwLangHelper rSh.StartAction(); rSh.LockView( TRUE ); rSh.Push(); - + // prepare to apply new language to all text in document rSh.SelAll(); rSh.ExtendedSelectAll(); } - + if (aNewLangTxt == aStrNone) SwLangHelper::SetLanguage_None( rSh, pOLV, aSelection, bForSelection, aEditAttr ); else if (aNewLangTxt == aStrResetLangs) SwLangHelper::ResetLanguages( rSh, pOLV, aSelection, bForSelection ); else SwLangHelper::SetLanguage( rSh, pOLV, aSelection, aNewLangTxt, bForSelection, aEditAttr ); - + // ugly hack, as it seems that EditView/EditEngine does not update their spellchecking marks // when setting a new language attribute - if (bForSelection) + if (bForSelection) { const SwViewOption* pVOpt = rView.GetWrtShellPtr()->GetViewOptions(); ULONG nCntrl = pEditEngine->GetControlWord(); @@ -225,7 +225,7 @@ namespace SwLangHelper rEditView.Invalidate(); } - if (!bForSelection) + if (!bForSelection) { // need to release view and restore selection... rSh.Pop( FALSE ); @@ -234,14 +234,14 @@ namespace SwLangHelper } } } - + // invalidate slot to get the new language displayed pViewFrame->GetBindings().Invalidate( rReq.GetSlot() ); - + rReq.Done(); return bRestoreSelection; } - + void SetLanguage( SwWrtShell &rWrtSh, const String &rLangText, bool bIsForSelection, SfxItemSet &rCoreSet ) { @@ -254,7 +254,7 @@ namespace SwLangHelper if (nLang != LANGUAGE_DONTKNOW) { USHORT nScriptType = SvtLanguageOptions::GetScriptTypeOfLanguage( nLang ); - + EditEngine* pEditEngine = pOLV ? pOLV->GetEditView().GetEditEngine() : NULL; OSL_ENSURE( !pOLV || pEditEngine, "OutlinerView without EditEngine???" ); @@ -266,7 +266,7 @@ namespace SwLangHelper case SCRIPTTYPE_LATIN : nLangWhichId = pEditEngine ? EE_CHAR_LANGUAGE : RES_CHRATR_LANGUAGE; break; case SCRIPTTYPE_ASIAN : nLangWhichId = pEditEngine ? EE_CHAR_LANGUAGE_CJK : RES_CHRATR_CJK_LANGUAGE; break; case SCRIPTTYPE_COMPLEX : nLangWhichId = pEditEngine ? EE_CHAR_LANGUAGE_CTL : RES_CHRATR_CTL_LANGUAGE; break; - default: + default: bIsSingleScriptType = false; OSL_ENSURE(false, "unexpected case" ); } @@ -300,8 +300,8 @@ namespace SwLangHelper case EE_CHAR_LANGUAGE_CTL : nLangWhichId = RES_CHRATR_CTL_LANGUAGE; break; } rWrtSh.SetDefault( SvxLanguageItem( nLang, nLangWhichId ) ); - - // set respective language attribute in text document to default + + // set respective language attribute in text document to default // (for all text in the document - which should be selected by now...) SvUShortsSort aAttribs; aAttribs.Insert( nLangWhichId ); @@ -382,8 +382,8 @@ namespace SwLangHelper (void) aSelection; // reset language for current selection. - // The selection should already have been expanded to the whole paragraph or - // to all text in the document if those are the ranges where to reset + // The selection should already have been expanded to the whole paragraph or + // to all text in the document if those are the ranges where to reset // the language attributes if (pOLV) @@ -431,7 +431,7 @@ namespace SwLangHelper } else if (nState == SFX_ITEM_DEFAULT) { - // since the attribute is not set: retrieve the default value + // since the attribute is not set: retrieve the default value nLang = (dynamic_cast< const SvxLanguageItem& >(aSet.GetPool()->GetDefaultItem( nLangWhichId ))).GetLanguage(); } else if (nState == SFX_ITEM_DONTCARE) @@ -511,7 +511,7 @@ namespace SwLangHelper case SCRIPTTYPE_COMPLEX : nLangWhichId = EE_CHAR_LANGUAGE_CTL; break; default: bIsSingleScriptType = false; } - + // get language according to the script type(s) in use LanguageType nCurrentLang = LANGUAGE_SYSTEM; if (bIsSingleScriptType) @@ -535,7 +535,7 @@ namespace SwLangHelper { nCurrentLang = LANGUAGE_DONTKNOW; break; - } + } } } OSL_ENSURE( nCurrentLang != LANGUAGE_SYSTEM, "failed to get the language?" ); @@ -570,7 +570,7 @@ namespace SwLangHelper { // string for guessing language String aText; - + aText = rEditEngine->GetText(aDocSelection); if (aText.Len() > 0) { @@ -582,7 +582,7 @@ namespace SwLangHelper nEnd = aText.Len() - nEnd > 100 ? nEnd + 100 : aText.Len(); aText = aText.Copy( nStt, nEnd - nStt ); } - + return aText; } diff --git a/sw/source/ui/shells/listsh.cxx b/sw/source/ui/shells/listsh.cxx index 5505ff5e3e4b..abf89407e40b 100644 --- a/sw/source/ui/shells/listsh.cxx +++ b/sw/source/ui/shells/listsh.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 @@ -167,7 +167,7 @@ void SwListShell::Execute(SfxRequest &rReq) rSh.NumUpDown( ( nSlot == FN_NUM_BULLET_DOWN ) ? TRUE : FALSE ); - pFrame->GetBindings().Invalidate( SID_TABLE_CELL ); // StatusZeile updaten! + pFrame->GetBindings().Invalidate( SID_TABLE_CELL ); // StatusZeile updaten! } break; diff --git a/sw/source/ui/shells/mediash.cxx b/sw/source/ui/shells/mediash.cxx index ec8242d77f2d..c086fae3706b 100644 --- a/sw/source/ui/shells/mediash.cxx +++ b/sw/source/ui/shells/mediash.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 @@ -90,12 +90,12 @@ SFX_IMPL_INTERFACE(SwMediaShell, SwBaseShell, SW_RES(STR_SHELLNAME_MEDIA)) void SwMediaShell::ExecMedia(SfxRequest &rReq) { SwWrtShell* pSh = &GetShell(); - SdrView* pSdrView = pSh->GetDrawView(); + SdrView* pSdrView = pSh->GetDrawView(); if( pSdrView ) { const SfxItemSet* pArgs = rReq.GetArgs(); - USHORT nSlotId = rReq.GetSlot(); + USHORT nSlotId = rReq.GetSlot(); BOOL bChanged = pSdrView->GetModel()->IsChanged(); pSdrView->GetModel()->SetChanged( FALSE ); @@ -121,7 +121,7 @@ void SwMediaShell::ExecMedia(SfxRequest &rReq) { if( pSh->IsObjSelected() ) { - const SfxPoolItem* pItem; + const SfxPoolItem* pItem; if( !pArgs || ( SFX_ITEM_SET != pArgs->GetItemState( SID_AVMEDIA_TOOLBOX, FALSE, &pItem ) ) ) pItem = NULL; @@ -160,16 +160,16 @@ void SwMediaShell::ExecMedia(SfxRequest &rReq) void SwMediaShell::GetMediaState(SfxItemSet &rSet) { - SfxWhichIter aIter( rSet ); - USHORT nWhich = aIter.FirstWhich(); + SfxWhichIter aIter( rSet ); + USHORT nWhich = aIter.FirstWhich(); while( nWhich ) { if( SID_AVMEDIA_TOOLBOX == nWhich ) { - SwWrtShell& rSh = GetShell(); - SdrView* pView = rSh.GetDrawView(); - bool bDisable = true; + SwWrtShell& rSh = GetShell(); + SdrView* pView = rSh.GetDrawView(); + bool bDisable = true; if( pView ) { diff --git a/sw/source/ui/shells/olesh.cxx b/sw/source/ui/shells/olesh.cxx index a971998beb74..736e83e47d3f 100644 --- a/sw/source/ui/shells/olesh.cxx +++ b/sw/source/ui/shells/olesh.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/shells/shells.src b/sw/source/ui/shells/shells.src index 7e9a20bb6fc0..42b3b0029a7b 100644 --- a/sw/source/ui/shells/shells.src +++ b/sw/source/ui/shells/shells.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/shells/slotadd.cxx b/sw/source/ui/shells/slotadd.cxx index ab6850ce6aae..c91d12a6844d 100644 --- a/sw/source/ui/shells/slotadd.cxx +++ b/sw/source/ui/shells/slotadd.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/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx index 77e973900566..41672f1e90b7 100644 --- a/sw/source/ui/shells/tabsh.cxx +++ b/sw/source/ui/shells/tabsh.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 @@ -122,25 +122,25 @@ TYPEINIT1(SwTableShell,SwBaseShell) const USHORT __FAR_DATA aUITableAttrRange[] = { - FN_PARAM_TABLE_NAME, FN_PARAM_TABLE_NAME, - FN_PARAM_TABLE_HEADLINE, FN_PARAM_TABLE_HEADLINE, - FN_PARAM_TABLE_SPACE, FN_PARAM_TABLE_SPACE, - FN_TABLE_REP, FN_TABLE_REP, + FN_PARAM_TABLE_NAME, FN_PARAM_TABLE_NAME, + FN_PARAM_TABLE_HEADLINE, FN_PARAM_TABLE_HEADLINE, + FN_PARAM_TABLE_SPACE, FN_PARAM_TABLE_SPACE, + FN_TABLE_REP, FN_TABLE_REP, SID_RULER_BORDERS, SID_RULER_BORDERS, - RES_LR_SPACE, RES_UL_SPACE, - SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_SHADOW, - RES_BOX, RES_SHADOW, - RES_BACKGROUND, RES_BACKGROUND, - SID_BACKGRND_DESTINATION, SID_BACKGRND_DESTINATION, - SID_HTML_MODE, SID_HTML_MODE, - SID_ATTR_BRUSH_ROW, SID_ATTR_BRUSH_TABLE, - RES_PAGEDESC, RES_BREAK, - RES_KEEP, RES_KEEP, - RES_LAYOUT_SPLIT, RES_LAYOUT_SPLIT, - FN_TABLE_SET_VERT_ALIGN, FN_TABLE_SET_VERT_ALIGN, + RES_LR_SPACE, RES_UL_SPACE, + SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_SHADOW, + RES_BOX, RES_SHADOW, + RES_BACKGROUND, RES_BACKGROUND, + SID_BACKGRND_DESTINATION, SID_BACKGRND_DESTINATION, + SID_HTML_MODE, SID_HTML_MODE, + SID_ATTR_BRUSH_ROW, SID_ATTR_BRUSH_TABLE, + RES_PAGEDESC, RES_BREAK, + RES_KEEP, RES_KEEP, + RES_LAYOUT_SPLIT, RES_LAYOUT_SPLIT, + FN_TABLE_SET_VERT_ALIGN, FN_TABLE_SET_VERT_ALIGN, RES_FRAMEDIR, RES_FRAMEDIR, RES_ROW_SPLIT, RES_ROW_SPLIT, - FN_TABLE_BOX_TEXTDIRECTION, FN_TABLE_BOX_TEXTDIRECTION, + FN_TABLE_BOX_TEXTDIRECTION, FN_TABLE_BOX_TEXTDIRECTION, // --> collapsing borders FME 2005-05-27 #i29550# RES_COLLAPSING_BORDERS, RES_COLLAPSING_BORDERS, // <-- collapsing borders @@ -178,8 +178,8 @@ static SwTableRep* lcl_TableParamToItemSet( SfxItemSet& rSet, SwWrtShell &rSh ) USHORT nBackgroundDestination = rSh.GetViewOptions()->GetTblDest(); rSet.Put(SwBackgroundDestinationItem(SID_BACKGRND_DESTINATION, nBackgroundDestination )); SvxBrushItem aBrush( RES_BACKGROUND ); -// rSh.GetBoxBackground(aBrush); -// rSet.Put( aBrush ); +// rSh.GetBoxBackground(aBrush); +// rSet.Put( aBrush ); if(rSh.GetRowBackground(aBrush)) rSet.Put( aBrush, SID_ATTR_BRUSH_ROW ); else @@ -202,7 +202,7 @@ static SwTableRep* lcl_TableParamToItemSet( SfxItemSet& rSet, SwWrtShell &rSh ) SvxBoxInfoItem aBoxInfo( SID_ATTR_BORDER_INNER ); // Tabellenvariante, wenn mehrere Tabellenzellen selektiert - rSh.GetCrsr(); //Damit GetCrsrCnt() auch das Richtige liefert + rSh.GetCrsr(); //Damit GetCrsrCnt() auch das Richtige liefert aBoxInfo.SetTable ((rSh.IsTableMode() && rSh.GetCrsrCnt() > 1) || !bTableSel); // Abstandsfeld immer anzeigen @@ -494,7 +494,7 @@ void SwTableShell::Execute(SfxRequest &rReq) { case SID_ATTR_BORDER: { -/* BOOL bPopCrsr = FALSE; +/* BOOL bPopCrsr = FALSE; if ( !rReq.IsAPI() ) { //Keine Tabellenselektion -> Aenderung wird auf die gesamte @@ -586,8 +586,8 @@ void SwTableShell::Execute(SfxRequest &rReq) if ((pBorderLine = aInfo.GetVert()) != NULL) aInfo.SetLine(&aBorderLine, BOXINFO_LINE_VERT), bLine |= TRUE; -// if ( bPopCrsr && !bLine ) -// aBox.SetDistance( 0 ); +// if ( bPopCrsr && !bLine ) +// aBox.SetDistance( 0 ); aCoreSet.Put( aBox ); aCoreSet.Put( aInfo ); @@ -600,7 +600,7 @@ void SwTableShell::Execute(SfxRequest &rReq) rReq.AppendItem( aInfo ); bCallDone = TRUE; -/* if ( bPopCrsr ) +/* if ( bPopCrsr ) { rSh.KillPams(); rSh.Pop(FALSE); @@ -789,7 +789,7 @@ void SwTableShell::Execute(SfxRequest &rReq) case TBLMERGE_OK: bCallDone = TRUE; //no break; - case TBLMERGE_NOSELECTION: break; + case TBLMERGE_NOSELECTION: break; case TBLMERGE_TOOCOMPLEX: { InfoBox aInfoBox( GetView().GetWindow(), @@ -1054,7 +1054,7 @@ void SwTableShell::Execute(SfxRequest &rReq) case FN_TABLE_MODE_FIX : case FN_TABLE_MODE_FIX_PROP : - case FN_TABLE_MODE_VARIABLE : + case FN_TABLE_MODE_VARIABLE : { rSh.SetTblChgMode( ( FN_TABLE_MODE_FIX == nSlot ? TBLFIX_CHGABS : FN_TABLE_MODE_FIX_PROP == nSlot @@ -1268,7 +1268,7 @@ void SwTableShell::GetState(SfxItemSet &rSet) case FN_INSERT_TABLE: // Irgendeinen Wert "putten", damit Controller enabled bleibt. // Statt "Insert:Table" erscheint dann "Format:Table". -// rSet.Put(SfxUInt16Item(nSlot, 1)); +// rSet.Put(SfxUInt16Item(nSlot, 1)); break; case FN_TABLE_OPTIMAL_HEIGHT: @@ -1311,7 +1311,7 @@ void SwTableShell::GetState(SfxItemSet &rSet) case FN_TABLE_MODE_FIX : case FN_TABLE_MODE_FIX_PROP : - case FN_TABLE_MODE_VARIABLE : + case FN_TABLE_MODE_VARIABLE : { TblChgMode nMode = rSh.GetTblChgMode(); BOOL bSet = (nSlot == FN_TABLE_MODE_FIX && nMode == TBLFIX_CHGABS) || @@ -1428,7 +1428,7 @@ void SwTableShell::ExecTableStyle(SfxRequest& rReq) case SID_FRAME_LINESTYLE: case SID_FRAME_LINECOLOR: { -/* Tabellenselektion ist abgeschafft +/* Tabellenselektion ist abgeschafft BOOL bPopCrsr = FALSE; if ( !rReq.IsAPI() ) { @@ -1461,7 +1461,7 @@ void SwTableShell::ExecTableStyle(SfxRequest& rReq) } rReq.Done(); -/* if ( bPopCrsr ) +/* if ( bPopCrsr ) { rSh.KillPams(); rSh.Pop(FALSE); @@ -1501,7 +1501,7 @@ void SwTableShell::ExecNumberFormat(SfxRequest& rReq) if(pArgs) pArgs->GetItemState(GetPool().GetWhich(nSlot), FALSE, &pItem); - // Sprache immer von Cursorposition besorgen + // Sprache immer von Cursorposition besorgen LanguageType eLang = rSh.GetCurLang(); SvNumberFormatter* pFormatter = rSh.GetNumberFormatter(); sal_uInt32 nNumberFormat = NUMBERFORMAT_ENTRY_NOT_FOUND; @@ -1512,12 +1512,12 @@ void SwTableShell::ExecNumberFormat(SfxRequest& rReq) case FN_NUMBER_FORMAT: if( pItem ) { - // Index fuer String bestimmen + // Index fuer String bestimmen String aCode( ((const SfxStringItem*)pItem)->GetValue() ); nNumberFormat = pFormatter->GetEntryKey( aCode, eLang ); if( NUMBERFORMAT_ENTRY_NOT_FOUND == nNumberFormat ) { - // neu eintragen + // neu eintragen xub_StrLen nErrPos; short nType; if( !pFormatter->PutEntry( aCode, nErrPos, nType, @@ -1526,14 +1526,14 @@ void SwTableShell::ExecNumberFormat(SfxRequest& rReq) } } break; - case FN_NUMBER_STANDARD: nFmtType = NUMBERFORMAT_NUMBER; break; - case FN_NUMBER_SCIENTIFIC: nFmtType = NUMBERFORMAT_SCIENTIFIC; break; + case FN_NUMBER_STANDARD: nFmtType = NUMBERFORMAT_NUMBER; break; + case FN_NUMBER_SCIENTIFIC: nFmtType = NUMBERFORMAT_SCIENTIFIC; break; case FN_NUMBER_DATE: nFmtType = NUMBERFORMAT_DATE; break; - case FN_NUMBER_TIME: nFmtType = NUMBERFORMAT_TIME; break; - case FN_NUMBER_CURRENCY: nFmtType = NUMBERFORMAT_CURRENCY; break; - case FN_NUMBER_PERCENT: nFmtType = NUMBERFORMAT_PERCENT; break; + case FN_NUMBER_TIME: nFmtType = NUMBERFORMAT_TIME; break; + case FN_NUMBER_CURRENCY: nFmtType = NUMBERFORMAT_CURRENCY; break; + case FN_NUMBER_PERCENT: nFmtType = NUMBERFORMAT_PERCENT; break; - case FN_NUMBER_TWODEC: // #.##0,00 + case FN_NUMBER_TWODEC: // #.##0,00 nFmtType = NUMBERFORMAT_NUMBER; nOffset = NF_NUMBER_1000DEC2; break; @@ -1544,7 +1544,7 @@ void SwTableShell::ExecNumberFormat(SfxRequest& rReq) } if( nFmtType ) - nNumberFormat = pFormatter->GetStandardFormat( nFmtType, eLang ) + nOffset; + nNumberFormat = pFormatter->GetStandardFormat( nFmtType, eLang ) + nOffset; if( NUMBERFORMAT_ENTRY_NOT_FOUND != nNumberFormat ) { diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx index 7750582e0d05..8de4dc91ed5f 100644 --- a/sw/source/ui/shells/textfld.cxx +++ b/sw/source/ui/shells/textfld.cxx @@ -30,7 +30,7 @@ #include "precompiled_sw.hxx" #include <crsskip.hxx> -#include <hintids.hxx> //_immer_ vor den solar-Items +#include <hintids.hxx> //_immer_ vor den solar-Items #include <sfx2/lnkbase.hxx> #include <fmtfld.hxx> @@ -85,18 +85,18 @@ using namespace nsSwDocInfoSubType; -extern BOOL bNoInterrupt; // in mainwn.cxx +extern BOOL bNoInterrupt; // in mainwn.cxx String& lcl_AppendRedlineStr( String& rStr, USHORT nRedlId ) { USHORT nResId = 0; switch( nRedlId ) { - case nsRedlineType_t::REDLINE_INSERT: nResId = STR_REDLINE_INSERTED; break; - case nsRedlineType_t::REDLINE_DELETE: nResId = STR_REDLINE_DELETED; break; - case nsRedlineType_t::REDLINE_FORMAT: nResId = STR_REDLINE_FORMATED; break; - case nsRedlineType_t::REDLINE_TABLE: nResId = STR_REDLINE_TABLECHG; break; - case nsRedlineType_t::REDLINE_FMTCOLL: nResId = STR_REDLINE_FMTCOLLSET; break; + case nsRedlineType_t::REDLINE_INSERT: nResId = STR_REDLINE_INSERTED; break; + case nsRedlineType_t::REDLINE_DELETE: nResId = STR_REDLINE_DELETED; break; + case nsRedlineType_t::REDLINE_FORMAT: nResId = STR_REDLINE_FORMATED; break; + case nsRedlineType_t::REDLINE_TABLE: nResId = STR_REDLINE_TABLECHG; break; + case nsRedlineType_t::REDLINE_FMTCOLL: nResId = STR_REDLINE_FMTCOLLSET; break; } if( nResId ) rStr += SW_RESSTR( nResId ); @@ -302,7 +302,7 @@ void SwTextShell::ExecField(SfxRequest &rReq) { SfxViewFrame* pVFrame = GetView().GetViewFrame(); if (!pVFrame->HasChildWindow(FN_INSERT_FIELD)) - pVFrame->ToggleChildWindow(FN_INSERT_FIELD); // Dialog anzeigen + pVFrame->ToggleChildWindow(FN_INSERT_FIELD); // Dialog anzeigen // Flddlg auf neue TabPage umschalten USHORT nId = SwFldDlgWrapper::GetChildWindowId(); @@ -370,7 +370,7 @@ void SwTextShell::ExecField(SfxRequest &rReq) rSh.Push(); rSh.SwCrsrShell::Left(1, CRSR_SKIP_CHARS, FALSE); pPostIt = (SwPostItField*)aFldMgr.GetCurFld(); - rSh.Pop(FALSE); // Cursorpos restaurieren + rSh.Pop(FALSE); // Cursorpos restaurieren } if (pPostIt) @@ -393,7 +393,7 @@ void SwTextShell::ExecField(SfxRequest &rReq) break; case FN_REDLINE_COMMENT: { - /* this code can be used once we want redline comments in the margin, all other stuff can + /* this code can be used once we want redline comments in the margin, all other stuff can then be deleted String sComment; const SwRedline *pRedline = rSh.GetCurrRedline(); @@ -436,8 +436,8 @@ void SwTextShell::ExecField(SfxRequest &rReq) const SwRedline *pActRed = rSh.SelPrevRedline(); if (pActRed == pRedline) - { // Neuer Cursor steht am Anfang des Current Redlines - rSh.Pop(); // Alten Cursor wegwerfen + { // Neuer Cursor steht am Anfang des Current Redlines + rSh.Pop(); // Alten Cursor wegwerfen rSh.Push(); pActRed = rSh.SelPrevRedline(); } @@ -447,13 +447,13 @@ void SwTextShell::ExecField(SfxRequest &rReq) rSh.EndAction(); rSh.ClearMark(); - rSh.SelNextRedline(); // Aktueller Redline wird selektiert + rSh.SelNextRedline(); // Aktueller Redline wird selektiert rSh.StartAction(); rSh.Push(); pActRed = rSh.SelNextRedline(); BOOL bNext = pActRed != 0; - rSh.Pop(FALSE); // Cursorpos restaurieren + rSh.Pop(FALSE); // Cursorpos restaurieren if( rSh.IsCrsrPtAtEnd() ) rSh.SwapPam(); @@ -654,7 +654,7 @@ void SwTextShell::StateField( SfxItemSet &rSet ) } USHORT nTempWhich = pField ? pField->GetTyp()->Which() : USHRT_MAX; - if( USHRT_MAX == nTempWhich || + if( USHRT_MAX == nTempWhich || RES_POSTITFLD == nTempWhich || RES_SCRIPTFLD == nTempWhich || RES_AUTHORITY == nTempWhich ) @@ -797,7 +797,7 @@ IMPL_LINK( SwTextShell, RedlineNextHdl, AbstractSvxPostItDialog *, pBtn ) { // Traveling nur bei mehr als einem Feld if( !pSh->IsCrsrPtAtEnd() ) - pSh->SwapPam(); // Cursor hinter den Redline stellen + pSh->SwapPam(); // Cursor hinter den Redline stellen pSh->Push(); const SwRedline *pActRed = pSh->SelNextRedline(); diff --git a/sw/source/ui/shells/textglos.cxx b/sw/source/ui/shells/textglos.cxx index 0e998d7c6224..b91d04b83fa0 100644 --- a/sw/source/ui/shells/textglos.cxx +++ b/sw/source/ui/shells/textglos.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/shells/textidx.cxx b/sw/source/ui/shells/textidx.cxx index cb47f09827c0..941f2db76097 100644 --- a/sw/source/ui/shells/textidx.cxx +++ b/sw/source/ui/shells/textidx.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 @@ -43,7 +43,7 @@ #include "cmdid.h" #include "view.hxx" #include "wrtsh.hxx" -#include "swundo.hxx" // fuer Undo-Ids +#include "swundo.hxx" // fuer Undo-Ids #include "textsh.hxx" #include "idxmrk.hxx" #include "cnttab.hxx" @@ -94,7 +94,7 @@ void SwTextShell::ExecIdx(SfxRequest &rReq) SwTOXMgr aMgr(GetShellPtr()); USHORT nRet = RET_OK; if(aMgr.GetTOXMarkCount() > 1) - { // Mehrere Marken, welche solls denn sein ? + { // Mehrere Marken, welche solls denn sein ? // SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "Dialogdiet fail!"); @@ -104,7 +104,7 @@ void SwTextShell::ExecIdx(SfxRequest &rReq) nRet = pMultDlg->Execute(); delete pMultDlg; } - if( nRet == RET_OK) + if( nRet == RET_OK) { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "Dialogdiet fail!"); @@ -129,7 +129,7 @@ void SwTextShell::ExecIdx(SfxRequest &rReq) SID_ATTR_PAGE_SIZE, SID_ATTR_PAGE_SIZE, RES_LR_SPACE, RES_LR_SPACE, FN_PARAM_TOX_TYPE, FN_PARAM_TOX_TYPE, - 0 ); + 0 ); SwWrtShell& rSh = GetShell(); SwRect aRect; rSh.CalcBoundRect(aRect, FLY_AS_CHAR); @@ -248,7 +248,7 @@ void SwTextShell::GetIdxState(SfxItemSet &rSet) else rSet.Put(SfxBoolItem(FN_INSERT_AUTH_ENTRY_DLG, 0 != pAuthMark)); - if( bInReadonly || !pField || + if( bInReadonly || !pField || pField->GetTyp()->Which() != RES_AUTHORITY) rSet.DisableItem(FN_EDIT_AUTH_ENTRY_DLG); rSet.DisableItem(FN_REMOVE_CUR_TOX); diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx index f385b53e8b14..92e8103623bb 100644 --- a/sw/source/ui/shells/textsh.cxx +++ b/sw/source/ui/shells/textsh.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 @@ -85,7 +85,7 @@ #include <textsh.hxx> #include <frmfmt.hxx> #include <tablemgr.hxx> -#include <swundo.hxx> // fuer Undo-IDs +#include <swundo.hxx> // fuer Undo-IDs #include <shellio.hxx> #include <frmdlg.hxx> #include <usrpref.hxx> @@ -907,7 +907,7 @@ void SwTextShell::StateInsert( SfxItemSet &rSet ) aHLinkItem.SetInsertMode((SvxLinkInsertMode)(aHLinkItem.GetInsertMode() | ((nHtmlMode & HTMLMODE_ON) != 0 ? HLINK_HTMLMODE : 0))); - aHLinkItem.SetMacroEvents ( HYPERDLG_EVENT_MOUSEOVER_OBJECT| + aHLinkItem.SetMacroEvents ( HYPERDLG_EVENT_MOUSEOVER_OBJECT| HYPERDLG_EVENT_MOUSECLICK_OBJECT | HYPERDLG_EVENT_MOUSEOUT_OBJECT ); rSet.Put(aHLinkItem); @@ -1173,9 +1173,9 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq ) bFontChanged = TRUE; SvxFontItem aNewFontItem( aFont ); aNewFontItem.GetFamilyName() = aNewFont.GetName(); - aNewFontItem.GetFamily() = aNewFont.GetFamily(); - aNewFontItem.GetPitch() = aNewFont.GetPitch(); - aNewFontItem.GetCharSet() = aNewFont.GetCharSet(); + aNewFontItem.GetFamily() = aNewFont.GetFamily(); + aNewFontItem.GetPitch() = aNewFont.GetPitch(); + aNewFontItem.GetCharSet() = aNewFont.GetCharSet(); SfxItemSet aRestoreSet( GetPool(), RES_CHRATR_FONT, RES_CHRATR_FONT, RES_CHRATR_CJK_FONT, RES_CHRATR_CJK_FONT, diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx index 8f8ecca3b901..5633e4cd09b9 100644 --- a/sw/source/ui/shells/textsh1.cxx +++ b/sw/source/ui/shells/textsh1.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 @@ -84,7 +84,7 @@ #include <docstat.hxx> #include <outline.hxx> #include <tablemgr.hxx> -#include <swundo.hxx> // fuer Undo-IDs +#include <swundo.hxx> // fuer Undo-IDs #include <reffld.hxx> #include <docsh.hxx> #include <mdiexp.hxx> @@ -662,7 +662,7 @@ void SwTextShell::Execute(SfxRequest &rReq) break; case FN_AUTOFORMAT_AUTO: { - SvxAutoCorrCfg* pACfg = SvxAutoCorrCfg::Get(); + SvxAutoCorrCfg* pACfg = SvxAutoCorrCfg::Get(); BOOL bSet = pItem ? ((const SfxBoolItem*)pItem)->GetValue() : !pACfg->IsAutoFmtByInput(); if( bSet != pACfg->IsAutoFmtByInput() ) { @@ -842,10 +842,10 @@ void SwTextShell::Execute(SfxRequest &rReq) break; case SID_CHAR_DLG_FOR_PARAGRAPH: { - rWrtSh.Push(); //save current cursor + rWrtSh.Push(); //save current cursor SwLangHelper::SelectCurrentPara( rWrtSh ); lcl_CharDialog( rWrtSh, bUseDialog, nSlot, pArgs, &rReq ); - rWrtSh.Pop( FALSE ); //restore old cursor + rWrtSh.Pop( FALSE ); //restore old cursor } break; case SID_ATTR_LRSPACE : @@ -1148,7 +1148,7 @@ void SwTextShell::Execute(SfxRequest &rReq) rReq.Done(); -/* OS 22.02.97 18:40 Das alte Verhalten ist unerwuenscht +/* OS 22.02.97 18:40 Das alte Verhalten ist unerwuenscht if(!pApply || pApply->nColor != SID_ATTR_CHAR_COLOR_BACKGROUND_EXT) { Brush aBrush(pItem ? BRUSH_SOLID : BRUSH_NULL); @@ -1406,7 +1406,7 @@ void SwTextShell::GetState( SfxItemSet &rSet ) rSet.DisableItem( SID_THES ); } break; - + case FN_NUMBER_NEWSTART : if(!rSh.GetCurNumRule()) rSet.DisableItem(nWhich); diff --git a/sw/source/ui/shells/textsh2.cxx b/sw/source/ui/shells/textsh2.cxx index 98086857f31c..632cea50f303 100644 --- a/sw/source/ui/shells/textsh2.cxx +++ b/sw/source/ui/shells/textsh2.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 @@ -95,8 +95,8 @@ struct DBTextStruct_Impl { SwDBData aDBData; Sequence<Any> aSelection; - Reference<XResultSet> xCursor; - Reference<XConnection> xConnection; + Reference<XResultSet> xCursor; + Reference<XConnection> xConnection; }; inline void AddSelList( List& rLst, long nRow ) @@ -166,15 +166,15 @@ void SwTextShell::ExecDB(SfxRequest &rReq) { if(pSourceItem && pCommandItem && pCommandTypeItem) { - DBTextStruct_Impl* pNew = new DBTextStruct_Impl; - pNew->aDBData.sDataSource = sSourceArg; - pNew->aDBData.sCommand = sCommandArg; - pNew->aDBData.nCommandType = nCommandTypeArg; - pNew->aSelection = aSelection; + DBTextStruct_Impl* pNew = new DBTextStruct_Impl; + pNew->aDBData.sDataSource = sSourceArg; + pNew->aDBData.sCommand = sCommandArg; + pNew->aDBData.nCommandType = nCommandTypeArg; + pNew->aSelection = aSelection; //if the cursor is NULL, it must be created inside InsertDBTextHdl // because it called via a PostUserEvent - pNew->xCursor = xCursor; - pNew->xConnection = xConnection; + pNew->xCursor = xCursor; + pNew->xConnection = xConnection; Application::PostUserEvent( STATIC_LINK( this, SwBaseShell, InsertDBTextHdl ), pNew ); @@ -195,10 +195,10 @@ void SwTextShell::ExecDB(SfxRequest &rReq) ODataAccessDescriptor aDescriptor; aDescriptor.setDataSource(sSourceArg); - aDescriptor[daCommand] <<= sCommandArg; - aDescriptor[daCursor] <<= xCursor; - aDescriptor[daSelection] <<= aSelection; - aDescriptor[daCommandType] <<= nCommandTypeArg; + aDescriptor[daCommand] <<= sCommandArg; + aDescriptor[daCursor] <<= xCursor; + aDescriptor[daSelection] <<= aSelection; + aDescriptor[daCommandType] <<= nCommandTypeArg; SwMergeDescriptor aMergeDesc( DBMGR_MERGE, *GetShellPtr(), aDescriptor ); pNewDBMgr->MergeNew(aMergeDesc); diff --git a/sw/source/ui/shells/txtattr.cxx b/sw/source/ui/shells/txtattr.cxx index 43ee2df4305f..71571fd92880 100644 --- a/sw/source/ui/shells/txtattr.cxx +++ b/sw/source/ui/shells/txtattr.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 @@ -67,8 +67,8 @@ #include <SwStyleNameMapper.hxx> #include "swabstdlg.hxx" #include "chrdlg.hrc" -const SwTwips lFontInc = 2 * 20; // ==> PointToTwips(2) -const SwTwips lFontMaxSz = 72 * 20; // ==> PointToTwips(72) +const SwTwips lFontInc = 2 * 20; // ==> PointToTwips(2) +const SwTwips lFontMaxSz = 72 * 20; // ==> PointToTwips(72) @@ -254,7 +254,7 @@ void SwTextShell::ExecCharAttrArgs(SfxRequest &rReq) if (bGrow) { if( lSize == lFontMaxSz ) - break; // das wars, hoeher gehts nicht + break; // das wars, hoeher gehts nicht if( ( lSize += lFontInc ) > lFontMaxSz ) lSize = lFontMaxSz; } @@ -316,14 +316,14 @@ void SwTextShell::ExecParaAttr(SfxRequest &rReq) switch (rReq.GetSlot()) { - case FN_SET_LEFT_PARA: lcl_SetAdjust(ADJLEFT,aSet); break; - case FN_SET_RIGHT_PARA: lcl_SetAdjust(ADJRIGHT,aSet); break; - case FN_SET_CENTER_PARA: lcl_SetAdjust(ADJCENTER,aSet); break; - case SID_ATTR_PARA_ADJUST_BLOCK:lcl_SetAdjust(ADJBLOCK,aSet); break; + case FN_SET_LEFT_PARA: lcl_SetAdjust(ADJLEFT,aSet); break; + case FN_SET_RIGHT_PARA: lcl_SetAdjust(ADJRIGHT,aSet); break; + case FN_SET_CENTER_PARA: lcl_SetAdjust(ADJCENTER,aSet); break; + case SID_ATTR_PARA_ADJUST_BLOCK:lcl_SetAdjust(ADJBLOCK,aSet); break; - case FN_SET_LINE_SPACE_1: lcl_SetLineSpace(100,aSet); break; - case FN_SET_LINE_SPACE_15: lcl_SetLineSpace(150,aSet); break; - case FN_SET_LINE_SPACE_2: lcl_SetLineSpace(200,aSet); break; + case FN_SET_LINE_SPACE_1: lcl_SetLineSpace(100,aSet); break; + case FN_SET_LINE_SPACE_15: lcl_SetLineSpace(150,aSet); break; + case FN_SET_LINE_SPACE_2: lcl_SetLineSpace(200,aSet); break; default: OSL_ENSURE(false, "SwTextShell::ExecParaAttr wrong Dispatcher"); @@ -377,10 +377,10 @@ void SwTextShell::ExecParaAttr(SfxRequest &rReq) } } break; - case SID_ATTR_PARA_ADJUST_LEFT: eAdjst = SVX_ADJUST_LEFT; goto SET_ADJUST; - case SID_ATTR_PARA_ADJUST_RIGHT: eAdjst = SVX_ADJUST_RIGHT; goto SET_ADJUST; - case SID_ATTR_PARA_ADJUST_CENTER: eAdjst = SVX_ADJUST_CENTER; goto SET_ADJUST; - case SID_ATTR_PARA_ADJUST_BLOCK: eAdjst = SVX_ADJUST_BLOCK; goto SET_ADJUST; + case SID_ATTR_PARA_ADJUST_LEFT: eAdjst = SVX_ADJUST_LEFT; goto SET_ADJUST; + case SID_ATTR_PARA_ADJUST_RIGHT: eAdjst = SVX_ADJUST_RIGHT; goto SET_ADJUST; + case SID_ATTR_PARA_ADJUST_CENTER: eAdjst = SVX_ADJUST_CENTER; goto SET_ADJUST; + case SID_ATTR_PARA_ADJUST_BLOCK: eAdjst = SVX_ADJUST_BLOCK; goto SET_ADJUST; SET_ADJUST: { aSet.Put(SvxAdjustItem(eAdjst,RES_PARATR_ADJUST)); @@ -396,9 +396,9 @@ SET_ADJUST: aSet.Put( aLineSpace ); } break; - case SID_ATTR_PARA_LINESPACE_10: ePropL = 100; goto SET_LINESPACE; - case SID_ATTR_PARA_LINESPACE_15: ePropL = 150; goto SET_LINESPACE; - case SID_ATTR_PARA_LINESPACE_20: ePropL = 200; goto SET_LINESPACE; + case SID_ATTR_PARA_LINESPACE_10: ePropL = 100; goto SET_LINESPACE; + case SID_ATTR_PARA_LINESPACE_15: ePropL = 150; goto SET_LINESPACE; + case SID_ATTR_PARA_LINESPACE_20: ePropL = 200; goto SET_LINESPACE; SET_LINESPACE: { @@ -549,7 +549,7 @@ void SwTextShell::ExecParaAttrArgs(SfxRequest &rReq) SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); - SfxAbstractDialog* pDlg = pFact->CreateSfxDialog( GetView().GetWindow(), aSet, + SfxAbstractDialog* pDlg = pFact->CreateSfxDialog( GetView().GetWindow(), aSet, rSh.GetView().GetViewFrame()->GetFrame().GetFrameInterface(), DLG_SWDROPCAPS ); OSL_ENSURE(pDlg, "Dialogdiet fail!"); if (pDlg->Execute() == RET_OK) @@ -582,7 +582,7 @@ void SwTextShell::ExecParaAttrArgs(SfxRequest &rReq) if(pItem) { SfxItemSet aCoreSet( GetPool(), - RES_PAGEDESC, RES_PAGEDESC, + RES_PAGEDESC, RES_PAGEDESC, SID_ATTR_PARA_MODEL, SID_ATTR_PARA_MODEL, 0); aCoreSet.Put(*pItem); SfxToSwPageDescAttr( rSh, aCoreSet); @@ -612,7 +612,7 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet) sal_Bool bFlag = sal_False; SfxBoolItem aFlagItem; const SfxPoolItem* pItem = 0; - int eAdjust = -1; // Illegaler Wert, um DONTCARE zu erkennen + int eAdjust = -1; // Illegaler Wert, um DONTCARE zu erkennen SfxItemState eState = aCoreSet.GetItemState(RES_PARATR_ADJUST, FALSE, &pItem); if( SFX_ITEM_DEFAULT == eState ) diff --git a/sw/source/ui/shells/txtcrsr.cxx b/sw/source/ui/shells/txtcrsr.cxx index 9d0efc70c44d..3cf887b546dc 100644 --- a/sw/source/ui/shells/txtcrsr.cxx +++ b/sw/source/ui/shells/txtcrsr.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 @@ -116,22 +116,22 @@ void SwTextShell::ExecMove(SfxRequest &rReq) switch ( nSlot ) { case FN_START_OF_LINE_SEL: - case FN_START_OF_LINE: bRet = rSh.LeftMargin ( FN_START_OF_LINE_SEL == nSlot, FALSE ); + case FN_START_OF_LINE: bRet = rSh.LeftMargin ( FN_START_OF_LINE_SEL == nSlot, FALSE ); break; case FN_END_OF_LINE_SEL: - case FN_END_OF_LINE: bRet = rSh.RightMargin( FN_END_OF_LINE_SEL == nSlot, FALSE ); + case FN_END_OF_LINE: bRet = rSh.RightMargin( FN_END_OF_LINE_SEL == nSlot, FALSE ); break; case FN_START_OF_DOCUMENT_SEL: - case FN_START_OF_DOCUMENT: bRet = rSh.SttDoc ( FN_START_OF_DOCUMENT_SEL == nSlot); + case FN_START_OF_DOCUMENT: bRet = rSh.SttDoc ( FN_START_OF_DOCUMENT_SEL == nSlot); break; case FN_END_OF_DOCUMENT_SEL: - case FN_END_OF_DOCUMENT: bRet = rSh.EndDoc( FN_END_OF_DOCUMENT_SEL == nSlot ); + case FN_END_OF_DOCUMENT: bRet = rSh.EndDoc( FN_END_OF_DOCUMENT_SEL == nSlot ); break; - case FN_SELECT_WORD: bRet = rSh.SelNearestWrd(); break; + case FN_SELECT_WORD: bRet = rSh.SelNearestWrd(); break; case SID_SELECTALL: bRet = 0 != rSh.SelAll(); break; default: OSL_ENSURE(false, "wrong dispatcher"); return; @@ -158,7 +158,7 @@ void SwTextShell::ExecMovePage(SfxRequest &rReq) case FN_START_OF_NEXT_PAGE: rSh.SttNxtPg( FN_START_OF_NEXT_PAGE_SEL == nSlot ); break; case FN_END_OF_NEXT_PAGE_SEL: - case FN_END_OF_NEXT_PAGE: rSh.EndNxtPg( FN_END_OF_NEXT_PAGE_SEL == nSlot ); break; + case FN_END_OF_NEXT_PAGE: rSh.EndNxtPg( FN_END_OF_NEXT_PAGE_SEL == nSlot ); break; case FN_START_OF_PREV_PAGE_SEL: case FN_START_OF_PREV_PAGE: rSh.SttPrvPg( FN_START_OF_PREV_PAGE_SEL == nSlot ); break; @@ -167,10 +167,10 @@ void SwTextShell::ExecMovePage(SfxRequest &rReq) case FN_END_OF_PREV_PAGE: rSh.EndPrvPg( FN_END_OF_PREV_PAGE_SEL == nSlot ); break; case FN_START_OF_PAGE_SEL: - case FN_START_OF_PAGE: rSh.SttPg ( FN_START_OF_PAGE_SEL == nSlot ); break; + case FN_START_OF_PAGE: rSh.SttPg ( FN_START_OF_PAGE_SEL == nSlot ); break; case FN_END_OF_PAGE_SEL: - case FN_END_OF_PAGE: rSh.EndPg ( FN_END_OF_PAGE_SEL == nSlot ); break; + case FN_END_OF_PAGE: rSh.EndPg ( FN_END_OF_PAGE_SEL == nSlot ); break; default: OSL_ENSURE(false, "wrong dispatcher"); return; } rReq.Done(); @@ -182,12 +182,12 @@ void SwTextShell::ExecMoveCol(SfxRequest &rReq) SwWrtShell &rSh = GetShell(); switch ( rReq.GetSlot() ) { - case FN_START_OF_COLUMN: rSh.StartOfColumn ( FALSE ); break; - case FN_END_OF_COLUMN: rSh.EndOfColumn ( FALSE ); break; + case FN_START_OF_COLUMN: rSh.StartOfColumn ( FALSE ); break; + case FN_END_OF_COLUMN: rSh.EndOfColumn ( FALSE ); break; case FN_START_OF_NEXT_COLUMN: rSh.StartOfNextColumn( FALSE ) ; break; - case FN_END_OF_NEXT_COLUMN: rSh.EndOfNextColumn ( FALSE ); break; + case FN_END_OF_NEXT_COLUMN: rSh.EndOfNextColumn ( FALSE ); break; case FN_START_OF_PREV_COLUMN: rSh.StartOfPrevColumn( FALSE ); break; - case FN_END_OF_PREV_COLUMN: rSh.EndOfPrevColumn ( FALSE ); break; + case FN_END_OF_PREV_COLUMN: rSh.EndOfPrevColumn ( FALSE ); break; default: OSL_ENSURE(false, "wrong dispatcher"); return; } rReq.Done(); @@ -203,7 +203,7 @@ void SwTextShell::ExecMoveLingu(SfxRequest &rReq) switch ( nSlot ) { case FN_NEXT_WORD_SEL: - case FN_NEXT_WORD: bRet = rSh.NxtWrd( FN_NEXT_WORD_SEL == nSlot ); + case FN_NEXT_WORD: bRet = rSh.NxtWrd( FN_NEXT_WORD_SEL == nSlot ); break; case FN_START_OF_PARA_SEL: diff --git a/sw/source/ui/shells/txtnum.cxx b/sw/source/ui/shells/txtnum.cxx index e08b4bdc0140..d3ac0e32f23a 100644 --- a/sw/source/ui/shells/txtnum.cxx +++ b/sw/source/ui/shells/txtnum.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 |