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/view | |
parent | ec7d423f53a7beec49e7a69ccc9cb7bad366b7a3 (diff) |
Remove all bogus comments in impress.
Diffstat (limited to 'sd/source/ui/view')
-rw-r--r-- | sd/source/ui/view/ViewShellBase.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/view/drawview.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/drtxtob.cxx | 11 | ||||
-rw-r--r-- | sd/source/ui/view/drtxtob1.cxx | 8 | ||||
-rw-r--r-- | sd/source/ui/view/drviews1.cxx | 8 | ||||
-rw-r--r-- | sd/source/ui/view/drviews2.cxx | 7 | ||||
-rw-r--r-- | sd/source/ui/view/drviews4.cxx | 1 | ||||
-rw-r--r-- | sd/source/ui/view/drviews7.cxx | 17 | ||||
-rw-r--r-- | sd/source/ui/view/drviewsa.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/view/drviewsc.cxx | 8 | ||||
-rw-r--r-- | sd/source/ui/view/drviewse.cxx | 21 | ||||
-rw-r--r-- | sd/source/ui/view/drviewsh.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/view/drviewsj.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/outlnvsh.cxx | 1 | ||||
-rw-r--r-- | sd/source/ui/view/sdview3.cxx | 30 | ||||
-rw-r--r-- | sd/source/ui/view/unmodpg.cxx | 6 | ||||
-rw-r--r-- | sd/source/ui/view/viewshe3.cxx | 9 |
17 files changed, 60 insertions, 83 deletions
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); |