[Libreoffice-commits] .: sd/inc sd/source
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Jun 9 02:58:04 PDT 2011
sd/inc/drawdoc.hxx | 24 ------------------------
sd/source/core/drawdoc2.cxx | 14 --------------
sd/source/filter/ppt/pptin.cxx | 12 ------------
sd/source/ui/app/sdmod2.cxx | 6 ------
sd/source/ui/view/ViewShellBase.cxx | 8 --------
sd/source/ui/view/frmview.cxx | 7 -------
sd/source/ui/view/viewshe3.cxx | 2 --
7 files changed, 73 deletions(-)
New commits:
commit 97896d76c26308340722dd18bc459bc4b050a80b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jun 9 10:22:42 2011 +0100
Resolves: fdo#34723 unused variables and arguments
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index ad9e72e..c7bfd8c 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -538,16 +538,6 @@ public:
@param sNotesPageName
Name of the standard page. An empty string leads to using an
automatically created name.
- @param eStandardLayout
- Layout to use for the new standard page. Note that this layout
- is not used when the given <argument>pCurrentPage</argument> is
- not a standard page. In this case the layout is taken from the
- standard page associated with <argument>pCurrentPage</argument>.
- @param eNotesLayout
- Layout to use for the new notes page. Note that this layout
- is not used when the given <argument>pCurrentPage</argument> is
- not a notes page. In this case the layout is taken from the
- notes page associated with <argument>pCurrentPage</argument>.
@param bIsPageBack
This flag indicates whether to show the background shape.
@param bIsPageObj
@@ -565,8 +555,6 @@ public:
PageKind ePageKind,
const String& sStandardPageName,
const String& sNotesPageName,
- AutoLayout eStandardLayout,
- AutoLayout eNotesLayout,
sal_Bool bIsPageBack,
sal_Bool bIsPageObj,
const sal_Int32 nInsertPosition = -1);
@@ -609,16 +597,6 @@ private:
@param sNotesPageName
Name of the standard page. An empty string leads to using an
automatically created name.
- @param eStandardLayout
- Layout to use for the new standard page. Note that this layout
- is not used when the given <argument>pCurrentPage</argument> is
- not a standard page. In this case the layout is taken from the
- standard page associated with <argument>pCurrentPage</argument>.
- @param eNotesLayout
- Layout to use for the new notes page. Note that this layout
- is not used when the given <argument>pCurrentPage</argument> is
- not a notes page. In this case the layout is taken from the
- notes page associated with <argument>pCurrentPage</argument>.
@param bIsPageBack
This flag indicates whether to show the background shape.
@param bIsPageObj
@@ -640,8 +618,6 @@ private:
PageKind ePageKind,
const String& sStandardPageName,
const String& sNotesPageName,
- AutoLayout eStandardLayout,
- AutoLayout eNotesLayout,
sal_Bool bIsPageBack,
sal_Bool bIsPageObj,
SdPage* pStandardPage,
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index 9956618..ce052d1 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -1377,8 +1377,6 @@ sal_uInt16 SdDrawDocument::CreatePage (
ePageKind,
sStandardPageName,
sNotesPageName,
- eStandardLayout,
- eNotesLayout,
bIsPageBack,
bIsPageObj,
pStandardPage,
@@ -1402,14 +1400,10 @@ sal_uInt16 SdDrawDocument::DuplicatePage (sal_uInt16 nPageNum)
sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False);
SetOfByte aVisibleLayers = pActualPage->TRG_GetMasterPageVisibleLayers();
- // Get layout from current page.
- AutoLayout eAutoLayout = pActualPage->GetAutoLayout();
-
return DuplicatePage (
pActualPage, ePageKind,
// No names for the new slides.
String(), String(),
- eAutoLayout, eAutoLayout,
aVisibleLayers.IsSet(aBckgrnd),
aVisibleLayers.IsSet(aBckgrndObj));
}
@@ -1422,8 +1416,6 @@ sal_uInt16 SdDrawDocument::DuplicatePage (
PageKind ePageKind,
const String& sStandardPageName,
const String& sNotesPageName,
- AutoLayout eStandardLayout,
- AutoLayout eNotesLayout,
sal_Bool bIsPageBack,
sal_Bool bIsPageObj,
const sal_Int32 nInsertPosition)
@@ -1457,8 +1449,6 @@ sal_uInt16 SdDrawDocument::DuplicatePage (
ePageKind,
sStandardPageName,
sNotesPageName,
- eStandardLayout,
- eNotesLayout,
bIsPageBack,
bIsPageObj,
pStandardPage,
@@ -1474,8 +1464,6 @@ sal_uInt16 SdDrawDocument::InsertPageSet (
PageKind ePageKind,
const String& sStandardPageName,
const String& sNotesPageName,
- AutoLayout eStandardLayout,
- AutoLayout eNotesLayout,
sal_Bool bIsPageBack,
sal_Bool bIsPageObj,
SdPage* pStandardPage,
@@ -1498,7 +1486,6 @@ sal_uInt16 SdDrawDocument::InsertPageSet (
nNotesPageNum = pPreviousNotesPage->GetPageNum() + 2;
pPreviousStandardPage = (SdPage*) GetPage(nNotesPageNum - 3);
nStandardPageNum = nNotesPageNum - 1;
- eStandardLayout = pPreviousStandardPage->GetAutoLayout();
}
else
{
@@ -1507,7 +1494,6 @@ sal_uInt16 SdDrawDocument::InsertPageSet (
pPreviousNotesPage = (SdPage*) GetPage(nStandardPageNum - 1);
nNotesPageNum = nStandardPageNum + 1;
aNotesPageName = aStandardPageName;
- eNotesLayout = pPreviousNotesPage->GetAutoLayout();
}
OSL_ASSERT(nNotesPageNum==nStandardPageNum+1);
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 1f982cf..5b7ba44 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -300,8 +300,6 @@ sal_Bool ImplSdPPTImport::Import()
if ( nSlideCount && pSection->GetProperty( PID_HEADINGPAIR, aPropItem ) )
{
sal_uInt32 nSlideTitleIndex = 0, nSlideTitleCount = 0;
- sal_uInt32 nFontIndex, nFontCount = 0;
- sal_uInt32 nDesignTemplateIndex, nDesignTemplateCount = 0;
sal_uInt32 i, nTemp, nEntryCount = 0;
String aUString;
@@ -326,16 +324,6 @@ sal_Bool ImplSdPPTImport::Import()
nSlideTitleCount = nTemp;
nSlideTitleIndex = nEntryCount;
}
- else if ( aUString.EqualsAscii("Fonts Used") )
- {
- nFontCount = nTemp;
- nFontIndex = nEntryCount;
- }
- else if ( aUString.EqualsAscii("Design Template") )
- {
- nDesignTemplateCount = nTemp;
- nDesignTemplateIndex = nEntryCount;
- }
nEntryCount += nTemp;
}
}
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index beda5b4..5873a97 100644
--- a/sd/source/ui/app/sdmod2.cxx
+++ b/sd/source/ui/app/sdmod2.cxx
@@ -554,7 +554,6 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const SfxItemSet& rSet )
sal_Bool bNewPrintOptions = sal_False;
sal_Bool bMiscOptions = sal_False;
- ::sd::FrameView* pFrameView = NULL;
::sd::DrawDocShell* pDocSh = PTR_CAST(::sd::DrawDocShell, SfxObjectShell::Current() );
SdDrawDocument* pDoc = NULL;
// Hier wird der DocType vom Optionsdialog gesetzt (nicht Dokument!)
@@ -568,11 +567,6 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const SfxItemSet& rSet )
{
pDoc = pDocSh->GetDoc();
- // Wenn der Optionsdialog zum Dokumenttyp identisch ist,
- // kann auch die FrameView mit uebergeben werden:
- if( pDoc && eDocType == pDoc->GetDocumentType() )
- pFrameView = pDocSh->GetFrameView();
-
pViewShell = pDocSh->GetViewShell();
if (pViewShell != NULL)
pViewShell->WriteFrameViewData();
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 75b7611..1f7fc6d 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -1545,7 +1545,6 @@ void ViewShellBase::Implementation::ProcessTaskPaneSlot (SfxRequest& rRequest)
{
// Set the visibility state of the toolpanel and one of its top
// level panels.
- sal_Bool bShowToolPanel = sal_True;
toolpanel::PanelId nPanelId (
toolpanel::PID_UNKNOWN);
bool bPanelIdGiven = false;
@@ -1554,13 +1553,6 @@ void ViewShellBase::Implementation::ProcessTaskPaneSlot (SfxRequest& rRequest)
const SfxItemSet* pArgs = rRequest.GetArgs();
if (pArgs)
{
- if ((pArgs->Count() == 1) || (pArgs->Count() == 2))
- {
- SFX_REQUEST_ARG (rRequest, pIsPanelVisible,
- SfxBoolItem, ID_VAL_ISVISIBLE, sal_False);
- if (pIsPanelVisible != NULL)
- bShowToolPanel = pIsPanelVisible->GetValue();
- }
if (pArgs->Count() == 2)
{
SFX_REQUEST_ARG (rRequest, pPanelId, SfxUInt32Item,
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index 895d70a..173e499 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -643,10 +643,6 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < :
sal_Int32 aSnapGridWidthYNum = GetSnapGridWidthY().GetNumerator();
sal_Int32 aSnapGridWidthYDom = GetSnapGridWidthY().GetDenominator();
- EditMode eStandardEditMode;
- EditMode eNotesEditMode;
- EditMode eHandoutEditMode;
-
const com::sun::star::beans::PropertyValue *pValue = rSequence.getConstArray();
for (sal_Int16 i = 0 ; i < nLength; i++, pValue++ )
{
@@ -751,7 +747,6 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < :
SdDrawDocument* pDoc = dynamic_cast< SdDrawDocument* >( GetModel() );
if( pDoc && pDoc->GetDocSh() && ( SFX_CREATE_MODE_EMBEDDED == pDoc->GetDocSh()->GetCreateMode() ) )
SetViewShEditMode( (EditMode)nInt32, PK_STANDARD );
- eStandardEditMode = (EditMode)nInt32;
}
}
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_EditModeNotes ) ) )
@@ -761,7 +756,6 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < :
SdDrawDocument* pDoc = dynamic_cast< SdDrawDocument* >( GetModel() );
if( pDoc && pDoc->GetDocSh() && ( SFX_CREATE_MODE_EMBEDDED == pDoc->GetDocSh()->GetCreateMode() ) )
SetViewShEditMode( (EditMode)nInt32, PK_NOTES );
- eNotesEditMode = (EditMode)nInt32;
}
}
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_EditModeHandout ) ) )
@@ -771,7 +765,6 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < :
SdDrawDocument* pDoc = dynamic_cast< SdDrawDocument* >( GetModel() );
if( pDoc && pDoc->GetDocSh() && ( SFX_CREATE_MODE_EMBEDDED == pDoc->GetDocSh()->GetCreateMode() ) )
SetViewShEditMode( (EditMode)nInt32, PK_HANDOUT );
- eHandoutEditMode = (EditMode)nInt32;
}
}
else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_VisibleAreaTop ) ) )
diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx
index 0a7d1d8..7d271a3 100644
--- a/sd/source/ui/view/viewshe3.cxx
+++ b/sd/source/ui/view/viewshe3.cxx
@@ -394,8 +394,6 @@ SdPage* ViewShell::CreateOrDuplicatePage (
ePageKind,
aStandardPageName,
aNotesPageName,
- eStandardLayout,
- eNotesLayout,
bIsPageBack,
bIsPageObj,
nInsertPosition);
More information about the Libreoffice-commits
mailing list