summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
Diffstat (limited to 'extensions')
-rw-r--r--extensions/source/bibliography/toolbar.cxx6
-rw-r--r--extensions/source/propctrlr/browserline.cxx2
-rw-r--r--extensions/source/propctrlr/formcomponenthandler.cxx4
-rw-r--r--extensions/source/propctrlr/propcontroller.cxx2
-rw-r--r--extensions/source/update/feed/updatefeed.cxx4
5 files changed, 16 insertions, 2 deletions
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index daab0798c75e..71de2963862b 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -639,8 +639,10 @@ void BibToolBar::AdjustToolBox()
aSize.Height() = aOldSize.Height();
Size aTbSize = GetSizePixel();
- if ( aSize.Width() && aSize.Width() != aTbSize.Width() ||
- aSize.Height() && aSize.Height() != aTbSize.Height() )
+ if (
+ (aSize.Width() && aSize.Width() != aTbSize.Width()) ||
+ (aSize.Height() && aSize.Height() != aTbSize.Height())
+ )
{
SetPosSizePixel( GetPosPixel(), aSize );
Invalidate();
diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx
index 7f2e205b74d9..8bdb3333aa02 100644
--- a/extensions/source/propctrlr/browserline.cxx
+++ b/extensions/source/propctrlr/browserline.cxx
@@ -344,10 +344,12 @@ namespace pcr
void implSetBitIfAffected( sal_uInt16& _nEnabledBits, sal_Int16 _nAffectedMask, sal_Int16 _nTestBit, bool _bSet )
{
if ( _nAffectedMask & _nTestBit )
+ {
if ( _bSet )
_nEnabledBits |= _nTestBit;
else
_nEnabledBits &= ~_nTestBit;
+ }
}
void implEnable( Window* _pWindow, sal_uInt16 _nEnabledBits, sal_uInt16 _nMatchBits )
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 1e54e00a5d1b..11f464a8fde4 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -1193,6 +1193,7 @@ namespace pcr
if ( ( PROPERTY_ID_DEFAULTCHECKED == nPropId )
|| ( PROPERTY_ID_STATE == nPropId )
)
+ {
if ( impl_componentHasProperty_throw( PROPERTY_TRISTATE ) )
{
if ( !::comphelper::getBOOL( m_xComponent->getPropertyValue( PROPERTY_TRISTATE ) ) )
@@ -1203,6 +1204,7 @@ namespace pcr
}
else
--pEnd;
+ }
if ( PROPERTY_ID_LISTSOURCETYPE == nPropId )
if ( FormComponentType::COMBOBOX == m_nClassId )
@@ -1643,10 +1645,12 @@ namespace pcr
OFormattedNumericControl* pControl = dynamic_cast< OFormattedNumericControl* >( xControl.get() );
DBG_ASSERT( pControl, "FormComponentPropertyHandler::actuatingPropertyChanged: invalid control!" );
if ( pControl )
+ {
if ( bAccuracy )
pControl->SetDecimalDigits( nNewDigits );
else
pControl->SetThousandsSep( bUseSep );
+ }
}
}
}
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index b4ec5c0476f7..1789ff0e9c00 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -858,10 +858,12 @@ namespace pcr
{
Reference< XComponent > xComp( *loop, UNO_QUERY );
if ( xComp.is() )
+ {
if ( _bOn )
xComp->addEventListener( static_cast< XPropertyChangeListener* >( this ) );
else
xComp->removeEventListener( static_cast< XPropertyChangeListener* >( this ) );
+ }
}
catch( const Exception& )
{
diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx
index 2d21629ca5e0..e7ca93eacc18 100644
--- a/extensions/source/update/feed/updatefeed.cxx
+++ b/extensions/source/update/feed/updatefeed.cxx
@@ -1069,6 +1069,7 @@ void SAL_CALL UpdateInformationProvider::handle( uno::Reference< task::XInteract
xSupplyAuthentication->setPassword( aRec.UserList[0].Passwords[0].getStr() );
}
if ( aRec.UserList[0].Passwords.getLength() > 1 )
+ {
if ( aAuthenticationRequest.HasRealm )
{
if ( xSupplyAuthentication->canSetRealm() )
@@ -1076,6 +1077,7 @@ void SAL_CALL UpdateInformationProvider::handle( uno::Reference< task::XInteract
}
else if ( xSupplyAuthentication->canSetAccount() )
xSupplyAuthentication->setAccount( aRec.UserList[0].Passwords[1].getStr() );
+ }
xSupplyAuthentication->select();
return;
}
@@ -1096,6 +1098,7 @@ void SAL_CALL UpdateInformationProvider::handle( uno::Reference< task::XInteract
if ( xSupplyAuthentication->canSetPassword() )
xSupplyAuthentication->setPassword(aRec.UserList[0].Passwords[0].getStr());
if ( aRec.UserList[0].Passwords.getLength() > 1 )
+ {
if ( aAuthenticationRequest.HasRealm )
{
if ( xSupplyAuthentication->canSetRealm() )
@@ -1103,6 +1106,7 @@ void SAL_CALL UpdateInformationProvider::handle( uno::Reference< task::XInteract
}
else if ( xSupplyAuthentication->canSetAccount() )
xSupplyAuthentication->setAccount(aRec.UserList[0].Passwords[1].getStr());
+ }
xSupplyAuthentication->select();
return;
}