[Libreoffice-commits] .: sd/source
Caolán McNamara
caolan at kemper.freedesktop.org
Sun Dec 5 04:24:38 PST 2010
sd/source/filter/cgm/sdcgmfilter.cxx | 4 -
sd/source/filter/eppt/eppt.cxx | 62 ---------------------------
sd/source/filter/eppt/epptso.cxx | 45 -------------------
sd/source/filter/eppt/pptexanimations.cxx | 35 ---------------
sd/source/filter/eppt/pptx-epptooxml.cxx | 16 -------
sd/source/filter/eppt/pptx-stylesheet.cxx | 5 --
sd/source/filter/eppt/pptx-text.cxx | 46 --------------------
sd/source/filter/grf/sdgrffilter.cxx | 2
sd/source/filter/html/htmlattr.cxx | 1
sd/source/filter/html/htmlex.cxx | 68 ------------------------------
sd/source/filter/html/pubdlg.cxx | 14 ------
sd/source/filter/ppt/ppt97animations.cxx | 56 ------------------------
sd/source/filter/ppt/pptin.cxx | 32 +-------------
sd/source/filter/ppt/pptinanimations.cxx | 14 ------
sd/source/filter/sdfilter.cxx | 22 ---------
sd/source/filter/sdpptwrp.cxx | 4 -
sd/source/filter/xml/sdtransform.cxx | 13 -----
sd/source/filter/xml/sdxmlwrp.cxx | 1
18 files changed, 11 insertions(+), 429 deletions(-)
New commits:
commit 926a07a952dab7911a0edd8fdc4b3261dbb532d3
Author: Kayo Hamid <revol.code at yahoo.com>
Date: Sun Dec 5 11:45:14 2010 +0000
remove commented out code
diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx b/sd/source/filter/cgm/sdcgmfilter.cxx
index c5bf485..9a11b4f 100644
--- a/sd/source/filter/cgm/sdcgmfilter.cxx
+++ b/sd/source/filter/cgm/sdcgmfilter.cxx
@@ -145,10 +145,6 @@ sal_Bool SdCGMFilter::Export()
{
::rtl::OUString aPhysicalName( mrMedium.GetPhysicalName() );
- /* !!!
- if ( pViewShell && pViewShell->GetView() )
- pViewShell->GetView()->SdrEndTextEdit();
- */
CreateStatusIndicator();
bRet = FncCGMExport( aPhysicalName, mxModel, mxStatusIndicator, NULL );
}
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index abbfadd..97ef460 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -347,46 +347,6 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_
mpStrm->Write( aBinaryTagData10Atom.GetData(), aBinaryTagData10Atom.Tell() );
}
}
-/*
- if ( mbUseNewAnimations )
- {
- SvMemoryStream amsofbtAnimGroup;
- ppt::AnimationExporter aExporter( aSolverContainer, maSoundCollection );
- aExporter.doexport( mXDrawPage, amsofbtAnimGroup );
- sal_uInt32 nmsofbtAnimGroupSize = amsofbtAnimGroup.Tell();
- if ( nmsofbtAnimGroupSize )
- {
- EscherExContainer aProgTags ( *mpStrm, EPP_ProgTags );
- EscherExContainer aProgBinaryTag( *mpStrm, EPP_ProgBinaryTag );
- {
- EscherExAtom aCString( *mpStrm, EPP_CString );
- *mpStrm << (sal_uInt32)0x5f005f
- << (sal_uInt32)0x50005f
- << (sal_uInt32)0x540050
- << (sal_uInt16)0x31
- << (sal_uInt16)0x30;
- }
- {
- EscherExAtom aBinaryTagData( *mpStrm, EPP_BinaryTagData );
- {
- {
- EscherExAtom aMagic2( *mpStrm, 0x2eeb );
- *mpStrm << (sal_uInt32)0x01c45df9
- << (sal_uInt32)0xe1471b30;
- }
- {
- EscherExAtom aMagic( *mpStrm, 0x2b00 );
- *mpStrm << (sal_uInt32)0;
- }
- }
- mpStrm->Write( amsofbtAnimGroup.GetData(), amsofbtAnimGroup.Tell() );
- {
- EscherExContainer aMagic2( *mpStrm, 0x2b02 );
- }
- }
- }
- }
-*/
mpPptEscherEx->CloseContainer(); // EPP_Slide
}
@@ -897,12 +857,6 @@ sal_Bool PPTWriter::ImplCreateDocument()
}
}
-// if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "DiaName" ) ) ) )
-// {
-// }
-// if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "IsAlwaysOnTop" ) ) ) )
-// {
-// }
if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "IsAutomatic" ) ) ) )
{
sal_Bool bBool = sal_False;
@@ -925,18 +879,7 @@ sal_Bool PPTWriter::ImplCreateDocument()
if ( !bBool )
nFlags |= 0x11;
}
-// if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "IsMouseVisible" ) ) ) )
-// {
-// }
-// if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "PageRange" ) ) ) )
-// {
-// }
-// if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "StartWithNavigator" ) ) ) )
-// {
-// }
-// if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "UsePen" ) ) ) )
-// {
-// }
+
mpPptEscherEx->AddAtom( 80, EPP_SSDocInfoAtom, 1 );
*mpStrm << nPenColor << nRestartTime << nStartSlide << nEndSlide;
@@ -1044,8 +987,7 @@ sal_Bool PPTWriter::ImplCreateDocument()
sal_Bool PPTWriter::ImplCreateHyperBlob( SvMemoryStream& rStrm )
{
sal_uInt32 nCurrentOfs, nParaOfs, nParaCount = 0;
-// SfxOlePropertySection does this...
-// rStrm << (sal_uInt32)0x41; // property type VT_BLOB
+
nParaOfs = rStrm.Tell();
rStrm << (sal_uInt32)0; // property size
rStrm << (sal_uInt32)0; // property count
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index f324392..cec904a 100755
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -1121,33 +1121,6 @@ void PPTWriter::ImplAdjustFirstLineLineSpacing( TextObj& rTextObj, EscherPropert
if ( ( nLineSpacing > 0 ) && ( nLineSpacing < 100 ) )
{
- /*
- if ( rxText.is() )
- {
- ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape( rxText, ::com::sun::star::uno::UNO_QUERY );
- if ( xShape.is() )
- {
- SdrObject* pObj = GetSdrObjectFromXShape( mXShape );
- if ( pObj )
- {
- const OutlinerParaObject* pParaObj = pObj->GetOutlinerParaObject();
- if ( pParaObj )
- {
- SdrModel* pModel = pObj->GetModel();
- if ( pModel )
- {
- Outliner aOutliner( &pModel->GetItemPool(), pParaObj->GetOutlinerMode() );
- aOutliner.SetText( *pParaObj );
- ULONG nTextHeight = aOutliner.GetLineHeight( 0, 0 );
- if ( nTextHeight )
- {
- }
- }
- }
- }
- }
- }
- */
double fCharHeight = pPortion->mnCharHeight;
fCharHeight *= 2540 / 72;
fCharHeight *= 100 - nLineSpacing;
@@ -1445,7 +1418,6 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u
nNumberingType = pBulletPara->nMappedNumType;
break;
- // case SVX_NUM_PAGEDESC :
case SVX_NUM_BITMAP :
nNumberingType = 0;
break;
@@ -2210,14 +2182,7 @@ sal_Bool PPTWriter::ImplCreatePresentationPlaceholder( const sal_Bool bMasterPag
<< (sal_uInt8)0 // Size of PlaceHolder ( 0 = FULL, 1 = HALF, 2 = QUARTER )
<< (sal_uInt16)0; // padword
mpPptEscherEx->CloseContainer(); // ESCHER_ClientData
-/*
- if ( aExtBu.Tell() )
- {
- if ( !pClientData )
- pClientData = new SvMemoryStream( 0x200, 0x200 );
- ImplProgTagContainer( pClientData, &aExtBu );
- }
-*/
+
if ( aClientTextBox.Tell() )
{
*mpStrm << (sal_uInt32)( ( ESCHER_ClientTextbox << 16 ) | 0xf )
@@ -2887,8 +2852,6 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
aPropertyOptions.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x50001 );
aPropertyOptions.AddOpt( ESCHER_Prop_lTxid, mnTxId += 0x60 );
aPropertyOptions.AddOpt( ESCHER_Prop_AnchorText, ESCHER_AnchorMiddle );
-// aPropertyOptions.AddOpt( ESCHER_Prop_fillColor, nFillColor );
-// aPropertyOptions.AddOpt( ESCHER_Prop_fillBackColor, nFillBackColor );
aPropertyOptions.AddOpt( ESCHER_Prop_fNoFillHitTest, 0x110001 );
aPropertyOptions.AddOpt( ESCHER_Prop_lineColor, 0x8000001 );
aPropertyOptions.AddOpt( ESCHER_Prop_shadowColor, 0x8000002 );
@@ -2980,8 +2943,6 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
EscherPropertyContainer aPropOpt2;
aPropOpt2.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x50001 );
aPropOpt2.AddOpt( ESCHER_Prop_lTxid, mnTxId += 0x60 );
-// aPropOpt2.AddOpt( ESCHER_Prop_fillColor, nFillColor );
-// aPropOpt2.AddOpt( ESCHER_Prop_fillBackColor, nFillBackColor );
aPropOpt2.AddOpt( ESCHER_Prop_fNoFillHitTest, 0x110001 );
aPropOpt2.AddOpt( ESCHER_Prop_lineColor, 0x8000001 );
aPropOpt2.AddOpt( ESCHER_Prop_fNoLineDrawDash, 0x90001 );
@@ -3128,10 +3089,6 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
<< (sal_uInt32)0
<< (sal_uInt32)0x0012b600;
-// PPTWriter::WriteCString( *mpExEmbed, "Photo Editor Photo", 1 );
-// PPTWriter::WriteCString( *mpExEmbed, "MSPhotoEd.3", 2 );
-// PPTWriter::WriteCString( *mpExEmbed, "Microsoft Photo Editor 3.0 Photo", 3 );
-
nSize = mpExEmbed->Tell() - nOldPos;
mpExEmbed->Seek( nOldPos - 4 );
*mpExEmbed << nSize;
diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx
index 9cd8465..ae83076 100644
--- a/sd/source/filter/eppt/pptexanimations.cxx
+++ b/sd/source/filter/eppt/pptexanimations.cxx
@@ -584,14 +584,6 @@ void AnimationExporter::exportNode( SvStream& rStrm, Reference< XAnimationNode >
exportAnimPropertySet( rStrm, xNode );
exportAnimEvent( rStrm, xNode, 0 );
exportAnimValue( rStrm, xNode, sal_False );
-
- /*
- EscherExContainer aContainer( rStrm, DFF_msofbtAnimGroup, 1 );
- exportAnimNode( rStrm, xNode, pParent, nGroupLevel + 1, nFillDefault );
- exportAnimPropertySet( rStrm, xNode );
- exportAnimEvent( rStrm, xNode, 0 );
- exportAnimValue( rStrm, xNode, sal_False );
- */
}
break;
@@ -823,14 +815,12 @@ void AnimationExporter::exportAnimNode( SvStream& rStrm, const Reference< XAnima
case AnimationRestart::NEVER : aAnim.mnRestart = 3; break;
}
- // attribute Fill
-// aAnim.mnFill = GetFillMode( xNode, pParent );
switch( nFillDefault )
{
default:
case AnimationFill::DEFAULT : aAnim.mnFill = 0; break;
case AnimationFill::REMOVE : aAnim.mnFill = 1; break;
- case AnimationFill::FREEZE : // aAnim.mnFill = 2; break;
+ case AnimationFill::FREEZE :
case AnimationFill::HOLD : aAnim.mnFill = 3; break;
case AnimationFill::TRANSITION : aAnim.mnFill = 4; break;
}
@@ -864,13 +854,6 @@ void AnimationExporter::exportAnimNode( SvStream& rStrm, const Reference< XAnima
{
case ::com::sun::star::presentation::EffectNodeType::TIMING_ROOT : aAnim.mnNodeType = 0x12; break;
case ::com::sun::star::presentation::EffectNodeType::MAIN_SEQUENCE : aAnim.mnNodeType = 0x18; break;
- /*
- case ::com::sun::star::presentation::EffectNodeType::ON_CLICK :
- case ::com::sun::star::presentation::EffectNodeType::WITH_PREVIOUS :
- case ::com::sun::star::presentation::EffectNodeType::AFTER_PREVIOUS :
- case ::com::sun::star::presentation::EffectNodeType::INTERACTIVE_SEQUENCE :
- default:
- */
}
}
break;
@@ -981,7 +964,6 @@ sal_Int16 AnimationExporter::exportAnimPropertySet( SvStream& rStrm, const Refer
Reference< XAnimationNode > xMaster;
- //const Any aTrue( makeAny( (sal_Bool)sal_True ) );
Any aMasterRel, aOverride, aRunTimeContext;
// storing user data into pAny, to allow direct access later
@@ -1108,8 +1090,6 @@ sal_Int16 AnimationExporter::exportAnimPropertySet( SvStream& rStrm, const Refer
Reference< XAnimateColor > xColor( xNode, UNO_QUERY );
if( xColor.is() )
{
-// sal_uInt32 nColorSpace = xColor->getColorSpace() == AnimationColorSpace::RGB ? 0 : 1;
-// exportAnimPropertyuInt32( rStrm, DFF_ANIM_COLORSPACE, nColorSpace, TRANSLATE_NONE );
sal_Bool bDirection = !xColor->getDirection();
exportAnimPropertyuInt32( rStrm, DFF_ANIM_DIRECTION, bDirection, TRANSLATE_NONE );
@@ -1323,7 +1303,6 @@ void AnimationExporter::exportAnimEvent( SvStream& rStrm, const Reference< XAnim
Reference< XEnumeration > xE( xEA->createEnumeration(), UNO_QUERY_THROW );
if ( xE.is() && xE->hasMoreElements() )
{
-// while( xE->hasMoreElements() )
{
Reference< XAnimationNode > xClickNode( xE->nextElement(), UNO_QUERY );
aAny = xClickNode->getBegin();
@@ -1585,12 +1564,6 @@ sal_uInt32 AnimationExporter::GetValueTypeForAttributeName( const rtl::OUString&
{
sal_uInt32 nValueType = 0;
-/*
- AnimationValueType::STRING == 0;
- AnimationValueType::NUMBER == 1;
- AnimationValueType::COLOR == 2;
-*/
-
struct Entry
{
const sal_Char* pName;
@@ -1982,11 +1955,7 @@ void AnimationExporter::exportAnimateMotion( SvStream& rStrm, const Reference< X
float fToY = 100.0; // nBits&4
rStrm << nBits << fByX << fByY << fFromX << fFromY << fToX << fToY << nOrigin;
}
-/* ?
- {
- EscherExAtom aF137( rStrm, 0xf137 );
- }
-*/
+
OUString aStr;
if ( xMotion->getPath() >>= aStr )
{
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 2170ba3..541c6dc 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -289,8 +289,7 @@ void PowerPointExport::ImplWriteBackground( FSHelperPtr pFS, Reference< XPropert
mAny >>= aFillStyle;
if( aFillStyle == FillStyle_BITMAP ) {
- //DBG(printf ("FillStyle_BITMAP properties\n"));
- //DBG(dump_pset(rXPropSet));
+
}
if( aFillStyle == FillStyle_NONE ||
@@ -478,10 +477,6 @@ void PowerPointExport::WriteTransition( FSHelperPtr pFS )
nTransition = XML_cover;
pDirection = Get8Direction( nDirection );
break;
-// we don't have cut transition AFAIK
-// case PPT_TRANSITION_TYPE_CUT:
-// nTransition = XML_cut;
-// break;
case PPT_TRANSITION_TYPE_DIAMOND:
nTransition = XML_diamond;
break;
@@ -1243,11 +1238,6 @@ void PowerPointExport::ImplWriteNotes( sal_uInt32 nPageNum )
pFS->startElementNS( XML_p, XML_cSld, FSEND );
- // background
-// if( bHasBackground ) {
-// ImplWriteBackground( pFS, aXBackgroundPropSet );
-// }
-
WriteShapeTree( pFS, NOTICE, FALSE );
pFS->endElementNS( XML_p, XML_cSld );
@@ -1437,8 +1427,6 @@ void PowerPointExport::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPr
pFS->endElementNS( XML_p, XML_sldLayoutIdLst );
- // WriteTextStyles( pFS );
-
pFS->endElementNS( XML_p, XML_sldMaster );
DBG(printf("----------------\n"));
@@ -1469,8 +1457,6 @@ void PowerPointExport::ImplWriteLayout( sal_Int32 nOffset, sal_uInt32 nMasterNum
.makeStringAndClear(),
US( "application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml" ) );
-// LayoutInfo& rLayoutInfo = GetLayoutInfo( mXPagePropSet );
-
// add implicit relation of slide layout to slide master
addRelation( pFS->getOutputStream(),
US( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideMaster" ),
diff --git a/sd/source/filter/eppt/pptx-stylesheet.cxx b/sd/source/filter/eppt/pptx-stylesheet.cxx
index 76ac156..43de6be 100644
--- a/sd/source/filter/eppt/pptx-stylesheet.cxx
+++ b/sd/source/filter/eppt/pptx-stylesheet.cxx
@@ -171,10 +171,6 @@ PPTExParaSheet::PPTExParaSheet( int nInstance, sal_uInt16 nDefaultTab, PPTExBull
nUpperDist = 0x1e;
break;
-// default :
-// case EPP_TEXTTYPE_notUsed :
-// case EPP_TEXTTYPE_Other :
-// break;
}
switch ( nDepth )
{
@@ -309,7 +305,6 @@ void PPTExParaSheet::SetStyleSheet( const ::com::sun::star::uno::Reference< ::co
PPTExParaLevel& rLevel = maParaLevel[ i ];
if ( i )
aParagraphObj.ImplGetNumberingLevel( rBuProv, i, FALSE );
-// rLevel.mbIsBullet = ( ( aParagraphObj.nBulletFlags & 1 ) != 0 );
rLevel.mnTextOfs = aParagraphObj.nTextOfs;
rLevel.mnBulletOfs = (sal_uInt16)aParagraphObj.nBulletOfs;
rLevel.mnBulletChar = aParagraphObj.cBulletId;
diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx
index 77ac249..7168ea0 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -190,7 +190,6 @@ PortionObj::PortionObj( ::com::sun::star::uno::Reference< ::com::sun::star::text
case 156: nChar = 0x0153; break;// LATIN SMALL LIGATURE OE
case 158: nChar = 0x017E; break;// LATIN SMALL LETTER Z WITH CARON
case 159: nChar = 0x0178; break;// LATIN CAPITAL LETTER Y WITH DIAERESIS
-// case 222: nChar = 0x00B6; break;// PILCROW SIGN / PARAGRAPH SIGN
}
}
mpText[ i ] = nChar;
@@ -945,49 +944,6 @@ void ParagraphObj::ImplGetNumberingLevel( PPTExBulletProvider& rBuProv, sal_Int1
if ( aFontDesc.Name.getLength() )
{
-/*
- if ( aFontDesc.CharSet != ::com::sun::star::awt::CharSet::SYMBOL )
- {
- switch ( cBulletId )
- {
- // Currency
- case 128: cBulletId = 0x20AC; break;
- // Punctuation and other
- case 130: cBulletId = 0x201A; break;// SINGLE LOW-9 QUOTATION MARK
- case 131: cBulletId = 0x0192; break;// LATIN SMALL LETTER F WITH HOOK
- case 132: cBulletId = 0x201E; break;// DOUBLE LOW-9 QUOTATION MARK
- // LOW DOUBLE PRIME QUOTATION MARK
- case 133: cBulletId = 0x2026; break;// HORIZONTAL ELLIPSES
- case 134: cBulletId = 0x2020; break;// DAGGER
- case 135: cBulletId = 0x2021; break;// DOUBLE DAGGER
- case 136: cBulletId = 0x02C6; break;// MODIFIER LETTER CIRCUMFLEX ACCENT
- case 137: cBulletId = 0x2030; break;// PER MILLE SIGN
- case 138: cBulletId = 0x0160; break;// LATIN CAPITAL LETTER S WITH CARON
- case 139: cBulletId = 0x2039; break;// SINGLE LEFT-POINTING ANGLE QUOTATION MARK
- case 140: cBulletId = 0x0152; break;// LATIN CAPITAL LIGATURE OE
- case 142: cBulletId = 0x017D; break;// LATIN CAPITAL LETTER Z WITH CARON
- case 145: cBulletId = 0x2018; break;// LEFT SINGLE QUOTATION MARK
- // MODIFIER LETTER TURNED COMMA
- case 146: cBulletId = 0x2019; break;// RIGHT SINGLE QUOTATION MARK
- // MODIFIER LETTER APOSTROPHE
- case 147: cBulletId = 0x201C; break;// LEFT DOUBLE QUOTATION MARK
- // REVERSED DOUBLE PRIME QUOTATION MARK
- case 148: cBulletId = 0x201D; break;// RIGHT DOUBLE QUOTATION MARK
- // REVERSED DOUBLE PRIME QUOTATION MARK
- case 149: cBulletId = 0x2022; break;// BULLET
- case 150: cBulletId = 0x2013; break;// EN DASH
- case 151: cBulletId = 0x2014; break;// EM DASH
- case 152: cBulletId = 0x02DC; break;// SMALL TILDE
- case 153: cBulletId = 0x2122; break;// TRADE MARK SIGN
- case 154: cBulletId = 0x0161; break;// LATIN SMALL LETTER S WITH CARON
- case 155: cBulletId = 0x203A; break;// SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
- case 156: cBulletId = 0x0153; break;// LATIN SMALL LIGATURE OE
- case 158: cBulletId = 0x017E; break;// LATIN SMALL LETTER Z WITH CARON
- case 159: cBulletId = 0x0178; break;// LATIN CAPITAL LETTER Y WITH DIAERESIS
-// case 222: cBulletId = 0x00B6; break;// PILCROW SIGN / PARAGRAPH SIGN
- }
- }
-*/
nParaFlags |= 0x90; // wir geben den Font und den Charset vor
}
}
@@ -1446,8 +1402,6 @@ sal_uInt32 FontCollection::GetId( FontCollectionEntry& rEntry )
Font aFont;
aFont.SetCharSet( rEntry.CharSet );
aFont.SetName( rEntry.Original );
-// aFont.SetFamily( rEntry.Family );
-// aFont.SetPitch( rEntry.Pitch );
aFont.SetHeight( 100 );
if ( !pVDev )
diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx
index 75ccea0..02f1416 100644
--- a/sd/source/filter/grf/sdgrffilter.cxx
+++ b/sd/source/filter/grf/sdgrffilter.cxx
@@ -454,8 +454,6 @@ void SdGRFFilter::SaveGraphic( const ::com::sun::star::uno::Reference< ::com::su
break;
}
}
- // Fallthrough!
-// case ::com::sun::star::graphic::GraphicType::EMPTY:
default:
aMimeType = OUString(RTL_CONSTASCII_USTRINGPARAM( "image/png" ) );
break;
diff --git a/sd/source/filter/html/htmlattr.cxx b/sd/source/filter/html/htmlattr.cxx
index 2b33d28..57a7d74 100644
--- a/sd/source/filter/html/htmlattr.cxx
+++ b/sd/source/filter/html/htmlattr.cxx
@@ -44,7 +44,6 @@
SdHtmlAttrPreview::SdHtmlAttrPreview( Window* pParent, const ResId& rResId )
:Control( pParent, rResId )
{
-// SetMapMode( MAP_100TH_MM );
}
// =====================================================================
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 149b869..ae86ff4 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -654,21 +654,6 @@ void HtmlExport::InitExportParameters( const Sequence< PropertyValue >& rParams
Size aTmpSize( pPage->GetSize() );
double dRatio=((double)aTmpSize.Width())/aTmpSize.Height();
-/*
- switch( mnWidthPixel )
- {
- case 800:
- mnWidthPixel = 640;
- break;
- case 1024:
- mnWidthPixel = 800;
- break;
- case 640:
- default:
- mnWidthPixel = 512;
- break;
- }
-*/
mnHeightPixel = (USHORT)(mnWidthPixel/dRatio);
//------------------------------------------------------------------
@@ -681,7 +666,6 @@ void HtmlExport::InitExportParameters( const Sequence< PropertyValue >& rParams
maIndex = aINetURLObj.GetLastName();
mnSdPageCount = mpDoc->GetSdPageCount( PK_STANDARD );
-// USHORT nHiddenSlides = 0;
for( USHORT nPage = 0; nPage < mnSdPageCount; nPage++ )
{
pPage = mpDoc->GetSdPage( nPage, PK_STANDARD );
@@ -1107,7 +1091,6 @@ bool HtmlExport::CreateHtmlTextForPresPages()
if( mbDocColors )
{
SetDocColors( pPage );
-// maBackColor = pPage->GetPageBackgroundColor();
}
// HTML Kopf
@@ -2202,50 +2185,6 @@ String HtmlExport::getDocumentTitle()
return mDocTitle;
}
-/*
-var nCurrentPage = 0;
-var nPageCount = JSCRIPT2;
-
-function NavigateAbs( nPage )
-{
- frames[\"show\"].location.href = \"img\" + nPage + \".htm\";
- frames[\"notes\"].location.href = \"note\" + nPage + \".htm\";
- nCurrentPage = nPage;
- if(nCurrentPage==0)
- {
- frames[\"navbar1\"].location.href = \"navbar0.htm\";
- }
- else if(nCurrentPage==nPageCount-1)
- {
- frames[\"navbar1\"].location.href = \"navbar2.htm\";
- }
- else
- frames[\"navbar1\"].location.href = \"navbar1.htm\";
- }
-}
-
-function NavigateRel( nDelta )
-{
- var nPage = parseInt(nCurrentPage) + parseInt(nDelta);
- if( (nPage >= 0) && (nPage < nPageCount) )
- {
- NavigateAbs( nPage );
- }
-}
-
-function ExpandOutline()
-{
- frames[\"navbar2\"].location.href = \"navbar4.htm\";
- frames[\"outline\"].location.href = \"outline1.htm\";
-}
-
-function CollapseOutline()
-{
- frames[\"navbar2\"].location.href = \"navbar3.htm\";
- frames[\"outline\"].location.href = \"outline0.htm\";
-}
-*/
-
static const char* JS_NavigateAbs =
"function NavigateAbs( nPage )\r\n"
"{\r\n"
@@ -3221,13 +3160,6 @@ bool HtmlExport::checkForExistingFiles()
String HtmlExport::StringToURL( const String& rURL )
{
return rURL;
-/*
- return StringToHTMLString(rURL);
- OUString aURL( StringToHTMLString(rURL) );
-
- aURL = Uri::encode( aURL, rtl_UriCharClassUric, rtl_UriEncodeCheckEscapes, RTL_TEXTENCODING_UTF8);
- return String( aURL );
-*/
}
String HtmlExport::GetButtonName( int nButton ) const
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index b38754b..7c03f7a 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -174,7 +174,6 @@ SdPublishingDesign::SdPublishingDesign()
m_aAuthor += (String)aUserOptions.GetLastName();
m_aEMail = aUserOptions.GetEmail();
m_bDownload = FALSE;
-//-/ m_bCreated = TRUE;
m_nButtonThema = -1;
m_bUserAttr = FALSE;
@@ -219,7 +218,6 @@ int SdPublishingDesign::operator ==(const SdPublishingDesign & rDesign) const
m_aWWW == rDesign.m_aWWW &&
m_aMisc == rDesign.m_aMisc &&
m_bDownload == rDesign.m_bDownload &&
-//-/ m_bCreated == rDesign.m_bCreated &&
m_nButtonThema == rDesign.m_nButtonThema &&
m_bUserAttr == rDesign.m_bUserAttr &&
m_aBackColor == rDesign.m_aBackColor &&
@@ -639,8 +637,6 @@ void SdPublishingDlg::CreatePages()
if(m_bImpress)
aAssistentFunc.InsertControl(4,
pPage4_Download = new CheckBox(this,SdResId(PAGE4_DOWNLOAD)));
-//-/ aAssistentFunc.InsertControl(4,
-//-/ pPage4_Created = new CheckBox(this,SdResId(PAGE4_CREATED)));
// Seite 5
aAssistentFunc.InsertControl(5,
@@ -766,7 +762,6 @@ void SdPublishingDlg::RemovePages()
delete pPage4_Misc;
if(m_bImpress)
delete pPage4_Download;
-//-/ delete pPage4_Created;
delete pPage5_Bmp;
delete pPage5_Titel;
@@ -964,7 +959,6 @@ void SdPublishingDlg::GetParameterSequence( Sequence< PropertyValue >& rParams )
}
// Seite 6
-// aSet.Put(SfxBoolItem(ATTR_PUBLISH_SLIDESOUND,pPage6_Sound->IsChecked()));
rParams.realloc( aProps.size() );
@@ -1088,12 +1082,6 @@ IMPL_LINK( SdPublishingDlg, GfxFormatHdl, RadioButton *, pButton )
// =====================================================================
IMPL_LINK( SdPublishingDlg, BaseHdl, RadioButton *, EMPTYARG )
{
-/*
- if(pButton == pPage3_Standard)
- pPage3_Frames->Check( pButton == pPage3 );
- else
- pPage3_Standard->Check(FALSE);
-*/
UpdatePage();
return 0;
@@ -1516,7 +1504,6 @@ void SdPublishingDlg::SetDesign( SdPublishingDesign* pDesign )
pPage4_Misc->SetText(pDesign->m_aMisc);
if(m_bImpress)
pPage4_Download->Check(pDesign->m_bDownload);
-//-/ pPage4_Created->Check(pDesign->m_bCreated);
pPage5_TextOnly->Check(pDesign->m_nButtonThema == -1);
if(pDesign->m_nButtonThema != -1)
@@ -1581,7 +1568,6 @@ void SdPublishingDlg::GetDesign( SdPublishingDesign* pDesign )
pDesign->m_aWWW = pPage4_WWW->GetText();
pDesign->m_aMisc = pPage4_Misc->GetText();
pDesign->m_bDownload = m_bImpress?pPage4_Download->IsChecked():FALSE;
-//-/ pDesign->m_bCreated = pPage4_Created->IsChecked();
if(pPage5_TextOnly->IsChecked())
pDesign->m_nButtonThema = -1;
diff --git a/sd/source/filter/ppt/ppt97animations.cxx b/sd/source/filter/ppt/ppt97animations.cxx
index 45d3b2f..4387c96 100644
--- a/sd/source/filter/ppt/ppt97animations.cxx
+++ b/sd/source/filter/ppt/ppt97animations.cxx
@@ -300,11 +300,9 @@ void Ppt97Animation::UpdateCacheData() const
switch( m_aAtom.nFlyMethod )
{
case 0x0:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_APPEAR;
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-appear")); // --- appear ---
break;
case 0x01:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_RANDOM;
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-random")); // --- random ---
break;
case 0x02: // --- blinds effect ---
@@ -312,12 +310,10 @@ void Ppt97Animation::UpdateCacheData() const
switch ( m_aAtom.nFlyDirection )
{
case 0x0:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_VERTICAL_STRIPES;
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-venetian-blinds"));
m_aSubType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("horizontal")); // horizontal
break;
case 0x1:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_HORIZONTAL_STRIPES;
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-venetian-blinds"));
m_aSubType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vertical")); // vertical
break;
@@ -329,12 +325,10 @@ void Ppt97Animation::UpdateCacheData() const
switch ( m_aAtom.nFlyDirection )
{
case 0x0:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_HORIZONTAL_CHECKERBOARD;
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-checkerboard"));
m_aSubType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("across")); // vertical ???
break;
case 0x1:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_VERTICAL_CHECKERBOARD;
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-checkerboard"));
m_aSubType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("downward")); // horizontal ???
break;
@@ -342,7 +336,6 @@ void Ppt97Animation::UpdateCacheData() const
}
break;
case 0x05:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_DISSOLVE; // --- dissolve ----
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-dissolve-in"));
break;
case 0x08: // --- (hor/ver) lines ---
@@ -350,12 +343,10 @@ void Ppt97Animation::UpdateCacheData() const
switch ( m_aAtom.nFlyDirection )
{
case 0x0:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_HORIZONTAL_LINES;
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-random-bars"));
m_aSubType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vertical")); // horizontal ???
break;
case 0x1:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_VERTICAL_LINES;
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-random-bars"));
m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("horizontal")); // vertical ???
break;
@@ -367,22 +358,18 @@ void Ppt97Animation::UpdateCacheData() const
switch ( m_aAtom.nFlyDirection )
{
case 0x4:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_LOWERRIGHT;
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-diagonal-squares"));
m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("left-to-top")); // to left top
break;
case 0x5:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_LOWERLEFT;
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-diagonal-squares"));
m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("right-to-top")); // to right top
break;
case 0x6:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_UPPERRIGHT;
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-diagonal-squares"));
m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("left-to-bottom")); // to left bottom
break;
case 0x7:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_UPPERLEFT;
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-diagonal-squares"));
m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("right-to-bottom")); // to right bottom
break;
@@ -394,22 +381,18 @@ void Ppt97Animation::UpdateCacheData() const
switch ( m_aAtom.nFlyDirection )
{
case 0x0:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_RIGHT;
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-wipe"));
m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-right")); // from right
break;
case 0x1:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_BOTTOM;
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-wipe"));
m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-bottom")); // from bottom
break;
case 0x2:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_LEFT;
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-wipe"));
m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-left")); // from left
break;
case 0x3:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_TOP;
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-wipe"));
m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-top")); // from top
break;
@@ -421,12 +404,10 @@ void Ppt97Animation::UpdateCacheData() const
switch ( m_aAtom.nFlyDirection )
{
case 0x0:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_CENTER;
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-box"));
m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("out")); // from center
break;
case 0x1:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_TO_CENTER;
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-box"));
m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("in")); // to center
break;
@@ -438,160 +419,127 @@ void Ppt97Animation::UpdateCacheData() const
switch ( m_aAtom.nFlyDirection )
{
case 0x0:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_LEFT;
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in"));
m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-left"));
break;
case 0x1:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_TOP;
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in"));
m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-top"));
break;
case 0x2:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_RIGHT;
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in"));
m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-right"));
break;
case 0x3:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_BOTTOM;
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in"));
m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-bottom"));
break;
case 0x4:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_UPPERLEFT;
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in"));
m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-top-left"));
break;
case 0x5:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_UPPERRIGHT;
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in"));
m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-top-right"));
break;
case 0x6:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_LOWERLEFT;
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in"));
m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-bottom-left"));
break;
case 0x7:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_LOWERRIGHT;
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in"));
m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-bottom-right"));
break;
case 0x8: // -- short text effects --
- //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_SHORT_FROM_LEFT;
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-peek-in"));
m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-left"));
break;
case 0x9:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_SHORT_FROM_BOTTOM;
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-peek-in"));
m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-bottom"));
break;
case 0xa:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_SHORT_FROM_RIGHT;
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-peek-in"));
m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-right"));
break;
case 0xb:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_SHORT_FROM_TOP;
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-peek-in"));
m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-top"));
break;
case 0xc: // -- slow text effects --
{
- //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_LEFT;
- //rSpeed = ::com::sun::star::presentation::AnimationSpeed_SLOW;
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in-slow"));
m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-left"));
}
break;
case 0xd:
{
- //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_TOP;
- //rSpeed = ::com::sun::star::presentation::AnimationSpeed_SLOW;
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in-slow"));
m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-top"));
}
break;
case 0xe:
{
- //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_RIGHT;
- //rSpeed = ::com::sun::star::presentation::AnimationSpeed_SLOW;
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in-slow"));
m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-right"));
}
break;
case 0xf:
{
- //eRetval = ::com::sun::star::presentation::AnimationEffect_MOVE_FROM_BOTTOM;
- //rSpeed = ::com::sun::star::presentation::AnimationSpeed_SLOW;
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-fly-in-slow"));
m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-bottom"));
}
break;
case 0x10: // --- zoom ---
- //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_CENTER;
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-zoom"));
m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("in"));
break;
case 0x11:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_CENTER;
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-zoom"));
m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("in-slightly"));
break;
case 0x12:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_TO_CENTER;
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-zoom"));
m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("out"));
break;
case 0x13:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_TO_CENTER;
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-zoom"));
m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("out-slightly"));
break;
case 0x14:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_FROM_CENTER;
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-zoom"));
m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("in-from-screen-center"));
break;
case 0x15:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_FADE_TO_CENTER;
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-zoom"));
m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("out-from-screen-center"));
break;
case 0x16: // --- stretch ---
- //eRetval = ::com::sun::star::presentation::AnimationEffect_HORIZONTAL_STRETCH;
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-stretchy"));
m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("across"));
break;
case 0x17:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_STRETCH_FROM_LEFT;
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-stretchy"));
m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-left"));
break;
case 0x18:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_STRETCH_FROM_TOP;
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-stretchy"));
m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-top"));
break;
case 0x19:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_STRETCH_FROM_RIGHT;
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-stretchy"));
m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-right"));
break;
case 0x1a:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_STRETCH_FROM_BOTTOM;
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-stretchy"));
m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("from-bottom"));
break;
case 0x1b: // --- rotate ---
- //eRetval = ::com::sun::star::presentation::AnimationEffect_HORIZONTAL_ROTATE;
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-swivel"));
m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vertical"));
break;
case 0x1c: // --- spirale ---
- //eRetval = ::com::sun::star::presentation::AnimationEffect_SPIRALOUT_LEFT;
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-spiral-in"));
break;
}
@@ -602,22 +550,18 @@ void Ppt97Animation::UpdateCacheData() const
switch ( m_aAtom.nFlyDirection )
{
case 0x0:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_OPEN_VERTICAL ; // ???
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-split"));
m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("horizontal-out")); //horizontal open
break;
case 0x1:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_CLOSE_VERTICAL; // ???
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-split"));
m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("horizontal-in")); //horizontal close
break;
case 0x2:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_OPEN_HORIZONTAL; // ???
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-split"));
m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vertical-out")); // vertical open
break;
case 0x3:
- //eRetval = ::com::sun::star::presentation::AnimationEffect_CLOSE_HORIZONTAL; // ???
m_aPresetId = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo-entrance-split"));
m_aSubType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vertical-in")); // vertical close
break;
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 043ae27..749b8cc 100755
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -653,12 +653,7 @@ sal_Bool ImplSdPPTImport::Import()
{
UINT32 nTitleInstance = TSS_TYPE_PAGETITLE;
UINT32 nOutlinerInstance = TSS_TYPE_BODY;
-// BOOL bSwapStyleSheet = pSlideLayout->eLayout == PPT_LAYOUT_TITLEMASTERSLIDE;
-// if ( bSwapStyleSheet )
-// {
-// nTitleInstance = TSS_TYPE_TITLE;
-// nOutlinerInstance = TSS_TYPE_SUBTITLE;
-// }
+
/////////////////////
// titelstylesheet //
/////////////////////
@@ -958,13 +953,6 @@ sal_Bool ImplSdPPTImport::Import()
rStCtrl >> aProgTagContentHd;
switch( aProgTagContentHd.nRecType )
{
-/*
- case PPT_PST_CommentContainer :
- {
-
- }
- break;
-*/
case DFF_msofbtAnimGroup :
{
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > xPage( pPage->getUnoPage(), ::com::sun::star::uno::UNO_QUERY );
@@ -1400,8 +1388,7 @@ sal_Bool ImplSdPPTImport::Import()
rPresSettings.mbCustomShow = ( nFlags & 8 ) != 0;
rPresSettings.mbEndless = ( nFlags & 0x80 ) != 0;
rPresSettings.mbFullScreen = ( nFlags & 0x10 ) == 0;
-// rPresSettings.mnPauseTimeout;
-// rPresSettings.mbShowLogo;
+
if ( nStartSlide && ( nStartSlide <= GetPageCount() ) )
{
SdPage* pPage = mpDoc->GetSdPage( nStartSlide - 1, PK_STANDARD );
@@ -1812,9 +1799,6 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat
else
pPage->SetPresChange( mePresChange );
-// if ( nBuildFlags & 1 ) // slidechange by mouseclick
-// pPage->SetPresChange( mePresChange );
-
if ( nBuildFlags & 4 )
pPage->SetExcluded( TRUE ); // Dia nicht anzeigen
if ( nBuildFlags & 16 )
@@ -2094,18 +2078,10 @@ void ImplSdPPTImport::FillSdAnimationInfo( SdAnimationInfo* pInfo, PptInteractiv
pInfo->SetBookmark( ReadSound( pIAtom->nSoundRef ) ); // Pfad zum Soundfile in MSDOS-Notation
pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_SOUND; // RunProgramAction
}
-// if ( nFlags & 0x01 ) // koennen wir nicht ( beim Anklicken markieren )
+
switch ( pIAtom->nAction )
{
-// case 0x01 : // MacroAction
-// {
-// pInfo->meClickAction = ::com::sun::star::presentation::::com::sun::star::presentation::ClickAction_MACRO;
-// // aMacro liegt in folgender Form vor:
-// // "Macroname.Modulname.Libname.Dokumentname" oder
-// // "Macroname.Modulname.Libname.Applikationsname"
-// pInfo->maBookmark = aMacroName;
-// }
-// break;
+
case 0x02 : // RunProgramAction
{
pInfo->meClickAction = ::com::sun::star::presentation::ClickAction_PROGRAM;
diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx
index 189e00d..cfb3264 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -245,7 +245,6 @@ void AnimationImporter::import( const Reference< XDrawPage >& xPage, const DffRe
{
#ifdef DBG_ANIM_LOG
mpFile = fopen( "c:\\output.xml", "w+" );
- //mpFile = stdout;
#endif
dump("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
@@ -301,10 +300,6 @@ Reference< XAnimationNode > AnimationImporter::createNode( const Atom* pAtom, co
switch( rNode.mnNodeType )
{
case mso_Anim_Behaviour_FILTER:
-/*
- pServiceName = "com.sun.star.animations.TransitionFilter";
- break;
-*/
case mso_Anim_Behaviour_ANIMATION:
if( pAtom->hasChildAtom( DFF_msofbtAnimateSet ) )
pServiceName = "com.sun.star.animations.AnimateSet";
@@ -3133,14 +3128,9 @@ sal_Int32 AnimationImporter::importTargetElementContainer( const Atom* pAtom, An
}
-// dump( " ref=\"%s\"", nRefMode == 3 ? "source" : ( nRefMode == 0 ? "target" : "unknown" ) );
-// dump( " type=\"%s\"", nRefType == 1 ? "shape" : ( nRefType == 2 ? "sound": "unknown" ) );
-// dump( " id=\"%lu\"", (sal_Int32)nRefId );
#ifdef DBG_ANIM_LOG
if((begin != -1) || (end != -1) )
{
-// dump( " text_begin=\"%ld\"", begin );
-// dump( " text_end=\"%ld\"", end );
}
#endif
}
@@ -3149,9 +3139,6 @@ sal_Int32 AnimationImporter::importTargetElementContainer( const Atom* pAtom, An
{
sal_Int32 nU1;
mrStCtrl >> nU1;
-
- // HINT: nU1 == 1 : target document. ?
-// dump( " unknown_0x2b01=\"%#lx\"", nU1 );
}
break;
default:
@@ -3543,7 +3530,6 @@ void AnimationImporter::dump( const PropertySet& rSet )
break;
case DFF_ANIM_DIRECTION:
-// case DFF_ANIM_MASTERREL:
{
sal_Bool bDirection;
if( aAny >>= bDirection )
diff --git a/sd/source/filter/sdfilter.cxx b/sd/source/filter/sdfilter.cxx
index c985bdc..c7f3fe0 100644
--- a/sd/source/filter/sdfilter.cxx
+++ b/sd/source/filter/sdfilter.cxx
@@ -108,28 +108,6 @@ void SdFilter::CreateStatusIndicator()
if ( pStatusBarItem )
pStatusBarItem->GetValue() >>= mxStatusIndicator;
-// try
-// {
-// if (mxModel.is())
-// {
-// Reference< XController > xController( mxModel->getCurrentController());
-// if( xController.is())
-// {
-// Reference< XFrame > xFrame( xController->getFrame());
-// if( xFrame.is())
-// {
-// Reference< XStatusIndicatorFactory > xFactory( xFrame, UNO_QUERY );
-// if( xFactory.is())
-// {
-// mxStatusIndicator = xFactory->createStatusIndicator();
-// }
-// }
-// }
-// }
-// }
-// catch( Exception& )
-// {
-// }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx
index 3f59b9b..d5237f5 100644
--- a/sd/source/filter/sdpptwrp.cxx
+++ b/sd/source/filter/sdpptwrp.cxx
@@ -146,10 +146,6 @@ sal_Bool SdPPTFilter::Export()
SotStorageRef xStorRef = new SotStorage( mrMedium.GetOutStream(), FALSE );
ExportPPT PPTExport = reinterpret_cast<ExportPPT>(pLibrary->getFunctionSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ExportPPT")) ));
- /* !!!
- if ( pViewShell && pViewShell->GetView() )
- pViewShell->GetView()->SdrEndTextEdit();
- */
if( PPTExport && xStorRef.Is() )
{
sal_uInt32 nCnvrtFlags = 0;
diff --git a/sd/source/filter/xml/sdtransform.cxx b/sd/source/filter/xml/sdtransform.cxx
index ec8d9b5..2a8ca78 100644
--- a/sd/source/filter/xml/sdtransform.cxx
+++ b/sd/source/filter/xml/sdtransform.cxx
@@ -196,17 +196,6 @@ void SdTransformOOo2xDocument::transformShape( SdrObject& rObj )
void SdTransformOOo2xDocument::transformTextShape( SdrTextObj& rTextShape )
{
-/*
- const SfxItemSet& rSet = rTextShape.GetMergedItemSet();
-
- if( (rSet.GetItemState( EE_PARA_LRSPACE ) == SFX_ITEM_SET) && (rSet.GetItemState( EE_PARA_NUMBULLET ) == SFX_ITEM_SET) )
- {
- SvxLRSpaceItem aItem( *static_cast<const SvxLRSpaceItem*>(rSet.GetItem( EE_PARA_LRSPACE )) );
- aItem.SetLeftValue( 0 );
- aItem.SetTxtFirstLineOfst( 0 );
- rTextShape.SetMergedItem( aItem );
- }
-*/
if(!rTextShape.IsEmptyPresObj())
{
@@ -321,7 +310,7 @@ bool SdTransformOOo2xDocument::getBulletState( const SfxItemSet& rSet, sal_uInt1
bool SdTransformOOo2xDocument::transformItemSet( SfxItemSet& rSet, bool bNumbering )
{
bool bRet = false;
- if( bNumbering /* && (rSet.GetItemState( EE_PARA_LRSPACE ) == SFX_ITEM_SET) && (rSet.GetItemState( EE_PARA_NUMBULLET ) == SFX_ITEM_SET) */ )
+ if( bNumbering )
{
SvxLRSpaceItem aItem( *static_cast<const SvxLRSpaceItem*>(rSet.GetItem( EE_PARA_LRSPACE )) );
if( (aItem.GetLeft() != 0) || (aItem.GetTxtFirstLineOfst() != 0) )
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index b41ef05..76473b7 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -709,7 +709,6 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
switch( nRet )
{
case 0: break;
- // case ERRCODE_SFX_WRONGPASSWORD: break;
case SD_XML_READERROR: break;
case ERRCODE_IO_BROKENPACKAGE:
if( xStorage.is() )
More information about the Libreoffice-commits
mailing list