summaryrefslogtreecommitdiff
path: root/sfx2/source/control
diff options
context:
space:
mode:
Diffstat (limited to 'sfx2/source/control')
-rw-r--r--sfx2/source/control/bindings.cxx10
-rw-r--r--sfx2/source/control/querystatus.cxx14
-rw-r--r--sfx2/source/control/sfxstatuslistener.cxx16
-rw-r--r--sfx2/source/control/statcach.cxx10
-rw-r--r--sfx2/source/control/unoctitm.cxx10
5 files changed, 30 insertions, 30 deletions
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 1b905000c89f..8d7f161997d3 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -1936,27 +1936,27 @@ SfxItemState SfxBindings::QueryState( sal_uInt16 nSlot, SfxPoolItem* &rpState )
else
{
css::uno::Any aAny = pBind->GetStatus().State;
- css::uno::Type pType = aAny.getValueType();
+ css::uno::Type aType = aAny.getValueType();
- if ( pType == cppu::UnoType<bool>::get() )
+ if ( aType == cppu::UnoType<bool>::get() )
{
bool bTemp = false;
aAny >>= bTemp ;
pItem = new SfxBoolItem( nSlot, bTemp );
}
- else if ( pType == ::cppu::UnoType< ::cppu::UnoUnsignedShortType >::get() )
+ else if ( aType == ::cppu::UnoType< ::cppu::UnoUnsignedShortType >::get() )
{
sal_uInt16 nTemp = 0;
aAny >>= nTemp ;
pItem = new SfxUInt16Item( nSlot, nTemp );
}
- else if ( pType == cppu::UnoType<sal_uInt32>::get() )
+ else if ( aType == cppu::UnoType<sal_uInt32>::get() )
{
sal_uInt32 nTemp = 0;
aAny >>= nTemp ;
pItem = new SfxUInt32Item( nSlot, nTemp );
}
- else if ( pType == cppu::UnoType<OUString>::get() )
+ else if ( aType == cppu::UnoType<OUString>::get() )
{
OUString sTemp ;
aAny >>= sTemp ;
diff --git a/sfx2/source/control/querystatus.cxx b/sfx2/source/control/querystatus.cxx
index a49315143c6c..aea4c8f01ff8 100644
--- a/sfx2/source/control/querystatus.cxx
+++ b/sfx2/source/control/querystatus.cxx
@@ -109,40 +109,40 @@ throw( RuntimeException, std::exception )
if ( rEvent.IsEnabled )
{
m_eState = SfxItemState::DEFAULT;
- css::uno::Type pType = rEvent.State.getValueType();
+ css::uno::Type aType = rEvent.State.getValueType();
- if ( pType == cppu::UnoType<bool>::get() )
+ if ( aType == cppu::UnoType<bool>::get() )
{
bool bTemp = false;
rEvent.State >>= bTemp ;
m_pItem = new SfxBoolItem( m_nSlotID, bTemp );
}
- else if ( pType == ::cppu::UnoType< ::cppu::UnoUnsignedShortType >::get() )
+ else if ( aType == ::cppu::UnoType< ::cppu::UnoUnsignedShortType >::get() )
{
sal_uInt16 nTemp = 0;
rEvent.State >>= nTemp ;
m_pItem = new SfxUInt16Item( m_nSlotID, nTemp );
}
- else if ( pType == cppu::UnoType<sal_uInt32>::get() )
+ else if ( aType == cppu::UnoType<sal_uInt32>::get() )
{
sal_uInt32 nTemp = 0;
rEvent.State >>= nTemp ;
m_pItem = new SfxUInt32Item( m_nSlotID, nTemp );
}
- else if ( pType == cppu::UnoType<OUString>::get() )
+ else if ( aType == cppu::UnoType<OUString>::get() )
{
OUString sTemp ;
rEvent.State >>= sTemp ;
m_pItem = new SfxStringItem( m_nSlotID, sTemp );
}
- else if ( pType == cppu::UnoType< css::frame::status::ItemStatus>::get() )
+ else if ( aType == cppu::UnoType< css::frame::status::ItemStatus>::get() )
{
ItemStatus aItemStatus;
rEvent.State >>= aItemStatus;
m_eState = (SfxItemState) aItemStatus.State;
m_pItem = new SfxVoidItem( m_nSlotID );
}
- else if ( pType == cppu::UnoType< css::frame::status::Visibility>::get() )
+ else if ( aType == cppu::UnoType< css::frame::status::Visibility>::get() )
{
Visibility aVisibilityStatus;
rEvent.State >>= aVisibilityStatus;
diff --git a/sfx2/source/control/sfxstatuslistener.cxx b/sfx2/source/control/sfxstatuslistener.cxx
index 4e6567ecb186..dab426adf6b2 100644
--- a/sfx2/source/control/sfxstatuslistener.cxx
+++ b/sfx2/source/control/sfxstatuslistener.cxx
@@ -168,45 +168,45 @@ throw( RuntimeException, std::exception )
if ( rEvent.IsEnabled )
{
eState = SfxItemState::DEFAULT;
- css::uno::Type pType = rEvent.State.getValueType();
+ css::uno::Type aType = rEvent.State.getValueType();
- if ( pType == ::cppu::UnoType<void>::get() )
+ if ( aType == ::cppu::UnoType<void>::get() )
{
pItem = new SfxVoidItem( m_nSlotID );
eState = SfxItemState::UNKNOWN;
}
- else if ( pType == cppu::UnoType< bool >::get() )
+ else if ( aType == cppu::UnoType< bool >::get() )
{
bool bTemp = false;
rEvent.State >>= bTemp ;
pItem = new SfxBoolItem( m_nSlotID, bTemp );
}
- else if ( pType == cppu::UnoType< ::cppu::UnoUnsignedShortType >::get() )
+ else if ( aType == cppu::UnoType< ::cppu::UnoUnsignedShortType >::get() )
{
sal_uInt16 nTemp = 0;
rEvent.State >>= nTemp ;
pItem = new SfxUInt16Item( m_nSlotID, nTemp );
}
- else if ( pType == cppu::UnoType<sal_uInt32>::get() )
+ else if ( aType == cppu::UnoType<sal_uInt32>::get() )
{
sal_uInt32 nTemp = 0;
rEvent.State >>= nTemp ;
pItem = new SfxUInt32Item( m_nSlotID, nTemp );
}
- else if ( pType == cppu::UnoType<OUString>::get() )
+ else if ( aType == cppu::UnoType<OUString>::get() )
{
OUString sTemp ;
rEvent.State >>= sTemp ;
pItem = new SfxStringItem( m_nSlotID, sTemp );
}
- else if ( pType == cppu::UnoType< css::frame::status::ItemStatus >::get() )
+ else if ( aType == cppu::UnoType< css::frame::status::ItemStatus >::get() )
{
ItemStatus aItemStatus;
rEvent.State >>= aItemStatus;
eState = (SfxItemState) aItemStatus.State;
pItem = new SfxVoidItem( m_nSlotID );
}
- else if ( pType == cppu::UnoType< css::frame::status::Visibility >::get() )
+ else if ( aType == cppu::UnoType< css::frame::status::Visibility >::get() )
{
Visibility aVisibilityStatus;
rEvent.State >>= aVisibilityStatus;
diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx
index b0fd28be36e4..eb8550da93ca 100644
--- a/sfx2/source/control/statcach.cxx
+++ b/sfx2/source/control/statcach.cxx
@@ -95,26 +95,26 @@ void SAL_CALL BindDispatch_Impl::statusChanged( const css::frame::FeatureStateE
eState = SfxItemState::DEFAULT;
css::uno::Any aAny = aStatus.State;
- css::uno::Type pType = aAny.getValueType();
- if ( pType == cppu::UnoType< bool >::get() )
+ css::uno::Type aType = aAny.getValueType();
+ if ( aType == cppu::UnoType< bool >::get() )
{
bool bTemp = false;
aAny >>= bTemp ;
pItem = new SfxBoolItem( nId, bTemp );
}
- else if ( pType == ::cppu::UnoType< ::cppu::UnoUnsignedShortType >::get() )
+ else if ( aType == ::cppu::UnoType< ::cppu::UnoUnsignedShortType >::get() )
{
sal_uInt16 nTemp = 0;
aAny >>= nTemp ;
pItem = new SfxUInt16Item( nId, nTemp );
}
- else if ( pType == cppu::UnoType<sal_uInt32>::get() )
+ else if ( aType == cppu::UnoType<sal_uInt32>::get() )
{
sal_uInt32 nTemp = 0;
aAny >>= nTemp ;
pItem = new SfxUInt32Item( nId, nTemp );
}
- else if ( pType == cppu::UnoType<OUString>::get() )
+ else if ( aType == cppu::UnoType<OUString>::get() )
{
OUString sTemp ;
aAny >>= sTemp ;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index c67048e3b6a0..d9462ba16962 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -152,27 +152,27 @@ void SAL_CALL SfxUnoControllerItem::statusChanged(const css::frame::FeatureState
if ( rEvent.IsEnabled )
{
eState = SfxItemState::DEFAULT;
- css::uno::Type pType = rEvent.State.getValueType();
+ css::uno::Type aType = rEvent.State.getValueType();
- if ( pType == cppu::UnoType< bool >::get() )
+ if ( aType == cppu::UnoType< bool >::get() )
{
bool bTemp = false;
rEvent.State >>= bTemp ;
pItem = new SfxBoolItem( pCtrlItem->GetId(), bTemp );
}
- else if ( pType == cppu::UnoType< ::cppu::UnoUnsignedShortType >::get() )
+ else if ( aType == cppu::UnoType< ::cppu::UnoUnsignedShortType >::get() )
{
sal_uInt16 nTemp = 0;
rEvent.State >>= nTemp ;
pItem = new SfxUInt16Item( pCtrlItem->GetId(), nTemp );
}
- else if ( pType == cppu::UnoType<sal_uInt32>::get() )
+ else if ( aType == cppu::UnoType<sal_uInt32>::get() )
{
sal_uInt32 nTemp = 0;
rEvent.State >>= nTemp ;
pItem = new SfxUInt32Item( pCtrlItem->GetId(), nTemp );
}
- else if ( pType == cppu::UnoType<OUString>::get() )
+ else if ( aType == cppu::UnoType<OUString>::get() )
{
OUString sTemp ;
rEvent.State >>= sTemp ;