Skip to content

Fix and standardize identifier name #510

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jbampton wants to merge 1 commit into
base: trunk
Choose a base branch
from
+55 −55
Open

Fix and standardize identifier name #510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion main/extensions/source/abpilot/abpfinalpage.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ namespace abp
//= FinalPage
//=====================================================================
//---------------------------------------------------------------------
FinalPage::FinalPage( OAddessBookSourcePilot* _pParent )
FinalPage::FinalPage( OAddressBookSourcePilot* _pParent )
:AddressBookSourcePage(_pParent, ModuleRes(RID_PAGE_FINAL))
,m_aExplanation ( this, ModuleRes( FT_FINISH_EXPL ) )
,m_aLocationLabel ( this, ModuleRes( FT_LOCATION ) )
Expand Down
2 changes: 1 addition & 1 deletion main/extensions/source/abpilot/abpfinalpage.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ namespace abp
StringBag m_aInvalidDataSourceNames;

public:
FinalPage( OAddessBookSourcePilot* _pParent );
FinalPage( OAddressBookSourcePilot* _pParent );

protected:
// OWizardPage overridables
Expand Down
10 changes: 5 additions & 5 deletions main/extensions/source/abpilot/abspage.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ namespace abp
//=====================================================================
//= AddressBookSourcePage
//=====================================================================
AddressBookSourcePage::AddressBookSourcePage( OAddessBookSourcePilot* _pParent, const ResId& _rId )
AddressBookSourcePage::AddressBookSourcePage( OAddressBookSourcePilot* _pParent, const ResId& _rId )
:AddressBookSourcePage_Base(_pParent, _rId)
{
}
Expand All @@ -50,15 +50,15 @@ namespace abp
}

//---------------------------------------------------------------------
OAddessBookSourcePilot* AddressBookSourcePage::getDialog()
OAddressBookSourcePilot* AddressBookSourcePage::getDialog()
{
return static_cast<OAddessBookSourcePilot*>(GetParent());
return static_cast<OAddressBookSourcePilot*>(GetParent());
}

//---------------------------------------------------------------------
const OAddessBookSourcePilot* AddressBookSourcePage::getDialog() const
const OAddressBookSourcePilot* AddressBookSourcePage::getDialog() const
{
return static_cast<const OAddessBookSourcePilot*>(GetParent());
return static_cast<const OAddressBookSourcePilot*>(GetParent());
}

//---------------------------------------------------------------------
Expand Down
8 changes: 4 additions & 4 deletions main/extensions/source/abpilot/abspage.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ namespace abp
{
//.........................................................................

class OAddessBookSourcePilot;
class OAddressBookSourcePilot;
struct AddressSettings;

//=====================================================================
Expand All @@ -48,12 +48,12 @@ namespace abp
class AddressBookSourcePage : public AddressBookSourcePage_Base
{
protected:
AddressBookSourcePage( OAddessBookSourcePilot* _pParent, const ResId& _rId );
AddressBookSourcePage( OAddressBookSourcePilot* _pParent, const ResId& _rId );

protected:
// helper
OAddessBookSourcePilot* getDialog();
const OAddessBookSourcePilot* getDialog() const;
OAddressBookSourcePilot* getDialog();
const OAddressBookSourcePilot* getDialog() const;
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
getORB();
AddressSettings& getSettings();
Expand Down
58 changes: 29 additions & 29 deletions main/extensions/source/abpilot/abspilot.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ namespace abp
using namespace ::com::sun::star::lang;

//=====================================================================
//= OAddessBookSourcePilot
//= OAddressBookSourcePilot
//=====================================================================
//---------------------------------------------------------------------
OAddessBookSourcePilot::OAddessBookSourcePilot(Window* _pParent, const Reference< XMultiServiceFactory >& _rxORB)
:OAddessBookSourcePilot_Base( _pParent, ModuleRes( RID_DLG_ADDRESSBOOKSOURCEPILOT ),
OAddressBookSourcePilot::OAddressBookSourcePilot(Window* _pParent, const Reference< XMultiServiceFactory >& _rxORB)
:OAddressBookSourcePilot_Base( _pParent, ModuleRes( RID_DLG_ADDRESSBOOKSOURCEPILOT ),
WZB_HELP | WZB_FINISH | WZB_CANCEL | WZB_NEXT | WZB_PREVIOUS )
,m_xORB(_rxORB)
,m_aNewDataSource(_rxORB)
Expand Down Expand Up @@ -105,7 +105,7 @@ namespace abp
m_pFinish->SetHelpId(HID_ABSPILOT_FINISH);
m_pHelp->SetUniqueId(UID_ABSPILOT_HELP);

m_pCancel->SetClickHdl( LINK( this, OAddessBookSourcePilot, OnCancelClicked) );
m_pCancel->SetClickHdl( LINK( this, OAddressBookSourcePilot, OnCancelClicked) );

// some initial settings
#ifdef MACOSX
Expand All @@ -131,7 +131,7 @@ namespace abp
}

//---------------------------------------------------------------------
String OAddessBookSourcePilot::getStateDisplayName( WizardState _nState ) const
String OAddressBookSourcePilot::getStateDisplayName( WizardState _nState ) const
{
sal_uInt16 nResId = 0;
switch ( _nState )
Expand All @@ -142,7 +142,7 @@ namespace abp
case STATE_MANUAL_FIELD_MAPPING: nResId = STR_MANUAL_FIELD_MAPPING; break;
case STATE_FINAL_CONFIRM: nResId = STR_FINAL_CONFIRM; break;
}
DBG_ASSERT( nResId, "OAddessBookSourcePilot::getStateDisplayName: don't know this state!" );
DBG_ASSERT( nResId, "OAddressBookSourcePilot::getStateDisplayName: don't know this state!" );

String sDisplayName;
if ( nResId )
Expand All @@ -155,7 +155,7 @@ namespace abp
}

//---------------------------------------------------------------------
void OAddessBookSourcePilot::implCommitAll()
void OAddressBookSourcePilot::implCommitAll()
{
// in real, the data source already exists in the data source context
// Thus, if the user changed the name, we have to rename the data source
Expand All @@ -177,14 +177,14 @@ namespace abp
}

//---------------------------------------------------------------------
void OAddessBookSourcePilot::implCleanup()
void OAddressBookSourcePilot::implCleanup()
{
if ( m_aNewDataSource.isValid() )
m_aNewDataSource.remove();
}

//---------------------------------------------------------------------
IMPL_LINK( OAddessBookSourcePilot, OnCancelClicked, void*, /*NOTINTERESTEDIN*/ )
IMPL_LINK( OAddressBookSourcePilot, OnCancelClicked, void*, /*NOTINTERESTEDIN*/ )
{
// do cleanups
implCleanup();
Expand All @@ -198,17 +198,17 @@ namespace abp
}

//---------------------------------------------------------------------
sal_Bool OAddessBookSourcePilot::Close()
sal_Bool OAddressBookSourcePilot::Close()
{
implCleanup();

return OAddessBookSourcePilot_Base::Close();
return OAddressBookSourcePilot_Base::Close();
}

//---------------------------------------------------------------------
sal_Bool OAddessBookSourcePilot::onFinish()
sal_Bool OAddressBookSourcePilot::onFinish()
{
if ( !OAddessBookSourcePilot_Base::onFinish() )
if ( !OAddressBookSourcePilot_Base::onFinish() )
return sal_False;

implCommitAll();
Expand All @@ -219,7 +219,7 @@ namespace abp
}

//---------------------------------------------------------------------
void OAddessBookSourcePilot::enterState( WizardState _nState )
void OAddressBookSourcePilot::enterState( WizardState _nState )
{
switch ( _nState )
{
Expand All @@ -237,13 +237,13 @@ namespace abp
break;
}

OAddessBookSourcePilot_Base::enterState(_nState);
OAddressBookSourcePilot_Base::enterState(_nState);
}

//---------------------------------------------------------------------
sal_Bool OAddessBookSourcePilot::prepareLeaveCurrentState( CommitPageReason _eReason )
sal_Bool OAddressBookSourcePilot::prepareLeaveCurrentState( CommitPageReason _eReason )
{
if ( !OAddessBookSourcePilot_Base::prepareLeaveCurrentState( _eReason ) )
if ( !OAddressBookSourcePilot_Base::prepareLeaveCurrentState( _eReason ) )
return sal_False;

if ( _eReason == eTravelBackward )
Expand Down Expand Up @@ -295,7 +295,7 @@ namespace abp
}

//---------------------------------------------------------------------
void OAddessBookSourcePilot::implDefaultTableName()
void OAddressBookSourcePilot::implDefaultTableName()
{
const StringBag& rTableNames = getDataSource().getTableNames();
if ( rTableNames.end() != rTableNames.find( getSettings().sSelectedTable ) )
Expand All @@ -311,7 +311,7 @@ namespace abp
case AST_EVOLUTION_GROUPWISE:
case AST_EVOLUTION_LDAP : pGuess = "Personal"; break;
default:
DBG_ERROR( "OAddessBookSourcePilot::implDefaultTableName: unhandled case!" );
DBG_ERROR( "OAddressBookSourcePilot::implDefaultTableName: unhandled case!" );
return;
}
const ::rtl::OUString sGuess = ::rtl::OUString::createFromAscii( pGuess );
Expand All @@ -320,15 +320,15 @@ namespace abp
}

//---------------------------------------------------------------------
void OAddessBookSourcePilot::implDoAutoFieldMapping()
void OAddressBookSourcePilot::implDoAutoFieldMapping()
{
DBG_ASSERT( !needManualFieldMapping( ), "OAddessBookSourcePilot::implDoAutoFieldMapping: invalid call!" );
DBG_ASSERT( !needManualFieldMapping( ), "OAddressBookSourcePilot::implDoAutoFieldMapping: invalid call!" );

fieldmapping::defaultMapping( getORB(), m_aSettings.aFieldMapping );
}

//---------------------------------------------------------------------
void OAddessBookSourcePilot::implCreateDataSource()
void OAddressBookSourcePilot::implCreateDataSource()
{
if (m_aNewDataSource.isValid())
{ // we already have a data source object
Expand Down Expand Up @@ -386,16 +386,16 @@ namespace abp
break;

case AST_INVALID:
DBG_ERROR( "OAddessBookSourcePilot::implCreateDataSource: illegal data source type!" );
DBG_ERROR( "OAddressBookSourcePilot::implCreateDataSource: illegal data source type!" );
break;
}
m_eNewDataSourceType = m_aSettings.eType;
}

//---------------------------------------------------------------------
sal_Bool OAddessBookSourcePilot::connectToDataSource( sal_Bool _bForceReConnect )
sal_Bool OAddressBookSourcePilot::connectToDataSource( sal_Bool _bForceReConnect )
{
DBG_ASSERT( m_aNewDataSource.isValid(), "OAddessBookSourcePilot::implConnect: invalid current data source!" );
DBG_ASSERT( m_aNewDataSource.isValid(), "OAddressBookSourcePilot::implConnect: invalid current data source!" );

WaitObject aWaitCursor( this );
if ( _bForceReConnect && m_aNewDataSource.isConnected( ) )
Expand All @@ -405,7 +405,7 @@ namespace abp
}

//---------------------------------------------------------------------
OWizardPage* OAddessBookSourcePilot::createPage(WizardState _nState)
OWizardPage* OAddressBookSourcePilot::createPage(WizardState _nState)
{
switch (_nState)
{
Expand All @@ -425,13 +425,13 @@ namespace abp
return new FinalPage( this );

default:
DBG_ERROR("OAddessBookSourcePilot::createPage: invalid state!");
DBG_ERROR("OAddressBookSourcePilot::createPage: invalid state!");
return NULL;
}
}

//---------------------------------------------------------------------
void OAddessBookSourcePilot::impl_updateRoadmap( AddressSourceType _eType )
void OAddressBookSourcePilot::impl_updateRoadmap( AddressSourceType _eType )
{
bool bSettingsPage = needAdminInvokationPage( _eType );
bool bTablesPage = needTableSelection( _eType );
Expand Down Expand Up @@ -460,7 +460,7 @@ namespace abp
}

//---------------------------------------------------------------------
void OAddessBookSourcePilot::typeSelectionChanged( AddressSourceType _eType )
void OAddressBookSourcePilot::typeSelectionChanged( AddressSourceType _eType )
{
PathId nCurrentPathID( PATH_COMPLETE );
bool bSettingsPage = needAdminInvokationPage( _eType );
Expand Down
10 changes: 5 additions & 5 deletions main/extensions/source/abpilot/abspilot.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ namespace abp
//.........................................................................

//=====================================================================
//= OAddessBookSourcePilot
//= OAddressBookSourcePilot
//=====================================================================
typedef ::svt::RoadmapWizard OAddessBookSourcePilot_Base;
class OAddessBookSourcePilot : public OAddessBookSourcePilot_Base
typedef ::svt::RoadmapWizard OAddressBookSourcePilot_Base;
class OAddressBookSourcePilot : public OAddressBookSourcePilot_Base
{
protected:
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
Expand All @@ -51,7 +51,7 @@ namespace abp

public:
/// ctor
OAddessBookSourcePilot(
OAddressBookSourcePilot(
Window* _pParent,
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB);

Expand All @@ -65,7 +65,7 @@ namespace abp

sal_Bool connectToDataSource( sal_Bool _bForceReConnect );

void travelNext( ) { OAddessBookSourcePilot_Base::travelNext(); }
void travelNext( ) { OAddressBookSourcePilot_Base::travelNext(); }

/// to be called when the selected type changed
void typeSelectionChanged( AddressSourceType _eType );
Expand Down
2 changes: 1 addition & 1 deletion main/extensions/source/abpilot/admininvokationpage.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ namespace abp
//=====================================================================
//= AdminDialogInvokationPage
//=====================================================================
AdminDialogInvokationPage::AdminDialogInvokationPage( OAddessBookSourcePilot* _pParent )
AdminDialogInvokationPage::AdminDialogInvokationPage( OAddressBookSourcePilot* _pParent )
:AddressBookSourcePage(_pParent, ModuleRes(RID_PAGE_ADMININVOKATION))
,m_aExplanation (this, ModuleRes(FT_ADMINEXPLANATION))
,m_aInvokeAdminDialog (this, ModuleRes(PB_INVOKE_ADMIN_DIALOG))
Expand Down
2 changes: 1 addition & 1 deletion main/extensions/source/abpilot/admininvokationpage.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ namespace abp
sal_Bool m_bSuccessfullyExecutedDialog;

public:
AdminDialogInvokationPage( OAddessBookSourcePilot* _pParent );
AdminDialogInvokationPage( OAddressBookSourcePilot* _pParent );

protected:
// TabDialog overridables
Expand Down
2 changes: 1 addition & 1 deletion main/extensions/source/abpilot/fieldmappingpage.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ namespace abp
//= FieldMappingPage
//=====================================================================
//---------------------------------------------------------------------
FieldMappingPage::FieldMappingPage( OAddessBookSourcePilot* _pParent )
FieldMappingPage::FieldMappingPage( OAddressBookSourcePilot* _pParent )
:AddressBookSourcePage( _pParent, ModuleRes( RID_PAGE_FIELDMAPPING ) )
,m_aExplanation ( this, ModuleRes( FT_FIELDASSIGMENTEXPL ) )
,m_aInvokeDialog ( this, ModuleRes( PB_INVOKE_FIELDS_DIALOG ) )
Expand Down
2 changes: 1 addition & 1 deletion main/extensions/source/abpilot/fieldmappingpage.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ namespace abp
FixedText m_aHint;

public:
FieldMappingPage( OAddessBookSourcePilot* _pParent );
FieldMappingPage( OAddressBookSourcePilot* _pParent );

protected:
// OWizardPage overridables
Expand Down
2 changes: 1 addition & 1 deletion main/extensions/source/abpilot/tableselectionpage.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ namespace abp
//= TableSelectionPage
//=====================================================================
//---------------------------------------------------------------------
TableSelectionPage::TableSelectionPage( OAddessBookSourcePilot* _pParent )
TableSelectionPage::TableSelectionPage( OAddressBookSourcePilot* _pParent )
:AddressBookSourcePage(_pParent, ModuleRes(RID_PAGE_TABLESELECTION_AB))
,m_aLabel ( this, ModuleRes( FL_TOOMUCHTABLES ) )
,m_aTableList ( this, ModuleRes( LB_TABLELIST ) )
Expand Down
2 changes: 1 addition & 1 deletion main/extensions/source/abpilot/tableselectionpage.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ namespace abp
ListBox m_aTableList;

public:
TableSelectionPage( OAddessBookSourcePilot* _pParent );
TableSelectionPage( OAddressBookSourcePilot* _pParent );

protected:
// OWizardPage overridables
Expand Down
2 changes: 1 addition & 1 deletion main/extensions/source/abpilot/typeselectionpage.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ namespace abp
//= TypeSelectionPage
//=====================================================================
//---------------------------------------------------------------------
TypeSelectionPage::TypeSelectionPage( OAddessBookSourcePilot* _pParent )
TypeSelectionPage::TypeSelectionPage( OAddressBookSourcePilot* _pParent )
:AddressBookSourcePage(_pParent, ModuleRes(RID_PAGE_SELECTABTYPE))
,m_aHint (this, ModuleRes(FT_TYPE_HINTS))
,m_aTypeSep (this, ModuleRes(FL_TYPE))
Expand Down
2 changes: 1 addition & 1 deletion main/extensions/source/abpilot/typeselectionpage.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ namespace abp
::std::vector< ButtonItem > m_aAllTypes;

public:
TypeSelectionPage( OAddessBookSourcePilot* _pParent );
TypeSelectionPage( OAddressBookSourcePilot* _pParent );
~TypeSelectionPage();

// retrieves the currently selected type
Expand Down
Loading