summaryrefslogtreecommitdiff
path: root/sfx2/source/dialog
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-04-20 10:34:01 +0200
committerNoel Grandin <noel@peralex.com>2016-04-21 08:32:47 +0200
commit5abc669599001bf888b97c4d3c2715e1fb7523b9 (patch)
tree2407c6fc040a795e6ffc69de02ba940285c04c7f /sfx2/source/dialog
parent5bb308a9ad16f6002486a60e4a753693818580b6 (diff)
new plugin stylepolice
check for local variables which follow our member field naming convention, which is highly confusing Change-Id: Idacedf7145d09843e96a584237b385f7662eea10
Diffstat (limited to 'sfx2/source/dialog')
-rw-r--r--sfx2/source/dialog/dinfdlg.cxx28
-rw-r--r--sfx2/source/dialog/dockwin.cxx12
-rw-r--r--sfx2/source/dialog/mgetempl.cxx4
3 files changed, 22 insertions, 22 deletions
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index ef8b863a8b2b..b6a72e86550e 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -959,10 +959,10 @@ bool SfxDocumentPage::FillItemSet( SfxItemSet* rSet )
if ( pExpSet && SfxItemState::SET == pExpSet->GetItemState( SID_DOCINFO, true, &pItem ) )
{
- const SfxDocumentInfoItem* m_pInfoItem = static_cast<const SfxDocumentInfoItem*>(pItem);
+ const SfxDocumentInfoItem* pInfoItem = static_cast<const SfxDocumentInfoItem*>(pItem);
bool bUseData = ( TRISTATE_TRUE == m_pUseUserDataCB->GetState() );
- const_cast<SfxDocumentInfoItem*>(m_pInfoItem)->SetUseUserData( bUseData );
- rSet->Put( SfxDocumentInfoItem( *m_pInfoItem ) );
+ const_cast<SfxDocumentInfoItem*>(pInfoItem)->SetUseUserData( bUseData );
+ rSet->Put( SfxDocumentInfoItem( *pInfoItem ) );
bRet = true;
}
}
@@ -996,10 +996,10 @@ bool SfxDocumentPage::FillItemSet( SfxItemSet* rSet )
if ( pExpSet && SfxItemState::SET == pExpSet->GetItemState( SID_DOCINFO, true, &pItem ) )
{
- const SfxDocumentInfoItem* m_pxInfoItem = static_cast<const SfxDocumentInfoItem*>(pItem);
+ const SfxDocumentInfoItem* pInfoItem = static_cast<const SfxDocumentInfoItem*>(pItem);
bool bUseThumbnail = ( TRISTATE_TRUE == m_pUseThumbnailSaveCB->GetState() );
- const_cast<SfxDocumentInfoItem*>(m_pxInfoItem)->SetUseThumbnailSave( bUseThumbnail );
- rSet->Put( SfxDocumentInfoItem( *m_pxInfoItem ) );
+ const_cast<SfxDocumentInfoItem*>(pInfoItem)->SetUseThumbnailSave( bUseThumbnail );
+ rSet->Put( SfxDocumentInfoItem( *pInfoItem ) );
bRet = true;
}
}
@@ -1082,7 +1082,7 @@ void SfxDocumentPage::Reset( const SfxItemSet* rSet )
m_pFileValEd->SetText( aURL.GetPartBeforeLastName() );
// handle access data
- bool m_bUseUserData = rInfoItem.IsUseUserData();
+ bool bUseUserData = rInfoItem.IsUseUserData();
const LocaleDataWrapper& rLocaleWrapper( Application::GetSettings().GetLocaleDataWrapper() );
m_pCreateValFt->SetText( ConvertDateTime_Impl( rInfoItem.getAuthor(),
rInfoItem.getCreationDate(), rLocaleWrapper ) );
@@ -1095,7 +1095,7 @@ void SfxDocumentPage::Reset( const SfxItemSet* rSet )
m_pPrintValFt->SetText( ConvertDateTime_Impl( rInfoItem.getPrintedBy(),
aTime, rLocaleWrapper ) );
const long nTime = rInfoItem.getEditingDuration();
- if ( m_bUseUserData )
+ if ( bUseUserData )
{
const tools::Time aT( nTime/3600, (nTime%3600)/60, nTime%60 );
m_pTimeLogValFt->SetText( rLocaleWrapper.getDuration( aT ) );
@@ -1103,7 +1103,7 @@ void SfxDocumentPage::Reset( const SfxItemSet* rSet )
rInfoItem.getEditingCycles() ) );
}
- bool m_bUseThumbnailSave = rInfoItem.IsUseThumbnailSave();
+ bool bUseThumbnailSave = rInfoItem.IsUseThumbnailSave();
// Check for cmis properties where otherwise unavailable
if ( rInfoItem.isCmisDocument( ) )
@@ -1116,13 +1116,13 @@ void SfxDocumentPage::Reset( const SfxItemSet* rSet )
{
Sequence< sal_Int64 > seqValue;
aCmisProps[i].Value >>= seqValue;
- SvNumberFormatter m_aNumberFormatter( ::comphelper::getProcessComponentContext(),
+ SvNumberFormatter aNumberFormatter( ::comphelper::getProcessComponentContext(),
Application::GetSettings().GetLanguageTag().getLanguageType() );
- sal_uInt32 nIndex = m_aNumberFormatter.GetFormatIndex( NF_NUMBER_SYSTEM );
+ sal_uInt32 nIndex = aNumberFormatter.GetFormatIndex( NF_NUMBER_SYSTEM );
if ( seqValue.getLength( ) > 0 )
{
OUString sValue;
- m_aNumberFormatter.GetInputLineString( seqValue[0], nIndex, sValue );
+ aNumberFormatter.GetInputLineString( seqValue[0], nIndex, sValue );
m_pShowSizeFT->SetText( CreateSizeText( sValue.toInt64( ) ) );
}
}
@@ -1154,12 +1154,12 @@ void SfxDocumentPage::Reset( const SfxItemSet* rSet )
}
}
- m_pUseUserDataCB->SetState( static_cast<TriState>(m_bUseUserData) );
+ m_pUseUserDataCB->SetState( static_cast<TriState>(bUseUserData) );
m_pUseUserDataCB->SaveValue();
m_pUseUserDataCB->Enable( bEnableUseUserData );
bHandleDelete = false;
m_pDeleteBtn->Enable( bEnableUseUserData );
- m_pUseThumbnailSaveCB->SetState( static_cast<TriState>(m_bUseThumbnailSave) );
+ m_pUseThumbnailSaveCB->SetState( static_cast<TriState>(bUseThumbnailSave) );
m_pUseThumbnailSaveCB->SaveValue();
}
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index a53ff86e36c2..3d431919b342 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -159,22 +159,22 @@ SfxDockingWrapper::SfxDockingWrapper( vcl::Window* pParentWnd ,
xFactoryMgr->createInstanceWithArgumentsAndContext( aArgs, xContext ),
uno::UNO_QUERY );
- static uno::WeakReference< frame::XModuleManager2 > m_xModuleManager;
+ static uno::WeakReference< frame::XModuleManager2 > s_xModuleManager;
- uno::Reference< frame::XModuleManager2 > xModuleManager( m_xModuleManager );
+ uno::Reference< frame::XModuleManager2 > xModuleManager( s_xModuleManager );
if ( !xModuleManager.is() )
{
xModuleManager = frame::ModuleManager::create(xContext);
- m_xModuleManager = xModuleManager;
+ s_xModuleManager = xModuleManager;
}
- static uno::WeakReference< container::XNameAccess > m_xWindowStateConfiguration;
+ static uno::WeakReference< container::XNameAccess > s_xWindowStateConfiguration;
- uno::Reference< container::XNameAccess > xWindowStateConfiguration( m_xWindowStateConfiguration );
+ uno::Reference< container::XNameAccess > xWindowStateConfiguration( s_xWindowStateConfiguration );
if ( !xWindowStateConfiguration.is() )
{
xWindowStateConfiguration = ui::theWindowStateConfiguration::get( xContext );
- m_xWindowStateConfiguration = xWindowStateConfiguration;
+ s_xWindowStateConfiguration = xWindowStateConfiguration;
}
OUString sModuleIdentifier = xModuleManager->identify( xFrame );
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 6765452cb15b..93da4a54c9a8 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -397,11 +397,11 @@ bool SfxManageStyleSheetPage::Execute_Impl(
pItems[ nCount++ ] = nullptr;
- const SfxPoolItem* mpItem = rDispatcher.Execute(
+ const SfxPoolItem* pItem = rDispatcher.Execute(
nId, SfxCallMode::SYNCHRON | SfxCallMode::RECORD | SfxCallMode::MODAL,
pItems );
- if ( !mpItem )
+ if ( !pItem )
return false;
return true;