Kaydet (Commit) 998adf0b authored tarafından Julien Nabet's avatar Julien Nabet

Typo: OAddessBookSourcePilot->OAddressBookSourcePilot

Change-Id: I26587b761c91433fe80b9439e7e7c5e420db6192
Reviewed-on: https://gerrit.libreoffice.org/24552Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarJulien Nabet <serval2412@yahoo.fr>
üst 87cccfbf
......@@ -42,7 +42,7 @@ namespace abp
return pFilter;
}
FinalPage::FinalPage( OAddessBookSourcePilot* _pParent )
FinalPage::FinalPage( OAddressBookSourcePilot* _pParent )
: AddressBookSourcePage(_pParent, "DataSourcePage",
"modules/sabpilot/ui/datasourcepage.ui")
{
......
......@@ -50,7 +50,7 @@ namespace abp
StringBag m_aInvalidDataSourceNames;
public:
explicit FinalPage(OAddessBookSourcePilot* _pParent);
explicit FinalPage(OAddressBookSourcePilot* _pParent);
virtual ~FinalPage();
virtual void dispose() override;
......
......@@ -29,7 +29,7 @@ namespace abp
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
AddressBookSourcePage::AddressBookSourcePage(OAddessBookSourcePilot* _pParent, const OString& rID, const OUString& rUIXMLDescription)
AddressBookSourcePage::AddressBookSourcePage(OAddressBookSourcePilot* _pParent, const OString& rID, const OUString& rUIXMLDescription)
:AddressBookSourcePage_Base(_pParent, rID, rUIXMLDescription)
{
}
......@@ -41,15 +41,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());
}
......
......@@ -31,7 +31,7 @@ namespace abp
{
class OAddessBookSourcePilot;
class OAddressBookSourcePilot;
struct AddressSettings;
typedef ::svt::OWizardPage AddressBookSourcePage_Base;
......@@ -39,12 +39,12 @@ namespace abp
class AddressBookSourcePage : public AddressBookSourcePage_Base
{
protected:
AddressBookSourcePage(OAddessBookSourcePilot *pParent, const OString& rID, const OUString& rUIXMLDescription);
AddressBookSourcePage(OAddressBookSourcePilot *pParent, const OString& rID, const OUString& rUIXMLDescription);
protected:
// helper
OAddessBookSourcePilot* getDialog();
const OAddessBookSourcePilot* getDialog() const;
OAddressBookSourcePilot* getDialog();
const OAddressBookSourcePilot* getDialog() const;
const css::uno::Reference< css::uno::XComponentContext > &
getORB();
AddressSettings& getSettings();
......
......@@ -54,8 +54,8 @@ namespace abp
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
OAddessBookSourcePilot::OAddessBookSourcePilot(vcl::Window* _pParent, const Reference< XComponentContext >& _rxORB)
:OAddessBookSourcePilot_Base( _pParent,
OAddressBookSourcePilot::OAddressBookSourcePilot(vcl::Window* _pParent, const Reference< XComponentContext >& _rxORB)
:OAddressBookSourcePilot_Base( _pParent,
WizardButtonFlags::HELP | WizardButtonFlags::FINISH | WizardButtonFlags::CANCEL | WizardButtonFlags::NEXT | WizardButtonFlags::PREVIOUS )
,m_xORB(_rxORB)
,m_aNewDataSource(_rxORB)
......@@ -94,7 +94,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 UNX
......@@ -123,7 +123,7 @@ namespace abp
SetHelpId(HID_ABSPILOT);
}
OUString OAddessBookSourcePilot::getStateDisplayName( WizardState _nState ) const
OUString OAddressBookSourcePilot::getStateDisplayName( WizardState _nState ) const
{
sal_uInt16 nResId = 0;
switch ( _nState )
......@@ -134,7 +134,7 @@ namespace abp
case STATE_MANUAL_FIELD_MAPPING: nResId = RID_STR_MANUAL_FIELD_MAPPING; break;
case STATE_FINAL_CONFIRM: nResId = RID_STR_FINAL_CONFIRM; break;
}
DBG_ASSERT( nResId, "OAddessBookSourcePilot::getStateDisplayName: don't know this state!" );
DBG_ASSERT( nResId, "OAddressBookSourcePilot::getStateDisplayName: don't know this state!" );
OUString sDisplayName;
if ( nResId )
......@@ -146,7 +146,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
......@@ -168,14 +168,14 @@ namespace abp
}
void OAddessBookSourcePilot::implCleanup()
void OAddressBookSourcePilot::implCleanup()
{
if ( m_aNewDataSource.isValid() )
m_aNewDataSource.remove();
}
IMPL_LINK_NOARG_TYPED( OAddessBookSourcePilot, OnCancelClicked, Button*, void )
IMPL_LINK_NOARG_TYPED( OAddressBookSourcePilot, OnCancelClicked, Button*, void )
{
// do cleanups
implCleanup();
......@@ -187,17 +187,17 @@ namespace abp
}
bool OAddessBookSourcePilot::Close()
bool OAddressBookSourcePilot::Close()
{
implCleanup();
return OAddessBookSourcePilot_Base::Close();
return OAddressBookSourcePilot_Base::Close();
}
bool OAddessBookSourcePilot::onFinish()
bool OAddressBookSourcePilot::onFinish()
{
if ( !OAddessBookSourcePilot_Base::onFinish() )
if ( !OAddressBookSourcePilot_Base::onFinish() )
return false;
implCommitAll();
......@@ -208,7 +208,7 @@ namespace abp
}
void OAddessBookSourcePilot::enterState( WizardState _nState )
void OAddressBookSourcePilot::enterState( WizardState _nState )
{
switch ( _nState )
{
......@@ -226,13 +226,13 @@ namespace abp
break;
}
OAddessBookSourcePilot_Base::enterState(_nState);
OAddressBookSourcePilot_Base::enterState(_nState);
}
bool OAddessBookSourcePilot::prepareLeaveCurrentState( CommitPageReason _eReason )
bool OAddressBookSourcePilot::prepareLeaveCurrentState( CommitPageReason _eReason )
{
if ( !OAddessBookSourcePilot_Base::prepareLeaveCurrentState( _eReason ) )
if ( !OAddressBookSourcePilot_Base::prepareLeaveCurrentState( _eReason ) )
return false;
if ( _eReason == eTravelBackward )
......@@ -284,7 +284,7 @@ namespace abp
}
void OAddessBookSourcePilot::implDefaultTableName()
void OAddressBookSourcePilot::implDefaultTableName()
{
const StringBag& rTableNames = getDataSource().getTableNames();
if ( rTableNames.end() != rTableNames.find( getSettings().sSelectedTable ) )
......@@ -300,7 +300,7 @@ namespace abp
case AST_EVOLUTION_GROUPWISE:
case AST_EVOLUTION_LDAP : pGuess = "Personal"; break;
default:
OSL_FAIL( "OAddessBookSourcePilot::implDefaultTableName: unhandled case!" );
OSL_FAIL( "OAddressBookSourcePilot::implDefaultTableName: unhandled case!" );
return;
}
const OUString sGuess = OUString::createFromAscii( pGuess );
......@@ -309,15 +309,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
......@@ -367,16 +367,16 @@ namespace abp
break;
case AST_INVALID:
OSL_FAIL( "OAddessBookSourcePilot::implCreateDataSource: illegal data source type!" );
OSL_FAIL( "OAddressBookSourcePilot::implCreateDataSource: illegal data source type!" );
break;
}
m_eNewDataSourceType = m_aSettings.eType;
}
bool OAddessBookSourcePilot::connectToDataSource( bool _bForceReConnect )
bool OAddressBookSourcePilot::connectToDataSource( 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( ) )
......@@ -386,7 +386,7 @@ namespace abp
}
VclPtr<TabPage> OAddessBookSourcePilot::createPage(WizardState _nState)
VclPtr<TabPage> OAddressBookSourcePilot::createPage(WizardState _nState)
{
switch (_nState)
{
......@@ -406,13 +406,13 @@ namespace abp
return VclPtr<FinalPage>::Create( this );
default:
OSL_FAIL("OAddessBookSourcePilot::createPage: invalid state!");
OSL_FAIL("OAddressBookSourcePilot::createPage: invalid state!");
return nullptr;
}
}
void OAddessBookSourcePilot::impl_updateRoadmap( AddressSourceType _eType )
void OAddressBookSourcePilot::impl_updateRoadmap( AddressSourceType _eType )
{
bool bSettingsPage = needAdminInvokationPage( _eType );
bool bTablesPage = needTableSelection( _eType );
......@@ -441,7 +441,7 @@ namespace abp
}
void OAddessBookSourcePilot::typeSelectionChanged( AddressSourceType _eType )
void OAddressBookSourcePilot::typeSelectionChanged( AddressSourceType _eType )
{
PathId nCurrentPathID( PATH_COMPLETE );
bool bSettingsPage = needAdminInvokationPage( _eType );
......
......@@ -29,8 +29,8 @@
namespace abp
{
typedef ::svt::RoadmapWizard OAddessBookSourcePilot_Base;
class OAddessBookSourcePilot : public OAddessBookSourcePilot_Base
typedef ::svt::RoadmapWizard OAddressBookSourcePilot_Base;
class OAddressBookSourcePilot : public OAddressBookSourcePilot_Base
{
protected:
css::uno::Reference< css::uno::XComponentContext >
......@@ -42,7 +42,7 @@ namespace abp
public:
/// ctor
OAddessBookSourcePilot(
OAddressBookSourcePilot(
vcl::Window* _pParent,
const css::uno::Reference< css::uno::XComponentContext >& _rxORB);
......@@ -56,7 +56,7 @@ namespace abp
bool connectToDataSource( bool _bForceReConnect );
void travelNext( ) { OAddessBookSourcePilot_Base::travelNext(); }
void travelNext( ) { OAddressBookSourcePilot_Base::travelNext(); }
/// to be called when the selected type changed
void typeSelectionChanged( AddressSourceType _eType );
......
......@@ -24,7 +24,7 @@
namespace abp
{
AdminDialogInvokationPage::AdminDialogInvokationPage( OAddessBookSourcePilot* _pParent )
AdminDialogInvokationPage::AdminDialogInvokationPage( OAddressBookSourcePilot* _pParent )
: AddressBookSourcePage(_pParent, "InvokeAdminPage",
"modules/sabpilot/ui/invokeadminpage.ui")
{
......
......@@ -32,7 +32,7 @@ namespace abp
VclPtr<FixedText> m_pErrorMessage;
public:
explicit AdminDialogInvokationPage(OAddessBookSourcePilot* _pParent);
explicit AdminDialogInvokationPage(OAddressBookSourcePilot* _pParent);
virtual ~AdminDialogInvokationPage();
virtual void dispose() override;
protected:
......
......@@ -26,7 +26,7 @@
namespace abp
{
FieldMappingPage::FieldMappingPage( OAddessBookSourcePilot* _pParent )
FieldMappingPage::FieldMappingPage( OAddressBookSourcePilot* _pParent )
: AddressBookSourcePage(_pParent, "FieldAssignPage",
"modules/sabpilot/ui/fieldassignpage.ui")
{
......
......@@ -34,7 +34,7 @@ namespace abp
VclPtr<FixedText> m_pHint;
public:
explicit FieldMappingPage(OAddessBookSourcePilot* _pParent);
explicit FieldMappingPage(OAddressBookSourcePilot* _pParent);
virtual ~FieldMappingPage();
virtual void dispose() override;
protected:
......
......@@ -27,7 +27,7 @@
namespace abp
{
TableSelectionPage::TableSelectionPage( OAddessBookSourcePilot* _pParent )
TableSelectionPage::TableSelectionPage( OAddressBookSourcePilot* _pParent )
:AddressBookSourcePage(_pParent, "SelectTablePage",
"modules/sabpilot/ui/selecttablepage.ui")
{
......
......@@ -34,7 +34,7 @@ namespace abp
VclPtr<ListBox> m_pTableList;
public:
explicit TableSelectionPage( OAddessBookSourcePilot* _pParent );
explicit TableSelectionPage( OAddressBookSourcePilot* _pParent );
virtual ~TableSelectionPage();
virtual void dispose() override;
protected:
......
......@@ -31,7 +31,7 @@ namespace abp
using namespace ::com::sun::star::sdbc;
// TypeSelectionPage
TypeSelectionPage::TypeSelectionPage( OAddessBookSourcePilot* _pParent )
TypeSelectionPage::TypeSelectionPage( OAddressBookSourcePilot* _pParent )
: AddressBookSourcePage(_pParent, "SelectTypePage",
"modules/sabpilot/ui/selecttypepage.ui")
{
......
......@@ -58,7 +58,7 @@ namespace abp
::std::vector< ButtonItem > m_aAllTypes;
public:
explicit TypeSelectionPage( OAddessBookSourcePilot* _pParent );
explicit TypeSelectionPage( OAddressBookSourcePilot* _pParent );
virtual ~TypeSelectionPage();
virtual void dispose() override;
......
......@@ -114,7 +114,7 @@ namespace abp
VclPtr<Dialog> OABSPilotUno::createDialog(vcl::Window* _pParent)
{
return VclPtr<OAddessBookSourcePilot>::Create(_pParent, m_aContext );
return VclPtr<OAddressBookSourcePilot>::Create(_pParent, m_aContext );
}
......@@ -137,7 +137,7 @@ namespace abp
{
if ( _nExecutionResult == RET_OK )
{
const AddressSettings& aSettings = static_cast<OAddessBookSourcePilot*>(m_pDialog.get())->getSettings();
const AddressSettings& aSettings = static_cast<OAddressBookSourcePilot*>(m_pDialog.get())->getSettings();
m_sDataSourceName = aSettings.bRegisterDataSource ? aSettings.sRegisteredDataSourceName : aSettings.sDataSourceName;
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment