diff options
| author | Guillaume Poussel <gpoussel@gmail.com> | 2011-02-07 22:11:09 +0100 |
|---|---|---|
| committer | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2011-02-08 19:09:12 +0100 |
| commit | cd4a86b717083e36d707f0605a9cf5719a411ef0 (patch) | |
| tree | 5f89ef86b2d4a0cbccc577180dd710ef49c2d3db /sd/source/ui | |
| parent | ec7d423f53a7beec49e7a69ccc9cb7bad366b7a3 (diff) | |
Remove all bogus comments in impress.
Diffstat (limited to 'sd/source/ui')
64 files changed, 130 insertions, 237 deletions
diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx index de9bd6f0a74d..cdf091e26acc 100644 --- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx +++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx @@ -111,7 +111,7 @@ AccessibleOutlineView::~AccessibleOutlineView (void) void AccessibleOutlineView::Init (void) { - // #105479# Set event source _before_ starting to listen + // Set event source _before_ starting to listen maTextHelper.SetEventSource(this); AccessibleDocumentViewBase::Init (); diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index 8b2d64788873..bc52b9dab76b 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -220,7 +220,7 @@ void SdModule::Execute(SfxRequest& rReq) case SID_NEWSD: { SfxFrame* pFrame = ExecuteNewDocument( rReq ); - // #94442# if a frame was created, set it as return value + // if a frame was created, set it as return value if(pFrame) rReq.SetReturnValue(SfxFrameItem(0, pFrame)); } @@ -739,7 +739,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) pDocShell->SetUseUserData(TRUE); - // #94652# clear UNDO stack after autopilot + // clear UNDO stack after autopilot pDocShell->ClearUndoBuffer(); bMakeLayoutVisible = true; @@ -1045,7 +1045,7 @@ void OutlineToImpressFinalizer::operator() (bool) } - // #97231# Undo-Stack needs to be cleared, else the user may remove the + // Undo-Stack needs to be cleared, else the user may remove the // only drawpage and this is a state we cannot handle ATM. ::sd::DrawDocShell* pDocShell = mrDocument.GetDocSh(); if( pDocShell ) diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index 840ef72d5a6b..02782541dd7f 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -620,7 +620,7 @@ void SdModule::ApplyItemSet( USHORT nSlot, const SfxItemSet& rSet ) INT32 nY = ( (SfxInt32Item*) pItem )->GetValue(); pOptions->SetScale( nX, nY ); - // #92067# Apply to document only if doc type match + // Apply to document only if doc type match if( pDocSh && pDoc && eDocType == pDoc->GetDocumentType() ) { pDoc->SetUIScale( Fraction( nX, nY ) ); @@ -745,7 +745,7 @@ void SdModule::ApplyItemSet( USHORT nSlot, const SfxItemSet& rSet ) if (pViewShell) { - // #74495# make sure no one is in text edit mode, cause there + // make sure no one is in text edit mode, cause there // are some pointers remembered else (!) if(pViewShell->GetView()) pViewShell->GetView()->SdrEndTextEdit(); diff --git a/sd/source/ui/app/sdpopup.cxx b/sd/source/ui/app/sdpopup.cxx index e757f10bcd16..4b549de49301 100644 --- a/sd/source/ui/app/sdpopup.cxx +++ b/sd/source/ui/app/sdpopup.cxx @@ -297,7 +297,7 @@ SvxFieldData* SdFieldPopup::GetField() if( pDocSh->HasName() ) aName = pDocSh->GetMedium()->GetName(); - // #91225# Get current filename, not the one stored in the old field + // Get current filename, not the one stored in the old field pNewField = new SvxExtFileField( aName ); ( (SvxExtFileField*) pNewField )->SetType( eType ); ( (SvxExtFileField*) pNewField )->SetFormat( eFormat ); @@ -326,7 +326,7 @@ SvxFieldData* SdFieldPopup::GetField() if( pAuthorField->GetFormat() != eFormat || pAuthorField->GetType() != eType ) { - // #91225# Get current state of address, not the old one + // Get current state of address, not the old one SvtUserOptions aUserOptions; pNewField = new SvxAuthorField( aUserOptions.GetFirstName(), aUserOptions.GetLastName(), aUserOptions.GetID() ); ( (SvxAuthorField*) pNewField )->SetType( eType ); diff --git a/sd/source/ui/app/tbxww.cxx b/sd/source/ui/app/tbxww.cxx index 0b818d390894..9a7e9d4e8877 100644 --- a/sd/source/ui/app/tbxww.cxx +++ b/sd/source/ui/app/tbxww.cxx @@ -155,7 +155,7 @@ void SdTbxControl::StateChanged( USHORT nSId, { TbxImageItem* pItem = PTR_CAST( TbxImageItem, pState ); // Im StarDesktop kann jetzt auch ein anderes Item ankommen, - // das nicht ausgewertet werden darf (#33802# und #33838#) + // das nicht ausgewertet werden darf if( pItem ) { ToolBox& rTbx = GetToolBox(); diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index 30865566e48e..a59c07d90de7 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -595,7 +595,7 @@ void AnimationWindow::UpdateControl( ULONG nListPos, BOOL bDisableCtrls ) ? ViewShell::OUTPUT_DRAWMODE_CONTRAST : ViewShell::OUTPUT_DRAWMODE_COLOR ); aVD.Erase(); - pObject->SingleObjectPainter( aVD ); // #110094#-17 + pObject->SingleObjectPainter( aVD ); aBmp = BitmapEx( aVD.GetBitmap( aObjRect.TopLeft(), aObjSize ) ); } diff --git a/sd/source/ui/dlg/dlgassim.cxx b/sd/source/ui/dlg/dlgassim.cxx index c30e7a5d515e..7242a6a06d76 100644 --- a/sd/source/ui/dlg/dlgassim.cxx +++ b/sd/source/ui/dlg/dlgassim.cxx @@ -52,7 +52,7 @@ SdPageListControl::SdPageListControl( // Tree-ListBox mit Linien versehen SetWindowBits( WinBits( WB_TABSTOP | WB_BORDER | WB_HASLINES | WB_HASBUTTONS | WB_HASLINESATROOT | - WB_HSCROLL | // #31562# + WB_HSCROLL | WB_HASBUTTONSATROOT ) ); SetNodeDefaultImages (); diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx index a9c50a6da310..bde2ccce6f71 100644 --- a/sd/source/ui/dlg/dlgfield.cxx +++ b/sd/source/ui/dlg/dlgfield.cxx @@ -155,7 +155,7 @@ SvxFieldData* SdModifyFieldDlg::GetField() if( pDocSh->HasName() ) aName = pDocSh->GetMedium()->GetName(); - // #91225# Get current filename, not the one stored in the old field + // Get current filename, not the one stored in the old field pNewField = new SvxExtFileField( aName ); ( (SvxExtFileField*) pNewField )->SetType( eType ); ( (SvxExtFileField*) pNewField )->SetFormat( eFormat ); @@ -173,7 +173,7 @@ SvxFieldData* SdModifyFieldDlg::GetField() eFormat = (SvxAuthorFormat) ( aLbFormat.GetSelectEntryPos() ); - // #91225# Get current state of address, not the old one + // Get current state of address, not the old one SvtUserOptions aUserOptions; pNewField = new SvxAuthorField( aUserOptions.GetFirstName(), aUserOptions.GetLastName(), aUserOptions.GetID() ); ( (SvxAuthorField*) pNewField )->SetType( eType ); diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx index 769ace5dead5..f444f6f27b7a 100644 --- a/sd/source/ui/dlg/docprev.cxx +++ b/sd/source/ui/dlg/docprev.cxx @@ -238,7 +238,7 @@ void SdDocPreviewWin::updateViewSettings() aVDev.SetMapMode( aMap ); - // #109058# Disable output, as we only want to record a metafile + // Disable output, as we only want to record a metafile aVDev.EnableOutput( FALSE ); pMtf->Record( &aVDev ); diff --git a/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx index 698fa76551b3..5aeb12f6834e 100644 --- a/sd/source/ui/dlg/inspagob.cxx +++ b/sd/source/ui/dlg/inspagob.cxx @@ -139,7 +139,7 @@ List* SdInsertPagesObjsDlg::GetList( USHORT nType ) // wird das gesamte Dokument (und nicht mehr!) eingefuegt. if( aLbTree.GetSelectionCount() == 0 || ( aLbTree.IsSelected( aLbTree.First() ) ) ) - return( NULL ); // #37350# + return( NULL ); } return( aLbTree.GetSelectEntryList( nType ) ); } diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 18a880a0874c..21d9787116f7 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -386,7 +386,7 @@ IMPL_LINK( SdNavigatorWin, ClickObjectHdl, void *, EMPTYARG ) mpBindings->GetDispatcher()->Execute( SID_NAVIGATOR_OBJECT, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L ); - // #98821# moved here from SetGetFocusHdl. Reset the + // moved here from SetGetFocusHdl. Reset the // focus only if something has been selected in the // document. SfxViewShell* pCurSh = SfxViewShell::Current(); diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx index aade684acacd..dfff80251764 100644 --- a/sd/source/ui/dlg/prltempl.cxx +++ b/sd/source/ui/dlg/prltempl.cxx @@ -181,7 +181,7 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, break; } - // #112490# the tabpages Alignment, Tabs and Asian Typography are very + // the tabpages Alignment, Tabs and Asian Typography are very // usefull, except for the background style if( DlgId.GetId() != TAB_PRES_LAYOUT_TEMPLATE_BACKGROUND ) { diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx index 1cfb45f8af5d..f7730286787a 100644 --- a/sd/source/ui/dlg/sdpreslt.cxx +++ b/sd/source/ui/dlg/sdpreslt.cxx @@ -245,7 +245,7 @@ IMPL_LINK(SdPresLayoutDlg, ClickLoadHdl, void *, EMPTYARG) } USHORT nResult = pDlg->Execute(); - // #96072# OJ: Inserted update to force repaint + // Inserted update to force repaint Update(); String aFile; diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 69cee3940f70..8240449a2c82 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -249,7 +249,7 @@ SdPageObjsTLB::SdPageObjsTLB( Window* pParentWin, const SdResId& rSdResId ) // Tree-ListBox mit Linien versehen SetWindowBits( WinBits( WB_TABSTOP | WB_BORDER | WB_HASLINES | WB_HASBUTTONS | // WB_HASLINESATROOT | - WB_HSCROLL | // #31562# + WB_HSCROLL | WB_HASBUTTONSATROOT ) ); SetNodeBitmaps( Bitmap( SdResId( BMP_EXPAND ) ), Bitmap( SdResId( BMP_COLLAPSE ) ) ); @@ -995,7 +995,7 @@ void SdPageObjsTLB::DoDrag() sal_Int8 nDNDActions = DND_ACTION_COPYMOVE; if( eDragType == NAVIGATOR_DRAGTYPE_LINK ) - nDNDActions = DND_ACTION_LINK; // #93240# Either COPY *or* LINK, never both! + nDNDActions = DND_ACTION_LINK; // Either COPY *or* LINK, never both! SvTreeListBox::ReleaseMouse(); diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index 422b4fadf765..3cfdfef4642e 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -483,8 +483,8 @@ void SdTPAction::OpenFileDialog() aFileDialog.SetDisplayDirectory( aFile ); - // The following is a fix for #1008001# and a workarround for - // #i4306#: The addition of the implicitely existing "all files" + // The following is a workarround for #i4306#: + // The addition of the implicitely existing "all files" // filter makes the (Windows system) open file dialog follow // links on the desktop to directories. aFileDialog.AddFilter ( diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index 0f564929d1ac..6127329e82fd 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -550,7 +550,6 @@ void SdTpOptionsMisc::Reset( const SfxItemSet& rAttrs ) aCbScale.SetText( GetScale( nX, nY ) ); - // #92067# broken feature disabled for 6.0 aFtOriginal.Hide(); aFtEquivalent.Hide(); aMtrFldOriginalWidth.Hide(); @@ -725,7 +724,7 @@ IMPL_LINK( SdTpOptionsMisc, ModifyOriginalScaleHdl, void *, EMPTYARG ) aFract = Fraction( aFract1.GetDenominator(), aFract1.GetNumerator() ); nValue = aFract; - // #92067# Swap nominator and denominator + // Swap nominator and denominator aCbScale.SetText( GetScale( nValue, 1 ) ); } else @@ -735,7 +734,7 @@ IMPL_LINK( SdTpOptionsMisc, ModifyOriginalScaleHdl, void *, EMPTYARG ) if( fValue > (double)nValue ) nValue++; - // #92067# Swap nominator and denominator + // Swap nominator and denominator aCbScale.SetText( GetScale( 1, nValue ) ); } return( 0L ); diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index e081eed7cae4..b05d55a4d77c 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -325,7 +325,7 @@ BOOL DrawDocShell::Load( SfxMedium& rMedium ) { UpdateTablePointers(); - // #108451# If we're an embedded OLE object, use tight bounds + // If we're an embedded OLE object, use tight bounds // for our visArea. No point in showing the user lots of empty // space. Had to remove the check for empty VisArea below, // since XML load always sets a VisArea before. @@ -381,31 +381,6 @@ BOOL DrawDocShell::LoadFrom( SfxMedium& rMedium ) BOOL bRet = FALSE; - /* - // #90691# return to old behaviour (before #80365#): construct own medium - SfxMedium aMedium(xStorage); - - // #90691# for having a progress bar nonetheless for XML copy it - // from the local DocShell medium (GetMedium()) to the constructed one - SfxMedium* pLocalMedium = GetMedium(); - if(pLocalMedium) - { - SfxItemSet* pLocalItemSet = pLocalMedium->GetItemSet(); - SfxItemSet* pDestItemSet = aMedium.GetItemSet(); - - if(pLocalItemSet && pDestItemSet) - { - const SfxUnoAnyItem* pItem = static_cast< - const SfxUnoAnyItem*>( - pLocalItemSet->GetItem(SID_PROGRESS_STATUSBAR_CONTROL)); - - if(pItem) - { - pDestItemSet->Put(*pItem); - } - } - } */ - mpDoc->NewOrLoadCompleted( NEW_DOC ); mpDoc->CreateFirstPages(); mpDoc->StopWorkStartupDelay(); @@ -571,7 +546,7 @@ BOOL DrawDocShell::Save() if( bRet ) { - // #86834# Call UpdateDocInfoForSave() before export + // Call UpdateDocInfoForSave() before export UpdateDocInfoForSave(); bRet = SdXMLFilter( *GetMedium(), *this, sal_True, SDXMLMODE_Normal, SotStorage::GetVersion( GetMedium()->GetStorage() ) ).Export(); @@ -599,7 +574,7 @@ BOOL DrawDocShell::SaveAs( SfxMedium& rMedium ) if( bRet ) { - // #86834# Call UpdateDocInfoForSave() before export + // Call UpdateDocInfoForSave() before export UpdateDocInfoForSave(); bRet = SdXMLFilter( rMedium, *this, sal_True, SDXMLMODE_Normal, SotStorage::GetVersion( rMedium.GetStorage() ) ).Export(); } @@ -882,7 +857,7 @@ BOOL DrawDocShell::GotoBookmark(const String& rBookmark) // Make the bookmarked page the current page. This is done // by using the API because this takes care of all the // little things to be done. Especially writing the view - // data to the frame view (see bug #107803#). + // data to the frame view. USHORT nSdPgNum = (nPageNumber - 1) / 2; Reference<drawing::XDrawView> xController (rBase.GetController(), UNO_QUERY); if (xController.is()) diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx index b59fb2bfc328..03d4b726c1bb 100644 --- a/sd/source/ui/docshell/docshell.cxx +++ b/sd/source/ui/docshell/docshell.cxx @@ -522,8 +522,8 @@ void DrawDocShell::SetModified( BOOL bSet /* = TRUE */ ) { SfxObjectShell::SetModified( bSet ); - // #100237# change model state, too - // #103182# only set the changed state if modification is enabled + // change model state, too + // only set the changed state if modification is enabled if( IsEnableSetModified() ) { if ( mpDoc ) @@ -539,7 +539,7 @@ void DrawDocShell::SetModified( BOOL bSet /* = TRUE */ ) |* \************************************************************************/ -// #91457# ExecuteSpellPopup now handled by DrawDocShell. This is necessary +// ExecuteSpellPopup now handled by DrawDocShell. This is necessary // to get hands on the outliner and the text object. IMPL_LINK(DrawDocShell, OnlineSpellCallback, SpellCallbackInfo*, pInfo) { diff --git a/sd/source/ui/func/fuconarc.cxx b/sd/source/ui/func/fuconarc.cxx index b44674e20b05..36bc874139cf 100644 --- a/sd/source/ui/func/fuconarc.cxx +++ b/sd/source/ui/func/fuconarc.cxx @@ -52,7 +52,6 @@ #include "ViewShellBase.hxx" #include "ToolBarManager.hxx" -// #97016# #include <svx/sxciaitm.hxx> namespace sd { diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx index 410174a39792..3f177a7aa15c 100644 --- a/sd/source/ui/func/fuconbez.cxx +++ b/sd/source/ui/func/fuconbez.cxx @@ -384,7 +384,6 @@ void FuConstructBezierPolygon::SetEditMode(USHORT nMode) rBindings.Invalidate(SID_BEZIER_INSERT); } -// #97016# SdrObject* FuConstructBezierPolygon::CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) { // case SID_DRAW_POLYGON: diff --git a/sd/source/ui/func/fuconcs.cxx b/sd/source/ui/func/fuconcs.cxx index 60bbc213791b..56df5e65e9be 100644 --- a/sd/source/ui/func/fuconcs.cxx +++ b/sd/source/ui/func/fuconcs.cxx @@ -60,15 +60,12 @@ #include <svx/svdoashp.hxx> #include <svx/sdtagitm.hxx> -// #88751# #include <svx/svdocapt.hxx> -// #97016# #include <svx/svdomeas.hxx> #include "ViewShell.hxx" #include "ViewShellBase.hxx" #include "ToolBarManager.hxx" -// #109583# #include <editeng/writingmodeitem.hxx> #include <svx/gallery.hxx> #include <svl/itempool.hxx> @@ -315,7 +312,6 @@ void FuConstructCustomShape::SetAttributes( SdrObject* pObj ) } } -// #97016# SdrObject* FuConstructCustomShape::CreateDefaultObject(const sal_uInt16, const Rectangle& rRectangle) { SdrObject* pObj = SdrObjFactory::MakeNewObject( diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx index 9cd2980831c9..37d541e7a353 100644 --- a/sd/source/ui/func/fuconrec.cxx +++ b/sd/source/ui/func/fuconrec.cxx @@ -56,15 +56,12 @@ #include <editeng/adjitem.hxx> #include <svx/xtable.hxx> -// #88751# #include <svx/svdocapt.hxx> -// #97016# #include <svx/svdomeas.hxx> #include "ViewShell.hxx" #include "ViewShellBase.hxx" #include "ToolBarManager.hxx" -// #109583# #include <editeng/writingmodeitem.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolygon.hxx> @@ -278,7 +275,7 @@ BOOL FuConstructRectangle::MouseButtonUp(const MouseEvent& rMEvt) pObj->SetLayer(rAdmin.GetLayerID(aStr, FALSE)); } - // #88751# init text position when vertica caption object is created + // init text position when vertica caption object is created if(pObj->ISA(SdrCaptionObj) && SID_DRAW_CAPTION_VERTICAL == nSlotId) { // draw text object, needs to be initialized when vertical text is used @@ -287,7 +284,6 @@ BOOL FuConstructRectangle::MouseButtonUp(const MouseEvent& rMEvt) aSet.Put(SdrTextVertAdjustItem(SDRTEXTVERTADJUST_CENTER)); aSet.Put(SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_RIGHT)); - // #109583# // Correct the value of SDRATTR_TEXTDIRECTION to avoid SetItemSet // calling SetVerticalWriting() again since this item may not yet // be set at the object and thus may differ from verical state of @@ -548,7 +544,7 @@ void FuConstructRectangle::SetAttributes(SfxItemSet& rAttr, SdrObject* pObj) rAttr.Put( SdrTextAutoGrowHeightItem( TRUE ) ); rAttr.Put( SdrTextAutoGrowWidthItem( TRUE ) ); - // #103516# Support full with for vertical caption objects, too + // Support full with for vertical caption objects, too if(SID_DRAW_CAPTION == nSlotId) rAttr.Put( SdrTextHorzAdjustItem( SDRTEXTHORZADJUST_BLOCK ) ); else @@ -805,7 +801,6 @@ void FuConstructRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj) } } -// #97016# SdrObject* FuConstructRectangle::CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) { DBG_ASSERT( (nID != SID_DRAW_FONTWORK) && (nID != SID_DRAW_FONTWORK_VERTICAL ), "FuConstRectangle::CreateDefaultObject can not create Fontwork shapes!" ); @@ -988,7 +983,7 @@ SdrObject* FuConstructRectangle::CreateDefaultObject(const sal_uInt16 nID, const pObj->SetMergedItemSet(aSet); } - // For task #105815# the default text is not inserted anymore. + // The default text is not inserted anymore. // String aText(SdResId(STR_POOLSHEET_TEXT)); // ((SdrCaptionObj*)pObj)->SetText(aText); diff --git a/sd/source/ui/func/fuconuno.cxx b/sd/source/ui/func/fuconuno.cxx index 6126fa15f97b..f8aa53af34db 100644 --- a/sd/source/ui/func/fuconuno.cxx +++ b/sd/source/ui/func/fuconuno.cxx @@ -200,7 +200,6 @@ void FuConstructUnoControl::Deactivate() mpWindow->SetPointer( aOldPointer ); } -// #97016# SdrObject* FuConstructUnoControl::CreateDefaultObject(const sal_uInt16, const Rectangle& rRectangle) { // case SID_FM_CREATE_CONTROL: diff --git a/sd/source/ui/func/fudspord.cxx b/sd/source/ui/func/fudspord.cxx index 24528f251640..d06777942e69 100644 --- a/sd/source/ui/func/fudspord.cxx +++ b/sd/source/ui/func/fudspord.cxx @@ -94,7 +94,7 @@ FunctionReference FuDisplayOrder::Create( ViewShell* pViewSh, ::sd::Window* pWin BOOL FuDisplayOrder::MouseButtonDown(const MouseEvent& rMEvt) { - // #95491# remember button state for creation of own MouseEvents + // remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); return TRUE; @@ -143,7 +143,7 @@ BOOL FuDisplayOrder::MouseMove(const MouseEvent& rMEvt) BOOL FuDisplayOrder::MouseButtonUp(const MouseEvent& rMEvt) { - // #95491# remember button state for creation of own MouseEvents + // remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); SdrPageView* pPV = NULL; diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index a27dacfabba4..a7361ffd9a8d 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -639,7 +639,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) if( mpView->InsertObjectAtView(pObj, *pPV, SDRINSERT_SETDEFLAYER) ) { - // #73279# Math objects change their object size during InsertObject. + // Math objects change their object size during InsertObject. // New size must be set in SdrObject, or a wrong scale will be set at // ActivateObject. diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx index 7400e477ead7..ff53735f32e9 100644 --- a/sd/source/ui/func/fupoor.cxx +++ b/sd/source/ui/func/fupoor.cxx @@ -64,10 +64,8 @@ #include <sfx2/viewfrm.hxx> -// #97016# IV #include <svx/svditer.hxx> -// #98533# #include <editeng/editeng.hxx> using namespace ::com::sun::star; @@ -102,7 +100,7 @@ FuPoor::FuPoor ( bScrollable (FALSE), bDelayActive (FALSE), bFirstMouseMove (FALSE), - // #95491# remember MouseButton state + // remember MouseButton state mnCode(0) { ReceiveRequest(rReq); @@ -234,7 +232,7 @@ IMPL_LINK_INLINE_START( FuPoor, ScrollHdl, Timer *, EMPTYARG ) { Point aPnt(mpWindow->GetPointerPosPixel()); - // #95491# use remembered MouseButton state to create correct + // use remembered MouseButton state to create correct // MouseEvents for this artifical MouseMove. MouseMove(MouseEvent(aPnt, 1, 0, GetMouseButtonCode())); @@ -259,7 +257,6 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) switch (nCode) { - // #97016# IV case KEY_RETURN: { if(rKEvt.GetKeyCode().IsMod1()) @@ -314,8 +311,8 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) } else { - // #98255# activate OLE object on RETURN for selected object - // #98198# activate text edit on RETURN for selected object + // activate OLE object on RETURN for selected object + // activate text edit on RETURN for selected object const SdrMarkList& rMarkList = mpView->GetMarkedObjectList(); if( !mpView->IsTextEdit() && 1 == rMarkList.GetMarkCount() ) @@ -343,13 +340,12 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) } break; - // #97016# II case KEY_TAB: { - // #98994# handle Mod1 and Mod2 to get travelling running on different systems + // handle Mod1 and Mod2 to get travelling running on different systems if(rKEvt.GetKeyCode().IsMod1() || rKEvt.GetKeyCode().IsMod2()) { - // #97016# II do something with a selected handle? + // do something with a selected handle? const SdrHdlList& rHdlList = mpView->GetHdlList(); sal_Bool bForward(!rKEvt.GetKeyCode().IsShift()); @@ -583,7 +579,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) } break; - // #97016# II change select state when focus is on poly point + // change select state when focus is on poly point case KEY_SPACE: { const SdrHdlList& rHdlList = mpView->GetHdlList(); @@ -682,11 +678,9 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) if (mpView->AreObjectsMarked() && !rKEvt.GetKeyCode().IsMod1() && !mpDocSh->IsReadOnly()) { - // #97016# II const SdrHdlList& rHdlList = mpView->GetHdlList(); SdrHdl* pHdl = rHdlList.GetFocusHdl(); - // #109007# sal_Bool bIsMoveOfConnectedHandle(sal_False); sal_Bool bOldSuppress = false; SdrEdgeObj* pEdgeObj = 0L; @@ -711,7 +705,6 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) } } - // #109007# if(pEdgeObj) { // Suppress default connects to inside object and object center @@ -719,7 +712,6 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) pEdgeObj->SetSuppressDefaultConnect(sal_True); } - // #109007# if(bIsMoveOfConnectedHandle) { sal_uInt16 nMarkHdSiz(mpView->GetMarkHdlSizePixel()); @@ -738,7 +730,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) } else if(rKEvt.GetKeyCode().IsMod2()) { - // #97016# move in 1 pixel distance + // move in 1 pixel distance Size aLogicSizeOnePixel = (mpWindow) ? mpWindow->PixelToLogic(Size(1,1)) : Size(100, 100); nX *= aLogicSizeOnePixel.Width(); nY *= aLogicSizeOnePixel.Height(); @@ -757,10 +749,10 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) if(0L == pHdl) { - // #67368# only take action when move is allowed + // only take action when move is allowed if(mpView->IsMoveAllowed()) { - // #90129# restrict movement to WorkArea + // restrict movement to WorkArea const Rectangle& rWorkArea = mpView->GetWorkArea(); if(!rWorkArea.IsEmpty()) @@ -797,7 +789,6 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) { mpView->MoveAllMarked(Size(nX, nY)); - // #97016# II mpView->MakeVisible(mpView->GetAllMarkedRect(), *mpWindow); } } @@ -842,7 +833,6 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) } } - // #109007# if(pEdgeObj) { // Restore original suppress value @@ -868,7 +858,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) mpWindow->ReleaseMouse(); } - // #98198# when a text-editable object is selected and the + // when a text-editable object is selected and the // input character is printable, activate text edit on that object // and feed character to object if(!bReturn && !mpDocSh->IsReadOnly()) @@ -883,8 +873,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) if(pObj->ISA(SdrTextObj) && pObj->HasTextEdit() && !pObj->ISA(SdrOle2Obj)) { - // #98533# use common IsSimpleCharInput from - // the EditEngine. + // use common IsSimpleCharInput from the EditEngine. sal_Bool bPrintable(EditEngine::IsSimpleCharInput(rKEvt)); if(bPrintable) @@ -905,7 +894,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt) } else { - // #99039# test if there is a title object there. If yes, try to + // test if there is a title object there. If yes, try to // set it to edit mode and start typing... if(mpViewShell->ISA(DrawViewShell) && EditEngine::IsSimpleCharInput(rKEvt)) @@ -965,7 +954,6 @@ BOOL FuPoor::MouseMove(const MouseEvent& ) return FALSE; } -// #97016# II void FuPoor::SelectionHasChanged() { const SdrHdlList& rHdlList = mpView->GetHdlList(); @@ -1062,7 +1050,7 @@ IMPL_LINK_INLINE_START( FuPoor, DelayHdl, Timer *, EMPTYARG ) Point aPnt(mpWindow->GetPointerPosPixel()); - // #95491# use remembered MouseButton state to create correct + // use remembered MouseButton state to create correct // MouseEvents for this artifical MouseMove. MouseMove(MouseEvent(aPnt, 1, 0, GetMouseButtonCode())); @@ -1078,7 +1066,7 @@ IMPL_LINK_INLINE_END( FuPoor, DelayHdl, Timer *, pTimer ) BOOL FuPoor::MouseButtonUp (const MouseEvent& rMEvt) { - // #95491# remember button state for creation of own MouseEvents + // remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); aDelayToScrollTimer.Stop (); @@ -1088,7 +1076,7 @@ BOOL FuPoor::MouseButtonUp (const MouseEvent& rMEvt) BOOL FuPoor::MouseButtonDown(const MouseEvent& rMEvt) { - // #95491# remember button state for creation of own MouseEvents + // remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); return FALSE; @@ -1159,12 +1147,6 @@ void FuPoor::ReceiveRequest(SfxRequest& rReq) } } -/************************************************************************* -|* -|* #97016# -|* -\************************************************************************/ - SdrObject* FuPoor::CreateDefaultObject(const sal_uInt16, const Rectangle& ) { // empty base implementation diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index 3cbb76adc095..a2836ae0661a 100644 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -80,7 +80,6 @@ #include "slideshow.hxx" -// #108981# #include <svx/svdundo.hxx> #include <avmedia/mediawindow.hxx> @@ -515,7 +514,7 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt) } else { - // #90239# point IS marked and NO shift is pressed. Start + // point IS marked and NO shift is pressed. Start // dragging of selected point(s) pHdl = mpView->PickHandle(aMDPos); if(pHdl) @@ -793,7 +792,6 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt) pPool->GetActualStyleSheet()); if (pStyleSheet != NULL && mpView->IsUndoEnabled() ) { - // #108981# // Added UNDOs for the WaterCan mode. This was never done in // the past, thus it was missing all the time. SdrUndoAction* pUndoAttr = mpDoc->GetSdrUndoFactory().CreateUndoAttrObject(*pWaterCanCandidate, sal_True, sal_True); @@ -803,7 +801,6 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt) pWaterCanCandidate->SetStyleSheet (pStyleSheet, FALSE); - // #108981# mpView->EndUndo(); } } @@ -975,7 +972,7 @@ void FuSelection::Activate() { case SID_OBJECT_ROTATE: { - // (gemapter) Slot wird explizit auf Rotate gesetzt #31052# + // (gemapter) Slot wird explizit auf Rotate gesetzt if( mpViewShell->ISA(DrawViewShell) ) { USHORT* pSlotArray = diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx index 1d7e4cac9c8f..4859e09f13f8 100644 --- a/sd/source/ui/func/fusldlg.cxx +++ b/sd/source/ui/func/fusldlg.cxx @@ -110,7 +110,7 @@ void FuSlideShowDlg::DoExecute( SfxRequest& ) List* pCustomShowList = mpDoc->GetCustomShowList(); // No Create BOOL bStartWithActualPage = SD_MOD()->GetSdOptions( mpDoc->GetDocumentType() )->IsStartWithActualPage(); -/* #109180# change in behaviour, even when always start with current page is enabled, range settings are +/* change in behaviour, even when always start with current page is enabled, range settings are still used if( bStartWithActualPage ) { diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx index 8b03f4a4598c..77f9d5258d69 100644 --- a/sd/source/ui/func/futempl.cxx +++ b/sd/source/ui/func/futempl.cxx @@ -263,7 +263,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_STYLE_FAMILY2 ); } } -/* #96983# GrabFocus moved to stylist +/* GrabFocus moved to stylist pWin->GrabFocus(); */ break; diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index bd26d421eaa2..58b715ff6c45 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -57,7 +57,6 @@ #include <editeng/outlobj.hxx> #include <svtools/langtab.hxx> -// #104122# #include <editeng/frmdiritem.hxx> #include <svx/svdetc.hxx> @@ -564,7 +563,7 @@ void FuText::ImpSetAttributesForNewTextObject(SdrTextObj* pTxtObj) // Set defaults for vertical klick-n'drag text object, pool defaults are: // SdrTextVertAdjustItem: SDRTEXTVERTADJUST_TOP // SdrTextHorzAdjustItem: SDRTEXTHORZADJUST_BLOCK - // Analog to that (thus, #91508# was not completely correct): + // Analog to that: aSet.Put(SdrTextVertAdjustItem(SDRTEXTVERTADJUST_BLOCK)); aSet.Put(SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_RIGHT)); @@ -700,7 +699,6 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt) || nSlotId == SID_TEXT_FITTOSIZE_VERTICAL); rOutl.SetVertical(bVertical); - // #107235# // Before ImpSetAttributesForNewTextObject the vertical writing mode // needs to be set at the object. This is done here at the OutlinerParaObject // directly to not mirror the layout text items involved. These items will be set @@ -847,8 +845,7 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt) // Analog to the else case below, for vertical simple click texts // one of the defaulted setted items from ImpSetAttributesForNewTextObject - // needs to be adapted to non-block mode. This could have been done with the - // #104122#, but was obviously overseen. + // needs to be adapted to non-block mode. const SfxItemSet& rSet = mpView->GetDefaultAttr(); SvxFrameDirection eDirection = (SvxFrameDirection)((SvxFrameDirectionItem&)rSet.Get(EE_PARA_WRITINGDIR)).GetValue(); diff --git a/sd/source/ui/func/fuzoom.cxx b/sd/source/ui/func/fuzoom.cxx index 5160c641e387..b01594039423 100644 --- a/sd/source/ui/func/fuzoom.cxx +++ b/sd/source/ui/func/fuzoom.cxx @@ -105,7 +105,7 @@ FunctionReference FuZoom::Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd:: BOOL FuZoom::MouseButtonDown(const MouseEvent& rMEvt) { - // #95491# remember button state for creation of own MouseEvents + // remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); mpWindow->CaptureMouse(); @@ -180,7 +180,7 @@ BOOL FuZoom::MouseMove(const MouseEvent& rMEvt) BOOL FuZoom::MouseButtonUp(const MouseEvent& rMEvt) { - // #95491# remember button state for creation of own MouseEvents + // remember button state for creation of own MouseEvents SetMouseButtonCode(rMEvt.GetButtons()); if (bVisible) diff --git a/sd/source/ui/func/undoback.cxx b/sd/source/ui/func/undoback.cxx index b09ace0712d6..a4f71ad38760 100644 --- a/sd/source/ui/func/undoback.cxx +++ b/sd/source/ui/func/undoback.cxx @@ -72,7 +72,6 @@ void SdBackgroundObjUndoAction::ImplRestoreBackgroundObj() delete mpItemSet; mpItemSet = pNew; - // #110094#-15 // tell the page that it's visualization has changed mrPage.ActionChanged(); } diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index ec3a9b33f018..28f6b04d3db9 100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -203,7 +203,7 @@ public: DECL_LINK( RenameSlideHdl, AbstractSvxNameDialog* ); - // #91457# ExecuteSpellPopup now handled by DrawDocShell + // ExecuteSpellPopup now handled by DrawDocShell DECL_LINK( OnlineSpellCallback, SpellCallbackInfo* ); void ClearUndoBuffer(); diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index 8f70c35cf8cc..98aa7e02e036 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -508,7 +508,7 @@ protected: ::std::auto_ptr<Implementation> mpImpl; - // #96090# Support methods for centralized UNDO/REDO + // Support methods for centralized UNDO/REDO virtual SfxUndoManager* ImpGetUndoManager (void) const; void ImpGetUndoStrings(SfxItemSet &rSet) const; void ImpGetRedoStrings(SfxItemSet &rSet) const; diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx index b085cf0ed9ef..9cf51d4a5b95 100644 --- a/sd/source/ui/inc/Window.hxx +++ b/sd/source/ui/inc/Window.hxx @@ -175,8 +175,7 @@ protected: USHORT mnMinZoom; USHORT mnMaxZoom; /** This flag tells whether to re-calculate the minimal zoom factor - depening on the current zoom factor. According to task #105436# its - default value is now FALSE. + depening on the current zoom factor. Its default value is now FALSE. */ bool mbMinZoomAutoCalc; bool mbCalcMinZoomByMinSide; diff --git a/sd/source/ui/inc/fucon3d.hxx b/sd/source/ui/inc/fucon3d.hxx index d064843bc969..5ed599ee655d 100644 --- a/sd/source/ui/inc/fucon3d.hxx +++ b/sd/source/ui/inc/fucon3d.hxx @@ -56,7 +56,6 @@ public: virtual void Activate(); // Function aktivieren virtual void Deactivate(); // Function deaktivieren - // #97016# virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); private: @@ -67,7 +66,6 @@ private: SdDrawDocument* pDoc, SfxRequest& rReq); - // #97016# void ImpPrepareBasic3DShape(E3dCompoundObject* p3DObj, E3dScene *pScene); E3dCompoundObject* ImpCreateBasic3DShape(); }; diff --git a/sd/source/ui/inc/fuconarc.hxx b/sd/source/ui/inc/fuconarc.hxx index 135f5e5fcce5..1cc3d905d08b 100644 --- a/sd/source/ui/inc/fuconarc.hxx +++ b/sd/source/ui/inc/fuconarc.hxx @@ -52,7 +52,6 @@ public: virtual void Activate(); // Function aktivieren virtual void Deactivate(); // Function deaktivieren - // #97016# virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); protected: diff --git a/sd/source/ui/inc/fuconbez.hxx b/sd/source/ui/inc/fuconbez.hxx index cdf93ee99390..eae3766e0bfc 100644 --- a/sd/source/ui/inc/fuconbez.hxx +++ b/sd/source/ui/inc/fuconbez.hxx @@ -64,7 +64,6 @@ public: void SetEditMode(USHORT nMode); USHORT GetEditMode() { return nEditMode; } - // #97016# virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); protected: diff --git a/sd/source/ui/inc/fuconcs.hxx b/sd/source/ui/inc/fuconcs.hxx index eaea8ba0fe22..16de1c7c7e1c 100644 --- a/sd/source/ui/inc/fuconcs.hxx +++ b/sd/source/ui/inc/fuconcs.hxx @@ -64,7 +64,6 @@ public: void SetAttributes( SdrObject* pObj ); - // #97016# virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); // #i33136# diff --git a/sd/source/ui/inc/fuconrec.hxx b/sd/source/ui/inc/fuconrec.hxx index 140f4f36c1c2..5ef72160cb8c 100644 --- a/sd/source/ui/inc/fuconrec.hxx +++ b/sd/source/ui/inc/fuconrec.hxx @@ -66,7 +66,6 @@ public: void SetAttributes(SfxItemSet& rAttr, SdrObject* pObj); void SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj); - // #97016# virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); protected: diff --git a/sd/source/ui/inc/fuconuno.hxx b/sd/source/ui/inc/fuconuno.hxx index b9c67003eaa2..3aff612ff8b2 100644 --- a/sd/source/ui/inc/fuconuno.hxx +++ b/sd/source/ui/inc/fuconuno.hxx @@ -58,7 +58,6 @@ public: virtual void Activate(); // Function aktivieren virtual void Deactivate(); // Function deaktivieren - // #97016# virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); protected: diff --git a/sd/source/ui/inc/fupoor.hxx b/sd/source/ui/inc/fupoor.hxx index 70112574d1bf..9d010c68eb4f 100644 --- a/sd/source/ui/inc/fupoor.hxx +++ b/sd/source/ui/inc/fupoor.hxx @@ -66,7 +66,6 @@ public: virtual void DoExecute( SfxRequest& rReq ); - // #95491# see member void SetMouseButtonCode(sal_uInt16 nNew) { if(nNew != mnCode) mnCode = nNew; } sal_uInt16 GetMouseButtonCode() const { return mnCode; } @@ -82,7 +81,7 @@ public: virtual BOOL MouseMove(const MouseEvent& ); virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); - // #95491# moved from inline to *.cxx + // moved from inline to *.cxx virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); virtual BOOL Command(const CommandEvent& rCEvt); @@ -98,7 +97,6 @@ public: void SetWindow(::sd::Window* pWin) { mpWindow = pWin; } - // #97016# II virtual void SelectionHasChanged(); USHORT GetSlotID() const { return( nSlotId ); } @@ -109,7 +107,6 @@ public: void StartDelayToScrollTimer (); - // #97016# virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); /** is called when the currenct function should be aborted. <p> @@ -195,7 +192,7 @@ protected: BOOL bDelayActive; BOOL bFirstMouseMove; - // #95491# member to hold state of the mouse buttons for creation + // member to hold state of the mouse buttons for creation // of own MouseEvents (like in ScrollHdl) private: diff --git a/sd/source/ui/inc/futext.hxx b/sd/source/ui/inc/futext.hxx index bd732ab3a534..b22cf719174e 100644 --- a/sd/source/ui/inc/futext.hxx +++ b/sd/source/ui/inc/futext.hxx @@ -74,7 +74,6 @@ public: DECL_LINK(SpellError, void* ); - // #97016# virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); /** is called when the currenct function should be aborted. <p> @@ -103,7 +102,6 @@ protected: SfxRequest& rRequest; private: - // #97016# void ImpSetAttributesForNewTextObject(SdrTextObj* pTxtObj); void ImpSetAttributesFitToSize(SdrTextObj* pTxtObj); void ImpSetAttributesFitToSizeVertical(SdrTextObj* pTxtObj); diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx index 5d2b98b5952c..3965654ab418 100644 --- a/sd/source/ui/inc/optsitem.hxx +++ b/sd/source/ui/inc/optsitem.hxx @@ -249,7 +249,6 @@ class SD_DLLPUBLIC SdOptionsMisc : public SdOptionsGeneric { private: - // #97016# ULONG nDefaultObjectSizeWidth; ULONG nDefaultObjectSizeHeight; @@ -268,7 +267,6 @@ private: BOOL bSolidDragging : 1; // Misc/ModifyWithAttributes BOOL bSolidMarkHdl : 1; // /Misc/SimpleHandles BOOL bSummationOfParagraphs : 1; // misc/SummationOfParagraphs - // #90356# BOOL bShowUndoDeleteWarning : 1; // Misc/ShowUndoDeleteWarning // #i75315# BOOL bSlideshowRespectZOrder : 1; // Misc/SlideshowRespectZOrder @@ -323,10 +321,8 @@ public: is disabled. Other values are reserved for future use. */ USHORT GetPrinterIndependentLayout() const { Init(); return mnPrinterIndependentLayout; }; - // #90356# BOOL IsShowUndoDeleteWarning() const { Init(); return (BOOL) bShowUndoDeleteWarning; } BOOL IsSlideshowRespectZOrder() const { Init(); return (BOOL) bSlideshowRespectZOrder; } - // #97016# ULONG GetDefaultObjectSizeWidth() const { Init(); return nDefaultObjectSizeWidth; } ULONG GetDefaultObjectSizeHeight() const { Init(); return nDefaultObjectSizeHeight; } @@ -359,10 +355,8 @@ public: void SetPrinterIndependentLayout (USHORT nOn = 1 ){ if ( nOn != mnPrinterIndependentLayout ) { OptionsChanged(); mnPrinterIndependentLayout = nOn; } } void SetSolidDragging( BOOL bOn = TRUE ) { if( bSolidDragging != bOn ) { OptionsChanged(); bSolidDragging = bOn; } } void SetSolidMarkHdl( BOOL bOn = TRUE ) { if( bSolidMarkHdl != bOn ) { OptionsChanged(); bSolidMarkHdl = bOn; } } - // #90356# void SetShowUndoDeleteWarning( BOOL bOn = TRUE ) { if( bShowUndoDeleteWarning != bOn ) { OptionsChanged(); bShowUndoDeleteWarning = bOn; } } void SetSlideshowRespectZOrder( BOOL bOn = TRUE ) { if( bSlideshowRespectZOrder != bOn ) { OptionsChanged(); bSlideshowRespectZOrder = bOn; } } - // #97016# void SetDefaultObjectSizeWidth( ULONG nWidth ) { if( nDefaultObjectSizeWidth != nWidth ) { OptionsChanged(); nDefaultObjectSizeWidth = nWidth; } } void SetDefaultObjectSizeHeight( ULONG nHeight ) { if( nDefaultObjectSizeHeight != nHeight ) { OptionsChanged(); nDefaultObjectSizeHeight = nHeight; } } diff --git a/sd/source/ui/inc/unmodpg.hxx b/sd/source/ui/inc/unmodpg.hxx index 9540bf1c00a9..2181ab587e69 100644 --- a/sd/source/ui/inc/unmodpg.hxx +++ b/sd/source/ui/inc/unmodpg.hxx @@ -37,7 +37,6 @@ class SdPage; class ModifyPageUndoAction : public SdUndoAction { - // #67720# SfxUndoManager* mpManager; SdPage* mpPage; @@ -55,7 +54,7 @@ class ModifyPageUndoAction : public SdUndoAction public: TYPEINFO(); ModifyPageUndoAction( - SfxUndoManager* pManager, // #67720# + SfxUndoManager* pManager, SdDrawDocument* pTheDoc, SdPage* pThePage, String aTheNewName, diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx index c55e3dcc38b0..2d4952758155 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx @@ -195,7 +195,7 @@ FunctionReference SelectionFunction::Create( BOOL SelectionFunction::MouseButtonDown (const MouseEvent& rEvent) { - // #95491# remember button state for creation of own MouseEvents + // remember button state for creation of own MouseEvents SetMouseButtonCode (rEvent.GetButtons()); mbProcessingMouseButtonDown = true; @@ -260,7 +260,7 @@ BOOL SelectionFunction::MouseButtonUp (const MouseEvent& rEvent) { mrController.GetScrollBarManager().StopAutoScroll (); - // #95491# remember button state for creation of own MouseEvents + // remember button state for creation of own MouseEvents SetMouseButtonCode (rEvent.GetButtons()); if (aDragTimer.IsActive()) @@ -691,7 +691,7 @@ void SelectionFunction::GotoNextPage (int nOffset) void SelectionFunction::ProcessMouseEvent (sal_uInt32 nEventType, const MouseEvent& rEvent) { - // #95491# remember button state for creation of own MouseEvents + // remember button state for creation of own MouseEvents SetMouseButtonCode (rEvent.GetButtons()); // 1. Compute some frequently used values relating to the event. diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx index 61efa5ebd1a3..44eeb98f4ec3 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx @@ -664,7 +664,6 @@ void SlideSorterViewShell::SetZoomRect (const Rectangle& rZoomRect) ViewShell::SetZoomRect(aRect); - // #106268# GetViewFrame()->GetBindings().Invalidate( SID_ATTR_ZOOM ); GetViewFrame()->GetBindings().Invalidate( SID_ATTR_ZOOMSLIDER ); } diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 7bdc8e4a0ba9..061ba1a17292 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -1011,8 +1011,8 @@ void ViewShellBase::UpdateBorder ( bool bForce /* = false */ ) // made only for the main view shell. This not only avoids unnecessary // calls for the views in side panes but prevents calling an already // dying SfxViewShell base class. - // For issue #140703# we have to check the existence of the window, - // too. The SfxViewFrame accesses the window without checking it. + // We have to check the existence of the window, too. + // The SfxViewFrame accesses the window without checking it. ViewShell* pMainViewShell = GetMainViewShell().get(); if (pMainViewShell != NULL && GetWindow()!=NULL) { diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index bb75f1c07773..8553401c8608 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -409,7 +409,7 @@ void DrawView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) mpDrawViewShell->ResetActualLayer(); } - // #94278# switch to that page when it's not a master page + // switch to that page when it's not a master page if(HINT_SWITCHTOPAGE == eHintKind) { const SdrPage* pPage = ((const SdrHint&)rHint).GetPage(); diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx index dd6f9ec20a92..8fa63b3297fd 100644 --- a/sd/source/ui/view/drtxtob.cxx +++ b/sd/source/ui/view/drtxtob.cxx @@ -195,7 +195,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) if( (nSlotId == SID_ATTR_CHAR_FONT) || (nSlotId == SID_ATTR_CHAR_FONTHEIGHT) ) { - // #42732# input language should be preferred over + // input language should be preferred over // current cursor position to detect script type OutlinerView* pOLV = mpView->GetTextEditOutlinerView(); @@ -265,13 +265,12 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) List* pList = pOLV->CreateSelectionList(); Paragraph* pPara = (Paragraph*) pList->First(); - // #96539# find out if we are a OutlineView + // find out if we are a OutlineView BOOL bIsOutlineView(OUTLINERMODE_OUTLINEVIEW == pOLV->GetOutliner()->GetMode()); - // #96539# This is ONLY for OutlineViews + // This is ONLY for OutlineViews if(bIsOutlineView) { - // #96250# and #78665# // allow move up if position is 2 or greater OR it // is a title object (and thus depth==1) if(pOutl->GetAbsPos(pPara) > 1 || ( pOutl->HasParaFlag(pPara,PARAFLAG_ISPAGE) && pOutl->GetAbsPos(pPara) > 0 ) ) @@ -282,7 +281,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) } else { - // #96539# old behaviour for OUTLINERMODE_OUTLINEOBJECT + // old behaviour for OUTLINERMODE_OUTLINEOBJECT if(pOutl->GetAbsPos(pPara) > 0) { // Nicht ganz oben @@ -317,7 +316,6 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) bDisableDown = FALSE; } - // #96250# and #78665# // disable when first para and 2nd is not a title pPara = static_cast< Paragraph* >( pList->First() ); if(!bDisableDown && bIsOutlineView @@ -514,7 +512,6 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) rSet.Put( SfxBoolItem( SID_ATTR_PARA_RIGHT_TO_LEFT, TRUE ) ); break; - // #107865# // The case for the superordinate object is missing. case FRMDIR_ENVIRONMENT: { diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx index ee4e8ebf34cb..b0a9fd98e527 100644 --- a/sd/source/ui/view/drtxtob1.cxx +++ b/sd/source/ui/view/drtxtob1.cxx @@ -253,7 +253,7 @@ void TextObjectBar::Execute( SfxRequest &rReq ) // Ensure bold/italic etc. icon state updates Invalidate(); - // #96551# trigger preview refresh + // trigger preview refresh mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, TRUE, FALSE ); } rReq.Done(); @@ -268,7 +268,7 @@ void TextObjectBar::Execute( SfxRequest &rReq ) // Ensure bold/italic etc. icon state updates Invalidate(); - // #96551# trigger preview refresh + // trigger preview refresh mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, TRUE, FALSE ); } rReq.Done(); @@ -281,7 +281,7 @@ void TextObjectBar::Execute( SfxRequest &rReq ) { pOLV->AdjustHeight( -1 ); - // #96551# trigger preview refresh + // trigger preview refresh mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, TRUE, FALSE ); } rReq.Done(); @@ -294,7 +294,7 @@ void TextObjectBar::Execute( SfxRequest &rReq ) { pOLV->AdjustHeight( 1 ); - // #96551# trigger preview refresh + // trigger preview refresh mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, TRUE, FALSE ); } rReq.Done(); diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 85561926eb35..b8356f48cf43 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -122,7 +122,7 @@ void DrawViewShell::UIActivating( SfxInPlaceClient* pCli ) { ViewShell::UIActivating(pCli); - // #94252# Disable own controls + // Disable own controls maTabControl.Disable(); if (GetLayerTabControl() != NULL) GetLayerTabControl()->Disable(); @@ -130,7 +130,7 @@ void DrawViewShell::UIActivating( SfxInPlaceClient* pCli ) void DrawViewShell::UIDeactivated( SfxInPlaceClient* pCli ) { - // #94252# Enable own controls + // Enable own controls maTabControl.Enable(); if (GetLayerTabControl() != NULL) GetLayerTabControl()->Enable(); @@ -283,7 +283,7 @@ void DrawViewShell::SelectionHasChanged (void) GetViewShellBase().GetToolBarManager()->SelectionHasChanged(*this,*mpDrawView); } - // #96124# Invalidate for every subshell + // Invalidate for every subshell GetViewShellBase().GetViewShellManager()->InvalidateAllSubShells(this); mpDrawView->UpdateSelectionClipboard( FALSE ); @@ -596,7 +596,7 @@ SvxRuler* DrawViewShell::CreateVRuler(::sd::Window* pWin) GetViewFrame()->GetBindings(), aWBits); pRuler->SetSourceUnit(pWin->GetMapMode().GetMapUnit()); - // #96629# Metric same as HRuler, use document setting + // Metric same as HRuler, use document setting UINT16 nMetric = (UINT16)GetDoc()->GetUIUnit(); if( nMetric == 0xffff ) diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 9904ef576374..3a0fb7245bc5 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -83,7 +83,6 @@ #include "fuvect.hxx" #include "stlpool.hxx" -// #90356# #include "optsitem.hxx" #include "sdabstdlg.hxx" #include <com/sun/star/drawing/XMasterPagesSupplier.hpp> @@ -171,7 +170,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) BOOL bMergeUndo = FALSE; SfxUndoManager* pUndoManager = GetDocSh()->GetUndoManager(); - // Anpassungen Start/EndWidth #63083# + // Anpassungen Start/EndWidth if(nSId == SID_ATTR_LINE_WIDTH) { SdrObject* pObj = NULL; @@ -192,7 +191,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) { BOOL bSetItemSet(FALSE); - // #86265# do this for SFX_ITEM_DEFAULT and for SFX_ITEM_SET + // do this for SFX_ITEM_DEFAULT and for SFX_ITEM_SET if(SFX_ITEM_DONTCARE != aAttr.GetItemState(XATTR_LINESTARTWIDTH)) { INT32 nValAct = ((const XLineStartWidthItem&)aAttr.Get(XATTR_LINESTARTWIDTH)).GetValue(); @@ -203,7 +202,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) aAttr.Put(XLineStartWidthItem(nValNew)); } - // #86265# do this for SFX_ITEM_DEFAULT and for SFX_ITEM_SET + // do this for SFX_ITEM_DEFAULT and for SFX_ITEM_SET if(SFX_ITEM_DONTCARE != aAttr.GetItemState(XATTR_LINEENDWIDTH)) { INT32 nValAct = ((const XLineEndWidthItem&)aAttr.Get(XATTR_LINEENDWIDTH)).GetValue(); diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx index f5e3c1918205..d797e089ba0b 100644 --- a/sd/source/ui/view/drviews4.cxx +++ b/sd/source/ui/view/drviews4.cxx @@ -475,7 +475,6 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin) // menu from an inplace client is closed. Now we have the chance to // deactivate the inplace client without any problem regarding parent // windows and code on the stack. - // For more information, see #126086# and #128122# SfxInPlaceClient* pIPClient = GetViewShell()->GetIPClient(); BOOL bIsOleActive = ( pIPClient && pIPClient->IsObjectInPlaceActive() ); if ( bIsOleActive && ( rCEvt.GetCommand() == COMMAND_CONTEXTMENU )) diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index b6b151ba0bee..04294613cc0b 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -220,8 +220,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) { if (mpDrawView == NULL) { - // This assertion and return are here to prevent crashes like that - // of issue #126202#. + // This assertion and return are here to prevent crashes. DBG_ASSERT(mpDrawView!=NULL, "Please report this assertion to the Impress team."); return; } @@ -597,7 +596,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) { if ( !mpClipEvtLstnr ) { - // SSA: #108717# avoid clipboard initialization for + // avoid clipboard initialization for // read-only presentation views (workaround for NT4.0 // clipboard prob...) if( !ISA(PresentationViewShell) ) @@ -635,9 +634,8 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) if (mpDrawView == NULL) { - // When we come to this line then we probably have another - // incarnation of issue #126202#. The mpDrawView was not NULL but is - // now. The reason for this may be that the DrawViewShell has been + // The mpDrawView was not NULL but is now. + // The reason for this may be that the DrawViewShell has been // destroyed in the mean time. // We can only return immediately and hope that the deleted // DrawViewShell is not called again. @@ -1466,11 +1464,6 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) rSet.DisableItem (SID_ATTR_GRAF_CROP); } - // #96090# moved SID_UNDO to ViewShell::GetMenuState() - // #96090# moved SID_REDO to ViewShell::GetMenuState() - // #96090# moved SID_GETUNDOSTRINGS to ViewShell::GetMenuState() - // #96090# moved SID_GETREDOSTRINGS to ViewShell::GetMenuState() - /////////////////////////////////////////////////////////////////////// // Menuoption: Edit->Hyperlink // Disable, if there is no hyperlink @@ -1607,7 +1600,7 @@ void DrawViewShell::GetModeSwitchingMenuState (SfxItemSet &rSet) rSet.Put(SfxBoolItem(SID_HANDOUTMODE, FALSE)); } - // #101976# Removed [GetDocSh()->GetCurrentFunction() ||] from the following + // Removed [GetDocSh()->GetCurrentFunction() ||] from the following // clause because the current function of the docshell can only be // search and replace or spell checking and in that case switching the // view mode is allowed. diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index 81eb888e616e..74d44088e69b 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -164,7 +164,7 @@ DrawViewShell::~DrawViewShell() if( mxScannerListener.is() ) static_cast< ScannerEventListener* >( mxScannerListener.get() )->ParentDestroyed(); - // #96642# Remove references to items within Svx3DWin + // Remove references to items within Svx3DWin // (maybe do a listening sometime in Svx3DWin) USHORT nId = Svx3DChildWindow::GetChildWindowId(); SfxChildWindow* pWindow = GetViewFrame() ? GetViewFrame()->GetChildWindow(nId) : NULL; @@ -203,7 +203,7 @@ DrawViewShell::~DrawViewShell() if ( mpClipEvtLstnr ) { mpClipEvtLstnr->AddRemoveListener( GetActiveWindow(), FALSE ); - mpClipEvtLstnr->ClearCallbackLink(); // #103849# prevent callback if another thread is waiting + mpClipEvtLstnr->ClearCallbackLink(); // prevent callback if another thread is waiting mpClipEvtLstnr->release(); } diff --git a/sd/source/ui/view/drviewsc.cxx b/sd/source/ui/view/drviewsc.cxx index 7e4602614ae6..81162af15aab 100644 --- a/sd/source/ui/view/drviewsc.cxx +++ b/sd/source/ui/view/drviewsc.cxx @@ -203,7 +203,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq) case SID_COMBINE: // BASIC { - // #88224# End text edit to avoid conflicts + // End text edit to avoid conflicts if(mpDrawView->IsTextEdit()) mpDrawView->SdrEndTextEdit(); @@ -240,7 +240,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq) case SID_POLY_MERGE: { - // #88224# End text edit to avoid conflicts + // End text edit to avoid conflicts if(mpDrawView->IsTextEdit()) mpDrawView->SdrEndTextEdit(); @@ -261,7 +261,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq) case SID_POLY_SUBSTRACT: { - // #88224# End text edit to avoid conflicts + // End text edit to avoid conflicts if(mpDrawView->IsTextEdit()) mpDrawView->SdrEndTextEdit(); @@ -282,7 +282,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq) case SID_POLY_INTERSECT: { - // #88224# End text edit to avoid conflicts + // End text edit to avoid conflicts if(mpDrawView->IsTextEdit()) mpDrawView->SdrEndTextEdit(); diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index b4e97c4ee489..74dbd463ba86 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -125,7 +125,7 @@ namespace sd { void ImpAddPrintableCharactersToTextEdit(SfxRequest& rReq, ::sd::View* pView) { - // #98198# evtl. feed characters to activated textedit + // evtl. feed characters to activated textedit const SfxItemSet* pSet = rReq.GetArgs(); if(pSet) @@ -183,7 +183,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq) Invalidate(); - // #98198# evtl. feed characters to activated textedit + // evtl. feed characters to activated textedit if(SID_ATTR_CHAR == nSId && GetView() && GetView()->IsTextEdit()) ImpAddPrintableCharactersToTextEdit(rReq, GetView()); @@ -265,7 +265,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq) rBindings.Invalidate( SID_TEXT_FITTOSIZE ); rBindings.Invalidate( SID_TEXT_FITTOSIZE_VERTICAL ); - // #98198# evtl. feed characters to activated textedit + // evtl. feed characters to activated textedit if(SID_ATTR_CHAR == nSId && GetView() && GetView()->IsTextEdit()) ImpAddPrintableCharactersToTextEdit(rReq, GetView()); @@ -280,7 +280,6 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq) } break; - // #98721# case SID_FM_CREATE_FIELDCONTROL: { SFX_REQUEST_ARG( rReq, pDescriptorItem, SfxUnoAnyItem, SID_FM_DATACCESS_DESCRIPTOR, sal_False ); @@ -571,7 +570,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq) // Jetzt explizit der letzte Slot incl. Update() Invalidate(); - // #97016# III CTRL-SID_OBJECT_SELECT -> select first draw object if none is selected yet + // CTRL-SID_OBJECT_SELECT -> select first draw object if none is selected yet if(SID_OBJECT_SELECT == nSId && HasCurrentFunction() && (rReq.GetModifier() & KEY_MOD1)) { if(!GetView()->AreObjectsMarked()) @@ -586,7 +585,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq) } } - // #97016# with qualifier construct directly + // with qualifier construct directly if(HasCurrentFunction() && (rReq.GetModifier() & KEY_MOD1)) { // get SdOptions @@ -1045,7 +1044,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) { const SfxItemSet* pReqArgs = rReq.GetArgs(); - // #97516# Remember old ruler state + // Remember old ruler state BOOL bOldHasRuler(HasRuler()); if ( pReqArgs ) @@ -1055,7 +1054,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) } else SetRuler (!HasRuler()); - // #97516# Did ruler state change? Tell that to SdOptions, too. + // Did ruler state change? Tell that to SdOptions, too. BOOL bHasRuler(HasRuler()); if(bOldHasRuler != bHasRuler) @@ -1460,13 +1459,13 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) // #UndoRedo# case SID_UNDO : { - // #96090# moved implementation to BaseClass + // moved implementation to BaseClass ImpSidUndo(TRUE, rReq); } break; case SID_REDO : { - // #96090# moved implementation to BaseClass + // moved implementation to BaseClass ImpSidRedo(TRUE, rReq); } break; @@ -1578,7 +1577,6 @@ void DrawViewShell::InsertURLButton(const String& rURL, const String& rText, xPropSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "ButtonType" )), Any( form::FormButtonType_URL ) ); if ( ::avmedia::MediaWindow::isMediaURL( rURL ) ) { - // #105638# OJ xPropSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "DispatchURLInternal" )), Any( sal_True ) ); } } @@ -1612,7 +1610,6 @@ void DrawViewShell::InsertURLButton(const String& rURL, const String& rText, xPropSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "TargetFrame" )), Any( OUString( rTarget ) ) ); xPropSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "ButtonType" )), Any( form::FormButtonType_URL ) ); - // #105638# OJ if ( ::avmedia::MediaWindow::isMediaURL( rURL ) ) xPropSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "DispatchURLInternal" )), Any( sal_True ) ); diff --git a/sd/source/ui/view/drviewsh.cxx b/sd/source/ui/view/drviewsh.cxx index 3fff3eeb729f..758ed5f49f18 100644 --- a/sd/source/ui/view/drviewsh.cxx +++ b/sd/source/ui/view/drviewsh.cxx @@ -85,7 +85,7 @@ BOOL DrawViewShell::GotoBookmark(const String& rBookmark) void DrawViewShell::MakeVisible(const Rectangle& rRect, ::Window& rWin) { - // #98568# In older versions, if in X or Y the size of the object was + // In older versions, if in X or Y the size of the object was // smaller than the visible area, the user-defined zoom was // changed. This was decided to be a bug for 6.x, thus I developed a // version which instead handles X/Y bigger/smaller and visibility @@ -117,7 +117,7 @@ void DrawViewShell::MakeVisible(const Rectangle& rRect, ::Window& rWin) } else { - // #98568# allow a mode for move-only visibility without zooming. + // allow a mode for move-only visibility without zooming. const sal_Int32 nPercentBorder(30); const Rectangle aInnerRectangle( aVisArea.Left() + ((aVisAreaSize.Width() * nPercentBorder) / 200), diff --git a/sd/source/ui/view/drviewsj.cxx b/sd/source/ui/view/drviewsj.cxx index 590a5265593c..4af83506d5aa 100644 --- a/sd/source/ui/view/drviewsj.cxx +++ b/sd/source/ui/view/drviewsj.cxx @@ -130,7 +130,7 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet ) pObj->TakeObjInfo( aInfoRec ); - // #91929#; don't show original size entry if not possible + // don't show original size entry if not possible if ( pObj->ISA( SdrOle2Obj ) ) { SdrOle2Obj* pOleObj = PTR_CAST(SdrOle2Obj, pObj); diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 387accf7da14..35596b468444 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -1234,7 +1234,6 @@ void OutlineViewShell::SetZoomRect(const Rectangle& rZoomRect) pOutlinerView->SetOutputArea(aWin); } - // #106268# GetViewFrame()->GetBindings().Invalidate( SID_ATTR_ZOOM ); GetViewFrame()->GetBindings().Invalidate( SID_ATTR_ZOOMSLIDER ); } diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index 306529bbf9a6..a6aff823fd23 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -109,7 +109,6 @@ namespace sd { |* \************************************************************************/ -// #83525# struct ImpRememberOrigAndClone { SdrObject* pOrig; @@ -126,7 +125,7 @@ SdrObject* ImpGetClone(Container& aConnectorContainer, SdrObject* pConnObj) return 0L; } -// #90129# restrict movement to WorkArea +// restrict movement to WorkArea void ImpCheckInsertPos(Point& rPos, const Size& rSize, const Rectangle& rWorkArea) { if(!rWorkArea.IsEmpty()) @@ -251,7 +250,7 @@ bool View::InsertMetaFile( TransferableDataHelper& rDataHelper, const Point& rPo if( !bVector && (aGraphic.GetType() == GRAPHIC_NONE) ) bVector = true; - // #90129# restrict movement to WorkArea + // restrict movement to WorkArea Point aInsertPos( rPos ); Size aImageSize; aImageSize = bVector ? aMtf.GetPrefSize() : aGraphic.GetSizePixel(); @@ -440,7 +439,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, pMarkList->ForceSort(); - // #83525# stuff to remember originals and clones + // stuff to remember originals and clones Container aConnectorContainer(0); sal_uInt32 a, nConnectorCount(0L); Point aCurPos; @@ -470,7 +469,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, { if(!bDropOnTabBar) { - // #83525# do a NbcMove(...) instead of setting SnapRects here + // do a NbcMove(...) instead of setting SnapRects here pObj->NbcMove(aVector); } @@ -483,7 +482,6 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, EndUndo(); } - // #83525# ImpRememberOrigAndClone* pRem = new ImpRememberOrigAndClone; pRem->pOrig = pM->GetMarkedSdrObj(); pRem->pClone = pObj; @@ -494,7 +492,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, } } - // #83525# try to re-establish connections at clones + // try to re-establish connections at clones if(nConnectorCount) { for(a = 0; a < aConnectorContainer.Count(); a++) @@ -573,7 +571,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, } } - // #83525# cleanup remember classes + // cleanup remember classes for(a = 0; a < aConnectorContainer.Count(); a++) delete (ImpRememberOrigAndClone*)aConnectorContainer.GetObject(a); @@ -631,7 +629,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, pWorkPage->SetRectsDirty(); - // #104148# Use SnapRect, not BoundRect + // Use SnapRect, not BoundRect Size aSize( pWorkPage->GetAllObjSnapRect().GetSize() ); maDropPos.X() = pOwnData->GetStartPos().X() + ( aSize.Width() >> 1 ); @@ -784,7 +782,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, if( pOwnData ) { - // #104148# Use SnapRect, not BoundRect + // Use SnapRect, not BoundRect Size aSize( pWorkPage->GetAllObjSnapRect().GetSize() ); maDropPos.X() = pOwnData->GetStartPos().X() + ( aSize.Width() >> 1 ); @@ -850,7 +848,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, if( pOwnData ) { - // #104148# Use SnapRect, not BoundRect + // Use SnapRect, not BoundRect Size aSize( pWorkPage->GetAllObjSnapRect().GetSize() ); maDropPos.X() = pOwnData->GetStartPos().X() + ( aSize.Width() >> 1 ); @@ -1165,14 +1163,14 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, pWorkPage->SetRectsDirty(); - // #104148# Use SnapRect, not BoundRect + // Use SnapRect, not BoundRect Size aSize( pWorkPage->GetAllObjSnapRect().GetSize() ); aInsertPos.X() = pOwnData->GetStartPos().X() + ( aSize.Width() >> 1 ); aInsertPos.Y() = pOwnData->GetStartPos().Y() + ( aSize.Height() >> 1 ); } - // #90129# restrict movement to WorkArea + // restrict movement to WorkArea Size aImageMapSize = OutputDevice::LogicToLogic(aGraphic.GetPrefSize(), aGraphic.GetPrefMapMode(), MapMode(MAP_100TH_MM)); @@ -1196,7 +1194,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, pWorkPage->SetRectsDirty(); - // #104148# Use SnapRect, not BoundRect + // Use SnapRect, not BoundRect Size aSize( pWorkPage->GetAllObjSnapRect().GetSize() ); aInsertPos.X() = pOwnData->GetStartPos().X() + ( aSize.Width() >> 1 ); @@ -1222,14 +1220,14 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper, pWorkPage->SetRectsDirty(); - // #104148# Use SnapRect, not BoundRect + // Use SnapRect, not BoundRect Size aSize( pWorkPage->GetAllObjSnapRect().GetSize() ); aInsertPos.X() = pOwnData->GetStartPos().X() + ( aSize.Width() >> 1 ); aInsertPos.Y() = pOwnData->GetStartPos().Y() + ( aSize.Height() >> 1 ); } - // #90129# restrict movement to WorkArea + // restrict movement to WorkArea Size aImageMapSize(aBmp.GetPrefSize()); ImpCheckInsertPos(aInsertPos, aImageMapSize, GetWorkArea()); diff --git a/sd/source/ui/view/unmodpg.cxx b/sd/source/ui/view/unmodpg.cxx index 16315f989f04..83884cdba948 100644 --- a/sd/source/ui/view/unmodpg.cxx +++ b/sd/source/ui/view/unmodpg.cxx @@ -57,7 +57,7 @@ TYPEINIT1(ModifyPageUndoAction, SdUndoAction); \************************************************************************/ ModifyPageUndoAction::ModifyPageUndoAction( - SfxUndoManager* pTheManager, // #67720# + SfxUndoManager* pTheManager, SdDrawDocument* pTheDoc, SdPage* pThePage, String aTheNewName, @@ -101,7 +101,7 @@ ModifyPageUndoAction::ModifyPageUndoAction( #include <svx/svdview.hxx> void ModifyPageUndoAction::Undo() { - // #94637# invalidate Selection, there could be objects deleted in tis UNDO + // invalidate Selection, there could be objects deleted in tis UNDO // which are no longer allowed to be selected then. SdrViewIter aIter(mpPage); SdrView* pView = aIter.FirstView(); @@ -150,7 +150,7 @@ void ModifyPageUndoAction::Undo() void ModifyPageUndoAction::Redo() { - // #94637# invalidate Selection, there could be objects deleted in tis UNDO + // invalidate Selection, there could be objects deleted in tis UNDO // which are no longer allowed to be selected then. SdrViewIter aIter(mpPage); SdrView* pView = aIter.FirstView(); diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx index 29bb1c62dd3a..6769af6c2946 100644 --- a/sd/source/ui/view/viewshe3.cxx +++ b/sd/source/ui/view/viewshe3.cxx @@ -82,7 +82,6 @@ #include "optsitem.hxx" #include "sdresid.hxx" -// #96090# #include <svx/svxids.hrc> #include <sfx2/request.hxx> #include <svl/aeitem.hxx> @@ -132,19 +131,16 @@ void ViewShell::GetMenuState( SfxItemSet &rSet ) rSet.Put(SfxUInt16Item(SID_STYLE_FAMILY, nFamily )); } - // #96090# if(SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_GETUNDOSTRINGS)) { ImpGetUndoStrings(rSet); } - // #96090# if(SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_GETREDOSTRINGS)) { ImpGetRedoStrings(rSet); } - // #96090# if(SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_UNDO)) { SfxUndoManager* pUndoManager = ImpGetUndoManager(); @@ -160,7 +156,7 @@ void ViewShell::GetMenuState( SfxItemSet &rSet ) if(bActivate) { - // #87229# Set the necessary string like in + // Set the necessary string like in // sfx2/source/view/viewfrm.cxx ver 1.23 ln 1072 ff. String aTmp(ResId(STR_UNDO, *SFX_APP()->GetSfxResManager())); aTmp += pUndoManager->GetUndoActionComment(0); @@ -172,7 +168,6 @@ void ViewShell::GetMenuState( SfxItemSet &rSet ) } } - // #96090# if(SFX_ITEM_AVAILABLE == rSet.GetItemState(SID_REDO)) { SfxUndoManager* pUndoManager = ImpGetUndoManager(); @@ -188,7 +183,7 @@ void ViewShell::GetMenuState( SfxItemSet &rSet ) if(bActivate) { - // #87229# Set the necessary string like in + // Set the necessary string like in // sfx2/source/view/viewfrm.cxx ver 1.23 ln 1081 ff. String aTmp(ResId(STR_REDO, *SFX_APP()->GetSfxResManager())); aTmp += pUndoManager->GetRedoActionComment(0); |