[Libreoffice-commits] .: 2 commits - sd/source slideshow/source
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Nov 30 13:11:48 PST 2010
sd/source/core/drawdoc3.cxx | 9 ++-------
slideshow/source/engine/shapes/drawinglayeranimation.cxx | 4 +---
2 files changed, 3 insertions(+), 10 deletions(-)
New commits:
commit 3db839fdf652d3fc5ed55aceff30cbb08aa03ae1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Nov 30 13:57:42 2010 +0000
cppcheck: unused variable
diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.cxx b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
index fdad9fd..2f9915b 100644
--- a/slideshow/source/engine/shapes/drawinglayeranimation.cxx
+++ b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
@@ -376,7 +376,7 @@ void ActivityImpl::ImpForceScrollTextAnimNodes()
sal_uInt32 nLoopTime;
double fZeroLogic, fOneLogic, fInitLogic, fDistanceLogic;
double fZeroLogicAlternate = 0.0, fOneLogicAlternate = 0.0;
- double fZeroRelative, fOneRelative, fInitRelative,fDistanceRelative;
+ double fZeroRelative, fOneRelative, fInitRelative;
if(ScrollHorizontal())
{
@@ -429,13 +429,11 @@ void ActivityImpl::ImpForceScrollTextAnimNodes()
(fZeroLogicAlternate - fZeroLogic) / fDistanceLogic;
fOneRelative =
(fOneLogicAlternate - fZeroLogic) / fDistanceLogic;
- fDistanceRelative = fOneRelative - fZeroRelative;
}
else
{
fZeroRelative = 0.0;
fOneRelative = 1.0;
- fDistanceRelative = 1.0;
}
if(mnStartTime)
commit 6c5ea26f9b55d8096bd7a60a443dc88c67b8f50d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Nov 29 12:09:29 2010 +0000
cppcheck: unused variables
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index 4de9a83..0a4ff68 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -1129,8 +1129,6 @@ BOOL SdDrawDocument::InsertBookmarkAsObject(
delete pView;
- List* pList = pBookmarkList;
-
if (pExchangeList)
{
// Anzahl Objekte nach dem Einfuegen bestimmen
@@ -1151,8 +1149,6 @@ BOOL SdDrawDocument::InsertBookmarkAsObject(
pExchangeList->Next();
}
-
- pList = pExchangeList;
}
}
@@ -1728,9 +1724,8 @@ void SdDrawDocument::SetMasterPage(USHORT nSdPageNum,
if (pSourceDoc != this)
{
// Aus dem Source-Dokument austragen
- SdrPage* pTest = NULL;
- pTest = pSourceDoc->RemoveMasterPage(pNotesMaster->GetPageNum());
- pTest = pSourceDoc->RemoveMasterPage(pMaster->GetPageNum());
+ pSourceDoc->RemoveMasterPage(pNotesMaster->GetPageNum());
+ pSourceDoc->RemoveMasterPage(pMaster->GetPageNum());
}
/*********************************************************************
More information about the Libreoffice-commits
mailing list