[Libreoffice-commits] core.git: 2 commits - forms/source formula/source fpicker/source sd/inc sd/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Feb 23 10:55:07 UTC 2019
forms/source/component/ComboBox.cxx | 1
forms/source/component/ComboBox.hxx | 3 -
forms/source/xforms/submission.cxx | 1
forms/source/xforms/submission/submission.hxx | 5 --
formula/source/ui/dlg/formula.cxx | 6 --
fpicker/source/office/OfficeFolderPicker.cxx | 3 -
fpicker/source/office/OfficeFolderPicker.hxx | 3 -
sd/inc/TransitionPreset.hxx | 1
sd/source/core/TransitionPreset.cxx | 1
sd/source/filter/html/HtmlOptionsDialog.cxx | 4 -
sd/source/filter/ppt/pptin.cxx | 2
sd/source/filter/ppt/pptin.hxx | 1
sd/source/ui/dlg/RemoteDialogClientBox.cxx | 11 -----
sd/source/ui/dlg/RemoteDialogClientBox.hxx | 18 --------
sd/source/ui/dlg/docprev.cxx | 21 ----------
sd/source/ui/framework/factories/BasicPaneFactory.cxx | 1
sd/source/ui/framework/factories/BasicPaneFactory.hxx | 1
sd/source/ui/framework/factories/PresentationFactory.cxx | 11 -----
sd/source/ui/inc/docprev.hxx | 3 -
sd/source/ui/inc/framework/PresentationFactory.hxx | 2
sd/source/ui/presenter/PresenterTextView.cxx | 6 --
sd/source/ui/slideshow/showwin.cxx | 5 --
sd/source/ui/slideshow/showwindow.hxx | 2
sd/source/ui/slideshow/slideshowviewimpl.cxx | 1
sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx | 5 --
sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx | 1
sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx | 2
27 files changed, 5 insertions(+), 116 deletions(-)
New commits:
commit cd383000f84b8b75ffe15d1cd1bb8d5a14a71685
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Feb 22 15:54:49 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sat Feb 23 11:54:54 2019 +0100
loplugin:unusedfields in forms..fpicker
Change-Id: Ifd3afbf276100e3cef802bbcc0792b43a9cd84f8
Reviewed-on: https://gerrit.libreoffice.org/68228
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx
index ce94ba6d846d..06f5f4234c0d 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -163,7 +163,6 @@ void OComboBoxModel::disposing()
OBoundControlModel::disposing();
OEntryListHelper::disposing();
OErrorBroadcaster::disposing();
- m_xFormatter = nullptr;
}
diff --git a/forms/source/component/ComboBox.hxx b/forms/source/component/ComboBox.hxx
index 06b77f762d5f..dd5db15a010e 100644
--- a/forms/source/component/ComboBox.hxx
+++ b/forms/source/component/ComboBox.hxx
@@ -54,9 +54,6 @@ class OComboBoxModel final
css::uno::Any m_aLastKnownValue;
css::uno::Sequence<OUString> m_aDesignModeStringItems;
- // upon loading, in some cases we reset fill our string item list ourself. We don't want
- // to lose the user's items then, so we remember them here.
- css::uno::Reference< css::util::XNumberFormatter> m_xFormatter;
css::form::ListSourceType m_eListSourceType; // ListSource's type
bool m_bEmptyIsNull; // Empty string is interpreted as NULL
diff --git a/forms/source/xforms/submission.cxx b/forms/source/xforms/submission.cxx
index 08e04b8b2a33..54cc757db748 100644
--- a/forms/source/xforms/submission.cxx
+++ b/forms/source/xforms/submission.cxx
@@ -255,7 +255,6 @@ bool Submission::doSubmit( const Reference< XInteractionHandler >& xHandler )
return false;
}
- xSubmission->setEncoding(getEncoding());
CSubmission::SubmissionResult aResult = xSubmission->submit( xHandler );
if (aResult == CSubmission::SUCCESS)
diff --git a/forms/source/xforms/submission/submission.hxx b/forms/source/xforms/submission/submission.hxx
index 7d726392c736..77d59b1f740e 100644
--- a/forms/source/xforms/submission/submission.hxx
+++ b/forms/source/xforms/submission/submission.hxx
@@ -110,7 +110,6 @@ protected:
css::uno::Reference< css::xml::dom::XDocumentFragment > m_aFragment;
css::uno::Reference< css::io::XInputStream > m_aResultStream;
css::uno::Reference< css::uno::XComponentContext > m_xContext;
- OUString m_aEncoding;
::std::unique_ptr< CSerialization > createSerialization(const css::uno::Reference< css::task::XInteractionHandler >& aHandler
,css::uno::Reference<css::ucb::XCommandEnvironment>& _rOutEnv);
@@ -129,10 +128,6 @@ public:
virtual ~CSubmission() {}
- void setEncoding(const OUString& aEncoding)
- {
- m_aEncoding = aEncoding;
- }
virtual SubmissionResult submit(const css::uno::Reference< css::task::XInteractionHandler >& ) = 0;
SubmissionResult replace(const OUString&, const css::uno::Reference< css::xml::dom::XDocument >&, const css::uno::Reference< css::frame::XFrame>&);
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index d1052c3a4142..19d41ee211d7 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -144,8 +144,6 @@ public:
mutable uno::Sequence< sheet::FormulaToken > m_aSeparatorsOpCodes;
mutable uno::Sequence< sheet::FormulaOpCodeMapEntry > m_aFunctionOpCodes;
mutable const sheet::FormulaOpCodeMapEntry* m_pFunctionOpCodesEnd;
- mutable uno::Sequence< sheet::FormulaOpCodeMapEntry > m_aUnaryOpCodes;
- mutable uno::Sequence< sheet::FormulaOpCodeMapEntry > m_aBinaryOpCodes;
::std::map<const FormulaToken*, sheet::FormulaToken> m_aTokenMap;
IFormulaEditorHelper* m_pHelper;
VclPtr<Dialog> m_pParent;
@@ -403,10 +401,6 @@ void FormulaDlg_Impl::InitFormulaOpCodeMapper()
m_aFunctionOpCodes = m_xOpCodeMapper->getAvailableMappings( sheet::FormulaLanguage::ODFF, sheet::FormulaMapGroup::FUNCTIONS);
m_pFunctionOpCodesEnd = m_aFunctionOpCodes.getConstArray() + m_aFunctionOpCodes.getLength();
- m_aUnaryOpCodes = m_xOpCodeMapper->getAvailableMappings( sheet::FormulaLanguage::ODFF, sheet::FormulaMapGroup::UNARY_OPERATORS);
-
- m_aBinaryOpCodes = m_xOpCodeMapper->getAvailableMappings( sheet::FormulaLanguage::ODFF, sheet::FormulaMapGroup::BINARY_OPERATORS);
-
uno::Sequence< OUString > aArgs(3);
aArgs[TOKEN_OPEN] = "(";
aArgs[TOKEN_CLOSE] = ")";
diff --git a/fpicker/source/office/OfficeFolderPicker.cxx b/fpicker/source/office/OfficeFolderPicker.cxx
index b95f0f972980..2c049ed605f0 100644
--- a/fpicker/source/office/OfficeFolderPicker.cxx
+++ b/fpicker/source/office/OfficeFolderPicker.cxx
@@ -141,9 +141,8 @@ OUString SAL_CALL SvtFolderPicker::getDirectory()
return OUString();
}
-void SAL_CALL SvtFolderPicker::setDescription( const OUString& aDescription )
+void SAL_CALL SvtFolderPicker::setDescription( const OUString& )
{
- m_aDescription = aDescription;
}
void SvtFolderPicker::cancel()
diff --git a/fpicker/source/office/OfficeFolderPicker.hxx b/fpicker/source/office/OfficeFolderPicker.hxx
index 7a44881c05f8..790dff6e9048 100644
--- a/fpicker/source/office/OfficeFolderPicker.hxx
+++ b/fpicker/source/office/OfficeFolderPicker.hxx
@@ -40,8 +40,6 @@ typedef
class SvtFolderPicker: public SvtFolderPicker_Base
{
private:
- OUString m_aDescription;
-
css::uno::Reference< css::ui::dialogs::XDialogClosedListener >
m_xListener;
@@ -55,7 +53,6 @@ public:
// XFolderPicker2 functions
-
virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory ) override;
virtual OUString SAL_CALL getDisplayDirectory() override;
virtual OUString SAL_CALL getDirectory() override;
commit a25ee52f6861796853cb3ebf12e49834222bcba0
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Feb 22 13:17:53 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sat Feb 23 11:54:44 2019 +0100
loplugin:unusedfields in sd
Change-Id: I33d2559cf193489141c9a7047c09d3b5660e7c80
Reviewed-on: https://gerrit.libreoffice.org/68223
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/sd/inc/TransitionPreset.hxx b/sd/inc/TransitionPreset.hxx
index d4c5381c7039..14518e51b661 100644
--- a/sd/inc/TransitionPreset.hxx
+++ b/sd/inc/TransitionPreset.hxx
@@ -62,7 +62,6 @@ private:
bool mbDirection;
sal_Int32 mnFadeColor;
OUString maPresetId;
- OUString maGroupId;
OUString maSetId;
OUString maSetLabel;
OUString maVariantLabel;
diff --git a/sd/source/core/TransitionPreset.cxx b/sd/source/core/TransitionPreset.cxx
index 7894b5c77561..b6c8271ee097 100644
--- a/sd/source/core/TransitionPreset.cxx
+++ b/sd/source/core/TransitionPreset.cxx
@@ -137,7 +137,6 @@ bool TransitionPreset::importTransitionsFile( TransitionPresetList& rList,
if( xGroupNode.is() )
{
- pPreset->maGroupId = sGroup;
xGroupNode->getByName( "Label" ) >>= sGroup;
if( !sVariant.isEmpty() )
{
diff --git a/sd/source/filter/html/HtmlOptionsDialog.cxx b/sd/source/filter/html/HtmlOptionsDialog.cxx
index 9135e4016732..989015375a3f 100644
--- a/sd/source/filter/html/HtmlOptionsDialog.cxx
+++ b/sd/source/filter/html/HtmlOptionsDialog.cxx
@@ -49,7 +49,6 @@ class SdHtmlOptionsDialog : public cppu::WeakImplHelper
{
Sequence< PropertyValue > maMediaDescriptor;
Sequence< PropertyValue > maFilterDataSequence;
- OUString aDialogTitle;
DocumentType meDocType;
public:
@@ -152,9 +151,8 @@ void SdHtmlOptionsDialog::setPropertyValues( const Sequence< PropertyValue > & a
}
// XExecutableDialog
-void SdHtmlOptionsDialog::setTitle( const OUString& aTitle )
+void SdHtmlOptionsDialog::setTitle( const OUString& )
{
- aDialogTitle = aTitle;
}
sal_Int16 SdHtmlOptionsDialog::execute()
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 957f052925c7..057e15e1908f 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -159,7 +159,6 @@ ImplSdPPTImport::ImplSdPPTImport( SdDrawDocument* pDocument, SotStorage& rStorag
, mnFilterOptions(0)
, mpDoc(pDocument)
, mePresChange(PRESCHANGE_MANUAL)
- , mnBackgroundLayerID(0)
, mnBackgroundObjectsLayerID(0)
{
if ( !bOk )
@@ -230,7 +229,6 @@ bool ImplSdPPTImport::Import()
const_cast<EditEngine&>(rOutl.GetEditEngine()).SetControlWord( nControlWord );
SdrLayerAdmin& rAdmin = mpDoc->GetLayerAdmin();
- mnBackgroundLayerID = rAdmin.GetLayerID( sUNO_LayerName_background );
mnBackgroundObjectsLayerID = rAdmin.GetLayerID( sUNO_LayerName_background_objects );
::sd::DrawDocShell* pDocShell = mpDoc->GetDocSh();
diff --git a/sd/source/filter/ppt/pptin.hxx b/sd/source/filter/ppt/pptin.hxx
index e63bd323e9af..4843bdf13507 100644
--- a/sd/source/filter/ppt/pptin.hxx
+++ b/sd/source/filter/ppt/pptin.hxx
@@ -52,7 +52,6 @@ class ImplSdPPTImport : public SdrPowerPointImport
sal_uInt32 mnFilterOptions;
SdDrawDocument* mpDoc;
PresChange mePresChange;
- SdrLayerID mnBackgroundLayerID;
SdrLayerID mnBackgroundObjectsLayerID;
tAnimationMap maAnimations;
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
index 476e4192d549..10cb9b687372 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
@@ -52,13 +52,6 @@ ClientBoxEntry::ClientBoxEntry(const std::shared_ptr<ClientInfo>& pClientInfo)
ClientBoxEntry::~ClientBoxEntry()
{}
-void ClientRemovedListener::disposing( lang::EventObject const & )
-{}
-
-ClientRemovedListener::~ClientRemovedListener()
-{
-}
-
// ClientBox
ClientBox::ClientBox( vcl::Window* pParent, WinBits nStyle ) :
@@ -98,8 +91,6 @@ ClientBox::ClientBox( vcl::Window* pParent, WinBits nStyle ) :
else
SetBackground( rStyleSettings.GetFieldColor() );
- m_xRemoveListener = new ClientRemovedListener( this );
-
populateEntries();
Show();
@@ -121,8 +112,6 @@ void ClientBox::dispose()
{
m_vEntries.clear();
- m_xRemoveListener.clear();
-
m_aPinBox.disposeAndClear();
m_aDeauthoriseButton.disposeAndClear();
m_aScrollBar.disposeAndClear();
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.hxx b/sd/source/ui/dlg/RemoteDialogClientBox.hxx
index ffd49436817f..78664e516151 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.hxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.hxx
@@ -60,22 +60,6 @@ struct ClientBoxEntry
// class ExtensionBox_Impl
class ClientBox;
-class ClientRemovedListener : public ::cppu::WeakImplHelper<css::lang::XEventListener>
-{
- VclPtr<ClientBox> m_pParent;
-
-public:
-
- explicit ClientRemovedListener(ClientBox *pParent)
- {
- m_pParent = pParent;
- }
- virtual ~ClientRemovedListener() override;
-
- // XEventListener
- virtual void SAL_CALL disposing(css::lang::EventObject const & evt) override;
-};
-
class ClientBox : public Control
{
bool m_bHasScrollBar : 1;
@@ -95,8 +79,6 @@ class ClientBox : public Control
VclPtr<ScrollBar> m_aScrollBar;
- rtl::Reference< ClientRemovedListener > m_xRemoveListener;
-
//This mutex is used for synchronizing access to m_vEntries.
//Currently it is used to synchronize adding, removing entries and
//functions like getItemName, getItemDescription, etc. to prevent
diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx
index 8b528baa2d36..3513f0e63621 100644
--- a/sd/source/ui/dlg/docprev.cxx
+++ b/sd/source/ui/dlg/docprev.cxx
@@ -114,28 +114,11 @@ void SdDocPreviewWin::Paint( vcl::RenderContext& /*rRenderContext*/, const ::too
}
}
-void SdDocPreviewWin::updateViewSettings()
-{
- SvtAccessibilityOptions aAccOptions;
- bool bUseWhiteColor = !aAccOptions.GetIsForPagePreviews() && GetSettings().GetStyleSettings().GetHighContrastMode();
- if( bUseWhiteColor )
- {
- maDocumentColor = COL_WHITE;
- }
- else
- {
- svtools::ColorConfig aColorConfig;
- maDocumentColor = aColorConfig.GetColorValue( svtools::DOCCOLOR ).nColor;
- }
-
- Invalidate();
-}
-
void SdDocPreviewWin::Notify(SfxBroadcaster&, const SfxHint& rHint)
{
if( rHint.GetId() == SfxHintId::ColorsChanged )
{
- updateViewSettings();
+ Invalidate();
}
}
void SdDocPreviewWin::DataChanged( const DataChangedEvent& rDCEvt )
@@ -144,7 +127,7 @@ void SdDocPreviewWin::DataChanged( const DataChangedEvent& rDCEvt )
if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) )
{
- updateViewSettings();
+ Invalidate();
}
}
diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
index 402389db7bf0..166c5d38618f 100644
--- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
@@ -133,7 +133,6 @@ void SAL_CALL BasicPaneFactory::initialize (const Sequence<Any>& aArguments)
{
// Get the XController from the first argument.
Reference<frame::XController> xController (aArguments[0], UNO_QUERY_THROW);
- mxControllerWeak = xController;
// Tunnel through the controller to obtain access to the ViewShellBase.
try
diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.hxx b/sd/source/ui/framework/factories/BasicPaneFactory.hxx
index 28f7fa870f65..69d57fe0836f 100644
--- a/sd/source/ui/framework/factories/BasicPaneFactory.hxx
+++ b/sd/source/ui/framework/factories/BasicPaneFactory.hxx
@@ -93,7 +93,6 @@ private:
css::uno::Reference<css::uno::XComponentContext> mxComponentContext;
css::uno::WeakReference<css::drawing::framework::XConfigurationController>
mxConfigurationControllerWeak;
- css::uno::WeakReference<css::frame::XController> mxControllerWeak;
ViewShellBase* mpViewShellBase;
class PaneDescriptor;
class PaneContainer;
diff --git a/sd/source/ui/framework/factories/PresentationFactory.cxx b/sd/source/ui/framework/factories/PresentationFactory.cxx
index 1f962160bedd..f5c45fab0a6b 100644
--- a/sd/source/ui/framework/factories/PresentationFactory.cxx
+++ b/sd/source/ui/framework/factories/PresentationFactory.cxx
@@ -90,19 +90,8 @@ static const char gsPresentationViewURL[] = "private:resource/view/Presentation"
PresentationFactory::PresentationFactory (
const Reference<frame::XController>& rxController)
: PresentationFactoryInterfaceBase(MutexOwner::maMutex),
- mxConfigurationController(),
mxController(rxController)
{
- try
- {
- // Get the XController from the first argument.
- Reference<XControllerManager> xControllerManager(rxController, UNO_QUERY_THROW);
- mxConfigurationController = xControllerManager->getConfigurationController();
- }
- catch (RuntimeException&)
- {
- DBG_UNHANDLED_EXCEPTION("sd");
- }
}
PresentationFactory::~PresentationFactory()
diff --git a/sd/source/ui/inc/docprev.hxx b/sd/source/ui/inc/docprev.hxx
index d13ddea47abe..e2700ede7574 100644
--- a/sd/source/ui/inc/docprev.hxx
+++ b/sd/source/ui/inc/docprev.hxx
@@ -34,7 +34,6 @@ namespace sd {
class SD_DLLPUBLIC SdDocPreviewWin final : public Control, public SfxListener
{
- Color maDocumentColor;
rtl::Reference< sd::SlideShow > mxSlideShow;
virtual void Paint( vcl::RenderContext& rRenderContext, const ::tools::Rectangle& rRect ) override;
@@ -45,8 +44,6 @@ class SD_DLLPUBLIC SdDocPreviewWin final : public Control, public SfxListener
virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override;
- void updateViewSettings();
-
public:
SdDocPreviewWin( vcl::Window* pParent, const WinBits nStyle );
virtual ~SdDocPreviewWin() override;
diff --git a/sd/source/ui/inc/framework/PresentationFactory.hxx b/sd/source/ui/inc/framework/PresentationFactory.hxx
index 48971540a148..e9f10b73794c 100644
--- a/sd/source/ui/inc/framework/PresentationFactory.hxx
+++ b/sd/source/ui/inc/framework/PresentationFactory.hxx
@@ -72,8 +72,6 @@ public:
const css::lang::EventObject& rEventObject) override;
private:
- css::uno::Reference<css::drawing::framework::XConfigurationController>
- mxConfigurationController;
css::uno::Reference<css::frame::XController> mxController;
/// @throws css::lang::DisposedException
diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx
index 8b9a7248e088..0ebdd603ae28 100644
--- a/sd/source/ui/presenter/PresenterTextView.cxx
+++ b/sd/source/ui/presenter/PresenterTextView.cxx
@@ -86,8 +86,6 @@ private:
std::unique_ptr<EditEngine> mpEditEngine;
SfxItemPool* mpEditEngineItemPool;
Size maSize;
- Color maBackgroundColor;
- Color maTextColor;
OUString msText;
sal_Int32 mnTop;
sal_Int32 mnTotalHeight;
@@ -218,8 +216,6 @@ PresenterTextView::Implementation::Implementation()
mpOutputDevice(VclPtr<VirtualDevice>::Create(*Application::GetDefaultDevice(), DeviceFormat::DEFAULT, DeviceFormat::DEFAULT)),
mpEditEngineItemPool(EditEngine::CreatePool()),
maSize(100,100),
- maBackgroundColor(0xffffffff),
- maTextColor(0x00000000),
msText(),
mnTop(0),
mnTotalHeight(-1)
@@ -310,7 +306,6 @@ void PresenterTextView::Implementation::SetSize (const Size aSize)
void PresenterTextView::Implementation::SetBackgroundColor (const Color aColor)
{
- maBackgroundColor = aColor;
mxBitmap = nullptr;
DBG_ASSERT(mpEditEngine!=nullptr, "EditEngine missing");
@@ -322,7 +317,6 @@ void PresenterTextView::Implementation::SetBackgroundColor (const Color aColor)
void PresenterTextView::Implementation::SetTextColor (const Color aColor)
{
- maTextColor = aColor;
mxBitmap = nullptr;
DBG_ASSERT(mpEditEngineItemPool!=nullptr, "EditEngineItemPool missing");
diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx
index 952dcd960478..1b458f4ba98f 100644
--- a/sd/source/ui/slideshow/showwin.cxx
+++ b/sd/source/ui/slideshow/showwin.cxx
@@ -580,11 +580,6 @@ IMPL_LINK( ShowWindow, EventHdl, VclWindowEvent&, rEvent, void )
}
}
-void ShowWindow::SetPresentationArea( const ::tools::Rectangle& rPresArea )
-{
- maPresArea = rPresArea;
-}
-
void ShowWindow::DeleteWindowFromPaintView()
{
if( mpViewShell->GetView() )
diff --git a/sd/source/ui/slideshow/showwindow.hxx b/sd/source/ui/slideshow/showwindow.hxx
index fc49a953b24b..b3436d5d8154 100644
--- a/sd/source/ui/slideshow/showwindow.hxx
+++ b/sd/source/ui/slideshow/showwindow.hxx
@@ -58,7 +58,6 @@ public:
const Color& GetBlankColor() const { return maShowBackground.GetColor(); }
void SetPreviewMode();
- void SetPresentationArea( const ::tools::Rectangle& rPresArea );
void SetMouseAutoHide( bool bMouseAutoHide ) { mbMouseAutoHide = bMouseAutoHide; }
@@ -96,7 +95,6 @@ private:
sal_Int32 mnRestartPageIndex;
ShowWindowMode meShowWindowMode;
bool mbShowNavigatorAfterSpecialMode;
- ::tools::Rectangle maPresArea;
bool mbMouseAutoHide;
bool mbMouseCursorHidden;
sal_uInt64 mnFirstMouseMove;
diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx
index fd54279e18ed..60ec12969842 100644
--- a/sd/source/ui/slideshow/slideshowviewimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx
@@ -375,7 +375,6 @@ geometry::AffineMatrix2D SAL_CALL SlideShowView::getTransformation( )
mTranslationOffset.Width = aOutputOffset.X();
maPresentationArea = ::tools::Rectangle( aOutputOffset, aOutputSize );
- mrOutputWindow.SetPresentationArea( maPresentationArea );
// scale presentation into available window rect (minus 10%); center in the window
const basegfx::B2DHomMatrix aMatrix(basegfx::utils::createScaleTranslateB2DHomMatrix(
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx
index 6043686a2d06..d276384985c9 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx
@@ -144,11 +144,9 @@ class PngCompression::PngReplacement : public BitmapReplacement
public:
void* mpData;
sal_Int32 mnDataSize;
- Size maImageSize;
PngReplacement()
: mpData(nullptr),
- mnDataSize(0),
- maImageSize(0,0)
+ mnDataSize(0)
{}
virtual ~PngReplacement()
{
@@ -167,7 +165,6 @@ std::shared_ptr<BitmapReplacement> PngCompression::Compress (const BitmapEx& rBi
aWriter.Write(aStream);
PngReplacement* pResult = new PngReplacement();
- pResult->maImageSize = rBitmap.GetSizePixel();
pResult->mnDataSize = aStream.Tell();
pResult->mpData = new char[pResult->mnDataSize];
memcpy(pResult->mpData, aStream.GetData(), pResult->mnDataSize);
diff --git a/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx b/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx
index 8b3a408ca45f..18ad49116d94 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx
@@ -79,7 +79,6 @@ private:
// Center of the insertion indicator.
Point maLocation;
BitmapEx maIcon;
- Point maIconOffset;
std::unique_ptr<FramePainter> mpShadowPainter;
Point PaintRepresentatives (
diff --git a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
index 60a4182afe3b..8af23d854945 100644
--- a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
+++ b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
@@ -70,7 +70,6 @@ InsertionIndicatorOverlay::InsertionIndicatorOverlay (SlideSorter& rSlideSorter)
mpLayerInvalidator(),
maLocation(),
maIcon(),
- maIconOffset(),
mpShadowPainter(
new FramePainter(mrSlideSorter.GetTheme()->GetIcon(Theme::Icon_RawInsertShadow)))
{
@@ -130,7 +129,6 @@ void InsertionIndicatorOverlay::Create (
Size aIconSize(
aPreviewSize.Width() + 2 * gnShadowBorder + nCount*nOffset,
aPreviewSize.Height() + 2 * gnShadowBorder + nCount*nOffset);
- maIconOffset = Point(gnShadowBorder, gnShadowBorder);
// Create virtual devices for bitmap and mask whose bitmaps later be
// combined to form the BitmapEx of the icon.
More information about the Libreoffice-commits
mailing list