Kaydet (Commit) a25ee52f authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:unusedfields in sd

Change-Id: I33d2559cf193489141c9a7047c09d3b5660e7c80
Reviewed-on: https://gerrit.libreoffice.org/68223
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst ad2809b4
......@@ -62,7 +62,6 @@ private:
bool mbDirection;
sal_Int32 mnFadeColor;
OUString maPresetId;
OUString maGroupId;
OUString maSetId;
OUString maSetLabel;
OUString maVariantLabel;
......
......@@ -137,7 +137,6 @@ bool TransitionPreset::importTransitionsFile( TransitionPresetList& rList,
if( xGroupNode.is() )
{
pPreset->maGroupId = sGroup;
xGroupNode->getByName( "Label" ) >>= sGroup;
if( !sVariant.isEmpty() )
{
......
......@@ -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()
......
......@@ -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();
......
......@@ -52,7 +52,6 @@ class ImplSdPPTImport : public SdrPowerPointImport
sal_uInt32 mnFilterOptions;
SdDrawDocument* mpDoc;
PresChange mePresChange;
SdrLayerID mnBackgroundLayerID;
SdrLayerID mnBackgroundObjectsLayerID;
tAnimationMap maAnimations;
......
......@@ -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();
......
......@@ -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
......
......@@ -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();
}
}
......
......@@ -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
......
......@@ -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;
......
......@@ -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()
......
......@@ -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;
......
......@@ -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
......
......@@ -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");
......
......@@ -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() )
......
......@@ -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;
......
......@@ -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(
......
......@@ -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);
......
......@@ -79,7 +79,6 @@ private:
// Center of the insertion indicator.
Point maLocation;
BitmapEx maIcon;
Point maIconOffset;
std::unique_ptr<FramePainter> mpShadowPainter;
Point PaintRepresentatives (
......
......@@ -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.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment