Patch co-licensed as usual under LGPLv3+, GPLv3+ and MPL licenses.
Patch made for sd repository, I hope it's not a problem.
Regards,
Robert <><
From 379c3b34b30edb9b6e182fb75f5b23b49d3f2c9f Mon Sep 17 00:00:00 2001
From: Robert Roth <robert.roth.off@gmail.com>
Date: Sun, 5 Dec 2010 00:16:48 +0200
Subject: [PATCH] Removed dead code and comments from sd
---
sd/inc/CustomAnimationPreset.hxx | 2 -
sd/inc/anminfo.hxx | 1 -
sd/source/ui/docshell/docshel2.cxx | 22 +---
sd/source/ui/docshell/docshel3.cxx | 3 +-
sd/source/ui/func/bulmaper.cxx | 1 -
sd/source/ui/func/fucon3d.cxx | 20 +---
sd/source/ui/func/fuconarc.cxx | 14 --
sd/source/ui/func/fudraw.cxx | 23 +---
sd/source/ui/func/fuinsfil.cxx | 13 +--
sd/source/ui/func/fuoaprms.cxx | 21 +---
sd/source/ui/func/futext.cxx | 81 ++----------
sd/source/ui/func/unoaprms.cxx | 7 +-
sd/source/ui/inc/CustomAnimation.hxx | 1 -
sd/source/ui/inc/OutlineView.hxx | 3 +-
sd/source/ui/inc/navigatr.hxx | 1 -
sd/source/ui/inc/optdlg.hxx | 1 -
sd/source/ui/inc/pubdlg.hxx | 3 -
sd/source/ui/inc/tpoption.hxx | 2 -
sd/source/ui/slideshow/showwin.cxx | 34 -----
sd/source/ui/slideshow/showwindow.hxx | 5 +-
sd/source/ui/slideshow/slideshow.cxx | 4 -
sd/source/ui/slideshow/slideshowimpl.cxx | 46 +------
sd/source/ui/slideshow/slideshowimpl.hxx | 1 -
.../ui/slidesorter/cache/SlsBitmapCompressor.cxx | 2 -
.../model/SlsPageEnumerationProvider.cxx | 1 -
sd/source/ui/unoidl/randomnode.cxx | 3 -
sd/source/ui/unoidl/unomodel.cxx | 59 ++-------
sd/source/ui/unoidl/unopage.cxx | 2 -
sd/source/ui/unoidl/unosrch.cxx | 1 -
sd/source/ui/view/Outliner.cxx | 9 +-
sd/source/ui/view/drviews3.cxx | 7 -
sd/source/ui/view/drviews4.cxx | 17 +--
sd/source/ui/view/drviews5.cxx | 11 +-
sd/source/ui/view/drviews6.cxx | 4 -
sd/source/ui/view/drviewsb.cxx | 11 +--
sd/source/ui/view/drviewsf.cxx | 17 ---
sd/source/ui/view/frmview.cxx | 140 +-------------------
sd/source/ui/view/outlnvsh.cxx | 26 +---
sd/source/ui/view/outlview.cxx | 19 +---
sd/source/ui/view/presvish.cxx | 3 -
sd/source/ui/view/sdview2.cxx | 3 +-
sd/source/ui/view/sdview4.cxx | 1 -
sd/source/ui/view/sdwindow.cxx | 8 +-
sd/source/ui/view/viewshel.cxx | 30 +---
44 files changed, 83 insertions(+), 600 deletions(-)
diff --git a/sd/inc/CustomAnimationPreset.hxx b/sd/inc/CustomAnimationPreset.hxx
index 9c1d57b..8bc510e 100644
--- a/sd/inc/CustomAnimationPreset.hxx
+++ b/sd/inc/CustomAnimationPreset.hxx
@@ -107,8 +107,6 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >
getRandomPreset( sal_Int16 nPresetClass ) const;
SD_DLLPUBLIC CustomAnimationPresetPtr getEffectDescriptor( const rtl::OUString& rPresetId )
const;
-// const AnimationEffect* getEffect( const rtl::OUString& rPresetId ) const;
-// const AnimationEffect* getEffect( const rtl::OUString& rPresetId, const rtl::OUString&
rPresetSubType ) const;
const rtl::OUString& getUINameForPresetId( const rtl::OUString& rPresetId ) const;
const rtl::OUString& getUINameForProperty( const rtl::OUString& rProperty ) const;
diff --git a/sd/inc/anminfo.hxx b/sd/inc/anminfo.hxx
index bd8798d..c5bfb41 100644
--- a/sd/inc/anminfo.hxx
+++ b/sd/inc/anminfo.hxx
@@ -71,7 +71,6 @@ public:
String maSecondSoundFile; // fuer Objekt ausblenden
BOOL mbSecondSoundOn; // fuer Objekt ausblenden
BOOL mbSecondPlayFull;// fuer Objekt ausblenden
-// String maBookmark; // Sprung zu Objekt/Seite
USHORT mnVerb; // fuer OLE-Objekt
ULONG mnPresOrder;
SdrObject& mrObject;
diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx
index 769f697..6e5447a 100644
--- a/sd/source/ui/docshell/docshel2.cxx
+++ b/sd/source/ui/docshell/docshel2.cxx
@@ -140,25 +140,6 @@ void DrawDocShell::Draw(OutputDevice* pOut, const JobSetup&, USHORT nAspect)
delete pView;
-// Fuer Testzwecke: Bitte nicht entfernen!
-//
-// GDIMetaFile* pMtf = pOut->GetConnectMetaFile();
-//
-// if( pMtf )
-// {
-// String aURLStr;
-//
-// if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( String(
RTL_CONSTASCII_USTRINGPARAM( "d:\\gdi.mtf" ) ), aURLStr ) )
-// {
-// SvStream* pOStm = ::utl::UcbStreamHelper::CreateStream( aURLStr,
STREAM_WRITE | STREAM_TRUNC );
-//
-// if( pOStm )
-// {
-// *pOStm << *pMtf;
-// delete pOStm;
-// }
-// }
-// }
}
Rectangle DrawDocShell::GetVisArea(USHORT nAspect) const
@@ -316,7 +297,6 @@ Bitmap DrawDocShell::GetPagePreviewBitmap(SdPage* pPage, USHORT nMaxEdgePixel)
if ( pPageView->GetLockedLayers() != pFrameView->GetLockedLayers() )
pPageView->SetLockedLayers( pFrameView->GetLockedLayers() );
- // if ( pPageView->GetHelpLines() != pFrameView->GetHelpLines() )
pPageView->SetHelpLines( pFrameView->GetStandardHelpLines() );
}
@@ -326,7 +306,7 @@ Bitmap DrawDocShell::GetPagePreviewBitmap(SdPage* pPage, USHORT nMaxEdgePixel)
pView->CompleteRedraw( &aVDev, Rectangle( aNullPt, aSize ) );
- // #111097# IsRedrawReady() always gives sal_True while ( !pView->IsRedrawReady() ) {}
+ // IsRedrawReady() always gives sal_True while ( !pView->IsRedrawReady() ) {}
delete pView;
aVDev.SetMapMode( MapMode() );
diff --git a/sd/source/ui/docshell/docshel3.cxx b/sd/source/ui/docshell/docshel3.cxx
index 78a60c6..d77b897 100644
--- a/sd/source/ui/docshell/docshel3.cxx
+++ b/sd/source/ui/docshell/docshel3.cxx
@@ -123,7 +123,7 @@ void DrawDocShell::Execute( SfxRequest& rReq )
{
if( dynamic_cast< FuSearch* >(mxDocShellFunction.get()) )
{
- // Suchen&Ersetzen in allen DocShells beenden
+ // End Search&Replace in all docshells
SfxObjectShell* pFirstShell = SfxObjectShell::GetFirst();
SfxObjectShell* pShell = pFirstShell;
@@ -184,7 +184,6 @@ void DrawDocShell::Execute( SfxRequest& rReq )
case SID_CLOSEDOC:
{
-// SfxObjectShell::DoClose();
ExecuteSlot(rReq, SfxObjectShell::GetStaticInterface());
}
break;
diff --git a/sd/source/ui/func/bulmaper.cxx b/sd/source/ui/func/bulmaper.cxx
index 85540be..8522a5c 100644
--- a/sd/source/ui/func/bulmaper.cxx
+++ b/sd/source/ui/func/bulmaper.cxx
@@ -131,7 +131,6 @@ void SdBulletMapper::MapFontsInNumRule( SvxNumRule& aNumRule, const SfxItemSet&
aMyFont.SetShadow(rSItem.GetValue());
aNewLevel.SetBulletFont(&aMyFont);
-// aNewLevel.SetBulletRelSize( 75 );
aNumRule.SetLevel(nLevel, aNewLevel );
}
else if( rSrcLevel.GetNumberingType() ==
com::sun::star::style::NumberingType::CHAR_SPECIAL )
diff --git a/sd/source/ui/func/fucon3d.cxx b/sd/source/ui/func/fucon3d.cxx
index cba11d2..0855cc0 100644
--- a/sd/source/ui/func/fucon3d.cxx
+++ b/sd/source/ui/func/fucon3d.cxx
@@ -57,7 +57,6 @@
#include "ToolBarManager.hxx"
#include <svx/svx3ditems.hxx>
-// #97016#
#include <svx/polysc3d.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
@@ -104,7 +103,6 @@ void FuConstruct3dObject::DoExecute( SfxRequest& rReq )
|*
\************************************************************************/
-// #97016#
E3dCompoundObject* FuConstruct3dObject::ImpCreateBasic3DShape()
{
E3dCompoundObject* p3DObj = NULL;
@@ -261,7 +259,6 @@ E3dCompoundObject* FuConstruct3dObject::ImpCreateBasic3DShape()
return p3DObj;
}
-// #97016#
void FuConstruct3dObject::ImpPrepareBasic3DShape(E3dCompoundObject* p3DObj, E3dScene *pScene)
{
Camera3D &aCamera = (Camera3D&) pScene->GetCamera ();
@@ -289,7 +286,6 @@ void FuConstruct3dObject::ImpPrepareBasic3DShape(E3dCompoundObject* p3DObj, E3dS
case SID_3D_SPHERE:
{
-// pScene->RotateX(DEG2RAD(60));
}
break;
@@ -304,13 +300,11 @@ void FuConstruct3dObject::ImpPrepareBasic3DShape(E3dCompoundObject* p3DObj,
E3dS
case SID_3D_CONE:
case SID_3D_PYRAMID:
{
-// pScene->RotateX(DEG2RAD(25));
}
break;
case SID_3D_TORUS:
{
-// pScene->RotateX(DEG2RAD(15));
aTransformation.rotate(DEG2RAD(90), 0.0, 0.0);
}
break;
@@ -342,11 +336,9 @@ BOOL FuConstruct3dObject::MouseButtonDown(const MouseEvent& rMEvt)
WaitObject aWait( (Window*)mpViewShell->GetActiveWindow() );
- // #97016#
p3DObj = ImpCreateBasic3DShape();
E3dScene* pScene = mpView->SetCurrent3DObj(p3DObj);
- // #97016#
ImpPrepareBasic3DShape(p3DObj, pScene);
bReturn = mpView->BegCreatePreparedObject(aPnt, nDrgLog, pScene);
@@ -441,17 +433,8 @@ void FuConstruct3dObject::Deactivate()
FuConstruct::Deactivate();
}
-// #97016#
SdrObject* FuConstruct3dObject::CreateDefaultObject(const sal_uInt16 nID, const Rectangle&
rRectangle)
{
- // case SID_3D_CUBE:
- // case SID_3D_SHELL:
- // case SID_3D_SPHERE:
- // case SID_3D_TORUS:
- // case SID_3D_HALF_SPHERE:
- // case SID_3D_CYLINDER:
- // case SID_3D_CONE:
- // case SID_3D_PYRAMID:
E3dCompoundObject* p3DObj = ImpCreateBasic3DShape();
@@ -465,7 +448,6 @@ SdrObject* FuConstruct3dObject::CreateDefaultObject(const sal_uInt16 nID, const
Rectangle a3DRect(0, 0, (long)fW, (long)fH);
E3dScene* pScene = new E3dPolyScene(mpView->Get3DDefaultAttributes());
- // mpView->InitScene(pScene, fW, fH, aVolume.MaxVec().Z() + ((fW + fH) / 4.0));
// copied code from E3dView::InitScene
double fCamZ(aVolume.getMaxZ() + ((fW + fH) / 4.0));
Camera3D aCam(pScene->GetCamera());
@@ -523,7 +505,7 @@ SdrObject* FuConstruct3dObject::CreateDefaultObject(const sal_uInt16 nID, const
}
}
- // #97016#, #98245# use changed rectangle, not original one
+ // use changed rectangle, not original one
pScene->SetLogicRect(aRect);
return pScene;
diff --git a/sd/source/ui/func/fuconarc.cxx b/sd/source/ui/func/fuconarc.cxx
index 8bb887f..afa0a29 100644
--- a/sd/source/ui/func/fuconarc.cxx
+++ b/sd/source/ui/func/fuconarc.cxx
@@ -144,7 +144,6 @@ BOOL FuConstructArc::MouseButtonDown( const MouseEvent& rMEvt )
SfxItemSet aAttr(mpDoc->GetPool());
SetStyleSheet(aAttr, pObj);
-//-/ pObj->NbcSetAttributes(aAttr, FALSE);
pObj->SetMergedItemSet(aAttr);
}
@@ -262,7 +261,6 @@ void FuConstructArc::Activate()
mpView->SetCurrentObj((UINT16)aObjKind);
FuConstruct::Activate();
-// FuDraw::Activate();
}
/*************************************************************************
@@ -274,22 +272,10 @@ void FuConstructArc::Activate()
void FuConstructArc::Deactivate()
{
FuConstruct::Deactivate();
-// FuDraw::Deactivate();
}
-// #97016#
SdrObject* FuConstructArc::CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle)
{
- // case SID_DRAW_ARC:
- // case SID_DRAW_CIRCLEARC:
- // case SID_DRAW_PIE:
- // case SID_DRAW_PIE_NOFILL:
- // case SID_DRAW_CIRCLEPIE:
- // case SID_DRAW_CIRCLEPIE_NOFILL:
- // case SID_DRAW_ELLIPSECUT:
- // case SID_DRAW_ELLIPSECUT_NOFILL:
- // case SID_DRAW_CIRCLECUT:
- // case SID_DRAW_CIRCLECUT_NOFILL:
SdrObject* pObj = SdrObjFactory::MakeNewObject(
mpView->GetCurrentObjInventor(), mpView->GetCurrentObjIdentifier(),
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index d4217ee..c81f3a6 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -117,7 +117,7 @@ FuDraw::~FuDraw()
BOOL FuDraw::MouseButtonDown(const MouseEvent& rMEvt)
{
- // #95491# remember button state for creation of own MouseEvents
+ // remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
BOOL bReturn = FALSE;
@@ -130,8 +130,6 @@ BOOL FuDraw::MouseButtonDown(const MouseEvent& rMEvt)
{
FrameView* pFrameView = mpViewShell->GetFrameView();
-// BOOL bOrtho = mpView->IsOrthoDesired() || pFrameView->IsOrtho();
-// bOrtho = bOrtho != rMEvt.IsShift();
BOOL bOrtho = FALSE;
BOOL bRestricted = TRUE;
@@ -220,7 +218,7 @@ BOOL FuDraw::MouseButtonDown(const MouseEvent& rMEvt)
SdrPageView* pPV = 0;
USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
- // #76572# look only for HelpLines when they are visible (!)
+ // look only for HelpLines when they are visible (!)
BOOL bHelpLine(FALSE);
if(mpView->IsHlplVisible())
bHelpLine = mpView->PickHelpLine(aMDPos, nHitLog, *mpWindow, nHelpLine, pPV);
@@ -252,8 +250,6 @@ BOOL FuDraw::MouseMove(const MouseEvent& rMEvt)
FrameView* pFrameView = mpViewShell->GetFrameView();
Point aPos = mpWindow->PixelToLogic( rMEvt.GetPosPixel() );
-// BOOL bOrtho = mpView->IsOrthoDesired() || pFrameView->IsOrtho();
-// bOrtho = bOrtho != rMEvt.IsShift();
BOOL bOrtho = FALSE;
BOOL bRestricted = TRUE;
@@ -461,7 +457,7 @@ BOOL FuDraw::KeyInput(const KeyEvent& rKEvt)
if ( !aCode.IsMod1() && !aCode.IsMod2() )
{
- // #105336# Moved next line which was a bugfix itself into
+ // Moved next line which was a bugfix itself into
// the scope which really does the object selection travel
// and thus is allowed to call SelectionHasChanged().
@@ -473,13 +469,12 @@ BOOL FuDraw::KeyInput(const KeyEvent& rKEvt)
// changeover to the next object
if(!mpView->MarkNextObj( !aCode.IsShift() ))
{
- // #97016# No next object: go over open end and
+ // No next object: go over open end and
// get first from the other side
mpView->UnmarkAllObj();
mpView->MarkNextObj(!aCode.IsShift());
}
- // #97016# II
if(mpView->AreObjectsMarked())
mpView->MakeVisible(mpView->GetAllMarkedRect(), *mpWindow);
@@ -494,11 +489,10 @@ BOOL FuDraw::KeyInput(const KeyEvent& rKEvt)
if ( aCode.IsMod1() )
{
- // #97016# mark last object
+ // mark last object
mpView->UnmarkAllObj();
mpView->MarkNextObj(FALSE);
- // #97016# II
if(mpView->AreObjectsMarked())
mpView->MakeVisible(mpView->GetAllMarkedRect(), *mpWindow);
@@ -513,11 +507,10 @@ BOOL FuDraw::KeyInput(const KeyEvent& rKEvt)
if ( aCode.IsMod1() )
{
- // #97016# mark first object
+ // mark first object
mpView->UnmarkAllObj();
mpView->MarkNextObj(TRUE);
- // #97016# II
if(mpView->AreObjectsMarked())
mpView->MakeVisible(mpView->GetAllMarkedRect(), *mpWindow);
@@ -843,9 +836,8 @@ void FuDraw::DoubleClick(const MouseEvent& rMEvt)
if ( !pDocSh->IsUIActive() )
{
/**********************************************************
- * aktivate OLE-object
+ * activate OLE-object
**********************************************************/
- //HMHmpView->HideMarkHdl();
mpViewShell->ActivateObject( (SdrOle2Obj*) pObj, 0);
}
}
@@ -1114,7 +1106,6 @@ bool FuDraw::cancel()
}
else if ( mpView->AreObjectsMarked() )
{
- // #97016# II
const SdrHdlList& rHdlList = mpView->GetHdlList();
SdrHdl* pHdl = rHdlList.GetFocusHdl();
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index d664b54..09e0058 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -411,7 +411,7 @@ BOOL FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium)
bLink, bReplace, nPos,
FALSE, NULL, TRUE, TRUE, FALSE );
- // Loeschen der BookmarkList
+ // delete the BookmarkList
if( pBookmarkList )
{
String* pString = (String*) pBookmarkList->First();
@@ -423,7 +423,7 @@ BOOL FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium)
delete pBookmarkList;
pBookmarkList = NULL;
}
- // Loeschen der ExchangeList
+ // delete the ExchangeList
if( pExchangeList )
{
String* pString = (String*) pExchangeList->First();
@@ -437,7 +437,6 @@ BOOL FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium)
}
}
// Dann Objekte einfuegen
- //pBookmarkList = pDlg->GetList( 2 ); // Objekte
pBookmarkList = pObjectBookmarkList;
// Um zu gewaehrleisten... (s.o.)
@@ -447,7 +446,7 @@ BOOL FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium)
bOK = mpDoc->InsertBookmarkAsObject( pBookmarkList, pExchangeList,
bLink, NULL, NULL);
- // Loeschen der BookmarkList
+ // delete the BookmarkList
if( pBookmarkList )
{
String* pString = (String*) pBookmarkList->First();
@@ -459,7 +458,7 @@ BOOL FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium)
delete pBookmarkList;
pBookmarkList = NULL;
}
- // Loeschen der ExchangeList
+ // delete the ExchangeList
if( pExchangeList )
{
String* pString = (String*) pExchangeList->First();
@@ -512,11 +511,7 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium)
// was zeichnen muessen;
// der globale Outliner koennte in SdPage::CreatePresObj
// benutzt werden
-// SfxItemPool* pPool = mpDoc->GetDrawOutliner().GetEmptyItemSet().GetPool();
SdrOutliner* pOutliner = new ::sd::Outliner( mpDoc, OUTLINERMODE_TEXTOBJECT );
-// pOutliner->SetStyleSheetPool((SfxStyleSheetPool*)mpDoc->GetStyleSheetPool());
-// pOutliner->SetEditTextObjectPool(pPool);
-// pOutliner->SetForbiddenCharsTable( mpDoc->GetForbiddenCharsTable() );
// Referenz-Device setzen
pOutliner->SetRefDevice( SD_MOD()->GetRefDevice( *mpDocSh ) );
diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx
index 3e7d46a..615d670 100644
--- a/sd/source/ui/func/fuoaprms.cxx
+++ b/sd/source/ui/func/fuoaprms.cxx
@@ -51,7 +51,7 @@
#include "ViewShell.hxx"
#include "anminfo.hxx"
#include "unoaprms.hxx" // Undo-Action
-#include "sdundogr.hxx" // Undo Gruppe
+#include "sdundogr.hxx" // Undo Group
#include "View.hxx"
#include "sdabstdlg.hxx"
#include "sdresid.hxx"
@@ -117,11 +117,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
short nSecondSoundOnSet = ATTR_MISSING;
short nSecondPlayFullSet = ATTR_MISSING;
-
-
-// BOOL bDontKnow = FALSE;
-
- // defaulten (fuer Undo-Aktion)
+ // defaults (for Undo-Action)
presentation::AnimationEffect eEffect = presentation::AnimationEffect_NONE;
presentation::AnimationEffect eTextEffect = presentation::AnimationEffect_NONE;
presentation::AnimationSpeed eSpeed = presentation::AnimationSpeed_MEDIUM;
@@ -727,10 +723,8 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
pAction->SetSoundOn(pInfo->mbSoundOn, pInfo->mbSoundOn);
pAction->SetSound(pInfo->maSoundFile, pInfo->maSoundFile);
pAction->SetPlayFull(pInfo->mbPlayFull, pInfo->mbPlayFull);
-// pAction->SetPathObj(pInfo->mpPathObj, pInfo->mpPathObj);
pAction->SetClickAction(pInfo->meClickAction, pInfo->meClickAction);
pAction->SetBookmark(pInfo->GetBookmark(), pInfo->GetBookmark());
-// pAction->SetInvisibleInPres(pInfo->mbInvisibleInPresentation, TRUE);
pAction->SetVerb(pInfo->mnVerb, pInfo->mnVerb);
pAction->SetSecondEffect(pInfo->meSecondEffect, pInfo->meSecondEffect);
pAction->SetSecondSpeed(pInfo->meSecondSpeed, pInfo->meSecondSpeed);
@@ -738,7 +732,6 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
pAction->SetSecondPlayFull(pInfo->mbSecondPlayFull, pInfo->mbSecondPlayFull);
pUndoGroup->AddAction(pAction);
-// pInfo->mbInvisibleInPresentation = TRUE;
}
else
{
@@ -759,8 +752,6 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
pAction->SetPathObj(pInfo->mpPathObj, pPath);
pAction->SetClickAction(pInfo->meClickAction, eClickAction);
pAction->SetBookmark(pInfo->GetBookmark(), aBookmark);
-// pAction->SetInvisibleInPres(pInfo->mbInvisibleInPresentation,
-//
pInfo->mbInvisibleInPresentation);
pAction->SetVerb(pInfo->mnVerb, (USHORT)pInfo->GetBookmark().ToInt32() );
pAction->SetSecondEffect(pInfo->meSecondEffect, eSecondEffect);
pAction->SetSecondSpeed(pInfo->meSecondSpeed, eSecondSpeed);
@@ -817,19 +808,15 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
if (nSecondPlayFullSet == ATTR_SET)
pInfo->mbSecondPlayFull = bSecondPlayFull;
- // noch ein paar Spezialitaeten
-// if (eEffect == presentation::AnimationEffect_PATH && nEffectSet ==
ATTR_SET)
-// pInfo->mSetPath(pPath);
-
if (eClickAction == presentation::ClickAction_VERB)
pInfo->mnVerb = (USHORT)aBookmark.ToInt32();
}
}
- // Undo Gruppe dem Undo Manager uebergeben
+ // Set the Undo Group in of the Undo Manager
pUndoMgr->AddUndoAction(pUndoGroup);
pUndoMgr->LeaveListAction();
- // Model geaendert
+ // Model changed
mpDoc->SetChanged();
}
// sieht man nicht, also muss an den Bindings nicht invalidiert werden
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index 0b77cab..4304b1d 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -240,7 +240,7 @@ void FuText::DoExecute( SfxRequest& )
if (pArgs
- // #98198# test for type before using
+ // test for type before using
&& SID_TEXTEDIT == nSlotId
&& SFX_ITEM_SET == pArgs->GetItemState(SID_TEXTEDIT)
@@ -265,15 +265,6 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt)
BOOL bReturn = FuDraw::MouseButtonDown(rMEvt);
- /* af: (de)Select object before showing the context menu.
- // Fuer PopupMenu (vorher DrawViewShell)
- if ((rMEvt.GetButtons() == MOUSE_RIGHT) && rMEvt.GetClicks() == 1 &&
- mpView->IsTextEdit())
- {
- return (TRUE);
- }
- */
-
mpView->SetMarkHdlWhenTextEdit(TRUE);
SdrViewEvent aVEvt;
SdrHitKind eHit = mpView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt);
@@ -407,10 +398,6 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt)
// this caused SdrEndTextEdit() to be called also when not in text
editing and
// this does not make sense and caused troubles. (see issue 112855)
-// ::Outliner* pOutl =
mpView->GetTextEditOutliner();
-//
-// if (mxTextObj.is() &&
(mxTextObj->GetOutlinerParaObject() ||
-// (pOutl &&
pOutl->GetText(pOutl->GetParagraph( 0 )).Len() != 0)))
if( mpView->IsTextEdit() )
{
mpView->SdrEndTextEdit();
@@ -434,7 +421,7 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt)
mpView->MarkObj(aVEvt.pRootObj, pPV);
}
- // Objekt draggen
+ // Drag object
bFirstMouseMove = TRUE;
aDragTimer.Start();
}
@@ -531,7 +518,6 @@ BOOL FuText::MouseMove(const MouseEvent& rMEvt)
|*
\************************************************************************/
-// #97016#
void FuText::ImpSetAttributesForNewTextObject(SdrTextObj* pTxtObj)
{
if(mpDoc->GetDocumentType() == DOCUMENT_TYPE_IMPRESS)
@@ -557,7 +543,7 @@ void FuText::ImpSetAttributesForNewTextObject(SdrTextObj* pTxtObj)
aSet.Put(SdrTextAutoGrowWidthItem(TRUE));
aSet.Put(SdrTextAutoGrowHeightItem(FALSE));
- // #91853# Needs to be set since default is SDRTEXTHORZADJUST_BLOCK
+ // Needs to be set since default is SDRTEXTHORZADJUST_BLOCK
aSet.Put(SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_RIGHT));
pTxtObj->SetMergedItemSet(aSet);
pTxtObj->AdjustTextFrameWidthAndHeight();
@@ -572,15 +558,9 @@ void FuText::ImpSetAttributesForNewTextObject(SdrTextObj* pTxtObj)
// draw text object, needs to be initialized when vertical text is used
SfxItemSet aSet(mpViewShell->GetPool());
- // #91510#
aSet.Put(SdrTextAutoGrowWidthItem(TRUE));
aSet.Put(SdrTextAutoGrowHeightItem(FALSE));
- // #91508#
- //aSet.Put(SdrTextVertAdjustItem(SDRTEXTVERTADJUST_TOP));
- //aSet.Put(SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_RIGHT));
-
- // #107235#
// Set defaults for vertical klick-n'drag text object, pool defaults are:
// SdrTextVertAdjustItem: SDRTEXTVERTADJUST_TOP
// SdrTextHorzAdjustItem: SDRTEXTHORZADJUST_BLOCK
@@ -593,7 +573,6 @@ void FuText::ImpSetAttributesForNewTextObject(SdrTextObj* pTxtObj)
}
}
-// #97016#
void FuText::ImpSetAttributesFitToSize(SdrTextObj* pTxtObj)
{
// FitToSize (An Rahmen anpassen)
@@ -606,7 +585,6 @@ void FuText::ImpSetAttributesFitToSize(SdrTextObj* pTxtObj)
pTxtObj->AdjustTextFrameWidthAndHeight();
}
-// #97016#
void FuText::ImpSetAttributesFitToSizeVertical(SdrTextObj* pTxtObj)
{
SfxItemSet aSet(mpViewShell->GetPool(),
@@ -619,15 +597,14 @@ void FuText::ImpSetAttributesFitToSizeVertical(SdrTextObj* pTxtObj)
pTxtObj->AdjustTextFrameWidthAndHeight();
}
-// #97016#
void FuText::ImpSetAttributesFitCommon(SdrTextObj* pTxtObj)
{
- // Normales Textobjekt
+ // Normal Textobject
if (mpDoc->GetDocumentType() == DOCUMENT_TYPE_IMPRESS)
{
if( nSlotId == SID_ATTR_CHAR )
{
- // Impress-Textobjekt (faellt auf Zeilenhoehe zusammen)
+ // Impress-Textobject (faellt auf Zeilenhoehe zusammen)
SfxItemSet aSet(mpViewShell->GetPool());
aSet.Put(SdrTextMinFrameHeightItem(0));
aSet.Put(SdrTextMaxFrameHeightItem(0));
@@ -742,7 +719,6 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt)
pPara->SetVertical(bVertical);
}
- // #97016#
ImpSetAttributesForNewTextObject(GetTextObj());
}
@@ -753,21 +729,18 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt)
}
else if (nSlotId == SID_TEXT_FITTOSIZE)
{
- // #97016#
ImpSetAttributesFitToSize(GetTextObj());
SetInEditMode(rMEvt, FALSE);
}
else if ( nSlotId == SID_TEXT_FITTOSIZE_VERTICAL )
{
- // #97016#
ImpSetAttributesFitToSizeVertical(GetTextObj());
SetInEditMode(rMEvt, FALSE);
}
else
{
- // #97016#
ImpSetAttributesFitCommon(GetTextObj());
// Damit die Handles und der graue Rahmen stimmen
@@ -843,11 +816,8 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt)
aSet.Put(SdrTextAutoGrowHeightItem(TRUE));
aSet.Put(SdrTextAutoGrowWidthItem(TRUE));
- // #91508#
if(nSlotId == SID_ATTR_CHAR_VERTICAL)
{
- // #107235#
- //
// Here, all items which need to be different from pool default need to be set
// again on the newly created text object.
// Since this is a simple klick text object, it is first created, then
SetVertical()
@@ -873,11 +843,8 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt)
pPara->SetVertical(sal_True);
}
- // #91508#
- // aSet.Put(SdrTextVertAdjustItem(SDRTEXTVERTADJUST_TOP));
aSet.Put(SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_RIGHT));
- // #107235#
// 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
@@ -896,14 +863,11 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt)
}
else
{
- // #104122# This is for Format/Page settings. Since this also leads
+ // This is for Format/Page settings. Since this also leads
// to the object defaults to be changed, i think this code can be
// removed. CL. wanted to take a look before adding this.
- //const SdrTextHorzAdjust eHA = ( ( pDoc && pDoc->GetDefaultWritingMode() ==
::com::sun::star::text::WritingMode_RL_TB ) ?
- // SDRTEXTHORZADJUST_RIGHT :
SDRTEXTHORZADJUST_LEFT );
- //aSet.Put( SdrTextHorzAdjustItem( eHA ) );
- // #104122# Look in the object defaults if left-to-right is wanted. If
+ // Look in the object defaults if left-to-right is wanted. If
// yes, set text anchoring to right to let the box grow to left.
const SfxItemSet& rSet = mpView->GetDefaultAttr();
SvxFrameDirection eDirection =
(SvxFrameDirection)((SvxFrameDirectionItem&)rSet.Get(EE_PARA_WRITINGDIR)).GetValue();
@@ -960,7 +924,6 @@ BOOL FuText::KeyInput(const KeyEvent& rKEvt)
KeyCode nCode = rKEvt.GetKeyCode();
BOOL bShift = nCode.IsShift();
- // #97016# IV
if(mxTextObj.is())
{
// maybe object is deleted, test if it's equal to the selected object
@@ -1006,8 +969,6 @@ BOOL FuText::KeyInput(const KeyEvent& rKEvt)
mpViewShell->GetViewFrame()->GetBindings().Invalidate( SidArray );
-// if ( pTextObj )
-// pTextObj->SetEmptyPresObj(FALSE);
}
else if (aKeyCode == KEY_ESCAPE)
{
@@ -1175,7 +1136,7 @@ void FuText::SetInEditMode(const MouseEvent& rMEvt, BOOL bQuickDrag)
}
else
{
- // #98198# Move cursor to end of text
+ // Move cursor to end of text
ESelection aNewSelection(EE_PARA_NOT_FOUND, EE_INDEX_NOT_FOUND,
EE_PARA_NOT_FOUND, EE_INDEX_NOT_FOUND);
pOLV->SetSelection(aNewSelection);
}
@@ -1318,7 +1279,7 @@ void FuText::ReceiveRequest(SfxRequest& rReq)
// Dann Basisklasse rufen (dort wird u.a. nSlotId NICHT gesetzt)
FuPoor::ReceiveRequest(rReq);
- if (nSlotId == SID_TEXTEDIT || mpViewShell->GetFrameView()->IsQuickEdit() || /*#95971#*/
SID_ATTR_CHAR == nSlotId)
+ if (nSlotId == SID_TEXTEDIT || mpViewShell->GetFrameView()->IsQuickEdit() || SID_ATTR_CHAR ==
nSlotId)
{
MouseEvent aMEvt(mpWindow->GetPointerPosPixel());
@@ -1332,7 +1293,7 @@ void FuText::ReceiveRequest(SfxRequest& rReq)
if (!mxTextObj.is())
{
- // Versuchen, ein Obj zu selektieren
+ // Try to select an object
SdrPageView* pPV = mpView->GetSdrPageView();
SdrViewEvent aVEvt;
mpView->PickAnything(aMEvt, SDRMOUSEBUTTONDOWN, aVEvt);
@@ -1365,7 +1326,7 @@ void FuText::ReceiveRequest(SfxRequest& rReq)
if (pArgs
- // #98198# test for type before using
+ // test for type before using
&& SID_TEXTEDIT == nSlotId
&& SFX_ITEM_SET == pArgs->GetItemState(SID_TEXTEDIT)
@@ -1396,27 +1357,16 @@ IMPL_LINK( FuText, SpellError, void *, nLang )
}
-/*************************************************************************
-|*
-|* Reaktion auf Doppelklick
-|*
-\************************************************************************/
void FuText::DoubleClick(const MouseEvent& )
{
- // Nichts zu tun
+ // Nothing to do
}
-/** #97016#
- #105815# Removed the insertion of default text and putting a new text
+/** Removed the insertion of default text and putting a new text
object directly into edit mode.
*/
SdrObject* FuText::CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle)
{
- // case SID_TEXTEDIT: // BASIC ???
- // case SID_ATTR_CHAR:
- // case SID_ATTR_CHAR_VERTICAL:
- // case SID_TEXT_FITTOSIZE:
- // case SID_TEXT_FITTOSIZE_VERTICAL:
SdrObject* pObj = SdrObjFactory::MakeNewObject(
mpView->GetCurrentObjInventor(), mpView->GetCurrentObjIdentifier(),
@@ -1432,22 +1382,18 @@ SdrObject* FuText::CreateDefaultObject(const sal_uInt16 nID, const
Rectangle& rR
sal_Bool bVertical = (SID_ATTR_CHAR_VERTICAL == nID || SID_TEXT_FITTOSIZE_VERTICAL ==
nID);
pText->SetVerticalWriting(bVertical);
- // #97016#
ImpSetAttributesForNewTextObject(pText);
if (nSlotId == SID_TEXT_FITTOSIZE)
{
- // #97016#
ImpSetAttributesFitToSize(pText);
}
else if ( nSlotId == SID_TEXT_FITTOSIZE_VERTICAL )
{
- // #97016#
ImpSetAttributesFitToSizeVertical(pText);
}
else
{
- // #97016#
ImpSetAttributesFitCommon(pText);
}
@@ -1501,7 +1447,6 @@ void FuText::ChangeFontSize( bool bGrow, OutlinerView* pOLV, const FontList*
pFo
}
else
{
-// SdDrawDocument* pDoc = pView->GetDoc();
const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
for( sal_uInt32 nMark = 0; nMark < rMarkList.GetMarkCount(); nMark++ )
diff --git a/sd/source/ui/func/unoaprms.cxx b/sd/source/ui/func/unoaprms.cxx
index a063d84..d2a527a 100644
--- a/sd/source/ui/func/unoaprms.cxx
+++ b/sd/source/ui/func/unoaprms.cxx
@@ -53,8 +53,7 @@ void SdAnimationPrmsUndoAction::Undo()
if( pDoc )
{
SdAnimationInfo* pInfo = pDoc->GetAnimationInfo( pObject );
- // So nicht...
- //SdAnimationInfo* pInfo = (SdAnimationInfo*)pObject->GetUserData(0);
+
pInfo->mbActive = bOldActive;
pInfo->meEffect = eOldEffect;
pInfo->meTextEffect = eOldTextEffect;
@@ -65,10 +64,8 @@ void SdAnimationPrmsUndoAction::Undo()
pInfo->mbSoundOn = bOldSoundOn;
pInfo->maSoundFile = aOldSoundFile;
pInfo->mbPlayFull = bOldPlayFull;
-// pInfo->mSetPath(pOldPathObj);
pInfo->meClickAction = eOldClickAction;
pInfo->SetBookmark( aOldBookmark );
-// pInfo->mbInvisibleInPresentation = bOldInvisibleInPres;
pInfo->mnVerb = nOldVerb;
pInfo->mnPresOrder = nOldPresOrder;
@@ -111,10 +108,8 @@ void SdAnimationPrmsUndoAction::Redo()
pInfo->mbSoundOn = bNewSoundOn;
pInfo->maSoundFile = aNewSoundFile;
pInfo->mbPlayFull = bNewPlayFull;
-// pInfo->mSetPath(pNewPathObj);
pInfo->meClickAction = eNewClickAction;
pInfo->SetBookmark( aNewBookmark );
-// pInfo->mbInvisibleInPresentation = bNewInvisibleInPres;
pInfo->mnVerb = nNewVerb;
pInfo->mnPresOrder = nNewPresOrder;
diff --git a/sd/source/ui/inc/CustomAnimation.hxx b/sd/source/ui/inc/CustomAnimation.hxx
index 00f07a6..f32d232 100644
--- a/sd/source/ui/inc/CustomAnimation.hxx
+++ b/sd/source/ui/inc/CustomAnimation.hxx
@@ -35,7 +35,6 @@ class Window;
namespace sd {
-// extern void showCustomAnimationPane( const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XDrawView >& xView );
extern ::Window* createCustomAnimationPane( ::Window* pParent, const
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel );
}
diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx
index 512b276..7d08c07 100644
--- a/sd/source/ui/inc/OutlineView.hxx
+++ b/sd/source/ui/inc/OutlineView.hxx
@@ -129,7 +129,6 @@ public:
virtual BOOL GetAttributes( SfxItemSet& rTargetSet, BOOL bOnlyHardAttr=FALSE ) const;
virtual BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll = FALSE);
-// virtual BOOL HasMarkedObjUnused() const;
void FillOutliner();
void SetLinks();
void ResetLinks() const;
@@ -152,7 +151,7 @@ public:
USHORT nLayer = SDRPAGE_NOTFOUND);
- // #97766# Re-implement GetScriptType for this view to get correct results
+ // Re-implement GetScriptType for this view to get correct results
virtual sal_uInt16 GetScriptType() const;
/** After this method has been called with <TRUE/> following changes of
diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx
index 56c4754..25cf440 100644
--- a/sd/source/ui/inc/navigatr.hxx
+++ b/sd/source/ui/inc/navigatr.hxx
@@ -125,7 +125,6 @@ private:
::sd::NavigatorChildWindow* mpChildWinContext;
Size maSize;
Size maMinSize;
-// Size maFltWinSize;
BOOL mbDocImported;
String maDropFileName;
NavigatorDragType meDragType;
diff --git a/sd/source/ui/inc/optdlg.hxx b/sd/source/ui/inc/optdlg.hxx
index 610d9f8..5e76e57 100644
--- a/sd/source/ui/inc/optdlg.hxx
+++ b/sd/source/ui/inc/optdlg.hxx
@@ -48,7 +48,6 @@ public:
protected:
virtual void PageCreated( USHORT nId, SfxTabPage &rPage );
-// virtual SfxItemSet* CreateInputItemSet( USHORT nPageId );
};
diff --git a/sd/source/ui/inc/pubdlg.hxx b/sd/source/ui/inc/pubdlg.hxx
index 1b4c158..901ddb5 100644
--- a/sd/source/ui/inc/pubdlg.hxx
+++ b/sd/source/ui/inc/pubdlg.hxx
@@ -138,7 +138,6 @@ private:
FixedText* pPage4_Titel2;
MultiLineEdit* pPage4_Misc;
CheckBox* pPage4_Download;
-//-/ CheckBox* pPage4_Created;
// page 5 controls
@@ -163,8 +162,6 @@ private:
boost::scoped_ptr< ButtonSet > mpButtonSet;
-// CheckBox* pPage6_Sound;
-
// standard controls
FixedLine aBottomLine;
HelpButton aHelpButton;
diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx
index 0295534..c3847c3 100644
--- a/sd/source/ui/inc/tpoption.hxx
+++ b/sd/source/ui/inc/tpoption.hxx
@@ -54,8 +54,6 @@ public:
virtual BOOL FillItemSet( SfxItemSet& );
virtual void Reset( const SfxItemSet & );
-// virtual void ActivatePage( const SfxItemSet& rSet );
-// virtual int DeactivatePage( SfxItemSet* pSet );
};
/*************************************************************************
|*
diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx
index deaa5c4..aa645a8 100644
--- a/sd/source/ui/slideshow/showwin.cxx
+++ b/sd/source/ui/slideshow/showwin.cxx
@@ -86,7 +86,6 @@ ShowWindow::ShowWindow( const ::rtl::Reference< SlideshowImpl >& xController, ::
maMouseTimer.SetTimeout( HIDE_MOUSE_TIMEOUT );
maShowBackground = Wallpaper( Color( COL_BLACK ) );
-// SetBackground( Wallpaper( Color( COL_BLACK ) ) );
SetBackground(); // avoids that VCL paints any background!
GetParent()->Show();
AddEventListener( LINK( this, ShowWindow, EventHdl ) );
@@ -289,17 +288,6 @@ void ShowWindow::Paint(const Rectangle& rRect)
{
if( (meShowWindowMode == SHOWWINDOWMODE_NORMAL) || (meShowWindowMode ==
SHOWWINDOWMODE_PREVIEW) )
{
-/*
- Region aOldClipRegion( GetClipRegion() );
-
- Region aClipRegion( rRect );
- aClipRegion.Exclude( maPresArea );
- SetClipRegion( aClipRegion );
-
- DrawWallpaper( rRect, maShowBackground );
-
- SetClipRegion( aOldClipRegion );
-*/
if( mxController.is() )
{
mxController->paint(rRect);
@@ -337,13 +325,6 @@ void ShowWindow::Paint(const Rectangle& rRect)
long ShowWindow::Notify(NotifyEvent& rNEvt)
{
long nOK = FALSE;
-/*
- if( mpViewShell && rNEvt.GetType() == EVENT_GETFOCUS )
- {
- NotifyEvent aNEvt(EVENT_GETFOCUS, this);
- nOK = mpViewShell->GetViewFrame()->GetWindow().Notify(aNEvt);
- }
-*/
if (!nOK)
nOK = Window::Notify(rNEvt);
@@ -357,13 +338,6 @@ void ShowWindow::GetFocus()
{
// Basisklasse
Window::GetFocus();
-/*
- if( mpViewShell )
- {
- NotifyEvent aNEvt(EVENT_GETFOCUS, this);
- mpViewShell->GetViewFrame()->GetWindow().Notify(aNEvt);
- }
-*/
}
// -----------------------------------------------------------------------------
@@ -398,8 +372,6 @@ BOOL ShowWindow::SetEndMode()
{
DeleteWindowFromPaintView();
meShowWindowMode = SHOWWINDOWMODE_END;
-// maShowBackground = GetBackground();
-// SetBackground( Wallpaper( Color( COL_BLACK ) ) );
maShowBackground = Wallpaper( Color( COL_BLACK ) );
// hide navigator if it is visible
@@ -434,8 +406,6 @@ BOOL ShowWindow::SetPauseMode( sal_Int32 nPageIndexToRestart, sal_Int32 nTimeout
mnPauseTimeout = nTimeout;
mnRestartPageIndex = nPageIndexToRestart;
meShowWindowMode = SHOWWINDOWMODE_PAUSE;
-// maShowBackground = GetBackground();
-// SetBackground( Wallpaper( Color( COL_BLACK ) ) );
maShowBackground = Wallpaper( Color( COL_BLACK ) );
// hide navigator if it is visible
@@ -466,8 +436,6 @@ BOOL ShowWindow::SetBlankMode( sal_Int32 nPageIndexToRestart, const Color& rBlan
DeleteWindowFromPaintView();
mnRestartPageIndex = nPageIndexToRestart;
meShowWindowMode = SHOWWINDOWMODE_BLANK;
-// maShowBackground = GetBackground();
-// SetBackground( Wallpaper( rBlankColor ) );
maShowBackground = Wallpaper( rBlankColor );
// hide navigator if it is visible
@@ -498,7 +466,6 @@ void ShowWindow::TerminateShow()
maPauseTimer.Stop();
maMouseTimer.Stop();
Erase();
-// SetBackground( maShowBackground );
maShowBackground = Wallpaper( Color( COL_BLACK ) );
meShowWindowMode = SHOWWINDOWMODE_NORMAL;
mnPauseTimeout = SLIDE_NO_TIMEOUT;
@@ -536,7 +503,6 @@ void ShowWindow::RestartShow( sal_Int32 nPageIndexToRestart )
maLogo.Clear();
maPauseTimer.Stop();
Erase();
-// SetBackground( maShowBackground );
maShowBackground = Wallpaper( Color( COL_BLACK ) );
meShowWindowMode = SHOWWINDOWMODE_NORMAL;
mnPauseTimeout = SLIDE_NO_TIMEOUT;
diff --git a/sd/source/ui/slideshow/showwindow.hxx b/sd/source/ui/slideshow/showwindow.hxx
index 0c5c27e..063b954 100644
--- a/sd/source/ui/slideshow/showwindow.hxx
+++ b/sd/source/ui/slideshow/showwindow.hxx
@@ -68,12 +68,10 @@ enum ShowWindowMode
SHOWWINDOWMODE_PREVIEW = 4
};
-//class ShowWindowImpl;
-
class ShowWindow
: public ::sd::Window
{
-// friend class ShowWindowImpl;
+
public:
ShowWindow ( const ::rtl::Reference< ::sd::SlideshowImpl >& xController, ::Window* pParent );
virtual ~ShowWindow (void);
@@ -97,7 +95,6 @@ public:
virtual void Resize();
virtual void GetFocus();
virtual void LoseFocus();
-// virtual void GrabFocus();
virtual void KeyInput(const KeyEvent& rKEvt);
virtual void MouseMove(const MouseEvent& rMEvt);
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index 2e2d49c..7a98c03 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -142,8 +142,6 @@ const SfxItemPropertyMapEntry* ImplGetPresentationPropertyMap()
return aPresentationPropertyMap_Impl;
}
-//SfxItemPropertyMap map_impl[] = { { 0,0,0,0,0,0 } };
-
// --------------------------------------------------------------------
// class SlideShow
// --------------------------------------------------------------------
@@ -1216,8 +1214,6 @@ void SlideShow::StartFullscreenPresentation( )
delete mpFullScreenFrameView;
mpFullScreenFrameView = new FrameView(mpDoc, pOriginalFrameView);
-// Reference<XController> xController;
-
// The new frame is created hidden. To make it visible and activate the
// new view shell--a prerequisite to process slot calls and initialize
// its panes--a GrabFocus() has to be called later on.
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 3362f29..73abeb1 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -120,12 +120,8 @@ static USHORT __READONLY_DATA pAllowed[] =
{
SID_OPENDOC , // 5501 //
damit interne Spruenge klappen
SID_JUMPTOMARK , // 5598
-// SID_SHOWPOPUPS , // 5929
-// SID_GALLERY , // 5960
SID_OPENHYPERLINK , // 6676
-// SID_GALLERY_FORMATS , // 10280
SID_NAVIGATOR , // 10366
-// SID_FM_DESIGN_MODE , // 10629
SID_PRESENTATION_END , // 27218
SID_NAVIGATOR_PAGENAME , // 27287
SID_NAVIGATOR_STATE , // 27288
@@ -560,7 +556,6 @@ SlideshowImpl::SlideshowImpl( const Reference< XPresentation2 >& xPresentation,
, mbSwitchEraserMode(false)
, mdUserPaintStrokeWidth ( 4.0 )
, mbEraseAllInk(false)
-//, mbEraseInk(false)
, mnEraseInkSize(100)
#endif
, mnEntryCounter(0)
@@ -1033,10 +1028,6 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings )
Help::DisableContextHelp();
Help::DisableExtHelp();
- // mpTimeButton = new PushButton( mpShowWindow, SdResId( RID_TIME_BUTTON ) );
- // maPencil = Pointer( POINTER_PEN );
- // mpTimeButton->Hide();
-
if( maPresSettings.mbFullScreen )
{
// disable basic ide error handling
@@ -1061,18 +1052,6 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings )
// resize() at the SlideShow (this). Calling resize here results in a
// temporary display of a black window in the window's default size
-/*
- if ( mbRehearseTimings )
- {
- Size aButtonSizePixel( pTimeButton->GetSizePixel() );
- Point aButtonPosPixel( aButtonSizePixel.Width() >> 1,
pShowWindow->GetSizePixel().Height() - aButtonSizePixel.Height() * 5 / 2);
-
- pTimeButton->SetPosPixel( aButtonPosPixel );
- aTimer.SetTimeoutHdl( LINK( this,FuSlideShow, TimeButtonTimeOutHdl ) );
- pTimeButton->SetClickHdl( LINK( this, FuSlideShow, TimeButtonHdl ) );
- }
-*/
-
if( mpView )
{
mpView->AddWindowToPaintView( mpShowWindow );
@@ -1111,13 +1090,6 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings )
-1, Any( bZOrderEnabled == sal_False ),
beans::PropertyState_DIRECT_VALUE ) );
-/*
- aProperties.push_back(
- beans::PropertyValue(
- OUString( RTL_CONSTASCII_USTRINGPARAM("MouseVisible") ),
- -1, Any( maPresSettings.mbMouseVisible != sal_False ),
- beans::PropertyState_DIRECT_VALUE ) );
-*/
aProperties.push_back(
beans::PropertyValue(
OUString( RTL_CONSTASCII_USTRINGPARAM("ForceManualAdvance") ),
@@ -1245,7 +1217,6 @@ void SlideshowImpl::paint( const Rectangle& /* rRect */ )
if( mxView.is() ) try
{
awt::PaintEvent aEvt;
- // aEvt.UpdateRect = TODO
mxView->paint( aEvt );
}
catch( Exception& e )
@@ -1708,7 +1679,7 @@ sal_Int32 SlideshowImpl::getSlideNumberForBookmark( const OUString&
rStrBookmark
if( nPgNum == SDRPAGE_NOTFOUND )
{
- // Ist das Bookmark ein Objekt?
+ // Is the bookmark an object?
SdrObject* pObj = mpDoc->GetObj( aBookmark );
if( pObj )
@@ -1912,9 +1883,7 @@ sal_Int32 SlideshowImpl::updateSlideShow (void)
// G550, the frame rates were much more steadier with this
// tweak, although.
-// currently no solution, because this kills sound (at least on Windows)
-// // Boost our prio, as long as we're in the render loop
-// ::canvas::tools::PriorityBooster aBooster(2);
+ // currently no solution, because this kills sound (at least on Windows)
double fUpdate = 0.0;
if( !xShow->update(fUpdate) )
@@ -2800,17 +2769,6 @@ void SlideshowImpl::resize( const Size& rSize )
{
mpShowWindow->SetSizePixel( maPresSize );
mpShowWindow->Show();
-
- // Call ToTop() to bring the window to top if
- // a) the old size is not degenerate (then the window will be closed
- // soon) and
- // b) the animation mode is not that of a preview (on the one hand
- // this leaves the old behaviour for the slide show mode unmodified
- // and on the other hand does not move the focus from the document
- // to the (preview) window; the ToTop() seems not to be necessary at
- // least for the preview).
-// if( !aOldSize.Width() && !aOldSize.Height() )
-// mpShowWindow->ToTop();
}
if( mxView.is() ) try
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx
index d60d747..6ed06ed 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -398,7 +398,6 @@ private:
bool mbSwitchEraserMode;
double mdUserPaintStrokeWidth;
bool mbEraseAllInk;
-// bool mbEraseInk;
sal_Int32 mnEraseInkSize;
#endif
/// used in updateHdl to prevent recursive calls
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx
b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx
index 1ee3d50..aab6f2b 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx
@@ -255,8 +255,6 @@ public:
pResult = new BitmapEx(aReader.Read());
}
-// sal_Int32 nRatio ((100L * (ULONG)pResult->GetSizeBytes()) / (ULONG)pData->mnDataSize);
-
return ::boost::shared_ptr<BitmapEx>(pResult);
}
diff --git a/sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx
b/sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx
index 820d9b9..2957825 100644
--- a/sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx
+++ b/sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx
@@ -81,7 +81,6 @@ public:
PageEnumeration PageEnumerationProvider::CreateAllPagesEnumeration (
const SlideSorterModel& rModel)
{
-// AllPagesPredicate aPredicate; // spurious warning on unxsoli4 debug=t
return PageEnumeration::Create(rModel, AllPagesPredicate());
}
diff --git a/sd/source/ui/unoidl/randomnode.cxx b/sd/source/ui/unoidl/randomnode.cxx
index 7bed368..0183fba 100644
--- a/sd/source/ui/unoidl/randomnode.cxx
+++ b/sd/source/ui/unoidl/randomnode.cxx
@@ -194,11 +194,8 @@ OUString RandomNode__getImplementationName() throw( RuntimeException )
Sequence< OUString > SAL_CALL RandomNode_getSupportedServiceNames() throw( RuntimeException )
{
-// static const OUString aSN1( OUString::createFromAscii( pSN1 ) );
static const OUString aSN2( OUString::createFromAscii( pSN2 ) );
Sequence< OUString > aSeq( &aSN2, 1 );
-// aSeq[0] = aSN1;
-/// aSeq[1] = aSN2;
return aSeq;
}
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index d19585c..7c8606e 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -73,7 +73,7 @@
#include <editeng/unonrule.hxx>
#include <editeng/eeitem.hxx>
-// #99870# Support creation of GraphicObjectResolver and EmbeddedObjectResolver
+// Support creation of GraphicObjectResolver and EmbeddedObjectResolver
#include <svx/xmleohlp.hxx>
#include <svx/xmlgrhlp.hxx>
#include "DrawDocShell.hxx"
@@ -257,41 +257,6 @@ SdXImpressDocument::~SdXImpressDocument() throw()
{
}
-// uno helper
-
-
-/******************************************************************************
-* Erzeugt anhand der uebergebennen SdPage eine SdDrawPage. Wurde fuer diese *
-* SdPage bereits eine SdDrawPage erzeugt, wird keine neue SdDrawPage erzeug. *
-******************************************************************************/
-/*
-uno::Reference< drawing::XDrawPage > SdXImpressDocument::CreateXDrawPage( SdPage* pPage ) throw()
-{
- DBG_ASSERT(pPage,"SdXImpressDocument::CreateXDrawPage( NULL? )");
-
- uno::Reference< drawing::XDrawPage > xDrawPage;
-
- if(pPage)
- {
- xDrawPage = SvxDrawPage::GetPageForSdrPage(pPage);
-
- if(!xDrawPage.is())
- {
- if(pPage->IsMasterPage())
- {
- xDrawPage = (presentation::XPresentationPage*)new SdMasterPage( this, pPage );
- }
- else
- {
- xDrawPage = (SvxDrawPage*)new SdDrawPage( this, pPage );
- }
- }
- }
-
- return xDrawPage;
-}
-*/
-
// XInterface
uno::Any SAL_CALL SdXImpressDocument::queryInterface( const uno::Type & rType )
throw(uno::RuntimeException)
{
@@ -523,7 +488,7 @@ SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, sal_Bool bDuplicate
sal_Bool bIsPageBack = aVisibleLayers.IsSet( aBckgrnd );
sal_Bool bIsPageObj = aVisibleLayers.IsSet( aBckgrndObj );
- // AutoLayouts muessen fertig sein
+ // AutoLayouts must be ready
mpDoc->StopWorkStartupDelay();
/**************************************************************
@@ -539,7 +504,7 @@ SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, sal_Bool bDuplicate
String aNotesPageName;
/**************************************************************
- * Standardseite
+ * Standardpage
**************************************************************/
if( bDuplicate )
pStandardPage = (SdPage*) pPreviousStandardPage->Clone();
@@ -572,7 +537,7 @@ SdPage* SdXImpressDocument::InsertSdPage( sal_uInt16 nPage, sal_Bool bDuplicate
pStandardPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers);
/**************************************************************
- * Notizseite
+ * Notespage
**************************************************************/
SdPage* pNotesPage = NULL;
@@ -1003,7 +968,7 @@ uno::Reference< uno::XInterface > SAL_CALL SdXImpressDocument::createInstance(
c
return svx::NamespaceMap_createInstance( aWhichIds, &mpDoc->GetItemPool() );
}
- // #99870# Support creation of GraphicObjectResolver and EmbeddedObjectResolver
+ // Support creation of GraphicObjectResolver and EmbeddedObjectResolver
if( 0 == aServiceSpecifier.reverseCompareToAsciiL(
RTL_CONSTASCII_STRINGPARAM("com.sun.star.document.ExportGraphicObjectResolver") ) )
{
return (::cppu::OWeakObject * )new SvXMLGraphicHelper( GRAPHICHELPER_MODE_WRITE );
@@ -1176,7 +1141,7 @@ uno::Sequence< OUString > SAL_CALL
SdXImpressDocument::getAvailableServiceNames(
aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM(sUNO_Service_ImageMapPolygonObject));
aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.NamespaceMap"));
- // #99870# Support creation of GraphicObjectResolver and EmbeddedObjectResolver
+ // Support creation of GraphicObjectResolver and EmbeddedObjectResolver
aSNS[i++] = OUString(
RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExportGraphicObjectResolver"));
aSNS[i++] = OUString(
RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ImportGraphicObjectResolver"));
aSNS[i++] = OUString(
RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExportEmbeddedObjectResolver"));
@@ -1608,7 +1573,6 @@ void ImplPDFExportComments( uno::Reference< drawing::XDrawPage > xPage,
vcl::PDF
geometry::RealPoint2D aRealPoint2D( xAnnotation->getPosition() );
uno::Reference< text::XText > xText( xAnnotation->getTextRange() );
-// rtl::OUString sInitials( getInitials( sAuthor ) );
util::DateTime aDateTime( xAnnotation->getDateTime() );
Date aDate( aDateTime.Day, aDateTime.Month, aDateTime.Year );
@@ -1976,7 +1940,7 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const
uno::Any& r
// exporting object interactions to pdf
// if necessary, the master page interactions will be exported
first
- sal_Bool bIsBackgroundObjectsVisible = sal_False; // SJ:
#i39428# IsBackgroundObjectsVisible not available for Draw
+ sal_Bool bIsBackgroundObjectsVisible = sal_False; // #i39428#
IsBackgroundObjectsVisible not available for Draw
const rtl::OUString sIsBackgroundObjectsVisible(
RTL_CONSTASCII_USTRINGPARAM( "IsBackgroundObjectsVisible" ) );
if ( mbImpressDoc && ( xPagePropSet->getPropertyValue(
sIsBackgroundObjectsVisible ) >>= bIsBackgroundObjectsVisible ) && bIsBackgroundObjectsVisible )
{
@@ -2011,7 +1975,7 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const
uno::Any& r
}
// exporting transition effects to pdf
- if ( mbImpressDoc &&
pPDFExtOutDevData->GetIsExportTransitionEffects() ) // SJ: #i39428# TransitionEffects not
available for Draw
+ if ( mbImpressDoc &&
pPDFExtOutDevData->GetIsExportTransitionEffects() ) // #i39428# TransitionEffects not available
for Draw
{
const rtl::OUString sEffect( RTL_CONSTASCII_USTRINGPARAM(
"Effect" ) );
const rtl::OUString sSpeed ( RTL_CONSTASCII_USTRINGPARAM(
"Speed" ) );
@@ -2115,7 +2079,7 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const
uno::Any& r
aIBeg++;
}
rBookmarks.clear();
- //---> i56629, i40318
+ //---> #i56629, #i40318
//get the page name, will be used as outline element in PDF bookmark
pane
String aPageName = mpDoc->GetSdPage( (USHORT)nPageNumber - 1 ,
PK_STANDARD )->GetName();
if( aPageName.Len() > 0 )
@@ -2125,7 +2089,7 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const
uno::Any& r
pPDFExtOutDevData->CreateNamedDest( aPageName, aPageRect,
nPageNumber - 1 );
//
// add the name to the outline, (almost) same code as in
sc/source/ui/unoobj/docuno.cxx
- // issue i40318.
+ // issue #i40318.
//
if( pPDFExtOutDevData->GetIsExportBookmarks() )
{
@@ -2137,7 +2101,7 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const
uno::Any& r
pPDFExtOutDevData->CreateOutlineItem( -1 , aPageName, nDestId
);
}
}
- //<--- i56629, i40318
+ //<--- #i56629, #i40318
}
catch( uno::Exception& )
{
@@ -2750,7 +2714,6 @@ uno::Reference< drawing::XDrawPage > SAL_CALL
SdMasterPagesAccess::insertNewByIn
pRefNotesPage->GetLwrBorder() );
pMNotesPage->SetLayoutName( aLayoutName );
mpDoc->InsertMasterPage(pMNotesPage, (USHORT)nInsertPos + 1);
-// pMNotesPage->InsertMasterPage( pMPage->GetPageNum() );
pMNotesPage->SetAutoLayout(AUTOLAYOUT_NOTES, sal_True, sal_True);
mpModel->SetModified();
}
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 11ebe49..1f0398a 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -2547,7 +2547,6 @@ void SdDrawPage::setBackground( const Any& rValue )
pBackground->fillItemSet( (SdDrawDocument*)GetPage()->GetModel(), aSet );
}
-//-/ pObj->NbcSetAttributes( aSet, sal_False );
if( aSet.Count() == 0 )
{
// no background fill, represent by setting XFILL_NONE
@@ -2562,7 +2561,6 @@ void SdDrawPage::setBackground( const Any& rValue )
// repaint only
SvxFmDrawPage::mpPage->ActionChanged();
- // pPage->SendRepaintBroadcast();
}
// XAnnotationAccess:
diff --git a/sd/source/ui/unoidl/unosrch.cxx b/sd/source/ui/unoidl/unosrch.cxx
index 3eb2055..208ec1e 100644
--- a/sd/source/ui/unoidl/unosrch.cxx
+++ b/sd/source/ui/unoidl/unosrch.cxx
@@ -627,7 +627,6 @@ uno::Reference< text::XTextRange > SdUnoSearchReplaceShape::Search( uno::Refere
xFound = (text::XText*)pRange;
pRange->SetSelection(aSelection);
-// pDescr->SetStartPos( nEndPos );
}
}
else
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index b7f33ae..f057230 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -370,7 +370,7 @@ void Outliner::EndSpelling (void)
SetUpdateMode(TRUE);
}
- // #95811# Before clearing the modify flag use it as a hint that
+ // Before clearing the modify flag use it as a hint that
// changes were done at SpellCheck
if(IsModified())
{
@@ -380,7 +380,7 @@ void Outliner::EndSpelling (void)
mpDrawDocument->SetChanged(TRUE);
}
- // #95811# now clear the modify flag to have a specified state of
+ // now clear the modify flag to have a specified state of
// Outliner
ClearModifyFlag();
@@ -533,7 +533,7 @@ bool Outliner::StartSearchAndReplace (const SvxSearchItem* pSearchItem)
{
RememberStartPosition ();
bEndOfSearch = SearchAndReplaceOnce ();
- //#107233# restore start position if nothing was found
+ // restore start position if nothing was found
if(!mbStringFound)
RestoreStartPosition ();
else
@@ -1477,8 +1477,6 @@ void Outliner::SetViewShell (const ::boost::shared_ptr<ViewShell>&
rpViewShell)
// When the outline view is not owned by us then we have to clear
// that pointer so that the current one for the new view shell will
// be used (in ProvideOutlinerView).
- // if ( ! mbOwnOutlineView)
- // mpOutlineView = NULL;
if (mpViewShell.get() != NULL)
{
mpView = mpViewShell->GetView();
@@ -1574,7 +1572,6 @@ void Outliner::PrepareConversion (void)
mpDrawDocument->GetDocSh()->SetWaitCursor( FALSE );
// Start seach at the right end of the current object's text
// depending on the search direction.
-// mpOutlineView->SetSelection (GetSearchStartPosition ());
}
else
{
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index cd0dca8..6d759ba 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -371,7 +371,6 @@ void DrawViewShell::ExecCtrl(SfxRequest& rReq)
case SID_RELOAD:
{
- // #83951#
USHORT nId = Svx3DChildWindow::GetChildWindowId();
SfxViewFrame* pFrame = GetViewFrame();
@@ -673,7 +672,6 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq)
aEditAttr.Put( rItem );
mpDrawView->SetAttributes( aEditAttr );
- // #91081# Invalidate is missing here
Invalidate(SID_ATTR_TABSTOP);
}
break;
@@ -745,7 +743,6 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq)
aEditAttr.Put( aLRSpaceItem );
mpDrawView->SetAttributes( aEditAttr );
- // #92557# Invalidate is missing here
Invalidate(SID_ATTR_PARA_LRSPACE);
break;
}
@@ -757,7 +754,6 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq)
aEditAttrReduced.Put( aLRSpaceItem );
mpDrawView->SetAttributes( aEditAttrReduced );
- // #92557# Invalidate is missing here
Invalidate(SID_ATTR_PARA_LRSPACE);
}
break;
@@ -834,8 +830,6 @@ void DrawViewShell::GetRulerState(SfxItemSet& rSet)
const SvxTabStopItem& rItem = (const SvxTabStopItem&) aEditAttr.Get(
EE_PARA_TABS );
rSet.Put( rItem );
- //Rectangle aRect = maMarkRect;
-
const SvxLRSpaceItem& rLRSpaceItem = (const SvxLRSpaceItem&) aEditAttr.Get(
EE_PARA_LRSPACE );
USHORT nId = SID_ATTR_PARA_LRSPACE;
SvxLRSpaceItem aLRSpaceItem( rLRSpaceItem.GetLeft(),
@@ -922,7 +916,6 @@ void DrawViewShell::GetRulerState(SfxItemSet& rSet)
{
rSet.DisableItem( SID_RULER_OBJECT );
rSet.DisableItem( EE_PARA_TABS );
-// rSet.DisableItem( SID_RULER_TEXT_RIGHT_TO_LEFT );
}
rSet.Put( aLRSpace );
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index 55740bc..d752a14 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -73,7 +73,6 @@
#include <svx/bmpmask.hxx>
#include "LayerTabBar.hxx"
-// #97016# IV
#include <svx/svditer.hxx>
namespace sd {
@@ -157,7 +156,6 @@ BOOL DrawViewShell::KeyInput (const KeyEvent& rKEvt, ::sd::Window* pWin)
if ( !IsInputLocked() || ( rKEvt.GetKeyCode().GetCode() == KEY_ESCAPE ) )
{
- // #97016# IV
if(KEY_RETURN == rKEvt.GetKeyCode().GetCode()
&& rKEvt.GetKeyCode().IsMod1()
&& GetView()->IsTextEdit())
@@ -284,7 +282,6 @@ void DrawViewShell::MouseButtonDown(const MouseEvent& rMEvt,
// opened by inplace client and we would deactivate the inplace client,
// the contex menu is closed by VCL asynchronously which in the end
// would work on deleted objects or the context menu has no parent anymore)
- // See #126086# and #128122#
SfxInPlaceClient* pIPClient = GetViewShell()->GetIPClient();
BOOL bIsOleActive = ( pIPClient && pIPClient->IsObjectInPlaceActive() );
@@ -345,7 +342,6 @@ void DrawViewShell::MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin)
pWin->CaptureMouse();
}
- // #109585#
// Since the next MouseMove may execute a IsSolidDraggingNow() in
// SdrCreateView::MovCreateObj and there the ApplicationBackgroundColor
// is needed it is necessary to set it here.
@@ -545,7 +541,6 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
const SvxFieldItem* pFldItem = NULL;
if( pOLV )
pFldItem = pOLV->GetFieldAtSelection();
- //pFldItem = pOLV->GetFieldUnderMousePointer();
// Hilfslinie
if ( mpDrawView->PickHelpLine( aMPos, nHitLog, *GetActiveWindow(), nHelpLine, pPV) )
@@ -568,7 +563,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
{
LanguageType eLanguage( LANGUAGE_SYSTEM );
- // #101743# Format popup with outliner language, if possible
+ // Format popup with outliner language, if possible
if( pOLV->GetOutliner() )
{
ESelection aSelection( pOLV->GetSelection() );
@@ -587,7 +582,6 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
if( pField )
{
SvxFieldItem aFieldItem( *pField, EE_FEATURE_FIELD );
- //pOLV->DeleteSelected(); <-- fehlt leider !
// Feld selektieren, so dass es beim Insert geloescht wird
ESelection aSel = pOLV->GetSelection();
BOOL bSel = TRUE;
@@ -631,8 +625,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
if( ( rCEvt.IsMouseEvent() &&
pOutlinerView->IsWrongSpelledWordAtPos(aPos) ) ||
( !rCEvt.IsMouseEvent() &&
pOutlinerView->IsCursorAtWrongSpelledWord() ) )
{
- // #91457# Popup for Online-Spelling now handled by
DrawDocShell
- // Link aLink = LINK(GetDoc(), SdDrawDocument,
OnlineSpellCallback);
+ // Popup for Online-Spelling now handled by DrawDocShell
Link aLink = LINK(GetDocSh(), DrawDocShell,
OnlineSpellCallback);
if( !rCEvt.IsMouseEvent() )
@@ -747,7 +740,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
break;
}
}
- else if( nInv == E3dInventor /*&& nId == E3D_POLYSCENE_ID*/)
+ else if( nInv == E3dInventor )
{
if( nId == E3D_POLYSCENE_ID || nId == E3D_SCENE_ID )
{
@@ -785,7 +778,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
RID_DRAW_NOSEL_POPUP;
}
}
- // Popup-Menue anzeigen
+ // show Popup-Menu
if (nSdResId)
{
GetActiveWindow()->ReleaseMouse();
@@ -794,7 +787,7 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
GetViewFrame()->GetDispatcher()->ExecutePopup(SdResId(nSdResId));
else
{
- //#106326# don't open contextmenu at mouse position if not opened via mouse
+ //don't open contextmenu at mouse position if not opened via mouse
//middle of the window if nothing is marked
Point aMenuPos(GetActiveWindow()->GetSizePixel().Width()/2
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index fd0dd65..877ba1a 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -92,7 +92,6 @@ void DrawViewShell::ModelHasChanged()
// Damit der Navigator auch einen aktuellen Status bekommt
GetViewFrame()->GetBindings().Invalidate( SID_NAVIGATOR_STATE, TRUE, FALSE );
- //Update3DWindow();
SfxBoolItem aItem( SID_3D_STATE, TRUE );
GetViewFrame()->GetDispatcher()->Execute(
SID_3D_STATE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
@@ -235,8 +234,6 @@ void DrawViewShell::ReadFrameViewData(FrameView* pView)
if (mpDrawView->IsMoveOnlyDragging() != pView->IsMoveOnlyDragging() )
mpDrawView->SetMoveOnlyDragging( pView->IsMoveOnlyDragging() );
-// mpDrawView->SetSlantButShear( pView->IsSlantButShear() );
-
if (mpDrawView->IsNoDragXorPolys() != pView->IsNoDragXorPolys() )
mpDrawView->SetNoDragXorPolys( pView->IsNoDragXorPolys() );
@@ -454,7 +451,7 @@ void DrawViewShell::PrePaint()
void DrawViewShell::Paint(const Rectangle& rRect, ::sd::Window* pWin)
{
- // #103834# Fill var FillColor here to have it available on later call
+ // Fill var FillColor here to have it available on later call
svtools::ColorConfig aColorConfig;
Color aFillColor;
@@ -467,15 +464,15 @@ void DrawViewShell::Paint(const Rectangle& rRect, ::sd::Window* pWin)
aFillColor = Color( aColorConfig.GetColorValue( svtools::DOCCOLOR ).nColor );
}
- /* #97517# This is done before each text edit, so why not do it before every paint.
+ /* This is done before each text edit, so why not do it before every paint.
The default language is only used if the outliner only contains one
character in a symbol font */
GetDoc()->GetDrawOutliner( NULL ).SetDefaultLanguage( GetDoc()->GetLanguage( EE_CHAR_LANGUAGE
) );
- // #103834# Set Application Background color for usage in SdrPaintView(s)
+ // Set Application Background color for usage in SdrPaintView(s)
mpDrawView->SetApplicationBackgroundColor(aFillColor);
- /* #97517# This is done before each text edit, so why not do it before every paint.
+ /* This is done before each text edit, so why not do it before every paint.
The default language is only used if the outliner only contains one
character in a symbol font */
GetDoc()->GetDrawOutliner( NULL ).SetDefaultLanguage( Application::GetSettings().GetLanguage()
);
diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx
index 68d3bc9..d908387 100644
--- a/sd/source/ui/view/drviews6.cxx
+++ b/sd/source/ui/view/drviews6.cxx
@@ -149,8 +149,6 @@ void DrawViewShell::GetFormTextState(SfxItemSet& rSet)
!((SdrTextObj*) pObj)->HasText() )
{
// automatisches Auf/Zuklappen des FontWork-Dialog; erstmal deaktiviert
-// if ( pDlg )
-// pDlg->SetActive(FALSE);
rSet.DisableItem(XATTR_FORMTXTSTYLE);
rSet.DisableItem(XATTR_FORMTXTADJUST);
@@ -169,7 +167,6 @@ void DrawViewShell::GetFormTextState(SfxItemSet& rSet)
{
if ( pDlg )
{
-// pDlg->SetActive();
pDlg->SetColorTable(GetDoc()->GetColorTable());
}
@@ -203,7 +200,6 @@ void DrawViewShell::ExecAnimationWin( SfxRequest& rReq )
{
AnimationWindow* pAnimWin;
USHORT nId = AnimationChildWindow::GetChildWindowId();
- //((const SfxUInt16Item&)(rReq.GetArgs()->Get(nSId))).GetValue();
pAnimWin = static_cast<AnimationWindow*>(
GetViewFrame()->GetChildWindow(nId)->GetWindow());
diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx
index 0dbca9f..3c34b29 100644
--- a/sd/source/ui/view/drviewsb.cxx
+++ b/sd/source/ui/view/drviewsb.cxx
@@ -156,8 +156,6 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq)
}
else
{
- //pDlg->GetAttr( aNewAttr );
- //aLayerName = ((SdAttrLayerName &) aNewAttr.Get
(ATTR_LAYER_NAME)).GetValue ();
aLayerTitle = ((SdAttrLayerTitle &) aNewAttr.Get
(ATTR_LAYER_TITLE)).GetValue ();
aLayerDesc = ((SdAttrLayerDesc &) aNewAttr.Get
(ATTR_LAYER_DESC)).GetValue ();
bIsVisible = ((SdAttrLayerVisible &) aNewAttr.Get
(ATTR_LAYER_VISIBLE)).GetValue ();
@@ -201,7 +199,6 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq)
if ( aPrevLayer == aName )
{
-// nPrevLayer = nLayer;
nPrevLayer = Max(nLayer, (USHORT) 4);
}
}
@@ -550,8 +547,6 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq)
String aName;
if( GetDocSh()->HasName() )
aName = GetDocSh()->GetMedium()->GetName();
- //else
- // aName = GetDocSh()->GetName();
pFieldItem = new SvxFieldItem( SvxExtFileField( aName ), EE_FEATURE_FIELD );
}
break;
@@ -638,7 +633,6 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq)
AbstractSdModifyFieldDlg* pDlg = pFact ?
pFact->CreateSdModifyFieldDlg(GetActiveWindow(), pFldItem->GetField(), pOLV->GetAttribs() ) : 0;
if( pDlg && pDlg->Execute() == RET_OK )
{
- // #108538#
// To make a correct SetAttribs() call at the utlinerView
// it is necessary to split the actions here
SvxFieldData* pField = pDlg->GetField();
@@ -658,7 +652,7 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq)
pOLV->InsertField( aFieldItem );
- // #108538# select again for eventual SetAttribs call
+ // select again for eventual SetAttribs call
pOLV->SetSelection( aSel );
}
@@ -675,7 +669,7 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq)
if(pField)
{
- // #108538# restore selection to original
+ // restore selection to original
if(bSelectionWasModified)
{
aSel.nEndPos--;
@@ -744,7 +738,6 @@ bool DrawViewShell::RenameSlide( USHORT nPageId, const String & rName )
BYTE nBgObj = rLayerAdmin.GetLayerID( String( SdResId( STR_LAYER_BCKGRNDOBJ )), FALSE );
SetOfByte aVisibleLayers = mpActualPage->TRG_GetMasterPageVisibleLayers();
- // (#67720#)
SfxUndoManager* pManager = GetDoc()->GetDocSh()->GetUndoManager();
ModifyPageUndoAction* pAction = new ModifyPageUndoAction(
pManager, GetDoc(), pUndoPage, rName, pUndoPage->GetAutoLayout(),
diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx
index 9d1e69f..ece07c7 100644
--- a/sd/source/ui/view/drviewsf.cxx
+++ b/sd/source/ui/view/drviewsf.cxx
@@ -367,7 +367,6 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet )
else
{ SfxTemplateItem aItem( nWhich, String() );
aAllSet.Put( aItem, aItem.Which() );
- // rSet.DisableItem( nWhich );
}
}
break;
@@ -488,22 +487,6 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet )
delete pSet;
}
-// const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList();
-// ULONG nMarkCount = rMarkList.GetMarkCount();
-// BOOL bDisabled = FALSE;
-//
-// for (ULONG i = 0;
-// i < nMarkCount && !bDisabled && i < 50; i++)
-// {
-// SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj();
-//
-// if (pObj->GetObjInventor() == E3dInventor)
-// {
-// bDisabled = TRUE;
-// rSet.ClearItem(SDRATTR_SHADOW);
-// rSet.DisableItem(SDRATTR_SHADOW);
-// }
-// }
}
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index 9d11475..aa1c0b1 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -181,8 +181,6 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK *
SetOrtho( pFrameView->IsOrtho() );
SetEliminatePolyPointLimitAngle( pFrameView->GetEliminatePolyPointLimitAngle() );
SetEliminatePolyPoints( pFrameView->IsEliminatePolyPoints() );
-// #110094#-7
-// SetMasterPagePaintCaching( pFrameView->IsMasterPagePaintCaching() );
SetDesignMode( pFrameView->IsDesignMode() );
SetSolidMarkHdl( pFrameView->IsSolidMarkHdl() );
@@ -350,8 +348,6 @@ void FrameView::Update(SdOptions* pOptions)
SetBigOrtho( pOptions->IsBigOrtho() );
SetOrtho( pOptions->IsOrtho() );
SetEliminatePolyPointLimitAngle( pOptions->GetEliminatePolyPointLimitAngle() );
-// #110094#-7
-// SetMasterPagePaintCaching( pOptions->IsMasterPagePaintCaching() );
GetModel()->SetPickThroughTransparentTextFrames( pOptions->IsPickThrough() );
SetSolidMarkHdl( pOptions->IsSolidMarkHdl() );
@@ -490,40 +486,12 @@ void FrameView::WriteUserDataSequence ( ::com::sun::star::uno::Sequence <
::com:
aUserData.addValue( sUNO_View_IsSnapToObjectFrame, makeAny( (sal_Bool)IsOFrmSnap() ) );
aUserData.addValue( sUNO_View_IsSnapToObjectPoints, makeAny( (sal_Bool)IsOPntSnap() ) );
-// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsSnapLinesVisible ) );
-// pValue->Value <<= (sal_Bool)IsHlplVisible();
-// pValue++;nIndex++;
-
-// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsDragStripes ) );
-// pValue->Value <<= (sal_Bool)IsDragStripes();
-// pValue++;nIndex++;
-
aUserData.addValue( sUNO_View_IsPlusHandlesAlwaysVisible, makeAny(
(sal_Bool)IsPlusHandlesAlwaysVisible() ) );
aUserData.addValue( sUNO_View_IsFrameDragSingles, makeAny( (sal_Bool)IsFrameDragSingles() ) );
-// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsMarkedHitMovesAlways
) );
-// pValue->Value <<= (sal_Bool)IsMarkedHitMovesAlways();
-// pValue++;nIndex++;
-
aUserData.addValue( sUNO_View_EliminatePolyPointLimitAngle, makeAny(
(sal_Int32)GetEliminatePolyPointLimitAngle() ) );
aUserData.addValue( sUNO_View_IsEliminatePolyPoints, makeAny(
(sal_Bool)IsEliminatePolyPoints() ) );
-// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsLineDraft ) );
-// pValue->Value <<= (sal_Bool)IsLineDraft();
-// pValue++;nIndex++;
-
-// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsFillDraft ) );
-// pValue->Value <<= (sal_Bool)IsFillDraft();
-// pValue++;nIndex++;
-
-// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsTextDraft ) );
-// pValue->Value <<= (sal_Bool)IsTextDraft();
-// pValue++;nIndex++;
-
-// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsGrafDraft ) );
-// pValue->Value <<= (sal_Bool)IsGrafDraft();
-// pValue++;nIndex++;
-
Any aAny;
GetVisibleLayers().QueryValue( aAny );
aUserData.addValue( sUNO_View_VisibleLayers, aAny );
@@ -551,23 +519,11 @@ void FrameView::WriteUserDataSequence ( ::com::sun::star::uno::Sequence <
::com:
aUserData.addValue( sUNO_View_SelectedPage, makeAny( (sal_Int16)GetSelectedPage() ) );
aUserData.addValue( sUNO_View_IsLayerMode, makeAny( (sal_Bool)IsLayerMode() ) );
-// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsQuickEdit ) );
-// pValue->Value <<= (sal_Bool)IsQuickEdit();
-// pValue++;nIndex++;
-
aUserData.addValue( sUNO_View_IsBigHandles, makeAny( (sal_Bool)IsBigHandles() ) );
aUserData.addValue( sUNO_View_IsDoubleClickTextEdit, makeAny(
(sal_Bool)IsDoubleClickTextEdit() ) );
aUserData.addValue( sUNO_View_IsClickChangeRotation, makeAny(
(sal_Bool)IsClickChangeRotation() ) );
-// pValue->Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_IsDragWithCopy ) );
-// pValue->Value <<= (sal_Bool)IsDragWithCopy();
-// pValue++;nIndex++;
-
aUserData.addValue( sUNO_View_SlidesPerRow, makeAny( (sal_Int16)GetSlidesPerRow() ) );
-/* #107128# Product managment decided to not make this persistent
- aUserData.addValue( sUNO_View_DrawMode, makeAny( (sal_Int32)GetDrawMode() ) );
- aUserData.addValue( sUNO_View_PreviewDrawMode, makeAny( (sal_Int32)GetPreviewDrawMode() ) );
-*/
aUserData.addValue( sUNO_View_EditModeStandard, makeAny( (sal_Int32)GetViewShEditMode(
PK_STANDARD ) ) );
aUserData.addValue( sUNO_View_EditModeNotes, makeAny( (sal_Int32)GetViewShEditMode( PK_NOTES )
) );
aUserData.addValue( sUNO_View_EditModeHandout, makeAny( (sal_Int32)GetViewShEditMode(
PK_HANDOUT ) ) );
@@ -760,14 +716,7 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence <
:
SetLayerMode( bBool );
}
}
-/* else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
sUNO_View_IsQuickEdit ) ) )
- {
- if( pValue->Value >>= bBool )
- {
- SetQuickEdit( bBool );
- }
- }
-*/ else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
sUNO_View_IsBigHandles ) ) )
+ else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsBigHandles
) ) )
{
if( pValue->Value >>= bBool )
{
@@ -788,43 +737,13 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence
< :
SetClickChangeRotation( bBool );
}
}
-/* else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
sUNO_View_IsDragWithCopy ) ) )
- {
- if( pValue->Value >>= bBool )
- {
- SetDragWithCopy( bBool );
- }
- }
-*/ else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
sUNO_View_SlidesPerRow ) ) )
+ else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_SlidesPerRow
) ) )
{
if( pValue->Value >>= nInt16 )
{
SetSlidesPerRow( (USHORT)nInt16 );
}
}
-/* #107128# Product managment decided to not make this persistent
- else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_DrawMode ) )
)
- {
- if( pValue->Value >>= nInt32 )
- {
- const StyleSettings& rStyleSettings =
Application::GetSettings().GetStyleSettings();
- if( rStyleSettings.GetHighContrastMode() )
- continue;
- SetDrawMode( (ULONG)nInt32 );
- }
- }
- else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
sUNO_View_PreviewDrawMode ) ) )
- {
- if( pValue->Value >>= nInt32 )
- {
- const StyleSettings& rStyleSettings =
Application::GetSettings().GetStyleSettings();
- SvtAccessibilityOptions aAccOptions;
- if( rStyleSettings.GetHighContrastMode() && aAccOptions.GetIsForPagePreviews()
)
- continue;
- SetPreviewDrawMode( (ULONG)nInt32 );
- }
- }
-*/
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
sUNO_View_EditModeStandard ) ) )
{
if( pValue->Value >>= nInt32 )
@@ -948,21 +867,7 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence <
:
SetOPntSnap( bBool );
}
}
-/* else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
sUNO_View_IsSnapLinesVisible ) ) )
- {
- if( pValue->Value >>= bBool )
- {
- SetHlplVisible( bBool );
- }
- }
- else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
sUNO_View_IsDragStripes ) ) )
- {
- if( pValue->Value >>= bBool )
- {
- SetDragStripes( bBool );
- }
- }
-*/ else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
sUNO_View_IsPlusHandlesAlwaysVisible ) ) )
+ else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
sUNO_View_IsPlusHandlesAlwaysVisible ) ) )
{
if( pValue->Value >>= bBool )
{
@@ -976,14 +881,7 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence <
:
SetFrameDragSingles( bBool );
}
}
-/* else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
sUNO_View_IsMarkedHitMovesAlways ) ) )
- {
- if( pValue->Value >>= bBool )
- {
- SetMarkedHitMovesAlways( bBool );
- }
- }
-*/ else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
sUNO_View_EliminatePolyPointLimitAngle ) ) )
+ else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
sUNO_View_EliminatePolyPointLimitAngle ) ) )
{
if( pValue->Value >>= nInt32 )
{
@@ -997,36 +895,6 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence <
:
SetEliminatePolyPoints( bBool );
}
}
-/*
- else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsLineDraft
) ) )
- {
- if( pValue->Value >>= bBool )
- {
- SetLineDraft( bBool );
- }
- }
- else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsFillDraft
) ) )
- {
- if( pValue->Value >>= bBool )
- {
- SetFillDraft( bBool );
- }
- }
- else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsTextDraft
) ) )
- {
- if( pValue->Value >>= bBool )
- {
- SetTextDraft( bBool );
- }
- }
- else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_IsGrafDraft
) ) )
- {
- if( pValue->Value >>= bBool )
- {
- SetGrafDraft( bBool );
- }
- }
-*/
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_ActiveLayer
) ) )
{
if( pValue->Value >>= aString )
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 68b7a99..6902c0f 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -254,7 +254,7 @@ OutlineViewShell::~OutlineViewShell()
if ( pClipEvtLstnr )
{
pClipEvtLstnr->AddRemoveListener( GetActiveWindow(), FALSE );
- pClipEvtLstnr->ClearCallbackLink(); // #103849# prevent callback if another
thread is waiting
+ pClipEvtLstnr->ClearCallbackLink(); // prevent callback if another thread is
waiting
pClipEvtLstnr->release();
}
}
@@ -308,13 +308,11 @@ void OutlineViewShell::ArrangeGUIElements ()
{
pWindow->SetMinZoomAutoCalc(FALSE);
- // pWindow->SetPosSizePixel(rNewPos, Size(nSizeX, nSizeY));
// OutputArea der OutlinerView aendern
OutlinerView* pOutlinerView = pOlView->GetViewByWindow(pWindow);
Rectangle aWin(Point(0,0), pWindow->GetOutputSizePixel());
-// aWin.nLeft = pOlView->GetPageNumberWidthPixel();
aWin = pWindow->PixelToLogic(aWin);
pOutlinerView->SetOutputArea(aWin);
@@ -418,10 +416,8 @@ void OutlineViewShell::Deactivate( BOOL bIsMDIActivate )
{
pOlView->DisconnectFromApplication();
- // #96416# Links must be kept also on deactivated viewshell, to allow drag'n'drop
+ // Links must be kept also on deactivated viewshell, to allow drag'n'drop
// to function properly
- // pOlView->ResetLinks();
-
ViewShell::Deactivate( bIsMDIActivate );
}
@@ -515,7 +511,6 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq)
(nSlot == SID_TRANSLITERATE_HIRAGANA) ||
(nSlot == SID_TRANSLITERATE_KATAGANA) ||
(nSlot == SID_CUT) ||
-// (nSlot == SID_COPY) ||
(nSlot == SID_PASTE) ||
(nSlot == SID_DELETE)))
{
@@ -696,7 +691,7 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq)
}
break;
- // #96090# added Undo/Redo handling
+ // added Undo/Redo handling
case SID_UNDO :
{
OutlineViewPageChangesGuard aGuard2(pOlView);
@@ -980,7 +975,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet )
GetDoc()->SetChanged(TRUE);
}
- // Da �berladen, muss hier der Status gesetzt werden
+ // Da ueberladen, muss hier der Status gesetzt werden
if( !GetDocSh()->IsModified() )
{
rSet.DisableItem( SID_SAVEDOC );
@@ -1116,9 +1111,6 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet )
FuBullet::GetSlotState( rSet, this, GetViewFrame() );
- //rSet.DisableItem( SID_PRINTDOC );
- //rSet.DisableItem( SID_PRINTDOCDIRECT );
- //rSet.DisableItem( SID_SETUPPRINTER );
}
/*************************************************************************
@@ -1218,7 +1210,6 @@ void OutlineViewShell::SetZoom(long nZoom)
pOutlinerView->SetOutputArea(aWin);
}
- // #106268#
GetViewFrame()->GetBindings().Invalidate( SID_ATTR_ZOOM );
GetViewFrame()->GetBindings().Invalidate( SID_ATTR_ZOOMSLIDER );
}
@@ -1406,10 +1397,7 @@ void OutlineViewShell::GetStatusBarState(SfxItemSet& rSet)
// Seitenanzeige und Layout
- /*
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_STATUS_PAGE ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_STATUS_LAYOUT ) )
- */
+
USHORT nPageCount = GetDoc()->GetSdPageCount( PK_STANDARD );
String aPageStr, aLayoutStr;
@@ -1475,8 +1463,7 @@ void OutlineViewShell::Command( const CommandEvent& rCEvt, ::sd::Window* pWin
)
if (pOLV && pOLV->IsWrongSpelledWordAtPos(aPos))
{
- // #91457# Popup for Online-Spelling now handled by DrawDocShell
- // Link aLink = LINK(GetDoc(), SdDrawDocument, OnlineSpellCallback);
+ // Popup for Online-Spelling now handled by DrawDocShell
Link aLink = LINK(GetDocSh(), DrawDocShell, OnlineSpellCallback);
pOLV->ExecuteSpellPopup(aPos, &aLink);
@@ -1567,7 +1554,6 @@ Size OutlineViewShell::GetOptimalSizePixel() const
// und jetzt jetzt das Standardgelumpe draufaddieren
aResult.Width() += mpVerticalScrollBar->GetSizePixel().Width();
aResult.Height() += mpHorizontalScrollBar->GetSizePixel().Height();
- //!!! + System::GetMenuBarHeightPixel(); // statt Titlebar
return aResult;
}
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 58c59ea..fea4edf 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -58,7 +58,6 @@
#include <editeng/numitem.hxx>
#include <editeng/editeng.hxx>
-// #97766#
#include <editeng/editobj.hxx>
#include <editeng/editund2.hxx>
@@ -277,22 +276,6 @@ void OutlineView::Paint(const Rectangle& rRect, ::sd::Window* pWin)
void OutlineView::InvalidateSlideNumberArea()
{
-/*
- for( sal_Int16 nView = 0; nView < MAX_OUTLINERVIEWS; ++nView )
- {
- if (mpOutlinerView[nView] != NULL)
- {
- ::Window* pWindow = mpOutlinerView[nView]->GetWindow();
- if( pWindow )
- {
- Rectangle aRect( Point(0,0), pWindow->GetOutputSize() );
- aRect.nRight = aRect.nLeft + pWindow->PixelToLogic( Point( mnPageNumberWidthPixel,
0 ) ).X() * 2;
-
- pWindow->Invalidate(aRect);
- }
- }
- }
-*/
}
/*************************************************************************
@@ -1587,7 +1570,7 @@ sal_Int8 OutlineView::ExecuteDrop( const ExecuteDropEvent&,
DropTargetHelper&, :
return DND_ACTION_NONE;
}
-// #97766# Re-implement GetScriptType for this view to get correct results
+// Re-implement GetScriptType for this view to get correct results
sal_uInt16 OutlineView::GetScriptType() const
{
sal_uInt16 nScriptType = ::sd::View::GetScriptType();
diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx
index 797f8f5..b0ff8e0 100644
--- a/sd/source/ui/view/presvish.cxx
+++ b/sd/source/ui/view/presvish.cxx
@@ -60,7 +60,6 @@
#include "ViewShellBase.hxx"
#include "FactoryIds.hxx"
-// #110496#
#include "slideshow.hxx"
#include "fupoor.hxx"
#include "Window.hxx"
@@ -126,7 +125,6 @@ void PresentationViewShell::FinishInitialization( FrameView* pFrameView )
pFrameView->Connect();
}
SetRuler(false);
-// SwitchPage (nPageNumber);
WriteFrameViewData();
GetActiveWindow()->GrabFocus();
@@ -150,7 +148,6 @@ void PresentationViewShell::Activate( BOOL bIsMDIActivate )
if( bIsMDIActivate )
{
- //HMH::sd::View* pView = GetView();
SfxBoolItem aItem( SID_NAVIGATOR_INIT, TRUE );
GetViewFrame()->GetDispatcher()->Execute( SID_NAVIGATOR_INIT, SFX_CALLMODE_ASYNCHRON |
SFX_CALLMODE_RECORD, &aItem, 0L );
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index 766d496..cdf1ad6 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -821,7 +821,6 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar
pAction->SetPathObj(pInfo->mpPathObj, pInfo->mpPathObj);
pAction->SetClickAction(pInfo->meClickAction, eClickAction);
pAction->SetBookmark(pInfo->GetBookmark(), aBookmark);
-//
pAction->SetInvisibleInPres(pInfo->mbInvisibleInPresentation, TRUE);
pAction->SetVerb(pInfo->mnVerb, pInfo->mnVerb);
pAction->SetSecondEffect(pInfo->meSecondEffect,
pInfo->meSecondEffect);
pAction->SetSecondSpeed(pInfo->meSecondSpeed,
pInfo->meSecondSpeed);
@@ -905,7 +904,7 @@ IMPL_LINK( View, ExecuteNavigatorDrop, SdNavigatorDropEvent*, pSdNavigatorDropEv
TRUE, &aPos );
}
- // Loeschen der ExchangeList
+ // Delete the ExchangeList
if( pExchangeList )
{
for( void* p = pExchangeList->First(); p; p = pExchangeList->Next() )
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index 3214452..3efbe25 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -207,7 +207,6 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction,
aPageSize.Width() -= pPage->GetLftBorder() + pPage->GetRgtBorder();
aPageSize.Height() -= pPage->GetUppBorder() + pPage->GetLwrBorder();
pNewGrafObj->AdjustToMaxRect( Rectangle( Point(), aPageSize ), TRUE );
-// pNewGrafObj->AdjustToMaxRect( Rectangle( pPV->GetOffset(), aPageSize ), TRUE );
ULONG nOptions = SDRINSERT_SETDEFLAYER;
BOOL bIsPresTarget = FALSE;
diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx
index 86d0bc1..46cd452 100644
--- a/sd/source/ui/view/sdwindow.cxx
+++ b/sd/source/ui/view/sdwindow.cxx
@@ -809,8 +809,6 @@ void Window::SetVisibleXY(double fX, double fY)
if ( fY >= 0 )
maWinPos.Y() = (long) (fY * maViewSize.Height());
UpdateMapOrigin(FALSE);
- // Size sz(nOldX - aWinPos.X(), nOldY - aWinPos.Y());
- // sz = LogicToPixel(sz);
Scroll(nOldX - maWinPos.X(), nOldY - maWinPos.Y(), SCROLL_CHILDREN);
Update();
}
@@ -983,12 +981,10 @@ void Window::DataChanged( const DataChangedEvent& rDCEvt )
{
SetDrawMode( nOutputMode );
mpViewShell->GetFrameView()->SetDrawMode( nOutputMode );
-// #110094#-7
-// mpViewShell->GetView()->ReleaseMasterPagePaintCache();
Invalidate();
}
- // #103100# Overwrite window color for OutlineView
+ // Overwrite window color for OutlineView
if( mpViewShell->ISA(OutlineViewShell ) )
{
svtools::ColorConfig aColorConfig;
@@ -1001,7 +997,7 @@ void Window::DataChanged( const DataChangedEvent& rDCEvt )
mpViewShell->Invalidate();
mpViewShell->ArrangeGUIElements();
- // #101928# re-create handles to show new outfit
+ // re-create handles to show new outfit
if(mpViewShell->ISA(DrawViewShell))
{
mpViewShell->GetView()->AdjustMarkHdl();
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 0b557d9..8ad2001 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -79,7 +79,6 @@
#include <svx/fontworkbar.hxx>
#include <svx/svdoutl.hxx>
-// #96090#
#include <svl/slstitm.hxx>
#include <sfx2/request.hxx>
#include "SpellDialogChildWindow.hxx"
@@ -317,8 +316,7 @@ void ViewShell::Activate(BOOL bIsMDIActivate)
// Laut MI darf keiner GrabFocus rufen, der nicht genau weiss von
// welchem Window der Focus gegrabt wird. Da Activate() vom SFX teilweise
// asynchron verschickt wird, kann es sein, dass ein falsches Window
- // den Focus hat (#29682#):
- //GetViewFrame()->GetWindow().GrabFocus();
+ // den Focus hat
if (mpHorizontalRuler.get() != NULL)
mpHorizontalRuler->SetActive(TRUE);
@@ -354,12 +352,6 @@ void ViewShell::Activate(BOOL bIsMDIActivate)
if(!GetDocSh()->IsUIActive())
UpdatePreview( GetActualPage(), TRUE );
- //HMH::sd::View* pView = GetView();
-
- //HMHif (pView)
- //HMH{
- //HMH pView->ShowMarkHdl();
- //HMH}
}
ReadFrameViewData( mpFrameView );
@@ -455,7 +447,6 @@ BOOL ViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin)
if(!bReturn)
{
- // #76008#
// give key input first to SfxViewShell to give CTRL+Key
// (e.g. CTRL+SHIFT+'+', to front) priority.
OSL_ASSERT (GetViewShell()!=NULL);
@@ -529,7 +520,6 @@ void ViewShell::MouseButtonDown(const MouseEvent& rMEvt, ::sd::Window* pWin)
{
pWin->GrabFocus();
SetActiveWindow(pWin);
-// GetViewFrame()->GetWindow().GrabFocus();
}
// MouseEvent in E3dView eintragen
@@ -814,7 +804,7 @@ void ViewShell::Resize (void)
return;
// Remember the new position and size.
- maViewPos = Point(0,0); //mpParentWindow->GetPosPixel();
+ maViewPos = Point(0,0);
maViewSize = aSize;
// Rearrange the UI elements to take care of the new position and size.
@@ -830,11 +820,9 @@ void ViewShell::Resize (void)
if (GetDocSh()->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED
&& IsMainViewShell())
{
- // GetDocSh()->SetVisArea(aVisArea);
+
}
- // VisAreaChanged(aVisArea);
-
::sd::View* pView = GetView();
if (pView)
@@ -1159,7 +1147,7 @@ void ViewShell::ImpSidUndo(BOOL, SfxRequest& rReq)
sal_uInt16 nCount(pUndoManager->GetUndoActionCount());
if(nCount >= nNumber)
{
- // #94637# when UndoStack is cleared by ModifyPageUndoAction
+ // when UndoStack is cleared by ModifyPageUndoAction
// the nCount may have changed, so test GetUndoActionCount()
while(nNumber-- && pUndoManager->GetUndoActionCount())
{
@@ -1167,7 +1155,7 @@ void ViewShell::ImpSidUndo(BOOL, SfxRequest& rReq)
}
}
- // #91081# refresh rulers, maybe UNDO was move of TAB marker in ruler
+ // refresh rulers, maybe UNDO was move of TAB marker in ruler
if (mbHasRulers)
{
Invalidate(SID_ATTR_TABSTOP);
@@ -1200,7 +1188,7 @@ void ViewShell::ImpSidRedo(BOOL, SfxRequest& rReq)
sal_uInt16 nCount(pUndoManager->GetRedoActionCount());
if(nCount >= nNumber)
{
- // #94637# when UndoStack is cleared by ModifyPageRedoAction
+ // when UndoStack is cleared by ModifyPageRedoAction
// the nCount may have changed, so test GetRedoActionCount()
while(nNumber-- && pUndoManager->GetRedoActionCount())
{
@@ -1208,7 +1196,7 @@ void ViewShell::ImpSidRedo(BOOL, SfxRequest& rReq)
}
}
- // #91081# refresh rulers, maybe REDO was move of TAB marker in ruler
+ // refresh rulers, maybe REDO was move of TAB marker in ruler
if (mbHasRulers)
{
Invalidate(SID_ATTR_TABSTOP);
@@ -1260,8 +1248,7 @@ void ViewShell::ExecReq( SfxRequest& rReq )
GetActiveWindow()->SetDrawMode( nMode );
mpFrameView->SetDrawMode( nMode );
-// #110094#-7
-// GetView()->ReleaseMasterPagePaintCache();
+
GetActiveWindow()->Invalidate();
Invalidate();
@@ -1403,7 +1390,6 @@ void ViewShell::DisposeFunctions()
bool ViewShell::IsMainViewShell (void) const
{
return mpImpl->mbIsMainViewShell;
- // return GetViewShellBase().GetMainViewShell() == this;
}
void ViewShell::SetIsMainViewShell (bool bIsMainViewShell)
--
1.7.1
Context
- [Libreoffice] Impress and draw cleanup session · Roth Robert
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.