summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
Diffstat (limited to 'sd')
-rw-r--r--sd/source/filter/html/htmlex.cxx2
-rw-r--r--sd/source/filter/html/htmlex.hxx2
-rw-r--r--sd/source/filter/html/sdhtmlfilter.cxx6
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx1
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx1
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx1
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx1
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx1
-rw-r--r--sd/source/ui/table/TableDesignPane.cxx1
-rw-r--r--sd/source/ui/table/TableDesignPane.hxx1
-rw-r--r--sd/source/ui/view/DocumentRenderer.cxx1
11 files changed, 1 insertions, 17 deletions
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 389ca500571d..897f26851024 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -345,11 +345,9 @@ void lclAppendStyle(OUStringBuffer& aBuffer, const OUString& aTag, const OUStrin
HtmlExport::HtmlExport(
const OUString& aPath,
const Sequence< PropertyValue >& rParams,
- const OUString& rFilterOptions,
SdDrawDocument* pExpDoc,
sd::DrawDocShell* pDocShell )
: maPath( aPath ),
- maFilterOptions( rFilterOptions ),
mpDoc(pExpDoc),
mpDocSh( pDocShell ),
meEC(NULL),
diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx
index e5e18c086dea..bb633fbade2a 100644
--- a/sd/source/filter/html/htmlex.hxx
+++ b/sd/source/filter/html/htmlex.hxx
@@ -85,7 +85,6 @@ class HtmlExport
std::vector< SdPage* > maNotesPages;
OUString maPath;
- OUString maFilterOptions;
SdDrawDocument* mpDoc;
::sd::DrawDocShell* mpDocSh;
@@ -230,7 +229,6 @@ class HtmlExport
public:
HtmlExport(const OUString& aPath,
const css::uno::Sequence<css::beans::PropertyValue>& rParams,
- const OUString& rFilterOptions,
SdDrawDocument* pExpDoc,
sd::DrawDocShell* pDocShell);
diff --git a/sd/source/filter/html/sdhtmlfilter.cxx b/sd/source/filter/html/sdhtmlfilter.cxx
index 524362204768..aab3d6341fea 100644
--- a/sd/source/filter/html/sdhtmlfilter.cxx
+++ b/sd/source/filter/html/sdhtmlfilter.cxx
@@ -57,17 +57,13 @@ bool SdHTMLFilter::Export()
SfxItemSet *pSet = mrMedium.GetItemSet();
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aParams;
- OUString sFilterOptions;
const SfxPoolItem* pItem;
if ( pSet->GetItemState( SID_FILTER_DATA, false, &pItem ) == SfxItemState::SET )
((SfxUnoAnyItem*)pItem)->GetValue() >>= aParams;
- if (pSet->GetItemState(SID_FILE_FILTEROPTIONS, true, &pItem) == SfxItemState::SET)
- sFilterOptions = ((SfxStringItem*)pItem)->GetValue();
-
- HtmlExport aExport(mrMedium.GetName(), aParams, sFilterOptions, &mrDocument, &mrDocShell);
+ HtmlExport aExport(mrMedium.GetName(), aParams, &mrDocument, &mrDocShell);
return true;
}
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx
index 0420b378d773..8c12d481e288 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx
@@ -71,7 +71,6 @@ SelectionManager::SelectionManager (SlideSorter& rSlideSorter)
mbIsMakeSelectionVisiblePending(true),
mnInsertionPosition(-1),
mnAnimationId(Animator::NotAnAnimationId),
- maRequestedTopLeft(),
mpPageInsertionListener(),
mpSelectionObserver(new SelectionObserver(rSlideSorter))
{
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx
index c9288c0021ad..2af4e0334cbf 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx
@@ -57,7 +57,6 @@ void SelectionObserver::Context::Abort(void)
SelectionObserver::SelectionObserver (SlideSorter& rSlideSorter)
: mrSlideSorter(rSlideSorter),
- mpDocument(mrSlideSorter.GetModel().GetDocument()),
mbIsOvservationActive(false),
maInsertedPages(),
maDeletedPages()
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx
index e546b205519e..5d5f235fa63e 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx
@@ -132,7 +132,6 @@ private:
and left of the visible area to maRequestedTopLeft.
*/
Animator::AnimationId mnAnimationId;
- Point maRequestedTopLeft;
class PageInsertionListener;
::boost::scoped_ptr<PageInsertionListener> mpPageInsertionListener;
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx
index 8c01b4737dad..30079a495cbd 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx
@@ -65,7 +65,6 @@ public:
private:
SlideSorter& mrSlideSorter;
- SdDrawDocument* mpDocument;
bool mbIsOvservationActive;
::std::vector<const SdPage*> maInsertedPages;
diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
index 054dbbdbb668..de7d76f5fb9e 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
@@ -84,7 +84,6 @@ private:
Bitmap maMouseOverFocusedBackground;
Bitmap maMouseOverSelectedBackground;
Bitmap maMouseOverSelectedAndFocusedBackground;
- Size maSize;
void PaintBackground (
PageObjectLayouter *pPageObjectLayouter,
diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx
index 629556dfbb68..5be0d543cdd1 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -91,7 +91,6 @@ static const OUString* getPropertyNames()
TableDesignWidget::TableDesignWidget( VclBuilderContainer* pParent, ViewShellBase& rBase, bool bModal )
: mrBase(rBase)
- , msTableTemplate("TableTemplate")
, mbModal(bModal)
, mbStyleSelected(false)
, mbOptionsChanged(false)
diff --git a/sd/source/ui/table/TableDesignPane.hxx b/sd/source/ui/table/TableDesignPane.hxx
index 7175a7bcf857..0fb256cc103c 100644
--- a/sd/source/ui/table/TableDesignPane.hxx
+++ b/sd/source/ui/table/TableDesignPane.hxx
@@ -91,7 +91,6 @@ private:
private:
ViewShellBase& mrBase;
- const OUString msTableTemplate;
TableValueSet* m_pValueSet;
CheckBox* m_aCheckBoxes[CB_COUNT];
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 5af3c448ed7d..1da275481f44 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -353,7 +353,6 @@ namespace {
}
private:
- Any maDialog;
::std::vector<beans::PropertyValue> maProperties;
::std::vector<sal_Int32> maSlidesPerPage;
bool mbImpress;