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

Typo: sDatasouce->sDatasource

Change-Id: I4ffaf4195ae17ecf86dffc9c44e4672c4b2835d7
üst 8d758d07
...@@ -237,7 +237,7 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt ) ...@@ -237,7 +237,7 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt )
} }
// extract the descriptor // extract the descriptor
OUString sDatasouce, sCommand, sFieldName,sDatabaseLocation,sConnnectionResource; OUString sDatasource, sCommand, sFieldName,sDatabaseLocation,sConnnectionResource;
sal_Int32 nCommandType = CommandType::COMMAND; sal_Int32 nCommandType = CommandType::COMMAND;
Reference< XPreparedStatement > xStatement; Reference< XPreparedStatement > xStatement;
Reference< XResultSet > xResultSet; Reference< XResultSet > xResultSet;
...@@ -245,7 +245,7 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt ) ...@@ -245,7 +245,7 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt )
Reference< XConnection > xConnection; Reference< XConnection > xConnection;
ODataAccessDescriptor aColumn = OColumnTransferable::extractColumnDescriptor(aDroppedData); ODataAccessDescriptor aColumn = OColumnTransferable::extractColumnDescriptor(aDroppedData);
if (aColumn.has(daDataSource)) aColumn[daDataSource] >>= sDatasouce; if (aColumn.has(daDataSource)) aColumn[daDataSource] >>= sDatasource;
if (aColumn.has(daDatabaseLocation)) aColumn[daDatabaseLocation] >>= sDatabaseLocation; if (aColumn.has(daDatabaseLocation)) aColumn[daDatabaseLocation] >>= sDatabaseLocation;
if (aColumn.has(daConnectionResource)) aColumn[daConnectionResource] >>= sConnnectionResource; if (aColumn.has(daConnectionResource)) aColumn[daConnectionResource] >>= sConnnectionResource;
if (aColumn.has(daCommand)) aColumn[daCommand] >>= sCommand; if (aColumn.has(daCommand)) aColumn[daCommand] >>= sCommand;
...@@ -256,7 +256,7 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt ) ...@@ -256,7 +256,7 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt )
if ( sFieldName.isEmpty() if ( sFieldName.isEmpty()
|| sCommand.isEmpty() || sCommand.isEmpty()
|| ( sDatasouce.isEmpty() || ( sDatasource.isEmpty()
&& sDatabaseLocation.isEmpty() && sDatabaseLocation.isEmpty()
&& !xConnection.is() && !xConnection.is()
) )
...@@ -273,12 +273,12 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt ) ...@@ -273,12 +273,12 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt )
{ // the transferable did not contain the connection -> build an own one { // the transferable did not contain the connection -> build an own one
try try
{ {
OUString sSignificantSource( sDatasouce.isEmpty() ? sDatabaseLocation : sDatasouce ); OUString sSignificantSource( sDatasource.isEmpty() ? sDatabaseLocation : sDatasource );
xConnection = OStaticDataAccessTools().getConnection_withFeedback(sSignificantSource, OUString(), OUString(), xConnection = OStaticDataAccessTools().getConnection_withFeedback(sSignificantSource, OUString(), OUString(),
static_cast<FmGridControl*>(GetParent())->getContext() ); static_cast<FmGridControl*>(GetParent())->getContext() );
} }
catch(NoSuchElementException&) catch(NoSuchElementException&)
{ // allowed, means sDatasouce isn't a valid data source name .... { // allowed, means sDatasource isn't a valid data source name ....
} }
catch(Exception&) catch(Exception&)
{ {
...@@ -374,8 +374,8 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ ) ...@@ -374,8 +374,8 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ )
Reference< XPropertySet > xField; Reference< XPropertySet > xField;
Reference< XConnection > xConnection; Reference< XConnection > xConnection;
OUString sDatasouce = m_pImpl->aDropData.getDataSource(); OUString sDatasource = m_pImpl->aDropData.getDataSource();
if ( sDatasouce.isEmpty() && m_pImpl->aDropData.has(daConnectionResource) ) if ( sDatasource.isEmpty() && m_pImpl->aDropData.has(daConnectionResource) )
m_pImpl->aDropData[daConnectionResource] >>= sURL; m_pImpl->aDropData[daConnectionResource] >>= sURL;
m_pImpl->aDropData[daCommand] >>= sCommand; m_pImpl->aDropData[daCommand] >>= sCommand;
m_pImpl->aDropData[daCommandType] >>= nCommandType; m_pImpl->aDropData[daCommandType] >>= nCommandType;
...@@ -585,8 +585,8 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ ) ...@@ -585,8 +585,8 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ )
{ {
if (::comphelper::getString(xForm->getPropertyValue(FM_PROP_DATASOURCE)).isEmpty()) if (::comphelper::getString(xForm->getPropertyValue(FM_PROP_DATASOURCE)).isEmpty())
{ {
if ( !sDatasouce.isEmpty() ) if ( !sDatasource.isEmpty() )
xForm->setPropertyValue(FM_PROP_DATASOURCE, makeAny(sDatasouce)); xForm->setPropertyValue(FM_PROP_DATASOURCE, makeAny(sDatasource));
else else
xForm->setPropertyValue(FM_PROP_URL, makeAny(sURL)); xForm->setPropertyValue(FM_PROP_URL, makeAny(sURL));
} }
......
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