mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:constantparam in toolkit

Browse Source 
Change-Id: I45d6c37bfe17ef686b50d688698bcc3a7f3cc311
This commit is contained in:
Noel Grandin
2016-03-09 14:26:45 +02:00
parent 70fca3e901
commit c3a3e646c9
5 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/toolkit/controls/unocontrol.hxx
View File

@@ -116,7 +116,7 @@ protected:
virtual void updateFromModel(); virtual void updateFromModel();
void peerCreated(); void peerCreated();
bool ImplCheckLocalize( OUString& _rPossiblyLocalizable ); bool ImplCheckLocalize( OUString& _rPossiblyLocalizable );
css::uno::Reference< css::awt::XWindowPeer > ImplGetCompatiblePeer( bool bAcceptExistingPeer ); css::uno::Reference< css::awt::XWindowPeer > ImplGetCompatiblePeer();
virtual void ImplSetPeerProperty( const OUString& rPropName, const css::uno::Any& rVal ); virtual void ImplSetPeerProperty( const OUString& rPropName, const css::uno::Any& rVal );
virtual void PrepareWindowDescriptor( css::awt::WindowDescriptor& rDesc ); virtual void PrepareWindowDescriptor( css::awt::WindowDescriptor& rDesc );
virtual void ImplModelPropertiesChanged( const css::uno::Sequence< css::beans::PropertyChangeEvent >& rEvents ); virtual void ImplModelPropertiesChanged( const css::uno::Sequence< css::beans::PropertyChangeEvent >& rEvents );

2
toolkit/source/controls/controlmodelcontainerbase.cxx
View File

@@ -1427,7 +1427,7 @@ void ControlContainerBase::ImplSetPosSize( Reference< XControl >& rxCtrl )
} }
else else
{ {
Reference< XWindowPeer > xPeer = ImplGetCompatiblePeer( true ); Reference< XWindowPeer > xPeer = ImplGetCompatiblePeer();
Reference< XDevice > xD( xPeer, UNO_QUERY ); Reference< XDevice > xD( xPeer, UNO_QUERY );
SimpleFontMetric aFM; SimpleFontMetric aFM;

2
toolkit/source/controls/dialogcontrol.cxx
View File

@@ -1133,7 +1133,7 @@ void UnoFrameControl::ImplSetPosSize( Reference< XControl >& rxCtrl )
} }
else else
{ {
Reference< XWindowPeer > xPeer = ImplGetCompatiblePeer( true ); Reference< XWindowPeer > xPeer = ImplGetCompatiblePeer();
Reference< XDevice > xD( xPeer, UNO_QUERY ); Reference< XDevice > xD( xPeer, UNO_QUERY );
SimpleFontMetric aFM; SimpleFontMetric aFM;

9
toolkit/source/controls/unocontrol.cxx
View File

@@ -156,16 +156,13 @@ OUString UnoControl::GetComponentServiceName()
return OUString(); return OUString();
} }
Reference< XWindowPeer > UnoControl::ImplGetCompatiblePeer( bool bAcceptExistingPeer ) Reference< XWindowPeer > UnoControl::ImplGetCompatiblePeer()
{ {
DBG_ASSERT( !mbCreatingCompatiblePeer, "ImplGetCompatiblePeer - rekursive?" ); DBG_ASSERT( !mbCreatingCompatiblePeer, "ImplGetCompatiblePeer - rekursive?" );
mbCreatingCompatiblePeer = true; mbCreatingCompatiblePeer = true;
Reference< XWindowPeer > xCompatiblePeer; Reference< XWindowPeer > xCompatiblePeer = getPeer();
if ( bAcceptExistingPeer )
xCompatiblePeer = getPeer();
if ( !xCompatiblePeer.is() ) if ( !xCompatiblePeer.is() )
{ {
@@ -1005,7 +1002,7 @@ void UnoControl::draw( sal_Int32 x, sal_Int32 y ) throw(RuntimeException, std::e
{ {
::osl::MutexGuard aGuard( GetMutex() ); ::osl::MutexGuard aGuard( GetMutex() );
xDrawPeer = ImplGetCompatiblePeer( true ); xDrawPeer = ImplGetCompatiblePeer();
bDisposeDrawPeer = xDrawPeer.is() && ( xDrawPeer != getPeer() ); bDisposeDrawPeer = xDrawPeer.is() && ( xDrawPeer != getPeer() );
xDrawPeerView.set( xDrawPeer, UNO_QUERY ); xDrawPeerView.set( xDrawPeer, UNO_QUERY );

10
toolkit/source/controls/unocontrolbase.cxx
View File

@@ -174,7 +174,7 @@ util::Time UnoControlBase::ImplGetPropertyValue_Time( sal_uInt16 nProp )
css::awt::Size UnoControlBase::Impl_getMinimumSize() css::awt::Size UnoControlBase::Impl_getMinimumSize()
{ {
css::awt::Size aSz; css::awt::Size aSz;
css::uno::Reference< css::awt::XWindowPeer > xP = ImplGetCompatiblePeer( true ); css::uno::Reference< css::awt::XWindowPeer > xP = ImplGetCompatiblePeer();
DBG_ASSERT( xP.is(), "Layout: No Peer!" ); DBG_ASSERT( xP.is(), "Layout: No Peer!" );
if ( xP.is() ) if ( xP.is() )
{ {
@@ -191,7 +191,7 @@ css::awt::Size UnoControlBase::Impl_getMinimumSize()
css::awt::Size UnoControlBase::Impl_getPreferredSize() css::awt::Size UnoControlBase::Impl_getPreferredSize()
{ {
css::awt::Size aSz; css::awt::Size aSz;
css::uno::Reference< css::awt::XWindowPeer > xP = ImplGetCompatiblePeer( true ); css::uno::Reference< css::awt::XWindowPeer > xP = ImplGetCompatiblePeer();
DBG_ASSERT( xP.is(), "Layout: No Peer!" ); DBG_ASSERT( xP.is(), "Layout: No Peer!" );
if ( xP.is() ) if ( xP.is() )
{ {
@@ -208,7 +208,7 @@ css::awt::Size UnoControlBase::Impl_getPreferredSize()
css::awt::Size UnoControlBase::Impl_calcAdjustedSize( const css::awt::Size& rNewSize ) css::awt::Size UnoControlBase::Impl_calcAdjustedSize( const css::awt::Size& rNewSize )
{ {
css::awt::Size aSz; css::awt::Size aSz;
css::uno::Reference< css::awt::XWindowPeer > xP = ImplGetCompatiblePeer( true ); css::uno::Reference< css::awt::XWindowPeer > xP = ImplGetCompatiblePeer();
DBG_ASSERT( xP.is(), "Layout: No Peer!" ); DBG_ASSERT( xP.is(), "Layout: No Peer!" );
if ( xP.is() ) if ( xP.is() )
{ {
@@ -225,7 +225,7 @@ css::awt::Size UnoControlBase::Impl_calcAdjustedSize( const css::awt::Size& rNew
css::awt::Size UnoControlBase::Impl_getMinimumSize( sal_Int16 nCols, sal_Int16 nLines ) css::awt::Size UnoControlBase::Impl_getMinimumSize( sal_Int16 nCols, sal_Int16 nLines )
{ {
css::awt::Size aSz; css::awt::Size aSz;
css::uno::Reference< css::awt::XWindowPeer > xP = ImplGetCompatiblePeer( true ); css::uno::Reference< css::awt::XWindowPeer > xP = ImplGetCompatiblePeer();
DBG_ASSERT( xP.is(), "Layout: No Peer!" ); DBG_ASSERT( xP.is(), "Layout: No Peer!" );
if ( xP.is() ) if ( xP.is() )
{ {
@@ -241,7 +241,7 @@ css::awt::Size UnoControlBase::Impl_getMinimumSize( sal_Int16 nCols, sal_Int16 n
void UnoControlBase::Impl_getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) void UnoControlBase::Impl_getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines )
{ {
css::uno::Reference< css::awt::XWindowPeer > xP = ImplGetCompatiblePeer( true ); css::uno::Reference< css::awt::XWindowPeer > xP = ImplGetCompatiblePeer();
DBG_ASSERT( xP.is(), "Layout: No Peer!" ); DBG_ASSERT( xP.is(), "Layout: No Peer!" );
if ( xP.is() ) if ( xP.is() )
{ {