Attached is a patch for the Easy Hack removing commented out code
(dead or uncompiled code). This is for the 'sd' module since I've been
working in it lately. I wasn't sure what other code needs to be done as
I couldn't find any information on which parts of the code have already
been cleaned up. (I know several programmers where working on this
awhile back).
Dona Hertel
******Note to Thorsten:
In the next few days I'm going email a partially-working patch of the
old Autolayout code from 2009. It's going to take some doing as the old
patch doesn't apply at all to the new build (the directories are
different) and I'm manually separating out the code and adding it
gradually (there's quite a bit of rewriting to do). Should I send this
to you directly instead of the mailing list as its not something that
will be added to the main repository right now?
Dona Hertel - coco...@mailbolt.com
>From 350153725e823032811c8b86b5c7d4b8d104440a Mon Sep 17 00:00:00 2001
From: Dona Hertel <coco...@mailbolt.com>
Date: Wed, 13 Apr 2011 17:28:39 -0700
Subject: [PATCH] Easy Hack remove dead code and uncompiled code in 'sd' module
---
sd/source/filter/ppt/pptinanimations.cxx | 18 ------
sd/source/ui/annotations/annotationmanager.cxx | 6 +--
sd/source/ui/annotations/annotationtag.cxx | 26 +---------
sd/source/ui/dlg/AnimationChildWindow.cxx | 13 -----
sd/source/ui/dlg/dlgctrls.cxx | 17 ------
sd/source/ui/dlg/dlgolbul.cxx | 18 ------
sd/source/ui/dlg/tpaction.cxx | 5 --
sd/source/ui/func/fuoltext.cxx | 15 -----
sd/source/ui/func/fupoor.cxx | 19 ++-----
sd/source/ui/func/fusldlg.cxx | 9 +---
sd/source/ui/func/futempl.cxx | 43 +--------------
sd/source/ui/presenter/PresenterPreviewCache.cxx | 7 ---
sd/source/ui/slideshow/slideshowimpl.cxx | 8 ---
.../ui/slidesorter/controller/SlsFocusManager.cxx | 18 ------
.../ui/slidesorter/controller/SlsSlotManager.cxx | 5 +--
sd/source/ui/unoidl/SdUnoOutlineView.cxx | 38 -------------
sd/source/ui/unoidl/unoobj.cxx | 58 +-------------------
sd/source/ui/view/ViewShellImplementation.cxx | 12 ----
sd/source/ui/view/drtxtob.cxx | 15 -----
sd/source/ui/view/drtxtob1.cxx | 26 ---------
sd/source/ui/view/drviews7.cxx | 3 -
sd/source/ui/view/drviewsj.cxx | 9 +---
sd/source/ui/view/sdview3.cxx | 9 +---
sd/source/ui/view/viewshe3.cxx | 13 -----
24 files changed, 14 insertions(+), 396 deletions(-)
diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx
index 4984fba..56a4832 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -1372,25 +1372,7 @@ void AnimationImporter::fillNode( Reference< XAnimationNode >& xNode, const Anim
}
}
-/* todo
- Reference< XAudio > xAudio( xNode, UNO_QUERY );
- if( xAudio.is() )
- {
- if( rSet.hasProperty( DFF_ANIM_ENDAFTERSLIDE ) )
- {
- sal_Int16 nEndAfterSlide = 0;
- if( rSet.getProperty( DFF_ANIM_ENDAFTERSLIDE ) >>= nEndAfterSlide )
- xAudio->setEndAfterSlide( nEndAfterSlide );
- }
- if( rSet.hasProperty( DFF_ANIM_VOLUME ) )
- {
- double fVolume = 1.0;
- rSet.getProperty( DFF_ANIM_VOLUME ) >>= fVolume;
- xAudio->setVolume( fVolume );
- }
- }
-*/
Reference< XAnimateColor > xColor( xNode, UNO_QUERY );
if( xColor.is() )
{
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index 4037cd8..8200b8f 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -1215,11 +1215,7 @@ SdPage* AnnotationManagerImpl::GetLastPage()
SdPage* AnnotationManagerImpl::GetCurrentPage()
{
-/*
- ::boost::shared_ptr<DrawViewShell> pDrawViewShell(::boost::dynamic_pointer_cast<DrawViewShell>(mrBase.GetMainViewShell()));
- if (pDrawViewShell.get() != NULL)
- return pDrawViewShell->GetActualPage();
-*/
+
return mrBase.GetMainViewShell()->getCurrentPage();
}
diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx
index 3c21093..cd9a9c5 100644
--- a/sd/source/ui/annotations/annotationtag.cxx
+++ b/sd/source/ui/annotations/annotationtag.cxx
@@ -342,13 +342,7 @@ bool AnnotationTag::MouseButtonDown( const MouseEvent& rMEvt, SmartHdl& /*rHdl*/
mrView.getSmartTags().select( xTag );
bRet = true;
}
- /*
- if( rMEvt.IsLeft() && (rMEvt.GetClicks() == 2) )
- {
- // double click;
- return true;
- }
- else */
+
if( rMEvt.IsLeft() && !rMEvt.IsRight() )
{
Window* pWindow = mrView.GetViewShell()->GetActiveWindow();
@@ -414,25 +408,7 @@ bool AnnotationTag::KeyInput( const KeyEvent& rKEvt )
/** returns true if the SmartTag consumes this event. */
bool AnnotationTag::RequestHelp( const HelpEvent& /*rHEvt*/ )
{
-/*
- ::Window* pWindow = mrView.GetViewShell()->GetActiveWindow();
- if( mxAnnotation.is() && pWindow )
- {
- OUString aHelpText( mrManager.GetHelpText( mxAnnotation ) );
- RealPoint2D aPosition( mxAnnotation->getPosition() );
- Point aPos( pWindow->LogicToPixel( Point( static_cast<long>(aPosition.X * 100.0), static_cast<long>(aPosition.Y * 100.0) ) ) );
-
- Rectangle aRect( aPos, maSize );
-
- if (Help::IsBalloonHelpEnabled())
- Help::ShowBalloon( pWindow, aPos, aRect, aHelpText);
- else if (Help::IsQuickHelpEnabled())
- Help::ShowQuickHelp( pWindow, aRect, aHelpText);
-
- return true;
- }
-*/
return false;
}
diff --git a/sd/source/ui/dlg/AnimationChildWindow.cxx b/sd/source/ui/dlg/AnimationChildWindow.cxx
index a0a1379..c4c5981 100644
--- a/sd/source/ui/dlg/AnimationChildWindow.cxx
+++ b/sd/source/ui/dlg/AnimationChildWindow.cxx
@@ -62,20 +62,7 @@ AnimationChildWindow::AnimationChildWindow(
eChildAlignment = SFX_ALIGN_NOALIGNMENT;
pAnimWin->Initialize( pInfo );
- /*
- if ( pInfo->aSize.Width() != 0 && pInfo->aSize.Height() != 0 )
- {
- pWindow->SetPosSizePixel( pInfo->aPos, pInfo->aSize );
- }
- else
- pWindow->SetPosPixel(SFX_APPWINDOW->OutputToScreenPixel(
- SFX_APPWINDOW->GetClientAreaPixel().TopLeft()));
- if ( pInfo->nFlags & SFX_CHILDWIN_ZOOMIN )
- pAnimWin->ZoomIn();
-
- pAnimWin->aFltWinSize = pWindow->GetSizePixel();
- */
SetHideNotDelete( sal_True );
}
diff --git a/sd/source/ui/dlg/dlgctrls.cxx b/sd/source/ui/dlg/dlgctrls.cxx
index e02d840..677e94c 100644
--- a/sd/source/ui/dlg/dlgctrls.cxx
+++ b/sd/source/ui/dlg/dlgctrls.cxx
@@ -80,23 +80,6 @@ void FadeEffectLB::Fill()
SelectEntryPos(0);
}
-// -----------------------------------------------------------------------------
-
-/*
-void FadeEffectLB::SelectEffect( presentation::FadeEffect eFE )
-{
- sal_Bool bFound = sal_False;
-
- for( long i = 0, nCount = sizeof( aEffects ) / sizeof( FadeEffectPair ); ( i < nCount ) && !bFound; i++ )
- {
- if( aEffects[ i ].meFE == eFE )
- {
- SelectEntryPos( (sal_uInt16) i );
- bFound = sal_True;
- }
- }
-}
-*/
// -----------------------------------------------------------------------------
diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx
index 5177a1d..b34133f 100644
--- a/sd/source/ui/dlg/dlgolbul.cxx
+++ b/sd/source/ui/dlg/dlgolbul.cxx
@@ -132,17 +132,6 @@ OutlineBulletDlg::OutlineBulletDlg(
aInputSet.Put(*pItem, EE_PARA_NUMBULLET);
}
- /* debug
- if( SFX_ITEM_SET == aInputSet.GetItemState(EE_PARA_NUMBULLET, sal_False, &pItem ))
- {
- SvxNumRule& rItem = *((SvxNumBulletItem*)pItem)->GetNumRule();
- for( int i = 0; i < 9; i++ )
- {
- SvxNumberFormat aNumberFormat = rItem.GetLevel(i);
- }
- }
- */
-
if(bTitle && aInputSet.GetItemState(EE_PARA_NUMBULLET,sal_True) == SFX_ITEM_ON )
{
SvxNumBulletItem* pItem = (SvxNumBulletItem*)aInputSet.GetItem(EE_PARA_NUMBULLET,sal_True);
@@ -215,15 +204,8 @@ const SfxItemSet* OutlineBulletDlg::GetOutputItemSet() const
{
SdBulletMapper::MapFontsInNumRule( *((SvxNumBulletItem*)pItem)->GetNumRule(), *pOutputSet );
-/* #i35937#
- SfxUInt16Item aBulletState( EE_PARA_BULLETSTATE, 1 );
- pOutputSet->Put(aBulletState);
-*/
}
-/* #i35937#
- SdBulletMapper::PostMapNumBulletForDialog( *pOutputSet );
-*/
if(bTitle && pOutputSet->GetItemState(EE_PARA_NUMBULLET,sal_True) == SFX_ITEM_ON )
{
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index b53073c..ecfc89c 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -228,11 +228,6 @@ void SdTPAction::Construct()
{
pGrafObj = (SdrGrafObj*) pObj;
}
-// // VCXControl ?
-// else if( pObj->IsA( TYPE( VCSbxDrawObject ) ) )
-// {
-// bDisableAll = sal_True;
-// }
}
}
if( pGrafObj )
diff --git a/sd/source/ui/func/fuoltext.cxx b/sd/source/ui/func/fuoltext.cxx
index a92c484..be7b3f3 100644
--- a/sd/source/ui/func/fuoltext.cxx
+++ b/sd/source/ui/func/fuoltext.cxx
@@ -155,21 +155,6 @@ sal_Bool FuOutlineText::MouseMove(const MouseEvent& rMEvt)
bReturn = FuOutline::MouseMove(rMEvt);
}
- // MT 07/2002: Done in OutlinerView::MouseMove
- /*
- const SvxFieldItem* pFieldItem = pOutlineView->GetViewByWindow( mpWindow )->
- GetFieldUnderMousePointer();
- const SvxFieldData* pField = NULL;
- if( pFieldItem )
- pField = pFieldItem->GetField();
-
- if( pField && pField->ISA( SvxURLField ) )
- {
- mpWindow->SetPointer( Pointer( POINTER_REFHAND ) );
- }
- else
- mpWindow->SetPointer( Pointer( POINTER_TEXT ) );
- */
return (bReturn);
}
diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx
index 60f0b49..7fc2649 100644
--- a/sd/source/ui/func/fupoor.cxx
+++ b/sd/source/ui/func/fupoor.cxx
@@ -181,14 +181,7 @@ void FuPoor::ForceScroll(const Point& aPixPos)
if ( !mpView->IsDragHelpLine() && !mpView->IsSetPageOrg() &&
!SlideShow::IsRunning( mpViewShell->GetViewShellBase() ) )
{
-/* Size aSize = mpWindow->GetSizePixel();
- short dx = 0, dy = 0;
-
- if ( aPixPos.X() <= 0 ) dx = -1;
- if ( aPixPos.X() >= aSize.Width() ) dx = 1;
- if ( aPixPos.Y() <= 0 ) dy = -1;
- if ( aPixPos.Y() >= aSize.Height() ) dy = 1;
-*/
+
Point aPos = mpWindow->OutputToScreenPixel(aPixPos);
const Rectangle& rRect = mpViewShell->GetAllWindowRect();
@@ -201,10 +194,10 @@ void FuPoor::ForceScroll(const Point& aPixPos)
{
short dx = 0, dy = 0;
- if ( aPos.X() <= rRect.Left() ) dx = -1;
- if ( aPos.X() >= rRect.Right() ) dx = 1;
- if ( aPos.Y() <= rRect.Top() ) dy = -1;
- if ( aPos.Y() >= rRect.Bottom() ) dy = 1;
+ if ( aPos.X() <= rRect.Left() ) dx = -1;
+ if ( aPos.X() >= rRect.Right() ) dx = 1;
+ if ( aPos.Y() <= rRect.Top() ) dy = -1;
+ if ( aPos.Y() >= rRect.Bottom() ) dy = 1;
if ( dx != 0 || dy != 0 )
{
@@ -1070,7 +1063,7 @@ sal_Bool FuPoor::MouseButtonUp (const MouseEvent& rMEvt)
SetMouseButtonCode(rMEvt.GetButtons());
aDelayToScrollTimer.Stop ();
- return bScrollable =
+ return bScrollable =
bDelayActive = sal_False;
}
diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx
index 30383cb..c34ab0d 100644
--- a/sd/source/ui/func/fusldlg.cxx
+++ b/sd/source/ui/func/fusldlg.cxx
@@ -110,14 +110,7 @@ void FuSlideShowDlg::DoExecute( SfxRequest& )
List* pCustomShowList = mpDoc->GetCustomShowList(); // No Create
sal_Bool bStartWithActualPage = SD_MOD()->GetSdOptions( mpDoc->GetDocumentType() )->IsStartWithActualPage();
-/* change in behaviour, even when always start with current page is enabled, range settings are
- still used
- if( bStartWithActualPage )
- {
- aFirstPage = pViewSh->GetActualPage()->GetName();
- pCustomShowList = NULL;
- }
-*/
+
if( !aFirstPage.Len() && pPage )
aFirstPage = pPage->GetName();
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index 199a32b..cd04a67 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -263,9 +263,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_STYLE_FAMILY2 );
}
}
-/* GrabFocus moved to stylist
- pWin->GrabFocus();
-*/
+
break;
case SID_STYLE_WATERCAN:
@@ -476,45 +474,6 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
SfxItemSet& rAttr = pStyleSheet->GetItemSet();
-/* #i35937#
- if ( rAttr.GetItemState( EE_PARA_LRSPACE ) == SFX_ITEM_ON )
- {
- // SvxLRSpaceItem hart gesetzt: NumBulletItem anpassen
- if ( aOriSet.GetItemState( EE_PARA_LRSPACE ) != SFX_ITEM_ON ||
- (const SvxLRSpaceItem&) aOriSet.Get( EE_PARA_LRSPACE ) !=
- (const SvxLRSpaceItem&) rAttr.Get( EE_PARA_LRSPACE ) )
- {
- SvxNumBulletItem aNumBullet( (const SvxNumBulletItem&) rAttr.Get(EE_PARA_NUMBULLET) );
-
- sal_uInt16 nLevel = 0;
- if( (ePO >= PO_OUTLINE_2) && (ePO <= PO_OUTLINE_9) )
- nLevel = (sal_uInt16)(ePO - PO_OUTLINE_1 + 1);
-
- EditEngine::ImportBulletItem( aNumBullet, nLevel, NULL,
- &(const SvxLRSpaceItem&) rAttr.Get( EE_PARA_LRSPACE ) );
-
- // the numbering bullet item is not valid in styles Outline 2 to Outline 9
- if( nLevel != 0 )
- {
- // so put it into Outline 1 then..
- String sStyleName((SdResId(STR_PSEUDOSHEET_OUTLINE)));
- sStyleName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " 1" ) );
- SfxStyleSheetBase* pFirstStyleSheet = pSSPool->Find( sStyleName, SD_STYLE_FAMILY_PSEUDO);
-
- if(pFirstStyleSheet)
- {
- pFirstStyleSheet->GetItemSet().Put( aNumBullet);
- SdStyleSheet* pRealSheet = ((SdStyleSheet*)pFirstStyleSheet)->GetRealStyleSheet();
- pRealSheet->Broadcast(SfxSimpleHint(SFX_HINT_DATACHANGED));
- }
- }
- else
- {
- ( (SfxItemSet&) rAttr).Put( aNumBullet );
- }
- }
- }
-*/
// check for unique names of named items for xml
if( rAttr.GetItemState( XATTR_FILLBITMAP ) == SFX_ITEM_SET )
{
diff --git a/sd/source/ui/presenter/PresenterPreviewCache.cxx b/sd/source/ui/presenter/PresenterPreviewCache.cxx
index 92bd7e8..3c7ac48 100644
--- a/sd/source/ui/presenter/PresenterPreviewCache.cxx
+++ b/sd/source/ui/presenter/PresenterPreviewCache.cxx
@@ -388,13 +388,6 @@ void PresenterPreviewCache::PresenterCacheContext::NotifyPreviewCreation (
bool PresenterPreviewCache::PresenterCacheContext::IsIdle (void)
{
return true;
- /*
- sal_Int32 nIdleState (tools::IdleDetection::GetIdleState(NULL));
- if (nIdleState == tools::IdleDetection::IDET_IDLE)
- return true;
- else
- return false;
- */
}
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 3ae8df2..35500de 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -1454,14 +1454,6 @@ void SlideshowImpl::displayCurrentSlide (const bool bSkipAllMainSequenceEffects)
void SlideshowImpl::endPresentation()
{
-/*
- if( maPresSettings.mbMouseAsPen)
- {
- Reference< XMultiServiceFactory > xDocFactory(mpDoc->getUnoModel(), UNO_QUERY );
- if( xDocFactory.is() )
- mxShow->registerUserPaintPolygons(xDocFactory);
- }
-*/
if( !mnEndShowEvent )
mnEndShowEvent = Application::PostUserEvent( LINK(this, SlideshowImpl, endPresentationHdl) );
}
diff --git a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx
index b872244..6f67c81 100644
--- a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx
@@ -229,24 +229,6 @@ sal_Int32 FocusManager::GetFocusedPageIndex (void) const
}
-
-/*
-void FocusManager::FocusPage (sal_Int32 nPageIndex)
-{
- if (nPageIndex != mnPageIndex)
- {
- // Hide the focus while switching it to the specified page.
- FocusHider aHider (*this);
- mnPageIndex = nPageIndex;
- }
-
- if (HasFocus() && !IsFocusShowing())
- ShowFocus();
-}
-*/
-
-
-
void FocusManager::SetFocusedPage (const model::SharedPageDescriptor& rpDescriptor)
{
if (rpDescriptor.get() != NULL)
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index dd1f802..779800b 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -825,10 +825,7 @@ void SlotManager::GetClipboardState ( SfxItemSet& rSet)
void SlotManager::GetStatusBarState (SfxItemSet& rSet)
{
// Seitenanzeige und Layout
- /*
- if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_STATUS_PAGE ) ||
- SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_STATUS_LAYOUT ) )
- */
+
SdPage* pPage = NULL;
SdPage* pFirstPage = NULL;
sal_uInt16 nFirstPage;
diff --git a/sd/source/ui/unoidl/SdUnoOutlineView.cxx b/sd/source/ui/unoidl/SdUnoOutlineView.cxx
index 100f79a..ee1d453 100644
--- a/sd/source/ui/unoidl/SdUnoOutlineView.cxx
+++ b/sd/source/ui/unoidl/SdUnoOutlineView.cxx
@@ -149,44 +149,6 @@ Reference< drawing::XDrawPage > SAL_CALL SdUnoOutlineView::getCurrentPage (void)
return xPage;
}
-
-
-/*
-// Return sal_True, value change
-sal_Bool SdUnoOutlineView::convertFastPropertyValue (
- Any & rConvertedValue,
- Any & rOldValue,
- sal_Int32 nHandle,
- const Any& rValue)
- throw ( com::sun::star::lang::IllegalArgumentException)
-{
- sal_Bool bResult = sal_False;
-
- switch( nHandle )
- {
- case DrawController::PROPERTY_CURRENTPAGE:
- {
- Reference< drawing::XDrawPage > xOldPage( getCurrentPage() );
- Reference< drawing::XDrawPage > xNewPage;
- ::cppu::convertPropertyValue( xNewPage, rValue );
- if( xOldPage != xNewPage )
- {
- rConvertedValue <<= xNewPage;
- rOldValue <<= xOldPage;
- bResult = sal_True;
- }
- }
- break;
-
- default:
- break;
- }
-
- return bResult;
-}
-*/
-
-
void SdUnoOutlineView::setFastPropertyValue (
sal_Int32 nHandle,
const Any& rValue)
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index b67d15b..bde3428 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -544,17 +544,6 @@ void SAL_CALL SdXShape::setPropertyValue( const ::rtl::OUString& aPropertyName,
EffectMigration::SetAnimationSpeed( mpShape, eSpeed );
break;
}
-/* TODO?? case WID_ISANIMATION:
- {
-
- sal_Bool bIsAnimation;
- if(!(aValue >>= bIsAnimation))
- throw lang::IllegalArgumentException();
-
- pInfo->mbIsMovie = bIsAnimation;
- break;
- }
-*/
case WID_BOOKMARK:
{
OUString aString;
@@ -568,12 +557,7 @@ void SAL_CALL SdXShape::setPropertyValue( const ::rtl::OUString& aPropertyName,
::cppu::any2enum< presentation::ClickAction >( pInfo->meClickAction, aValue);
break;
-/* todo?
- case WID_PLAYFULL:
- pInfo->mbPlayFull = ::cppu::any2bool(aValue);
- break;
-*/
- case WID_SOUNDFILE:
+ case WID_SOUNDFILE:
{
OUString aString;
if(!(aValue >>= aString))
@@ -590,17 +574,6 @@ void SAL_CALL SdXShape::setPropertyValue( const ::rtl::OUString& aPropertyName,
EffectMigration::UpdateSoundEffect( mpShape, pInfo );
break;
}
-/*
- case WID_BLUESCREEN:
- {
- sal_Int32 nColor;
- if(!(aValue >>= nColor))
- throw lang::IllegalArgumentException();
-
- pInfo->maBlueScreen.SetColor( nColor );
- break;
- }
-*/
case WID_VERB:
{
sal_Int32 nVerb = 0;
@@ -656,36 +629,7 @@ void SAL_CALL SdXShape::setPropertyValue( const ::rtl::OUString& aPropertyName,
case WID_MASTERDEPEND:
SetMasterDepend( ::cppu::any2bool(aValue) );
break;
-/* todo
- case WID_ANIMPATH:
- {
- uno::Reference< drawing::XShape > xShape;
- aValue >>= xShape;
-
- SdrObject* pObj = NULL;
- if(xShape.is())
- pObj = GetSdrObjectFromXShape( xShape );
-
- if( pObj == NULL || !pObj->ISA( SdrPathObj ) )
- throw lang::IllegalArgumentException();
- pInfo->mpPathObj = (SdrPathObj*)pObj;
-
- SdDrawDocument* pDoc = mpModel?mpModel->GetDoc():NULL;
- if( pDoc )
- {
- pInfo = pDoc->GetAnimationInfo(pObj);
- if( pInfo == NULL )
- {
- pInfo = new SdAnimationInfo(pDoc);
- pObj->InsertUserData( pInfo );
- }
- pInfo->mbInvisibleInPresentation = sal_True;
- }
-
- break;
- }
-*/
case WID_IMAGEMAP:
{
SdDrawDocument* pDoc = mpModel?mpModel->GetDoc():NULL;
diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx
index a265bdc..5eeeeb8 100644
--- a/sd/source/ui/view/ViewShellImplementation.cxx
+++ b/sd/source/ui/view/ViewShellImplementation.cxx
@@ -136,18 +136,6 @@ void ViewShell::Implementation::ProcessModifyPageSlot (
if (!pArgs || pArgs->Count() == 1 || pArgs->Count() == 2 )
{
- if (pArgs && pArgs->Count() == 2)
- {
- // We have been called with a request that contains two
- // arguments. One was used as preselected layout in a
- // dialog. We could select that layout in the
- // layout panel instead.
- /*
- SFX_REQUEST_ARG (rRequest, pNewAutoLayout, SfxUInt32Item, ID_VAL_WHATLAYOUT, sal_False);
- eNewAutoLayout = (AutoLayout) pNewAutoLayout->GetValue
- ();
- */
- }
// Make the layout menu visible in the tool pane.
SfxBoolItem aMakeToolPaneVisible (ID_VAL_ISVISIBLE, sal_True);
diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx
index a80d32b..b302eab 100644
--- a/sd/source/ui/view/drtxtob.cxx
+++ b/sd/source/ui/view/drtxtob.cxx
@@ -533,21 +533,6 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet )
}
}
-/* #i35937#
- if (aAttrSet.GetItemState(EE_PARA_BULLETSTATE) == SFX_ITEM_ON)
- {
- SfxUInt16Item aBulletState((const SfxUInt16Item&) aAttrSet.Get(EE_PARA_BULLETSTATE));
-
- if (aBulletState.GetValue() != 0)
- {
- rSet.Put(SfxBoolItem(FN_NUM_BULLET_ON, sal_True));
- }
- else
- {
- rSet.Put(SfxBoolItem(FN_NUM_BULLET_ON, sal_False));
- }
- }
-*/
sal_uInt16 nLineSpace = (sal_uInt16) ( (const SvxLineSpacingItem&) aAttrSet.
Get( EE_PARA_SBL ) ).GetPropLineSpace();
switch( nLineSpace )
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index cdb468c..493f88b 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -513,32 +513,6 @@ void TextObjectBar::Execute( SfxRequest &rReq )
aNewAttr.Put( *pPoolItem );
}
break;
-/* #i35937#
- case FN_NUM_BULLET_ON:
- {
- if (aEditAttr.GetItemState(EE_PARA_BULLETSTATE) == SFX_ITEM_ON)
- {
- SfxUInt16Item aBulletState((const SfxUInt16Item&) aEditAttr.Get(EE_PARA_BULLETSTATE));
-
- if (aBulletState.GetValue() != 0)
- {
- // Ausschalten
- aNewAttr.Put(SfxUInt16Item(EE_PARA_BULLETSTATE, 0));
- }
- else
- {
- // Einschalten
- aNewAttr.Put(SfxUInt16Item(EE_PARA_BULLETSTATE, 1));
- }
- }
- else
- {
- // Einschalten
- aNewAttr.Put(SfxUInt16Item(EE_PARA_BULLETSTATE, 1));
- }
- }
- break;
-*/
}
rReq.Done( aNewAttr );
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index f13d906..a00c763 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -1417,9 +1417,6 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
default:
break;
}
-
- // #i25616# bFoundObjNoLine = sal_True;
- // #i25616# bFoundObjNoArea = sal_True;
break;
case OBJ_TABLE:
bFoundTable = true;
diff --git a/sd/source/ui/view/drviewsj.cxx b/sd/source/ui/view/drviewsj.cxx
index 50ca03f..fbfb611 100644
--- a/sd/source/ui/view/drviewsj.cxx
+++ b/sd/source/ui/view/drviewsj.cxx
@@ -374,14 +374,7 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
bE3dCompoundObject = sal_True;
}
}
- /* Kann wohl raus, da jedes(?) Objekt Text enthalten kann
- if( !bText )
- {
- rSet.DisableItem( SID_CHAR_DLG );
- rSet.DisableItem( SID_PARA_DLG );
- rSet.DisableItem( SID_CHARMAP );
- }
- */
+
if( bLine && !bText && !bDrawObj &&!b3dObj)
{
rSet.DisableItem( SID_ATTR_FILL_STYLE );
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index 1e0cffe..b659fd7 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -892,14 +892,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper,
// (wg. Selection Manager bei Trustet Solaris)
#ifndef SOLARIS
-/*
- if( aDataHelper.GetGraphic( SOT_FORMATSTR_ID_SVXB, aGraphic ) )
- nGrFormat = SOT_FORMATSTR_ID_SVXB;
- else if( aDataHelper.GetGraphic( FORMAT_GDIMETAFILE, aGraphic ) )
- nGrFormat = SOT_FORMAT_GDIMETAFILE;
- else if( aDataHelper.GetGraphic( FORMAT_BITMAP, aGraphic ) )
- nGrFormat = SOT_FORMAT_BITMAP;
-*/
+
#endif
// insert replacement image ( if there is one ) into the object helper
diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx
index 2ba9de3..0a7d1d8 100644
--- a/sd/source/ui/view/viewshe3.cxx
+++ b/sd/source/ui/view/viewshe3.cxx
@@ -240,19 +240,6 @@ SdPage* ViewShell::CreateOrDuplicatePage (
const SfxItemSet* pArgs = rRequest.GetArgs();
if (! pArgs)
{
-/*
- // Make the layout menu visible in the tool pane.
- const ViewShellBase& rBase (GetViewShellBase());
- if (rBase.GetMainViewShell()!=NULL
- && rBase.GetMainViewShell()->GetShellType()!=ViewShell::ST_OUTLINE
- && rBase.GetMainViewShell()->GetShellType()!=ViewShell::ST_DRAW)
- {
- framework::FrameworkHelper::Instance(GetViewShellBase())->RequestTaskPanel(
- framework::FrameworkHelper::msLayoutTaskPanelURL,
- false);
- }
-*/
-
// AutoLayouts muessen fertig sein
pDocument->StopWorkStartupDelay();
--
1.7.1
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
