summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-11-25 13:51:15 +0200
committerNoel Grandin <noel@peralex.com>2015-11-25 13:57:29 +0200
commit1f86864e97bea96fdc608f8c8b93024ad4684d51 (patch)
treee5ec06a2148b26bbc0cdd420de8b82b654547ca3 /sd
parent3e6ba91e2d6d362f4af91566e740f5dbc310e026 (diff)
loplugin:unusedfields various
Change-Id: I59d9f7f73677358b4ae57efda965d43718bdf0d5
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/animations/CustomAnimationPane.cxx7
-rw-r--r--sd/source/ui/animations/CustomAnimationPane.hxx4
-rw-r--r--sd/source/ui/inc/RemoteServer.hxx3
-rw-r--r--sd/source/ui/inc/ViewShellBase.hxx1
-rw-r--r--sd/source/ui/remotecontrol/Server.cxx8
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.hxx2
-rw-r--r--sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx1
-rw-r--r--sd/source/ui/view/ViewShellBase.cxx1
8 files changed, 6 insertions, 21 deletions
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index ba817a62f2fb..c50955fe97b9 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -146,13 +146,11 @@ void fillRepeatComboBox( ListBox* pBox )
}
CustomAnimationPane::CustomAnimationPane( Window* pParent, ViewShellBase& rBase,
- const css::uno::Reference<css::frame::XFrame>& rxFrame,
- const Size& rMinSize )
+ const css::uno::Reference<css::frame::XFrame>& rxFrame )
: PanelLayout( pParent, "CustomAnimationsPanel", "modules/simpress/ui/customanimationspanel.ui", rxFrame ),
mrBase( rBase ),
mpCustomAnimationPresets(nullptr),
mnPropertyType( nPropertyTypeNone ),
- maMinSize( rMinSize ),
mxModel( rBase.GetDocShell()->GetDoc()->getUnoModel(), UNO_QUERY ),
maLateInitTimer()
{
@@ -2278,8 +2276,7 @@ vcl::Window * createCustomAnimationPanel( vcl::Window* pParent, ViewShellBase& r
DrawDocShell* pDocSh = rBase.GetDocShell();
if( pDocSh )
{
- const Size aMinSize( pParent->LogicToPixel( Size( 80, 256 ), MAP_APPFONT ) );
- pWindow = VclPtr<CustomAnimationPane>::Create( pParent, rBase, rxFrame, aMinSize );
+ pWindow = VclPtr<CustomAnimationPane>::Create( pParent, rBase, rxFrame );
}
return pWindow;
diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx
index f1a51d802677..86a6ec609a96 100644
--- a/sd/source/ui/animations/CustomAnimationPane.hxx
+++ b/sd/source/ui/animations/CustomAnimationPane.hxx
@@ -62,7 +62,7 @@ class CustomAnimationPane : public PanelLayout, public ICustomAnimationListContr
{
friend class MotionPathTag;
public:
- CustomAnimationPane( vcl::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame, const Size& rMinSize );
+ CustomAnimationPane( vcl::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame );
virtual ~CustomAnimationPane();
virtual void dispose() override;
@@ -151,8 +151,6 @@ private:
sal_Int32 mnPropertyType;
- Size maMinSize;
-
EffectSequence maListSelection;
css::uno::Any maViewSelection;
diff --git a/sd/source/ui/inc/RemoteServer.hxx b/sd/source/ui/inc/RemoteServer.hxx
index d8d9a18865f5..e6bc07ac938a 100644
--- a/sd/source/ui/inc/RemoteServer.hxx
+++ b/sd/source/ui/inc/RemoteServer.hxx
@@ -43,16 +43,13 @@ namespace sd
struct ClientInfo
{
OUString mName;
- OUString mAddress;
bool mbIsAlreadyAuthorised;
enum PROTOCOL { NETWORK = 1, BLUETOOTH };
ClientInfo( const OUString& rName,
- const OUString& rAddress,
const bool bIsAlreadyAuthorised ) :
mName( rName ),
- mAddress( rAddress ),
mbIsAlreadyAuthorised( bIsAlreadyAuthorised ) {}
virtual ~ClientInfo() {};
diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx
index 74c7e2e016be..5e4aec31e6a9 100644
--- a/sd/source/ui/inc/ViewShellBase.hxx
+++ b/sd/source/ui/inc/ViewShellBase.hxx
@@ -222,7 +222,6 @@ public:
OUString RetrieveLabelFromCommand( const OUString& aCmdURL ) const;
protected:
- osl::Mutex maMutex;
virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override;
diff --git a/sd/source/ui/remotecontrol/Server.cxx b/sd/source/ui/remotecontrol/Server.cxx
index 82c67c7e5e21..f0ebbff1acd3 100644
--- a/sd/source/ui/remotecontrol/Server.cxx
+++ b/sd/source/ui/remotecontrol/Server.cxx
@@ -53,11 +53,10 @@ namespace sd {
OUString mPin;
ClientInfoInternal( const OUString& rName,
- const OUString& rAddress,
const bool bIsAlreadyAuthorised,
BufferedStreamSocket *pSocket,
const OUString& rPin ):
- ClientInfo( rName, rAddress, bIsAlreadyAuthorised ),
+ ClientInfo( rName, bIsAlreadyAuthorised ),
mpStreamSocket( pSocket ),
mPin( rPin ) {}
};
@@ -126,13 +125,12 @@ void RemoteServer::execute()
SocketAddr aClientAddr;
pSocket->getPeerAddr( aClientAddr );
- OUString aAddress = aClientAddr.getHostname();
MutexGuard aGuard( sDataMutex );
std::shared_ptr< ClientInfoInternal > pClient(
new ClientInfoInternal(
OStringToOUString( aName, RTL_TEXTENCODING_UTF8 ),
- aAddress, false, pSocket, OStringToOUString( aPin,
+ false, pSocket, OStringToOUString( aPin,
RTL_TEXTENCODING_UTF8 ) ) );
mAvailableClients.push_back( pClient );
@@ -266,7 +264,7 @@ std::vector< std::shared_ptr< ClientInfo > > RemoteServer::getClients()
Sequence< OUString > aNames = xConfig->getElementNames();
for ( int i = 0; i < aNames.getLength(); i++ )
{
- aClients.push_back( std::shared_ptr< ClientInfo > ( new ClientInfo( aNames[i], "", true ) ) );
+ aClients.push_back( std::shared_ptr< ClientInfo > ( new ClientInfo( aNames[i], true ) ) );
}
return aClients;
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx
index e70f18a27398..b445211a7093 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -337,9 +337,7 @@ private:
std::shared_ptr< AnimationSlideController > mpSlideController;
long mnRestoreSlide;
- Point maSlideOrigin;
Point maPopupMousePos;
- Size maSlideSize;
Size maPresSize;
AnimationMode meAnimationMode;
OUString maCharBuffer;
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx
index 3a4954163b70..6d82fa16d546 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx
@@ -36,7 +36,6 @@ class NoBitmapCompression::DummyReplacement
{
public:
Bitmap maPreview;
- Size maOriginalSize;
explicit DummyReplacement (const Bitmap& rPreview) : maPreview(rPreview) { }
virtual ~DummyReplacement() {}
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 41ad7255dfcf..a66ad735f306 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -236,7 +236,6 @@ ViewShellBase::ViewShellBase (
: SfxViewShell (_pFrame,
SfxViewShellFlags::CAN_PRINT
| SfxViewShellFlags::HAS_PRINTOPTIONS),
- maMutex(),
mpImpl(),
mpDocShell (nullptr),
mpDocument (nullptr)