summaryrefslogtreecommitdiff
path: root/dbaccess
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/source/core/api/CacheSet.cxx2
-rw-r--r--dbaccess/source/core/api/RowSet.cxx2
-rw-r--r--dbaccess/source/core/dataaccess/databasedocument.cxx2
-rw-r--r--dbaccess/source/core/dataaccess/documentcontainer.cxx6
-rw-r--r--dbaccess/source/filter/xml/dbloader2.cxx2
-rw-r--r--dbaccess/source/filter/xml/xmlfilter.cxx2
-rw-r--r--dbaccess/source/ui/app/AppController.cxx2
-rw-r--r--dbaccess/source/ui/app/AppDetailPageHelper.cxx2
-rw-r--r--dbaccess/source/ui/browser/formadapter.cxx2
-rw-r--r--dbaccess/source/ui/browser/genericcontroller.cxx2
-rw-r--r--dbaccess/source/ui/browser/sbagrid.cxx12
-rw-r--r--dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx2
-rw-r--r--dbaccess/source/ui/misc/TokenWriter.cxx2
-rw-r--r--dbaccess/source/ui/relationdesign/RTableConnectionData.cxx4
-rw-r--r--dbaccess/source/ui/tabledesign/TEditControl.cxx16
-rw-r--r--dbaccess/source/ui/tabledesign/TableDesignView.cxx2
-rw-r--r--dbaccess/source/ui/tabledesign/TableFieldControl.cxx2
-rw-r--r--dbaccess/source/ui/tabledesign/TableUndo.cxx4
-rw-r--r--dbaccess/source/ui/uno/copytablewizard.cxx2
19 files changed, 34 insertions, 36 deletions
diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx
index fe930722ab68..6d230f9361c4 100644
--- a/dbaccess/source/core/api/CacheSet.cxx
+++ b/dbaccess/source/core/api/CacheSet.cxx
@@ -310,7 +310,7 @@ void OCacheSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOri
++i;
}
- m_bUpdated = xPrep->executeUpdate() > 0;
+ m_bUpdated = xPrep->executeUpdate() > 0;
}
void OCacheSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connectivity::OSQLTable& _xTable )
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index f390467422f2..6da73ff09fd3 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -769,7 +769,7 @@ void SAL_CALL ORowSet::updateBinaryStream( sal_Int32 columnIndex, const Referenc
checkUpdateConditions(columnIndex);
checkUpdateIterator();
- {
+ {
Sequence<sal_Int8> aSeq;
if(x.is())
x->readBytes(aSeq,length);
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index c20bb36c3566..4eb8613d683c 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -457,7 +457,7 @@ void ODatabaseDocument::impl_import_nolck_throw( const Reference< XComponentCont
Reference< XStatusIndicator > xStatusIndicator;
lcl_extractAndStartStatusIndicator( _rResource, xStatusIndicator, aFilterCreationArgs );
- uno::Reference< beans::XPropertySet > xInfoSet( comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo( aExportInfoMap ) ) );
+ uno::Reference< beans::XPropertySet > xInfoSet( comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo( aExportInfoMap ) ) );
OUString sBaseURI = _rResource.getOrDefault("BaseURI", OUString());
if (sBaseURI.isEmpty())
sBaseURI = _rResource.getOrDefault("URL",OUString());
diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx
index d422506307fa..bcb128145ffe 100644
--- a/dbaccess/source/core/dataaccess/documentcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx
@@ -384,7 +384,7 @@ Any SAL_CALL ODocumentContainer::execute( const Command& aCommand, sal_Int32 Com
{
// open command for a folder content
OpenCommandArgument2 aOpenCommand;
- if ( !( aCommand.Argument >>= aOpenCommand ) )
+ if ( !( aCommand.Argument >>= aOpenCommand ) )
{
OSL_FAIL( "Wrong argument type!" );
ucbhelper::cancelCommandExecution(
@@ -428,9 +428,9 @@ Any SAL_CALL ODocumentContainer::execute( const Command& aCommand, sal_Int32 Com
// insert
InsertCommandArgument arg;
- if ( !( aCommand.Argument >>= arg ) )
+ if ( !( aCommand.Argument >>= arg ) )
{
- OSL_FAIL( "Wrong argument type!" );
+ OSL_FAIL( "Wrong argument type!" );
ucbhelper::cancelCommandExecution(
makeAny( IllegalArgumentException(
OUString(),
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx
index 0872891cf1e3..d4de893a6b76 100644
--- a/dbaccess/source/filter/xml/dbloader2.cxx
+++ b/dbaccess/source/filter/xml/dbloader2.cxx
@@ -386,7 +386,7 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const OU
// not touch it.
if ( !aMediaDesc.has( "InteractionHandler" ) )
{
- Reference< XInteractionHandler2 > xHandler( InteractionHandler::createWithParent(m_aContext, nullptr) );
+ Reference< XInteractionHandler2 > xHandler( InteractionHandler::createWithParent(m_aContext, nullptr) );
aMediaDesc.put( "InteractionHandler", xHandler );
}
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index 2ad43c7fd64f..2be6e6d7be65 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -161,7 +161,7 @@ static ErrCode ReadThroughComponent(
{
bool bEncrypted = false;
// open stream (and set parser input)
- OUString sStreamName = OUString::createFromAscii(pStreamName);
+ OUString sStreamName = OUString::createFromAscii(pStreamName);
if ( !xStorage->hasByName( sStreamName ) || !xStorage->isStreamElement( sStreamName ) )
{
// stream name not found! Then try the compatibility name.
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 39ef3acd5069..bb1b82e70cc8 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -2159,7 +2159,7 @@ void OApplicationController::onSelectionChanged()
if ( pView->getSelectionCount() == 1 )
{
const ElementType eType = pView->getElementType();
- if ( pView->isALeafSelected() )
+ if ( pView->isALeafSelected() )
{
const OUString sName = pView->getQualifiedName( nullptr /* means 'first selected' */ );
showPreviewFor( eType, sName );
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 2402312fc12f..2dea88533bfe 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -651,7 +651,7 @@ void OAppDetailPageHelper::setDetailPage(vcl::Window* _pWindow)
m_aFL->Show();
{
bHasFocus = pCurrent != nullptr && pCurrent->HasChildPathFocus();
- _pWindow->Show();
+ _pWindow->Show();
}
m_aTBPreview->Show();
m_aBorder->Show();
diff --git a/dbaccess/source/ui/browser/formadapter.cxx b/dbaccess/source/ui/browser/formadapter.cxx
index d2a0baaafa5c..23d665307b0a 100644
--- a/dbaccess/source/ui/browser/formadapter.cxx
+++ b/dbaccess/source/ui/browser/formadapter.cxx
@@ -1326,7 +1326,7 @@ Sequence< css::beans::PropertyState> SAL_CALL SbaXFormAdapter::getPropertyStates
return xState->getPropertyStates(aPropertyName);
// set them all to DEFAULT
- Sequence< css::beans::PropertyState> aReturn(aPropertyName.getLength());
+ Sequence< css::beans::PropertyState> aReturn(aPropertyName.getLength());
for (css::beans::PropertyState& rState : aReturn)
rState = css::beans::PropertyState_DEFAULT_VALUE;
return aReturn;
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index e99725deb228..1c6c5fec4415 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -608,7 +608,7 @@ Sequence< Reference< XDispatch > > OGenericUnoController::queryDispatches(const
if ( nLen )
{
aReturn.realloc( nLen );
- Reference< XDispatch >* pReturn = aReturn.getArray();
+ Reference< XDispatch >* pReturn = aReturn.getArray();
const Reference< XDispatch >* pReturnEnd = aReturn.getArray() + nLen;
const DispatchDescriptor* pDescripts = aDescripts.getConstArray();
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 9b058ea0f918..42e7e18e3015 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -208,12 +208,12 @@ void SAL_CALL SbaXGridControl::createPeer(const Reference< css::awt::XToolkit >
// TODO: why the hell this whole class does not use any mutex?
- Reference< css::frame::XDispatch > xDisp(getPeer(), UNO_QUERY);
- for (auto const& elem : m_aStatusMultiplexer)
- {
- if (elem.second.is() && elem.second->getLength())
- xDisp->addStatusListener(elem.second.get(), elem.first);
- }
+ Reference< css::frame::XDispatch > xDisp(getPeer(), UNO_QUERY);
+ for (auto const& elem : m_aStatusMultiplexer)
+ {
+ if (elem.second.is() && elem.second->getLength())
+ xDisp->addStatusListener(elem.second.get(), elem.first);
+ }
}
void SAL_CALL SbaXGridControl::dispatch(const css::util::URL& aURL, const Sequence< PropertyValue >& aArgs)
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 5d0e19a955a7..5628b3a7a050 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -230,7 +230,7 @@ using namespace ::com::sun::star;
m_pETBaseDN->SetText(pBaseDN->GetValue());
m_pNFPortNumber->SetValue(pPortNumber->GetValue());
}
- OGenericAdministrationPage::implInitControls(_rSet, _bSaveValue);
+ OGenericAdministrationPage::implInitControls(_rSet, _bSaveValue);
callModifiedHdl();
}
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index 163263f2aaa5..029856bb066e 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -939,7 +939,7 @@ void OHTMLImportExport::WriteCell( sal_Int32 nFormat, sal_Int32 nWidthPixel, sal
void OHTMLImportExport::FontOn()
{
#if OSL_DEBUG_LEVEL > 0
- m_bCheckFont = true;
+ m_bCheckFont = true;
#endif
// <FONT FACE="xxx">
diff --git a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
index 6934ed27fe78..226cf4bb9c19 100644
--- a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
+++ b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
@@ -303,7 +303,7 @@ bool ORelationTableConnectionData::Update()
// get the name of foreign key; search for columns
m_aConnName.clear();
-xKey.clear();
+ xKey.clear();
bool bDropRelation = false;
for(sal_Int32 i=0;i<xKeys->getCount();++i)
{
@@ -361,7 +361,7 @@ xKey.clear();
}
}
}
- xKey.clear();
+ xKey.clear();
}
if ( bDropRelation )
{
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index 9e03aefda83e..594778dd6d35 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -712,8 +712,8 @@ void OTableEditorCtrl::CopyRows()
pDescrWin->SaveData( pActRow->GetActFieldDescr() );
// Copy selected rows to the ClipboardList
- std::shared_ptr<OTableRow> pClipboardRow;
- std::shared_ptr<OTableRow> pRow;
+ std::shared_ptr<OTableRow> pClipboardRow;
+ std::shared_ptr<OTableRow> pRow;
std::vector< std::shared_ptr<OTableRow> > vClipboardList;
vClipboardList.reserve(GetSelectRowCount());
@@ -775,7 +775,7 @@ void OTableEditorCtrl::InsertRows( long nRow )
aStreamRef->Seek(STREAM_SEEK_TO_BEGIN);
aStreamRef->ResetError();
long nInsertRow = nRow;
- std::shared_ptr<OTableRow> pRow;
+ std::shared_ptr<OTableRow> pRow;
sal_Int32 nSize = 0;
(*aStreamRef).ReadInt32( nSize );
vInsertedUndoRedoRows.reserve(nSize);
@@ -1068,7 +1068,7 @@ OFieldDescription* OTableEditorCtrl::GetFieldDescr( long nRow )
OSL_FAIL("(nRow<0) || (nRow>=nListCount)");
return nullptr;
}
- std::shared_ptr<OTableRow> pRow = (*m_pRowList)[ nRow ];
+ std::shared_ptr<OTableRow> pRow = (*m_pRowList)[ nRow ];
if( !pRow )
return nullptr;
return pRow->GetActFieldDescr();
@@ -1120,7 +1120,7 @@ bool OTableEditorCtrl::IsCopyAllowed()
return false;
// If one of the selected rows is empty, Copy is not possible
- std::shared_ptr<OTableRow> pRow;
+ std::shared_ptr<OTableRow> pRow;
long nIndex = FirstSelectedRow();
while( nIndex != SFX_ENDOFSELECTION )
{
@@ -1279,7 +1279,7 @@ bool OTableEditorCtrl::IsPrimaryKeyAllowed( long /*nRow*/ )
// - No Memo or Image entries
// - DROP is not permitted (see above) and the column is not Required (not null flag is not set).
long nIndex = FirstSelectedRow();
- std::shared_ptr<OTableRow> pRow;
+ std::shared_ptr<OTableRow> pRow;
while( nIndex != SFX_ENDOFSELECTION )
{
pRow = (*m_pRowList)[nIndex];
@@ -1518,7 +1518,7 @@ void OTableEditorCtrl::SetPrimaryKey( bool bSet )
while( nIndex != SFX_ENDOFSELECTION )
{
// Set the key
- std::shared_ptr<OTableRow> pRow = (*m_pRowList)[nIndex];
+ std::shared_ptr<OTableRow> pRow = (*m_pRowList)[nIndex];
OFieldDescription* pFieldDescr = pRow->GetActFieldDescr();
if(pFieldDescr)
AdjustFieldDescription(pFieldDescr,aInsertedPrimKeys,nIndex,false,true);
@@ -1567,7 +1567,7 @@ void OTableEditorCtrl::SwitchType( const TOTypeInfoSP& _pType )
if ( nRow < 0 || nRow > static_cast<long>(m_pRowList->size()) )
return;
// Show the new description
- std::shared_ptr<OTableRow> pRow = (*m_pRowList)[nRow];
+ std::shared_ptr<OTableRow> pRow = (*m_pRowList)[nRow];
pRow->SetFieldType( _pType, true );
if ( _pType.get() )
{
diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
index 09f393753732..60684bd6f7ea 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
@@ -292,7 +292,7 @@ void OTableDesignView::setReadOnly(bool _bReadOnly)
void OTableDesignView::reSync()
{
GetEditorCtrl()->DeactivateCell();
- std::shared_ptr<OTableRow> pRow = (*GetEditorCtrl()->GetRowList())[GetEditorCtrl()->GetCurRow()];
+ std::shared_ptr<OTableRow> pRow = (*GetEditorCtrl()->GetRowList())[GetEditorCtrl()->GetCurRow()];
OFieldDescription* pFieldDescr = pRow ? pRow->GetActFieldDescr() : nullptr;
if ( pFieldDescr )
GetDescWin()->DisplayData(pFieldDescr);
diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx
index 1a70c1995262..e88813e1fc6b 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx
@@ -63,7 +63,7 @@ bool OTableFieldControl::IsReadOnly()
bRead = true;
else
{
- std::shared_ptr<OTableRow> pCurRow = GetCtrl()->GetActRow();
+ std::shared_ptr<OTableRow> pCurRow = GetCtrl()->GetActRow();
if( pCurRow )
bRead = pCurRow->IsReadOnly();
}
diff --git a/dbaccess/source/ui/tabledesign/TableUndo.cxx b/dbaccess/source/ui/tabledesign/TableUndo.cxx
index 107722a7c07c..42f586b8608b 100644
--- a/dbaccess/source/ui/tabledesign/TableUndo.cxx
+++ b/dbaccess/source/ui/tabledesign/TableUndo.cxx
@@ -162,8 +162,8 @@ OTableEditorDelUndoAct::OTableEditorDelUndoAct( OTableEditorCtrl* pOwner) :
// fill DeletedRowList
std::vector< std::shared_ptr<OTableRow> >* pOriginalRows = pOwner->GetRowList();
sal_Int32 nIndex = pOwner->FirstSelectedRow();
- std::shared_ptr<OTableRow> pOriginalRow;
- std::shared_ptr<OTableRow> pNewRow;
+ std::shared_ptr<OTableRow> pOriginalRow;
+ std::shared_ptr<OTableRow> pNewRow;
while( nIndex != SFX_ENDOFSELECTION )
{
diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx
index ccda8f1a501b..e493dad24851 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -995,12 +995,10 @@ namespace
void (SAL_CALL XParameters::*_pSetter)( sal_Int32, const VALUE_TYPE& ) )
{
const VALUE_TYPE value( (m_xSource.get()->*_pGetter)( m_rSourcePos ) );
- {
if ( m_xSource->wasNull() )
m_xDest->setNull( m_rDestPos, m_rColTypes[ m_rSourcePos ] );
else
(m_xDest.get()->*_pSetter)( m_rDestPos, value );
- }
}
private:
const sal_Int32& m_rSourcePos;
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 10:49:41 +0000