summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/appl/appopen.cxx14
-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
-rw-r--r--sfx2/source/dialog/dinfdlg.cxx6
-rw-r--r--sfx2/source/doc/guisaveas.cxx6
-rw-r--r--sfx2/source/statbar/stbitem.cxx14
-rw-r--r--sfx2/source/toolbox/tbxitem.cxx32
10 files changed, 66 insertions, 66 deletions
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 3119d6df5a3e..2cc7a4a28379 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -602,7 +602,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
if ( !pFileNameItem )
{
// get FileName from dialog
- std::vector<OUString> pURLList;
+ std::vector<OUString> aURLList;
OUString aFilter;
SfxItemSet* pSet = nullptr;
OUString aPath;
@@ -640,12 +640,12 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
sal_uIntPtr nErr = sfx2::FileOpenDialog_Impl(
ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION,
- SFXWB_MULTISELECTION, OUString(), pURLList,
+ SFXWB_MULTISELECTION, OUString(), aURLList,
aFilter, pSet, &aPath, nDialog, sStandardDir, aBlackList );
if ( nErr == ERRCODE_ABORT )
{
- pURLList.clear();
+ aURLList.clear();
return;
}
@@ -656,7 +656,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
rReq.AppendItem( SfxStringItem( SID_REFERER, "private:user" ) );
delete pSet;
- if(!pURLList.empty())
+ if(!aURLList.empty())
{
if ( nSID == SID_OPENTEMPLATE )
rReq.AppendItem( SfxBoolItem( SID_TEMPLATE, false ) );
@@ -693,7 +693,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
rReq.AppendItem(SfxStringItem(SID_DOC_SERVICE, aDocService));
}
- for(std::vector<OUString>::const_iterator i = pURLList.begin(); i != pURLList.end(); ++i)
+ for(std::vector<OUString>::const_iterator i = aURLList.begin(); i != aURLList.end(); ++i)
{
rReq.RemoveItem( SID_FILE_NAME );
rReq.AppendItem( SfxStringItem( SID_FILE_NAME, *i ) );
@@ -725,10 +725,10 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
}
}
- pURLList.clear();
+ aURLList.clear();
return;
}
- pURLList.clear();
+ aURLList.clear();
}
bool bHyperlinkUsed = false;
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 ;
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 00409025f21e..43d8cd6e8019 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -177,14 +177,14 @@ OUString ConvertDateTime_Impl( const OUString& rName,
{
Date aD(uDT);
tools::Time aT(uDT);
- const OUString pDelim ( ", " );
+ const OUString aDelim( ", " );
OUString aStr( rWrapper.getDate( aD ) );
- aStr += pDelim;
+ aStr += aDelim;
aStr += rWrapper.getTime( aT );
OUString aAuthor = comphelper::string::stripStart(rName, ' ');
if (!aAuthor.isEmpty())
{
- aStr += pDelim;
+ aStr += aDelim;
aStr += aAuthor;
}
return aStr;
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 64c18419cb9c..e1d4ec319992 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -795,10 +795,10 @@ bool ModelData_Impl::CheckFilterOptionsDialogExistence()
while ( xFilterEnum->hasMoreElements() )
{
- uno::Sequence< beans::PropertyValue > pProps;
- if ( xFilterEnum->nextElement() >>= pProps )
+ uno::Sequence< beans::PropertyValue > aProps;
+ if ( xFilterEnum->nextElement() >>= aProps )
{
- ::comphelper::SequenceAsHashMap aPropsHM( pProps );
+ ::comphelper::SequenceAsHashMap aPropsHM( aProps );
OUString aUIServName = aPropsHM.getUnpackedValueOrDefault(
"UIComponent",
OUString() );
diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx
index 4b3b9c042f4f..beb29f7ba162 100644
--- a/sfx2/source/statbar/stbitem.cxx
+++ b/sfx2/source/statbar/stbitem.cxx
@@ -255,38 +255,38 @@ throw ( css::uno::RuntimeException, std::exception )
if ( rEvent.IsEnabled )
{
eState = SfxItemState::DEFAULT;
- uno::Type pType = rEvent.State.getValueType();
+ uno::Type aType = rEvent.State.getValueType();
- if ( pType == cppu::UnoType<void>::get() )
+ if ( aType == cppu::UnoType<void>::get() )
{
pItem = new SfxVoidItem( 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( 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( 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( nSlotID, nTemp );
}
- else if ( pType == cppu::UnoType<OUString>::get() )
+ else if ( aType == cppu::UnoType<OUString>::get() )
{
OUString sTemp ;
rEvent.State >>= sTemp ;
pItem = new SfxStringItem( nSlotID, sTemp );
}
- else if ( pType == cppu::UnoType< css::frame::status::ItemStatus>::get() )
+ else if ( aType == cppu::UnoType< css::frame::status::ItemStatus>::get() )
{
frame::status::ItemStatus aItemStatus;
rEvent.State >>= aItemStatus;
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 92627966c7c0..08bd90474870 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -483,38 +483,38 @@ throw ( css::uno::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( 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( 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( 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( nSlotId, nTemp );
}
- else if ( pType == cppu::UnoType<OUString>::get() )
+ else if ( aType == cppu::UnoType<OUString>::get() )
{
OUString sTemp ;
rEvent.State >>= sTemp ;
pItem = new SfxStringItem( 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;
@@ -527,7 +527,7 @@ throw ( css::uno::RuntimeException, std::exception )
eState = tmpState;
pItem = new SfxVoidItem( 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;
@@ -825,38 +825,38 @@ throw ( css::uno::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( 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( 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( 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( nSlotId, nTemp );
}
- else if ( pType == cppu::UnoType<OUString>::get() )
+ else if ( aType == cppu::UnoType<OUString>::get() )
{
OUString sTemp ;
rEvent.State >>= sTemp ;
pItem = new SfxStringItem( 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;
@@ -869,7 +869,7 @@ throw ( css::uno::RuntimeException, std::exception )
eState = tmpState;
pItem = new SfxVoidItem( 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;
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 15:21:35 +0000