summaryrefslogtreecommitdiff
path: root/sd/source/ui/view
diff options
context:
space:
mode:
authorDona Hertel <cocofan@mailbolt.com>2011-04-13 17:28:39 -0700
committerThorsten Behrens <tbehrens@novell.com>2011-04-14 11:36:04 +0200
commitf7ccecc999b44bb3e077c6205a0719e55e8784ff (patch)
treed4c0269a8fa50f8175a9f5cdd3a27be32d5c7b64 /sd/source/ui/view
parent5cc66424b33285db9bee54b5fb0cc0b030b8ab7e (diff)
Easy Hack remove dead code and uncompiled code in 'sd' module
Diffstat (limited to 'sd/source/ui/view')
-rw-r--r--sd/source/ui/view/ViewShellImplementation.cxx12
-rw-r--r--sd/source/ui/view/drtxtob.cxx15
-rw-r--r--sd/source/ui/view/drtxtob1.cxx27
-rw-r--r--sd/source/ui/view/drviews7.cxx3
-rw-r--r--sd/source/ui/view/drviewsj.cxx8
-rw-r--r--sd/source/ui/view/sdview3.cxx11
-rw-r--r--sd/source/ui/view/viewshe3.cxx13
7 files changed, 1 insertions, 88 deletions
diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx
index 1d6f52adbed9..43f07915c731 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 f4f653675ebb..5c79c3d5d7b4 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 c034038fe8c8..34b38028f837 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -513,32 +513,7 @@ 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;
-*/
+// #i35937# removed need for FN_NUM_BULLET_ON handling
}
rReq.Done( aNewAttr );
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index 5d69c6580ec5..b29b5883e065 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 ad4c67927abb..71601741b989 100644
--- a/sd/source/ui/view/drviewsj.cxx
+++ b/sd/source/ui/view/drviewsj.cxx
@@ -374,14 +374,6 @@ 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 5b74b8e1494d..a269463a26b8 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -890,17 +890,6 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper,
Graphic aGraphic;
sal_uLong nGrFormat = 0;
-// (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
if ( nGrFormat )
diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx
index ebb8cb66f1f4..b063d96eb326 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();