[Libreoffice-commits] .: animations/source sd/source
Thorsten Behrens
thorsten at kemper.freedesktop.org
Thu Dec 2 13:59:53 PST 2010
animations/source/animcore/animcore.cxx | 2 -
sd/source/core/CustomAnimationEffect.cxx | 40 ----------------------------
sd/source/core/EffectMigration.cxx | 27 ++-----------------
sd/source/core/PageListWatcher.cxx | 4 --
sd/source/core/anminfo.cxx | 1
sd/source/core/drawdoc.cxx | 16 -----------
sd/source/core/drawdoc3.cxx | 16 -----------
sd/source/core/drawdoc4.cxx | 37 +-------------------------
sd/source/core/sdpage.cxx | 26 +-----------------
sd/source/core/stlfamily.cxx | 2 -
sd/source/core/stlpool.cxx | 34 +-----------------------
sd/source/core/stlsheet.cxx | 43 -------------------------------
sd/source/core/text/textapi.cxx | 1
sd/source/core/typemap.cxx | 2 -
14 files changed, 11 insertions(+), 240 deletions(-)
New commits:
commit 14c96dc154ca428bfcd842d15040106268cb1654
Author: Kayo Hamid <revol.code at yahoo.com>
Date: Thu Dec 2 22:57:42 2010 +0100
Cleanup commented code in impress
Signed-off-by: Thorsten Behrens <tbehrens at novell.com>
diff --git a/animations/source/animcore/animcore.cxx b/animations/source/animcore/animcore.cxx
index fe90f91..d25950b 100644
--- a/animations/source/animcore/animcore.cxx
+++ b/animations/source/animcore/animcore.cxx
@@ -255,7 +255,7 @@ public:
virtual void SAL_CALL setVolume( double _volume ) throw (RuntimeException);
- // XCommand
+ // XCommand - the following two shadowed by animate, unfortunately
// virtual Any SAL_CALL getTarget() throw (RuntimeException);
// virtual void SAL_CALL setTarget( const Any& _target ) throw (RuntimeException);
virtual sal_Int16 SAL_CALL getCommand() throw (RuntimeException);
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index c753f1d..dfd03be 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -2214,7 +2214,6 @@ void stl_process_after_effect_node_func(AfterEffectNode& rNode)
{
Reference< XAnimationNode > xNode( xNextContainer, UNO_QUERY_THROW );
xNode->setBegin( makeAny( (double)0.0 ) );
-// xNode->setFill( AnimationFill::HOLD );
xNextClickContainer->appendChild( xNode );
}
}
@@ -2245,7 +2244,6 @@ void stl_process_after_effect_node_func(AfterEffectNode& rNode)
{
Reference< XAnimationNode > xNode( xNextContainer, UNO_QUERY_THROW );
xNode->setBegin( makeAny( (double)0.0 ) );
-// xNode->setFill( AnimationFill::HOLD );
xNewClickContainer->appendChild( xNode );
}
}
@@ -3190,44 +3188,6 @@ void EffectSequenceHelper::processAfterEffect( const Reference< XAnimationNode >
}
}
-/*
-double EffectSequenceHelper::calculateIterateNodeDuration(
-{
- Reference< i18n::XBreakIterator > xBI( ImplGetBreakIterator() );
-
- sal_Int32 nDone;
- sal_Int32 nNextCellBreak( xBI->nextCharacters(rTxt, nIdx, rLocale, i18n::CharacterIteratorMode::SKIPCELL, 0, nDone) );
- i18n::Boundary nNextWordBoundary( xBI->getWordBoundary(rTxt, nIdx, rLocale, i18n::WordType::ANY_WORD, sal_True) );
- sal_Int32 nNextSentenceBreak( xBI->endOfSentence(rTxt, nIdx, rLocale) );
-
- const sal_Int32 nEndPos( nIdx + nLen );
- sal_Int32 i, currOffset(0);
- for( i=nIdx; i<nEndPos; ++i )
- {
- // TODO: Check whether position update is valid for CTL/BiDi
- rOutDev.DrawText( rPos + Point(currOffset,0), rTxt, i, 1 );
- currOffset = *pDXArray++;
-
- // issue the comments at the respective break positions
- if( i == nNextCellBreak )
- {
- rMtf.AddAction( new MetaCommentAction( "XTEXT_EOC" ) );
- nNextCellBreak = xBI->nextCharacters(rTxt, i, rLocale, i18n::CharacterIteratorMode::SKIPCELL, 1, nDone);
- }
- if( i == nNextWordBoundary.endPos )
- {
- rMtf.AddAction( new MetaCommentAction( "XTEXT_EOW" ) );
- nNextWordBoundary = xBI->getWordBoundary(rTxt, i+1, rLocale, i18n::WordType::ANY_WORD, sal_True);
- }
- if( i == nNextSentenceBreak )
- {
- rMtf.AddAction( new MetaCommentAction( "XTEXT_EOS" ) );
- nNextSentenceBreak = xBI->endOfSentence(rTxt, i+1, rLocale);
- }
- }
-}
-
-*/
// ====================================================================
class AnimationChangeListener : public cppu::WeakImplHelper1< XChangesListener >
diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx
index e6c5124..7f98a0d 100644
--- a/sd/source/core/EffectMigration.cxx
+++ b/sd/source/core/EffectMigration.cxx
@@ -386,29 +386,9 @@ deprecated_AnimationEffect_conversion_table[] =
{ AnimationEffect_DISSOLVE, "ooo-entrance-fade-in-and-zoom", 0 },
{ AnimationEffect_DISSOLVE, "ooo-entrance-fade-in-and-swivel", 0 },
-// open
-/*
- { AnimationEffect_ZOOM_IN_FROM_LEFT, "ooo-entrance-zoom","in" },
- { AnimationEffect_ZOOM_IN_FROM_UPPERLEFT, "ooo-entrance-zoom","in" },
- { AnimationEffect_ZOOM_IN_FROM_TOP, "ooo-entrance-zoom","in" },
- { AnimationEffect_ZOOM_IN_FROM_UPPERRIGHT, "ooo-entrance-zoom","in" },
- { AnimationEffect_ZOOM_IN_FROM_RIGHT, "ooo-entrance-zoom","in" },
- { AnimationEffect_ZOOM_IN_FROM_LOWERRIGHT, "ooo-entrance-zoom","in" },
- { AnimationEffect_ZOOM_IN_FROM_BOTTOM, "ooo-entrance-zoom","in" },
- { AnimationEffect_ZOOM_IN_FROM_LOWERLEFT, "ooo-entrance-zoom","in" },
- { AnimationEffect_ZOOM_IN_FROM_CENTER, "ooo-entrance-zoom","in" },
-
- { AnimationEffect_ZOOM_OUT_FROM_LEFT, "ooo-entrance-appear",0 },
- { AnimationEffect_ZOOM_OUT_FROM_UPPERLEFT, "ooo-entrance-appear",0 },
- { AnimationEffect_ZOOM_OUT_FROM_TOP, "ooo-entrance-appear",0 },
- { AnimationEffect_ZOOM_OUT_FROM_UPPERRIGHT, "ooo-entrance-appear",0 },
- { AnimationEffect_ZOOM_OUT_FROM_RIGHT, "ooo-entrance-appear",0 },
- { AnimationEffect_ZOOM_OUT_FROM_LOWERRIGHT, "ooo-entrance-appear",0 },
- { AnimationEffect_ZOOM_OUT_FROM_BOTTOM, "ooo-entrance-appear",0 },
- { AnimationEffect_ZOOM_OUT_FROM_LOWERLEFT, "ooo-entrance-appear",0 },
- { AnimationEffect_ZOOM_OUT_FROM_CENTER, "ooo-entrance-appear",0 },
- { AnimationEffect_PATH, "ooo-entrance-spiral-in",0 },
-*/
+ // still open (no matching effect: AnimationEffect_ZOOM_IN_FROM_*,
+ // AnimationEffect_ZOOM_OUT_FROM_*, AnimationEffect_PATH
+
{ AnimationEffect_NONE, 0, 0 }
};
@@ -828,7 +808,6 @@ double EffectMigration::ConvertAnimationSpeed( AnimationSpeed eSpeed )
{
case AnimationSpeed_SLOW: fDuration = 2.0; break;
case AnimationSpeed_FAST: fDuration = 0.5; break;
- //case AnimationSpeed_MEDIUM:
default:
fDuration = 1.0; break;
}
diff --git a/sd/source/core/PageListWatcher.cxx b/sd/source/core/PageListWatcher.cxx
index 0343c06..0c2fb51 100644
--- a/sd/source/core/PageListWatcher.cxx
+++ b/sd/source/core/PageListWatcher.cxx
@@ -128,9 +128,7 @@ SdPage* ImpPageListWatcher::GetSdPage(PageKind ePgKind, sal_uInt32 nPgNum)
}
case PK_HANDOUT:
{
-// #11420# for models used to transfer drawing shapes via clipboard its
-// ok to not have a handout page
-// DBG_ASSERT(mpHandoutPage, "ImpPageListWatcher::GetSdPage: access to non existing handout page (!)");
+// #11420# for models used to transfer drawing shapes via clipboard its ok to not have a handout page
DBG_ASSERT(nPgNum == 0L, "ImpPageListWatcher::GetSdPage: access to non existing handout page (!)");
if (nPgNum == 0)
pRetval = mpHandoutPage;
diff --git a/sd/source/core/anminfo.cxx b/sd/source/core/anminfo.cxx
index e1a298b..be1ac13 100644
--- a/sd/source/core/anminfo.cxx
+++ b/sd/source/core/anminfo.cxx
@@ -94,7 +94,6 @@ SdAnimationInfo::SdAnimationInfo(const SdAnimationInfo& rAnmInfo, SdrObject& rOb
maSecondSoundFile (rAnmInfo.maSecondSoundFile),
mbSecondSoundOn (rAnmInfo.mbSecondSoundOn),
mbSecondPlayFull (rAnmInfo.mbSecondPlayFull),
-// maBookmark (rAnmInfo.maBookmark),
mnVerb (rAnmInfo.mnVerb),
mnPresOrder (LIST_APPEND),
mrObject (rObject)
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index 42db21b..b9efbd0 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -748,21 +748,6 @@ void SdDrawDocument::UpdateAllLinks()
*/
void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool )
{
-/* cl removed because not needed anymore since binfilter
- SdrObjListIter aShapeIter( *pPage );
- while( aShapeIter.IsMore() )
- {
- OutlinerParaObject* pOPO = aShapeIter.Next()->GetOutlinerParaObject();
- if( pOPO )
- {
- if( pOPO->GetOutlinerMode() == OUTLINERMODE_DONTKNOW )
- pOPO->SetOutlinerMode( OUTLINERMODE_TEXTOBJECT );
-
- pOPO->FinishLoad( pSPool );
- }
- }
-*/
-
const sd::ShapeList& rPresentationShapes( pPage->GetPresentationShapeList() );
if(!rPresentationShapes.isEmpty())
{
@@ -988,7 +973,6 @@ SvxNumType SdDrawDocument::GetPageNumType() const
void SdDrawDocument::SetPrinterIndependentLayout (sal_Int32 nMode)
{
// #108104#
- // DBG_ASSERT (mpDocSh!=NULL, "No available document shell to set ref device at.");
switch (nMode)
{
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index 0a4ff68..600a58a 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -89,22 +89,6 @@ using namespace ::com::sun::star;
|* Oeffnet ein Bookmark-Dokument
|*
\************************************************************************/
-/*
-SdStorageListener : public BaseImplHelper1 < lang::XEventListener >
-{
- uno::Reference < embed::XStorage >& xStor;
-public:
- SdStorageListener ( uno::Reference < embed::XStorage >& rStor )
- : xStor( rStor )
- {}
-
- void disposing ( const lang::EventObject& aEvent ) throw ( uno::RuntimeException );
-};
-
-void SdStorageListener::disposing( const lang::EventObject& aEvent ) throw ( uno::RuntimeException )
-{
- xStor = NULL;
-}*/
SdDrawDocument* SdDrawDocument::OpenBookmarkDoc(SfxMedium& rMedium)
{
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 8e20040..447c6c4 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -267,9 +267,6 @@ void SdDrawDocument::CreateLayoutTemplates()
aBulletItem.SetSymbol( 0x25CF ); // Punkt
rISet.Put(aBulletItem);
-// SfxUInt16Item aBulletStateItem(EE_PARA_BULLETSTATE, 0); // Bullets nicht sichtbar
-// rISet.Put(aBulletStateItem);
-
// Neues BulletItem
pSSPool->PutNumBulletItem( pSheet, aBulletFont );
@@ -373,12 +370,7 @@ void SdDrawDocument::CreateLayoutTemplates()
aLRSpaceItem.SetTxtFirstLineOfst(600); // Erstzeileneinzug 6mm, rechts 0
pISet->Put(aLRSpaceItem);
-/* #i35937#
- // SvxLRSpaceItem hart gesetzt: NumBulletItem anpassen
- SvxNumBulletItem aNumBullet( (const SvxNumBulletItem&) pISet->Get(EE_PARA_NUMBULLET) );
- EditEngine::ImportBulletItem( aNumBullet, 0, NULL, &aLRSpaceItem );
- pISet->Put( aNumBullet );
-*/
+/* #i35937# */
// ---- Titel ---------------------------------------------------------
aName = String(SdResId(STR_POOLSHEET_TITLE));
@@ -438,12 +430,7 @@ void SdDrawDocument::CreateLayoutTemplates()
SvxLRSpaceItem aLRSpItem( 200, 200, 0, 0, EE_PARA_LRSPACE);
pISet->Put( aLRSpItem ); // Erstzeileneinzug 0 mm, links und rechts 2 mm
-/* #i35937#
- // SvxLRSpaceItem hart gesetzt: NumBulletItem anpassen
- SvxNumBulletItem aNmBullet( (const SvxNumBulletItem&) pISet->Get(EE_PARA_NUMBULLET) );
- EditEngine::ImportBulletItem( aNmBullet, 0, NULL, &aLRSpItem );
- pISet->Put( aNmBullet );
-*/
+/* #i35937# */
pISet->Put(SvxULSpaceItem(100, 100, EE_PARA_ULSPACE )); // Absatzrand oben/unten 1 mm
@@ -580,7 +567,6 @@ void SdDrawDocument::CreateDefaultCellStyles()
pSheet = &(pSSPool->Make(aDefaultCellStyleName, SD_STYLE_FAMILY_CELL, nMask));
pSheet->SetHelpId( aHelpFile, HID_SD_CELL_STYLE_DEFAULT );
SfxItemSet& rISet = pSheet->GetItemSet();
-// SfxItemPool* pPool = rISet.GetPool();
String aNullStr;
@@ -616,21 +602,6 @@ void SdDrawDocument::CreateDefaultCellStyles()
rISet.Put( SvxFontHeightItem( 635, 100, EE_CHAR_FONTHEIGHT_CJK ) ); // 18 pt
rISet.Put( SvxFontHeightItem( convertFontHeightToCTL( 635 ), 100, EE_CHAR_FONTHEIGHT_CTL ) ); // 18 pt
-// rISet.Put( SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT ) );
-// rISet.Put( SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT_CJK ) );
-// rISet.Put( SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT_CTL ) );
-
-// rISet.Put( SvxPostureItem( ITALIC_NONE, EE_CHAR_ITALIC ) );
-// rISet.Put( SvxPostureItem( ITALIC_NONE, EE_CHAR_ITALIC_CJK ) );
-// rISet.Put( SvxPostureItem( ITALIC_NONE, EE_CHAR_ITALIC_CTL ) );
-
-// rISet.Put(SvxContourItem(FALSE, EE_CHAR_OUTLINE ));
-// rISet.Put(SvxShadowedItem(FALSE, EE_CHAR_SHADOW ));
-// rISet.Put(SvxUnderlineItem(UNDERLINE_NONE, EE_CHAR_UNDERLINE));
-// rISet.Put(SvxOverlineItem(UNDERLINE_NONE, EE_CHAR_OVERLINE));
-// rISet.Put(SvxCrossedOutItem(STRIKEOUT_NONE, EE_CHAR_STRIKEOUT ));
-// rISet.Put(SvxEmphasisMarkItem(EMPHASISMARK_NONE, EE_CHAR_EMPHASISMARK));
-// rISet.Put(SvxCharReliefItem(RELIEF_NONE, EE_CHAR_RELIEF));
rISet.Put(SvxColorItem(Color(COL_AUTO), EE_CHAR_COLOR ));
// Absatzattribute (Edit Engine)
@@ -1341,10 +1312,6 @@ void SdDrawDocument::SetTextDefaults() const
aBulletItem.SetSymbol( 0x25CF ); // Punkt
pItemPool->SetPoolDefaultItem( aBulletItem );
- // Bullets nicht sichtbar
-// SfxUInt16Item aBulletStateItem(EE_PARA_BULLETSTATE, 0);
-// pItemPool->SetPoolDefaultItem( aBulletStateItem );
-
// Neues BulletItem
SvxNumberFormat aNumberFormat(SVX_NUM_CHAR_SPECIAL);
aNumberFormat.SetBulletFont(&aBulletFont);
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 0a1d6ca..7df3c64 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -364,7 +364,6 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rec
// #i105146# We want no content to be displayed for PK_HANDOUT,
// so just never set a page as content
pSdrObj = new SdrPageObj(0);
-// pSdrObj->SetResizeProtect(TRUE);
}
break;
@@ -515,7 +514,6 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rec
// Objekt am StyleSheet anmelden
// #95114# Set style only when one was found (as in 5.2)
- // pSdrObj->NbcSetStyleSheet( GetStyleSheetForPresObj(eObjKind), FALSE );
if( mePageKind != PK_HANDOUT )
{
SfxStyleSheet* pSheetForPresObj = GetStyleSheetForPresObj(eObjKind);
@@ -717,10 +715,7 @@ void SdPage::Changed(const SdrObject& rObj, SdrUserCallType eType, const Rectang
{
sd::UndoManager* pUndoManager = pModel ? static_cast<SdDrawDocument*>(pModel)->GetUndoManager() : 0;
const bool bUndo = pUndoManager && pUndoManager->isInListAction() && IsInserted();
-/*
- DBG_ASSERT( bUndo || (pUndoManager && pUndoManager->isInUndo()),
- "SdPage::Changed(), model change without undo!?" );
-*/
+
if( bUndo )
pUndoManager->AddUndoAction( new UndoObjectUserCall(*pObj) );
@@ -1609,19 +1604,7 @@ void SdPage::SetAutoLayout(AutoLayout eLayout, BOOL bInit, BOOL bCreate )
if( !bUndo )
SdrObject::Free( pObj );
}
-/* #i108541# keep non empty pres obj as pres obj even if they are not part of the current layout
- else
- {
- if( bUndo )
- {
- pUndoManager->AddUndoAction( new UndoObjectPresentationKind( *pObj ) );
- if( pObj->GetUserCall() )
- pUndoManager->AddUndoAction( new UndoObjectUserCall( *pObj ) );
- }
- maPresentationShapeList.removeShape( *pObj );
- pObj->SetUserCall(0);
- }
-*/
+/* #i108541# keep non empty pres obj as pres obj even if they are not part of the current layout */
}
pObj = pNext;
}
@@ -2230,10 +2213,7 @@ SdrObject* SdPage::InsertAutoLayoutShape( SdrObject* pObj, PresObjKind eObjKind,
pUndoManager->AddUndoAction( new UndoObjectUserCall( *pObj ) );
}
-// if ( pObj->ISA(SdrGrafObj) && !pObj->IsEmptyPresObj() )
( /*(SdrGrafObj*)*/ pObj)->AdjustToMaxRect( aRect );
-// else
-// SetLogicRect( pObj, aRect );
pObj->SetUserCall(this);
@@ -2866,8 +2846,6 @@ bool SdPage::RestoreDefaultText( SdrObject* pObj )
if( pOldPara )
{
- //pTextObj->SetVerticalWriting( bVertical );
- //
// #94826# Here, only the vertical flag for the
// OutlinerParaObjects needs to be changed. The
// AutoGrowWidth/Height items still exist in the
diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx
index 0dcc164..44bb8dc 100644
--- a/sd/source/core/stlfamily.cxx
+++ b/sd/source/core/stlfamily.cxx
@@ -279,7 +279,6 @@ Sequence< OUString > SAL_CALL SdStyleFamily::getElementNames() throw(RuntimeExce
}
}
-// *pNames++ = (*iter++).second->GetApiName();
return aNames;
}
else
@@ -562,7 +561,6 @@ Any SdStyleFamily::getPropertyValue( const OUString& PropertyName ) throw (Unkno
{
case SD_STYLE_FAMILY_MASTERPAGE: sDisplayName = getName(); break;
case SD_STYLE_FAMILY_CELL: sDisplayName = String( SdResId(STR_CELL_STYLE_FAMILY) ); break;
-// case SD_STYLE_FAMILY_GRAPHICS:
default: sDisplayName = String( SdResId(STR_GRAPHICS_STYLE_FAMILY) ); break;
}
return Any( sDisplayName );
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index e24ab8d..8881783 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -107,7 +107,6 @@ SdStyleSheetPool::SdStyleSheetPool(SfxItemPool const& _rPool, SdDrawDocument* pD
for( sal_uInt16 nPage = 0; nPage < nCount; ++nPage )
AddStyleFamily( mpDoc->GetMasterSdPage(nPage,PK_STANDARD) );
-// StartListening( *mpDoc );
}
}
@@ -267,7 +266,6 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo
ULONG nFontSize = 20;
short nFirstIndent = -600;
-// USHORT nIndent = nLevel * 1200;
USHORT nLower = 100;
switch (nLevel)
@@ -309,25 +307,9 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo
rOutlineSet.Put( SvxFontHeightItem( nFontSize, 100, EE_CHAR_FONTHEIGHT_CJK ) );
rOutlineSet.Put( SvxFontHeightItem( SdDrawDocument::convertFontHeightToCTL( nFontSize ), 100, EE_CHAR_FONTHEIGHT_CTL ) );
- // Einzuege
-/* i35937
- aSvxLRSpaceItem.SetTxtFirstLineOfst(nFirstIndent);
- aSvxLRSpaceItem.SetTxtLeft(nIndent);
- aSvxLRSpaceItem.SetRight(0);
- aSvxLRSpaceItem.SetBulletFI(TRUE);
- pSheet->GetItemSet().Put(aSvxLRSpaceItem);
-*/
- // Zeilendurchschuss (Abstand nach unten)
+ // Line distance (downwards). Stuff around here cleaned up in i35937
aSvxULSpaceItem.SetLower(nLower);
pSheet->GetItemSet().Put(aSvxULSpaceItem);
-
-/* i35937
- if (nLevel == 1)
- {
- SfxUInt16Item aBulletStateItem(EE_PARA_BULLETSTATE, 1); // Bullets sichtbar
- pSheet->GetItemSet().Put(aBulletStateItem);
- }
-*/
}
}
@@ -394,7 +376,6 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo
rTitleSet.Put(SvxColorItem( Color(COL_AUTO), EE_CHAR_COLOR ));
rTitleSet.Put(SvxAdjustItem(SVX_ADJUST_CENTER, EE_PARA_JUST ));
rTitleSet.Put( SdrTextVertAdjustItem( SDRTEXTVERTADJUST_CENTER ) );
-// rTitleSet.Put( SfxUInt16Item(EE_PARA_BULLETSTATE, 0) );
// #i16874# enable kerning by default but only for new documents
rTitleSet.Put( SvxAutoKernItem( TRUE, EE_CHAR_PAIRKERNING ) );
@@ -440,7 +421,6 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo
rSubtitleSet.Put(SvxColorItem( Color(COL_AUTO), EE_CHAR_COLOR ));
rSubtitleSet.Put(SvxAdjustItem(SVX_ADJUST_CENTER, EE_PARA_JUST ));
rSubtitleSet.Put( SdrTextVertAdjustItem( SDRTEXTVERTADJUST_CENTER ) );
-// rSubtitleSet.Put( SfxUInt16Item(EE_PARA_BULLETSTATE, 0) );
// #i16874# enable kerning by default but only for new documents
rSubtitleSet.Put( SvxAutoKernItem( TRUE, EE_CHAR_PAIRKERNING ) );
aSvxLRSpaceItem.SetTxtLeft(0);
@@ -487,19 +467,11 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo
rNotesSet.Put( SvxEmphasisMarkItem(EMPHASISMARK_NONE, EE_CHAR_EMPHASISMARK ) );
rNotesSet.Put( SvxCharReliefItem(RELIEF_NONE, EE_CHAR_RELIEF) );
rNotesSet.Put( SvxColorItem( Color(COL_AUTO), EE_CHAR_COLOR ) );
-// rNotesSet.Put( SfxUInt16Item(EE_PARA_BULLETSTATE, 0) );
rNotesSet.Put( SvxLRSpaceItem( 0, 0, 600, -600, EE_PARA_LRSPACE ) );
// #i16874# enable kerning by default but only for new documents
rNotesSet.Put( SvxAutoKernItem( TRUE, EE_CHAR_PAIRKERNING ) );
-/* #i35937#
- SvxNumBulletItem aNumBullet( (const SvxNumBulletItem&) rNotesSet.Get(EE_PARA_NUMBULLET) );
-
- EditEngine::ImportBulletItem( aNumBullet, 0, NULL,
- &(const SvxLRSpaceItem&) rNotesSet.Get( EE_PARA_LRSPACE ) );
-
- ( (SfxItemSet&) rNotesSet).Put( aNumBullet );
-*/
+/* #i35937# */
}
@@ -812,7 +784,6 @@ void SdStyleSheetPool::CreatePseudosIfNecessary()
SfxStyleSheetBase* pSheet = NULL;
SfxStyleSheetBase* pParent = NULL;
- //USHORT nUsedMask = SFXSTYLEBIT_ALL & ~SFXSTYLEBIT_USERDEF;
USHORT nUsedMask = SFXSTYLEBIT_USED;
aName = String(SdResId(STR_PSEUDOSHEET_TITLE));
@@ -1386,7 +1357,6 @@ void SAL_CALL SdStyleSheetPool::dispose() throw (RuntimeException)
{
}
-// EndListening( *mpDoc );
mpDoc = 0;
Clear();
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 1a669da..331a9f4 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -301,7 +301,6 @@ SfxItemSet& SdStyleSheet::GetItemSet()
// aktuellen Praesentationslayouts: dessen ItemSet returnieren
else
{
-// return (GetRealStyleSheet()->GetItemSet());
SdStyleSheet* pSdSheet = GetRealStyleSheet();
@@ -766,21 +765,6 @@ SdStyleSheet* SdStyleSheet::CreateEmptyUserStyle( SfxStyleSheetBasePool& rPool,
// XInterface
// --------------------------------------------------------------------
-/*
-Any SAL_CALL SdStyleSheet::queryInterface( const ::com::sun::star::uno::Type& aType ) throw (RuntimeException)
-{
- return SdStyleSheetBase::queryInterface( aType );
-}
-
-// --------------------------------------------------------------------
-
-void SAL_CALL SdStyleSheet::acquire( ) throw ()
-{
- SdStyleSheetBase::acquire();
-}
-
-// --------------------------------------------------------------------
-*/
void SAL_CALL SdStyleSheet::release( ) throw ()
{
if (osl_decrementInterlockedCount( &m_refCount ) == 0)
@@ -804,31 +788,6 @@ void SAL_CALL SdStyleSheet::release( ) throw ()
}
// --------------------------------------------------------------------
-// XWeak
-// --------------------------------------------------------------------
-/*
-Reference< XAdapter > SAL_CALL SdStyleSheet::queryAdapter( ) throw (RuntimeException)
-{
- return SdStyleSheetBase::queryAdapter();
-}
-
-// --------------------------------------------------------------------
-// XTypeProvider
-// --------------------------------------------------------------------
-
-Sequence< Type > SAL_CALL SdStyleSheet::getTypes( ) throw (RuntimeException)
-{
- return SdStyleSheetBase::getTypes();
-}
-
-// --------------------------------------------------------------------
-
-Sequence< ::sal_Int8 > SAL_CALL SdStyleSheet::getImplementationId( ) throw (RuntimeException)
-{
- return SdStyleSheetBase::getImplementationId();
-}
-*/
-// --------------------------------------------------------------------
// XComponent
// --------------------------------------------------------------------
@@ -1327,8 +1286,6 @@ PropertyState SAL_CALL SdStyleSheet::getPropertyState( const OUString& PropertyN
case SFX_ITEM_DEFAULT:
eState = PropertyState_DEFAULT_VALUE;
break;
-// case SFX_ITEM_DONTCARE:
-// case SFX_ITEM_DISABLED:
default:
eState = PropertyState_AMBIGUOUS_VALUE;
break;
diff --git a/sd/source/core/text/textapi.cxx b/sd/source/core/text/textapi.cxx
index e6b9453..3426ad6 100644
--- a/sd/source/core/text/textapi.cxx
+++ b/sd/source/core/text/textapi.cxx
@@ -169,7 +169,6 @@ void SAL_CALL TextApiObject::dispose() throw(RuntimeException)
mpSource = 0;
}
- // SvxUnoText::dispose();
}
OutlinerParaObject* TextApiObject::CreateText()
diff --git a/sd/source/core/typemap.cxx b/sd/source/core/typemap.cxx
index d140d75..6498aea 100644
--- a/sd/source/core/typemap.cxx
+++ b/sd/source/core/typemap.cxx
@@ -115,7 +115,6 @@
#define SvxNumTypeItem SfxUInt16Item
#define SvxShadowLocationItem SfxUInt16Item
#define SvxDbTypeItem SfxUInt16Item
-//#define SvxChooseControlEnumItem SfxUInt16Item
#define SvxDrawToolEnumItem SfxUInt16Item
#define SvxChooseControlItem SfxEnumItem
#define SvxDrawToolItem SfxUInt16Item
@@ -123,7 +122,6 @@
#define SvxCellVerJustifyEnumItem SfxUInt16Item
#define SvxCellOrientationEnumItem SfxUInt16Item
#define SvxLanguage SfxUInt16Item
-//#define SfxLockBytesItem SfxPoolItem
#define OfaStringListItem SfxStringListItem
#define avmedia_MediaItem ::avmedia::MediaItem
#include <sfx2/tplpitem.hxx>
More information about the Libreoffice-commits
mailing list