Hi,
Another cleanup on impress.
Cheers,
-- Takeshi Abe
From f0011014c94de1a9ee159cc96276dc88e3ece5b9 Mon Sep 17 00:00:00 2001
From: Takeshi Abe <tabe@fixedpoint.jp>
Date: Thu, 27 Jan 2011 17:29:41 +0900
Subject: [PATCH 1/2] removed dead codes and fixed a typo
---
sd/source/core/PageListWatcher.cxx | 1 -
sd/source/core/TransitionPreset.cxx | 2 +-
sd/source/core/anminfo.cxx | 1 -
sd/source/core/cusshow.cxx | 1 -
sd/source/core/drawdoc.cxx | 8 --------
sd/source/core/drawdoc2.cxx | 5 -----
sd/source/core/drawdoc4.cxx | 3 ---
sd/source/core/sdpage2.cxx | 1 -
sd/source/filter/eppt/escherex.cxx | 5 -----
sd/source/filter/eppt/pptx-text.cxx | 2 +-
sd/source/filter/ppt/pptinanimations.cxx | 7 -------
sd/source/filter/xml/sdtransform.cxx | 2 --
sd/source/filter/xml/sdxmlwrp.cxx | 3 ---
13 files changed, 2 insertions(+), 39 deletions(-)
diff --git a/sd/source/core/PageListWatcher.cxx b/sd/source/core/PageListWatcher.cxx
index 0c2fb51..83357e8 100644
--- a/sd/source/core/PageListWatcher.cxx
+++ b/sd/source/core/PageListWatcher.cxx
@@ -36,7 +36,6 @@
#include <svx/svdmodel.hxx>
//////////////////////////////////////////////////////////////////////////////
-// #109538#
void ImpPageListWatcher::ImpRecreateSortedPageListOnDemand()
{
diff --git a/sd/source/core/TransitionPreset.cxx b/sd/source/core/TransitionPreset.cxx
index c4b2cf8..4041120 100644
--- a/sd/source/core/TransitionPreset.cxx
+++ b/sd/source/core/TransitionPreset.cxx
@@ -135,7 +135,7 @@ bool TransitionPreset::importTransitionsFile( TransitionPresetList& rList,
}
else
{
- DBG_ERROR( "sd::TransitionPreset::importTransitionPresetList(), missformed xml
configuration file, giving up!" );
+ DBG_ERROR( "sd::TransitionPreset::importTransitionPresetList(), misformed xml
configuration file, giving up!" );
break;
}
}
diff --git a/sd/source/core/anminfo.cxx b/sd/source/core/anminfo.cxx
index be1ac13..fd33ec4 100644
--- a/sd/source/core/anminfo.cxx
+++ b/sd/source/core/anminfo.cxx
@@ -41,7 +41,6 @@
#include "sdiocmpt.hxx"
#include "drawdoc.hxx"
-// #90477#
#include <tools/tenccvt.hxx>
using namespace ::com::sun::star;
diff --git a/sd/source/core/cusshow.cxx b/sd/source/core/cusshow.cxx
index 753d710..455bcee 100644
--- a/sd/source/core/cusshow.cxx
+++ b/sd/source/core/cusshow.cxx
@@ -37,7 +37,6 @@
#include "sdpage.hxx"
#include "drawdoc.hxx"
-// #90477#
#include <tools/tenccvt.hxx>
using namespace ::com::sun::star;
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index b9efbd0..2049d9a 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -92,7 +92,6 @@
#include "../ui/inc/optsitem.hxx"
#include "../ui/inc/FrameView.hxx"
-// #90477#
#include <tools/tenccvt.hxx>
using ::rtl::OUString;
@@ -176,7 +175,6 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
, mpDrawPageListWatcher(0)
, mpMasterPageListWatcher(0)
{
- // #109538#
mpDrawPageListWatcher = ::std::auto_ptr<ImpDrawPageListWatcher>(
new ImpDrawPageListWatcher(*this));
mpMasterPageListWatcher = ::std::auto_ptr<ImpMasterPageListWatcher>(
@@ -400,7 +398,6 @@ SdDrawDocument::~SdDrawDocument()
CloseBookmarkDoc();
SetAllocDocSh(FALSE);
- // #116168#
ClearModel(sal_True);
if (pLinkManager)
@@ -972,8 +969,6 @@ SvxNumType SdDrawDocument::GetPageNumType() const
void SdDrawDocument::SetPrinterIndependentLayout (sal_Int32 nMode)
{
- // #108104#
-
switch (nMode)
{
case ::com::sun::star::document::PrinterIndependentLayout::DISABLED:
@@ -981,7 +976,6 @@ void SdDrawDocument::SetPrinterIndependentLayout (sal_Int32 nMode)
// Just store supported modes and inform the doc shell.
mnPrinterIndependentLayout = nMode;
- // #108104#
// Since it is possible that a SdDrawDocument is constructed without a
// SdDrawDocShell the pointer member mpDocSh needs to be tested
// before the call is executed. This is e.-g. used for copy/paste.
@@ -1013,13 +1007,11 @@ void SdDrawDocument::SetStartWithPresentation( bool bStartWithPresentation )
mbStartWithPresentation = bStartWithPresentation;
}
-// #109538#
void SdDrawDocument::PageListChanged()
{
mpDrawPageListWatcher->Invalidate();
}
-// #109538#
void SdDrawDocument::MasterPageListChanged()
{
mpMasterPageListWatcher->Invalidate();
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index aa790d1..8df46ac 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -211,25 +211,21 @@ USHORT SdDrawDocument::GetPageByName(const String& rPgName, BOOL&
rbIsMasterPage
SdPage* SdDrawDocument::GetSdPage(USHORT nPgNum, PageKind ePgKind) const
{
- // #109538#
return mpDrawPageListWatcher->GetSdPage(ePgKind, sal_uInt32(nPgNum));
}
USHORT SdDrawDocument::GetSdPageCount(PageKind ePgKind) const
{
- // #109538#
return (sal_uInt16)mpDrawPageListWatcher->GetSdPageCount(ePgKind);
}
SdPage* SdDrawDocument::GetMasterSdPage(USHORT nPgNum, PageKind ePgKind)
{
- // #109538#
return mpMasterPageListWatcher->GetSdPage(ePgKind, sal_uInt32(nPgNum));
}
USHORT SdDrawDocument::GetMasterSdPageCount(PageKind ePgKind) const
{
- // #109538#
return (sal_uInt16)mpMasterPageListWatcher->GetSdPageCount(ePgKind);
}
@@ -1340,7 +1336,6 @@ USHORT SdDrawDocument::CreatePage (
// Create new standard page and set it up.
pStandardPage = (SdPage*) AllocPage(FALSE);
- // #108658#
// Set the size here since else the presobj autolayout
// will be wrong.
pStandardPage->SetSize( pPreviousStandardPage->GetSize() );
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 0360a34..35f2b3f 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -370,7 +370,6 @@ void SdDrawDocument::CreateLayoutTemplates()
aLRSpaceItem.SetTxtFirstLineOfst(600); // Erstzeileneinzug 6mm, rechts 0
pISet->Put(aLRSpaceItem);
-/* #i35937# */
// ---- Titel ---------------------------------------------------------
aName = String(SdResId(STR_POOLSHEET_TITLE));
@@ -430,8 +429,6 @@ void SdDrawDocument::CreateLayoutTemplates()
SvxLRSpaceItem aLRSpItem( 200, 200, 0, 0, EE_PARA_LRSPACE);
pISet->Put( aLRSpItem ); // Erstzeileneinzug 0 mm, links und rechts 2 mm
-/* #i35937# */
-
pISet->Put(SvxULSpaceItem(100, 100, EE_PARA_ULSPACE )); // Absatzrand oben/unten 1 mm
pISet->Put(SvxAdjustItem(SVX_ADJUST_CENTER, EE_PARA_JUST ));
diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx
index 74d9a00..31b176e 100644
--- a/sd/source/core/sdpage2.cxx
+++ b/sd/source/core/sdpage2.cxx
@@ -52,7 +52,6 @@
#include "../ui/inc/strings.hrc"
#include "../ui/inc/DrawDocShell.hxx"
-// #90477#
#include <tools/tenccvt.hxx>
#include <svl/itemset.hxx>
diff --git a/sd/source/filter/eppt/escherex.cxx b/sd/source/filter/eppt/escherex.cxx
index f6db4e1..0218d7f 100644
--- a/sd/source/filter/eppt/escherex.cxx
+++ b/sd/source/filter/eppt/escherex.cxx
@@ -182,11 +182,6 @@ void PptEscherEx::OpenContainer( UINT16 n_EscherContainer, int nRecInstance )
}
break;
- case ESCHER_SpContainer :
- {
- }
- break;
-
default:
break;
}
diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx
index 7168ea0..972d95f 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -700,7 +700,7 @@ ParagraphObj::ParagraphObj( const ::com::sun::star::uno::Reference< ::com::sun::
}
}
}
- ImplGetParagraphValues( rProv, TRUE );//
+ ImplGetParagraphValues( rProv, TRUE );
}
}
diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx
index 0111171..2e29a1a 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -3062,7 +3062,6 @@ sal_Int32 AnimationImporter::importTargetElementContainer( const Atom* pAtom,
An
switch( nRefMode )
{
-// default case 0: rSubType = ShapeAnimationSubType::AS_WHOLE; break;
case 6: rSubType = ShapeAnimationSubType::ONLY_BACKGROUND; break;
case 8: rSubType = ShapeAnimationSubType::ONLY_TEXT; break;
case 2: // one paragraph
@@ -3127,12 +3126,6 @@ sal_Int32 AnimationImporter::importTargetElementContainer( const Atom*
pAtom, An
DBG_ERROR("unknown reference type");
}
-
-#ifdef DBG_ANIM_LOG
- if((begin != -1) || (end != -1) )
- {
- }
-#endif
}
break;
case 0x2b01:
diff --git a/sd/source/filter/xml/sdtransform.cxx b/sd/source/filter/xml/sdtransform.cxx
index 2a8ca78..1cf87f2 100644
--- a/sd/source/filter/xml/sdtransform.cxx
+++ b/sd/source/filter/xml/sdtransform.cxx
@@ -206,8 +206,6 @@ void SdTransformOOo2xDocument::transformTextShape( SdrTextObj& rTextShape )
sal_uInt32 nCount = mrOutliner.GetParagraphCount();
- //Paragraph* pPara = NULL;
-
bool bChange = false;
for(sal_uInt16 nPara = 0; nPara < nCount; nPara++)
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index 334412d..e15e525 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -884,7 +884,6 @@ sal_Bool SdXMLFilter::Export()
/** property map for export info set */
PropertyMapEntry aExportInfoMap[] =
{
- // #82003#
{ MAP_LEN( "ProgressRange" ), 0, &::getCppuType((const sal_Int32*)0),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
{ MAP_LEN( "ProgressMax" ), 0, &::getCppuType((const sal_Int32*)0),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
{ MAP_LEN( "ProgressCurrent" ), 0, &::getCppuType((const sal_Int32*)0),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
@@ -968,7 +967,6 @@ sal_Bool SdXMLFilter::Export()
xGrfResolver = pGraphicHelper;
}
- // #82003#
if(mbShowProgress)
{
CreateStatusIndicator();
@@ -1083,7 +1081,6 @@ sal_Bool SdXMLFilter::Export()
}
while( bDocRet && pServices->mpService );
- // #82003#
if(mbShowProgress)
{
if(mxStatusIndicator.is())
--
1.7.2.3
From 645c5db8584095fd9ecd4d35608e104e8e2fa93b Mon Sep 17 00:00:00 2001
From: Takeshi Abe <tabe@fixedpoint.jp>
Date: Thu, 27 Jan 2011 17:30:37 +0900
Subject: [PATCH 2/2] narrowed a variable's scope
---
sd/source/core/EffectMigration.cxx | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx
index 7f98a0d..3680f2a 100644
--- a/sd/source/core/EffectMigration.cxx
+++ b/sd/source/core/EffectMigration.cxx
@@ -977,8 +977,6 @@ void EffectMigration::SetDimHide( SvxShape* pShape, sal_Bool bDimHide )
if( implIsInsideGroup( pObj ) )
return;
- Any aEmpty;
-
sd::MainSequencePtr pMainSequence = static_cast<SdPage*>(pObj->GetPage())->getMainSequence();
const Reference< XShape > xShape( pShape );
@@ -992,8 +990,10 @@ void EffectMigration::SetDimHide( SvxShape* pShape, sal_Bool bDimHide )
if( pEffect->getTargetShape() == xShape )
{
pEffect->setHasAfterEffect( bDimHide ? true : false );
- if( bDimHide )
+ if( bDimHide ) {
+ Any aEmpty;
pEffect->setDimColor( aEmpty );
+ }
pEffect->setAfterEffectOnNext( false );
bNeedRebuild = true;
}
--
1.7.2.3
Context
- [Libreoffice] [PATCH] cleanup on impress · Takeshi Abe
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.