summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2013-02-24 18:39:08 +0100
committerThomas Arnhold <thomas@arnhold.org>2013-02-24 18:42:02 +0100
commit305bf19e390aebdf2d20ea052a92f782e8d1185c (patch)
tree7a94d504a364f03e998e73774eb10b162b173731 /sd
parente5444ae3e099e1279b9b685b623c6e50bb8efd3b (diff)
loplugin: unused variables
And some fallout. Change-Id: I8dfc12f3566e72d79d4f9930284c92577aa485a1
Diffstat (limited to 'sd')
-rw-r--r--sd/source/core/CustomAnimationEffect.cxx1
-rw-r--r--sd/source/core/sdpage.cxx3
-rw-r--r--sd/source/core/stlpool.cxx2
-rw-r--r--sd/source/filter/eppt/epptso.cxx2
-rw-r--r--sd/source/ui/dlg/animobjs.cxx2
-rw-r--r--sd/source/ui/dlg/dlgass.cxx1
-rw-r--r--sd/source/ui/dlg/sdpreslt.cxx1
-rw-r--r--sd/source/ui/func/fusldlg.cxx1
-rw-r--r--sd/source/ui/func/futext.cxx1
-rw-r--r--sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx2
-rw-r--r--sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx1
-rw-r--r--sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx4
-rw-r--r--sd/source/ui/toolpanel/controls/MasterPageObserver.cxx2
-rw-r--r--sd/source/ui/unoidl/sddetect.cxx1
-rw-r--r--sd/source/ui/unoidl/unolayer.cxx1
-rw-r--r--sd/source/ui/unoidl/unomodel.cxx1
-rw-r--r--sd/source/ui/view/DocumentRenderer.cxx2
-rw-r--r--sd/source/ui/view/ViewShellImplementation.cxx1
-rw-r--r--sd/source/ui/view/ViewShellManager.cxx1
-rw-r--r--sd/source/ui/view/sdview2.cxx1
-rw-r--r--sd/source/ui/view/viewoverlaymanager.cxx1
21 files changed, 0 insertions, 32 deletions
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index 8091aa69671c..90eb27c4941a 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -2642,7 +2642,6 @@ void EffectSequenceHelper::createTextGroupParagraphEffects( CustomAnimationTextG
{
EffectSequence::iterator aInsertIter( find( pEffect ) );
- const OUString strNumberingLevel( "NumberingLevel" );
Reference< XEnumerationAccess > xText( xTarget, UNO_QUERY_THROW );
Reference< XEnumeration > xEnumeration( xText->createEnumeration(), UNO_QUERY_THROW );
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 1e5beb0c1a0a..dc99226d38ba 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -452,7 +452,6 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, sal_Bool bVertical, const
pOutliner->SetStyleSheet( 0, NULL );
pOutliner->SetVertical( bVertical );
- String aEmptyStr;
SetObjText( (SdrTextObj*) pSdrObj, (SdrOutliner*)pOutliner, eObjKind, aString );
pOutliner->Init( nOutlMode );
@@ -864,7 +863,6 @@ SdrObject* SdPage::CreateDefaultPresObj(PresObjKind eObjKind, bool bInsert)
const long nLftBorder = GetLftBorder();
const long nUppBorder = GetUppBorder();
- Point aTitlePos ( nLftBorder, nUppBorder );
Size aPageSize ( GetSize() );
aPageSize.Width() -= nLftBorder + GetRgtBorder();
aPageSize.Height() -= nUppBorder + GetLwrBorder();
@@ -904,7 +902,6 @@ SdrObject* SdPage::CreateDefaultPresObj(PresObjKind eObjKind, bool bInsert)
else
{
// create header&footer objects for handout and notes master
- Point aTitlePos ( GetLftBorder(), GetUppBorder() );
Size aPageSize ( GetSize() );
aPageSize.Width() -= GetLftBorder() + GetRgtBorder();
aPageSize.Height() -= GetUppBorder() + GetLwrBorder();
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 5f7671a714ab..2cbe841663d4 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -659,8 +659,6 @@ void SdStyleSheetPool::CopyLayoutSheets(const String& rLayoutName, SdStyleSheetP
{
SfxStyleSheetBase* pSheet = NULL;
- String aOutlineTag(SdResId(STR_LAYOUT_OUTLINE));
-
std::vector<String> aNameList;
CreateLayoutSheetNames(rLayoutName,aNameList);
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 44bacaff1e59..21c664fb8635 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -2292,8 +2292,6 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
sal_Bool bPolyPolygon = mType == "drawing.PolyPolygon";
sal_Bool bPolyLine = mType == "drawing.PolyLine";
- Rectangle aPolyBoundRect;
-
const ::com::sun::star::awt::Size aSize100thmm( mXShape->getSize() );
const ::com::sun::star::awt::Point aPoint100thmm( mXShape->getPosition() );
Rectangle aRect100thmm( Point( aPoint100thmm.X, aPoint100thmm.Y ), Size( aSize100thmm.Width, aSize100thmm.Height ) );
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index 870a90231de2..c54dcc5a7606 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -545,8 +545,6 @@ IMPL_LINK_NOARG(AnimationWindow, ModifyTimeHdl)
void AnimationWindow::UpdateControl(bool const bDisableCtrls)
{
- String aString;
-
if (!m_FrameList.empty())
{
BitmapEx aBmp(*m_FrameList[m_nCurrentFrame].first);
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index f048b28eac9e..1a4345f59538 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -1426,7 +1426,6 @@ void AssistentDlgImpl::UpdateUserData()
pPage->SetAutoLayout(AUTOLAYOUT_TITLE, sal_True);
SdrTextObj* pObj;
- String aEmptyString;
if( aTopic.Len() )
{
diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx
index 4a786d1d75f4..c5f13625bc49 100644
--- a/sd/source/ui/dlg/sdpreslt.cxx
+++ b/sd/source/ui/dlg/sdpreslt.cxx
@@ -224,7 +224,6 @@ IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl)
// Inserted update to force repaint
Update();
- String aFile;
sal_Bool bCancel = sal_False;
switch (nResult)
diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx
index d933768a4454..af3eecd3e49e 100644
--- a/sd/source/ui/func/fusldlg.cxx
+++ b/sd/source/ui/func/fusldlg.cxx
@@ -71,7 +71,6 @@ void FuSlideShowDlg::DoExecute( SfxRequest& )
std::vector<String> aPageNameList(mpDoc->GetSdPageCount( PK_STANDARD ));
const String& rPresPage = rPresentationSettings.maPresPage;
String aFirstPage;
- String aStandardName( SdResId( STR_PAGE ) );
SdPage* pPage = NULL;
long nPage;
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index 2b5d3ceb4443..c30ec8049165 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -1184,7 +1184,6 @@ sal_Bool FuText::DeleteDefaultText()
if ( mxTextObj.is() && mxTextObj->IsEmptyPresObj() )
{
- String aString;
SdPage* pPage = (SdPage*) mxTextObj->GetPage();
if (pPage)
diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
index 9a885f5fbd79..de382bf74c11 100644
--- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
@@ -45,8 +45,6 @@ DragAndDropContext::DragAndDropContext (SlideSorter& rSlideSorter)
: mpTargetSlideSorter(&rSlideSorter),
mnInsertionIndex(-1)
{
- ::std::vector<const SdPage*> aPages;
-
// No Drag-and-Drop for master pages.
if (rSlideSorter.GetModel().GetEditMode() != EM_PAGE)
return;
diff --git a/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx b/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx
index 2175eaeecdd6..48b0898aad67 100644
--- a/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx
@@ -194,7 +194,6 @@ void VisibleAreaManager::MakeVisible (void)
const sal_Int32 nVisibleHeight (aVisibleArea.GetHeight());
// Find the longest run of boxes whose union fits into the visible area.
- Rectangle aBoundingBox;
for (::std::vector<Rectangle>::const_iterator
iBox(maVisibleRequests.begin()),
iEnd(maVisibleRequests.end());
diff --git a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
index 2cbfb069dab2..6aadcb720e14 100644
--- a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
+++ b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
@@ -68,7 +68,6 @@ namespace sd { namespace slidesorter { namespace view {
//===== InsertionIndicatorOverlay ===========================================
const static sal_Int32 gnShadowBorder = 3;
-const static sal_Int32 gnSuperScaleFactor = 1;
InsertionIndicatorOverlay::InsertionIndicatorOverlay (SlideSorter& rSlideSorter)
: mrSlideSorter(rSlideSorter),
@@ -208,9 +207,6 @@ Point InsertionIndicatorOverlay::PaintRepresentatives (
// Paint the preview.
Bitmap aPreview (rRepresentatives[nIndex].maBitmap);
- const Size aSuperSampleSize(
- aPreviewSize.Width()*gnSuperScaleFactor,
- aPreviewSize.Height()*gnSuperScaleFactor);
aPreview.Scale(aPreviewSize, BMP_SCALE_BEST);
rContent.DrawBitmapEx(aPageOffset, aPreview);
diff --git a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx
index 1d27c9d084be..cd7df65920d3 100644
--- a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx
@@ -226,8 +226,6 @@ void MasterPageObserver::Implementation::AddEventListener (
// Tell the new listener about all the master pages that are
// currently in use.
typedef ::std::vector<String> StringList;
- StringList aNewMasterPages;
- StringList aRemovedMasterPages;
MasterPageContainer::iterator aDocumentIterator;
for (aDocumentIterator=maUsedMasterPages.begin();
aDocumentIterator!=maUsedMasterPages.end();
diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx
index 588982fa1cb2..88b9a83b658f 100644
--- a/sd/source/ui/unoidl/sddetect.cxx
+++ b/sd/source/ui/unoidl/sddetect.cxx
@@ -169,7 +169,6 @@ SdFilterDetect::~SdFilterDetect()
bWasReadOnly = pItem && pItem->GetValue();
const SfxFilter* pFilter = 0;
- String aFilterName;
String aPrefix = rtl::OUString("private:factory/");
if( aURL.Match( aPrefix ) == aPrefix.Len() )
{
diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx
index 21599334e2f3..b5a904bcfd9d 100644
--- a/sd/source/ui/unoidl/unolayer.cxx
+++ b/sd/source/ui/unoidl/unolayer.cxx
@@ -110,7 +110,6 @@ String SdLayer::convertToInternalName( const OUString& rName )
OUString SdLayer::convertToExternalName( const String& rName )
{
- const String aCompare( rName );
if( rName == String( SdResId( STR_LAYER_BCKGRND ) ) )
{
return OUString( sUNO_LayerName_background );
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index b4902298f924..56fe8153deb3 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -1812,7 +1812,6 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r
::sd::ClientView* pView = new ::sd::ClientView( mpDocShell, pOut, NULL );
Rectangle aVisArea = Rectangle( Point(), mpDoc->GetSdPage( (sal_uInt16)nPageNumber - 1, ePageKind )->GetSize() );
Region aRegion( aVisArea );
- Point aOrigin;
::sd::ViewShell* pOldViewSh = mpDocShell->GetViewShell();
::sd::View* pOldSdView = pOldViewSh ? pOldViewSh->GetView() : NULL;
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 18268ccfd031..59b1f0b96eac 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -859,7 +859,6 @@ namespace {
sal_Int32(aPrintSize.Width() / nPageWidth)));
const sal_Int32 nRowCount (::std::max(sal_Int32(2),
sal_Int32(aPrintSize.Height() / nPageHeight)));
- Point aPrintOrigin;
for (sal_Int32 nRow=0; nRow<nRowCount; ++nRow)
for (sal_Int32 nColumn=0; nColumn<nColumnCount; ++nColumn)
{
@@ -1968,7 +1967,6 @@ private:
{
::boost::shared_ptr<ViewShell> pViewShell (mrBase.GetMainViewShell());
pViewShell->WriteFrameViewData();
- Point aPtZero;
sal_Int32 nPageCount = mrBase.GetDocument()->GetSdPageCount(PK_STANDARD);
StringRangeEnumerator aRangeEnum(
diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx
index f48593f909cd..cea72846ce1d 100644
--- a/sd/source/ui/view/ViewShellImplementation.cxx
+++ b/sd/source/ui/view/ViewShellImplementation.cxx
@@ -104,7 +104,6 @@ void ViewShell::Implementation::ProcessModifyPageSlot (
sal_Bool bHandoutMode = sal_False;
SdPage* pHandoutMPage = NULL;
String aNewName;
- String aOldName;
AutoLayout aNewAutoLayout;
diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx
index c22f64aac80a..2df51ea80499 100644
--- a/sd/source/ui/view/ViewShellManager.cxx
+++ b/sd/source/ui/view/ViewShellManager.cxx
@@ -1065,7 +1065,6 @@ void ViewShellManager::Implementation::CreateShells (void)
::osl::MutexGuard aGuard (maMutex);
// Iterate over all view shells.
- ShellStack aShellStack;
ActiveShellList::reverse_iterator iShell;
for (iShell=maActiveViewShells.rbegin(); iShell!=maActiveViewShells.rend(); ++iShell)
{
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index e7b82835a827..1a9d5870c68e 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -116,7 +116,6 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent
// to fix fdo#45260
const Rectangle aMarkRect( GetAllMarkedRect() );
TransferableObjectDescriptor aObjDesc;
- String aDisplayName;
SdrOle2Obj* pSdrOleObj = NULL;
SdrPageView* pPgView = GetSdrPageView();
SdPage* pOldPage = pPgView ? ( (SdPage*) pPgView->GetPage() ) : NULL;
diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx
index 7701fa8433f5..0a9c9de0011a 100644
--- a/sd/source/ui/view/viewoverlaymanager.cxx
+++ b/sd/source/ui/view/viewoverlaymanager.cxx
@@ -374,7 +374,6 @@ BitmapEx ChangePlaceholderTag::createOverlayImage( int nHighlight )
SdrObject* pPlaceholder = mxPlaceholderObj.get();
SmartTagReference xThis( this );
const Rectangle& rSnapRect = pPlaceholder->GetSnapRect();
- const Point aPoint;
OutputDevice* pDev = mrView.GetFirstOutputDevice();
if( pDev == 0 )