From 405caad685edd0ba914789bda01b5dc9b3030773 Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Mon, 25 Feb 2013 02:17:44 +0100 Subject: loplugin: unused variables Change-Id: I46a748bf2c54d15c0f5718901197f3b4c34b82bf --- dbaccess/source/core/api/CacheSet.cxx | 4 ---- dbaccess/source/core/api/KeySet.cxx | 2 -- dbaccess/source/core/api/OptimisticSet.cxx | 5 ----- dbaccess/source/core/dataaccess/bookmarkcontainer.cxx | 3 --- dbaccess/source/ui/app/AppControllerDnD.cxx | 3 --- dbaccess/source/ui/app/AppDetailPageHelper.cxx | 1 - dbaccess/source/ui/browser/brwctrlr.cxx | 2 -- dbaccess/source/ui/control/marktree.cxx | 6 ------ dbaccess/source/ui/dlg/DbAdminImpl.cxx | 11 ----------- dbaccess/source/ui/dlg/dbwizsetup.cxx | 2 -- dbaccess/source/ui/dlg/paramdialog.cxx | 2 -- dbaccess/source/ui/dlg/tablespage.cxx | 1 - dbaccess/source/ui/misc/UITools.cxx | 6 ------ dbaccess/source/ui/misc/WColumnSelect.cxx | 2 -- dbaccess/source/ui/misc/WCopyTable.cxx | 4 ---- dbaccess/source/ui/misc/WTypeSelect.cxx | 1 - dbaccess/source/ui/querydesign/QueryDesignView.cxx | 1 - dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 3 --- dbaccess/source/ui/tabledesign/TEditControl.cxx | 1 - dbaccess/source/ui/tabledesign/TableController.cxx | 1 - 20 files changed, 61 deletions(-) (limited to 'dbaccess/source') diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx index 5974d4a11c03..32ffb78437c4 100644 --- a/dbaccess/source/core/api/CacheSet.cxx +++ b/dbaccess/source/core/api/CacheSet.cxx @@ -335,10 +335,6 @@ void SAL_CALL OCacheSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connecti OUStringBuffer aSql("DELETE FROM " + m_aComposedTableName + " WHERE "); - // list all cloumns that should be set - ::rtl::OUString aQuote = getIdentifierQuoteString(); - static ::rtl::OUString aAnd(" AND "); - // use keys and indexes for exact positioning // first the keys const Reference xPrimaryKeyColumns = getPrimaryKeyColumns_throw(xSet); diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx index 3b7ca892a56b..99022cf3727a 100644 --- a/dbaccess/source/core/api/KeySet.cxx +++ b/dbaccess/source/core/api/KeySet.cxx @@ -532,7 +532,6 @@ void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow ::std::vector< Reference > aAllIndexColumns; lcl_fillIndexColumns(xIndexes,aAllIndexColumns); - OUString aColumnName; OUStringBuffer sKeyCondition,sIndexCondition; ::std::vector aIndexColumnPositions; @@ -945,7 +944,6 @@ void SAL_CALL OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivit ::std::vector< Reference > aAllIndexColumns; lcl_fillIndexColumns(xIndexes,aAllIndexColumns); - OUString aColumnName; OUStringBuffer sIndexCondition; ::std::vector aIndexColumnPositions; SelectColumnsMetaData::const_iterator aIter = m_pColumnNames->begin(); diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx index e68cc7e9ede0..34f545be1057 100644 --- a/dbaccess/source/core/api/OptimisticSet.cxx +++ b/dbaccess/source/core/api/OptimisticSet.cxx @@ -182,8 +182,6 @@ void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORow static ::rtl::OUString s_sPara(" = ?"); ::rtl::OUString aQuote = getIdentifierQuoteString(); - ::rtl::OUString aColumnName; - ::rtl::OUStringBuffer sKeyCondition; ::std::map< ::rtl::OUString,bool > aResultSetChanged; TSQLStatements aKeyConditions; TSQLStatements aIndexConditions; @@ -351,9 +349,6 @@ void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const conn void SAL_CALL OptimisticSet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException) { ::rtl::OUString aQuote = getIdentifierQuoteString(); - ::rtl::OUString aColumnName; - ::rtl::OUStringBuffer sKeyCondition,sIndexCondition; - ::std::vector aIndexColumnPositions; TSQLStatements aKeyConditions; TSQLStatements aIndexConditions; TSQLStatements aSql; diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx index d58f5c330d7d..c22fbd99c6c6 100644 --- a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx +++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx @@ -306,9 +306,6 @@ void OBookmarkContainer::implRemove(const ::rtl::OUString& _rName) ++aSearch ) { -#ifdef DBG_UTIL - ::rtl::OUString sName = (*aSearch)->first; -#endif if ((*aSearch)->first == _rName) { aMapPos = *aSearch; diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx index 19da30e36ae4..76edb0764688 100644 --- a/dbaccess/source/ui/app/AppControllerDnD.cxx +++ b/dbaccess/source/ui/app/AppControllerDnD.cxx @@ -262,9 +262,6 @@ void OApplicationController::deleteObjects( ElementType _eType, const ::std::vec aObsolete != aUpperChildrenBound; ) { -#if OSL_DEBUG_LEVEL > 0 - ::rtl::OUString sObsoleteName = *aObsolete; -#endif ::std::set< ::rtl::OUString >::iterator aNextObsolete = aObsolete; ++aNextObsolete; aDeleteNames.erase( aObsolete ); --nObjectsLeft; diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index dc7c2ebc1e10..946b2431313a 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -998,7 +998,6 @@ void OAppDetailPageHelper::Resize() m_aFL.SetPosSizePixel( Point(nHalfOutputWidth , 0 ), Size(aFLSize.Width(), nOutputHeight ) ); - String sText = m_aTBPreview.GetItemText(SID_DB_APP_DISABLE_PREVIEW); Size aTBSize = m_aTBPreview.CalcWindowSizePixel(); m_aTBPreview.SetPosSizePixel(Point(nOutputWidth - aTBSize.getWidth(), 0 ), aTBSize ); diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index 0fbfdeb4d8ac..fc2ffc8fee75 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -1926,7 +1926,6 @@ void SbaXDataBrowserController::ExecuteFilterSortCrit(sal_Bool bFilter) if(bFilter) { DlgFilterCrit aDlg( getBrowserView(), getORB(), xCon, xParser, xSup->getColumns() ); - String aFilter; if ( !aDlg.Execute() ) return; // if so we don't need to update the grid aDlg.BuildWherePart(); @@ -1934,7 +1933,6 @@ void SbaXDataBrowserController::ExecuteFilterSortCrit(sal_Bool bFilter) else { DlgOrderCrit aDlg( getBrowserView(),xCon,xParser,xSup->getColumns() ); - String aOrder; if(!aDlg.Execute()) { return; // if so we don't need to actualize the grid diff --git a/dbaccess/source/ui/control/marktree.cxx b/dbaccess/source/ui/control/marktree.cxx index dcf7e5f559ac..a99ef1c9a3fa 100644 --- a/dbaccess/source/ui/control/marktree.cxx +++ b/dbaccess/source/ui/control/marktree.cxx @@ -106,9 +106,6 @@ SvButtonState OMarkableTreeListBox::implDetermineState(SvTreeListEntry* _pEntry) if (!GetModel()->HasChildren(_pEntry)) // nothing to do in this bottom-up routine if there are no children ... return eState; -#ifdef DBG_UTIL - String sEntryText =GetEntryText(_pEntry); -#endif // loop through the children and check their states sal_uInt16 nCheckedChildren = 0; @@ -117,9 +114,6 @@ SvButtonState OMarkableTreeListBox::implDetermineState(SvTreeListEntry* _pEntry) SvTreeListEntry* pChildLoop = GetModel()->FirstChild(_pEntry); while (pChildLoop) { -#ifdef DBG_UTIL - String sChildText =GetEntryText(pChildLoop); -#endif SvButtonState eChildState = implDetermineState(pChildLoop); if (SV_BUTTON_TRISTATE == eChildState) break; diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index e79538af8920..a8f028fc3efe 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -809,9 +809,6 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS { if (aIndirectProps.end() != aIndirectProps.find(aPreserved->second)) { -#if OSL_DEBUG_LEVEL > 0 - const OUString sName = aPreserved->second; -#endif aRemoveIndexes.push_back(aPreserved->first - nPositionCorrector); ++nPositionCorrector; } @@ -823,14 +820,6 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS ++aRemoveIndex ) ::comphelper::removeElementAt(_rInfo, *aRemoveIndex); -#if OSL_DEBUG_LEVEL > 0 - const PropertyValue* pWhatsLeft = _rInfo.getConstArray(); - const PropertyValue* pWhatsLeftEnd = pWhatsLeft + _rInfo.getLength(); - for (; pWhatsLeft != pWhatsLeftEnd; ++pWhatsLeft) - { - OUString sLookAtIt = pWhatsLeft->Name; - } -#endif } ::connectivity::DriversConfig aDriverConfig(getORB()); diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index 14177e75fcdb..424db244bf36 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -927,9 +927,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() String ODbTypeWizDialogSetup::createUniqueFileName(const INetURLObject& _rURL) { Reference< XSimpleFileAccess3 > xSimpleFileAccess(ucb::SimpleFileAccess::create(getORB())); - :: rtl::OUString sFilename = _rURL.getName(); ::rtl::OUString BaseName = _rURL.getBase(); - ::rtl::OUString sExtension = _rURL.getExtension(); sal_Bool bElementExists = sal_True; diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx index 694cdeaef318..2191c8b02d70 100644 --- a/dbaccess/source/ui/dlg/paramdialog.cxx +++ b/dbaccess/source/ui/dlg/paramdialog.cxx @@ -181,8 +181,6 @@ DBG_NAME(OParameterDialog) return 0L; } - // transform the current string according to the param field type - OUString sTransformedText(m_aParam.GetText()); Reference< XPropertySet > xParamAsSet; m_xParams->getByIndex(m_nCurrentlySelected) >>= xParamAsSet; if (xParamAsSet.is()) diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index 4443a3ced3a4..41754803c643 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -172,7 +172,6 @@ DBG_NAME(OTableSubscriptionPage) CheckAll(sal_False); // check the ones which are in the list - String aListBoxTable; ::rtl::OUString sCatalog, sSchema, sName; SvTreeListEntry* pRootEntry = m_aTablesList.getAllObjectsEntry(); diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index 61744a7274cb..70c1bb12c5d1 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -370,9 +370,6 @@ TOTypeInfoSP getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo, for(aIter = aPair.first; aIter != aPair.second; ++aIter) { // search the best matching type (now comparing the local names) -#ifdef DBG_UTIL - ::rtl::OUString sDBTypeName = aIter->second->aTypeName; -#endif sal_Int32 nPrec = aIter->second->nPrecision; sal_Int32 nScale = aIter->second->nMaximumScale; if ( (nPrec >= _nPrecision) @@ -389,9 +386,6 @@ TOTypeInfoSP getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo, for(aIter = aPair.first; aIter != aPair.second; ++aIter) { // search the best matching type (now comparing the local names) -#ifdef DBG_UTIL - ::rtl::OUString sDBTypeName = aIter->second->aTypeName; -#endif sal_Int32 nScale = aIter->second->nMaximumScale; if ( (nScale >= _nScale) && (aIter->second->bAutoIncrement == _bAutoIncrement) diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx index 24c5061ae695..b703d4a00c4a 100644 --- a/dbaccess/source/ui/misc/WColumnSelect.cxx +++ b/dbaccess/source/ui/misc/WColumnSelect.cxx @@ -207,7 +207,6 @@ IMPL_LINK( OWizColumnSelect, ButtonClickHdl, Button *, pButton ) ::std::vector< ::rtl::OUString> aRightColumns; fillColumns(pRight,aRightColumns); - String aColumnName; if(!bAll) { for(sal_uInt16 i=0; i < pLeft->GetSelectEntryCount(); ++i) @@ -257,7 +256,6 @@ IMPL_LINK( OWizColumnSelect, ListDoubleClickHdl, MultiListBox *, pListBox ) ::std::vector< ::rtl::OUString> aRightColumns; fillColumns(pRight,aRightColumns); - String aColumnName; for(sal_uInt16 i=0; i < pLeft->GetSelectEntryCount(); ++i) moveColumn(pRight,pLeft,aRightColumns,pLeft->GetSelectEntry(i),sExtraChars,nMaxNameLen,aCase); for(sal_uInt16 j=pLeft->GetSelectEntryCount(); j ; --j) diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index 5edb86e1b2b4..8a3a8bc300de 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -924,7 +924,6 @@ IMPL_LINK_NOARG(OCopyTableWizard, ImplOKHdl) if ( aFind == m_vDestColumns.end() && m_xInteractionHandler.is() ) { - String sTitle(ModuleRes(STR_TABLEDESIGN_NO_PRIM_KEY_HEAD)); String sMsg(ModuleRes(STR_TABLEDESIGN_NO_PRIM_KEY)); SQLContext aError; aError.Message = sMsg; @@ -1114,7 +1113,6 @@ void OCopyTableWizard::loadData( const ICopyTableSourceObject& _rSourceObject, _rColumns.clear(); OFieldDescription* pActFieldDescr = NULL; - String aType; ::rtl::OUString sCreateParam(RTL_CONSTASCII_USTRINGPARAM("x")); ////////////////////////////////////////////////////////////////////// // ReadOnly-Flag @@ -1351,8 +1349,6 @@ Reference< XPropertySet > OCopyTableWizard::createTable() const ::rtl::OUString* pIter = aSeq.getConstArray(); const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); - ::std::vector aAlreadyFound(m_vColumnPos.size(),0); - for(sal_Int32 nNewPos=1;pIter != pEnd;++pIter,++nNewPos) { ODatabaseExport::TColumns::const_iterator aDestIter = m_vDestColumns.find(*pIter); diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx index d9ec94d7be7e..8f5f5508d650 100644 --- a/dbaccess/source/ui/misc/WTypeSelect.cxx +++ b/dbaccess/source/ui/misc/WTypeSelect.cxx @@ -422,7 +422,6 @@ long OWizTypeSelectList::PreNotify( NotifyEvent& rEvt ) { case SID_TABLEDESIGN_TABED_PRIMARYKEY: { - String sColumnName; sal_uInt16 nCount = GetEntryCount(); for(sal_uInt16 j = 0 ; j < nCount ; ++j) { diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index fe780c9657d2..49330e5d2b99 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -678,7 +678,6 @@ namespace if ( !pEntryField->isOtherFunction() ) { // we have to look if we have alias.* here but before we have to check if the column doesn't already exist - String sTemp = rFieldName; OTableFieldDescRef aInfo = new OTableFieldDesc(); OJoinTableView::OTableWindowMap::iterator tableIter = pTabList->begin(); OJoinTableView::OTableWindowMap::iterator tableEnd = pTabList->end(); diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 381b8c47a3c3..003c9ac57c33 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -2258,7 +2258,6 @@ sal_Bool OSelectionBrowseBox::GetFunctionName(sal_uInt32 _nFunctionTokenId,Strin { DBG_CHKTHIS(OSelectionBrowseBox,NULL); sal_Bool bErg=sal_True; - String aText; switch(_nFunctionTokenId) { case SQL_TOKEN_COUNT: @@ -2386,7 +2385,6 @@ void OSelectionBrowseBox::SetCellContents(sal_Int32 nRow, sal_uInt16 nColId, con break; case BROW_FUNCTION_ROW: { - String sOldFunctionName = pEntry->GetFunction(); String sGroupFunctionName = m_aFunctionStrings.GetToken(comphelper::string::getTokenCount(m_aFunctionStrings, ';')-1); pEntry->SetFunction(strNewText); // first reset this two member @@ -2512,7 +2510,6 @@ sal_Bool OSelectionBrowseBox::isCutAllowed() // ----------------------------------------------------------------------------- void OSelectionBrowseBox::cut() { - String sOldValue = GetCellContents(GetRealRow(GetCurRow()),GetCurColumnId()); long nRow = GetRealRow(GetCurRow()); switch (nRow) { diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index 184a9606902c..0cc428eb55fc 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -374,7 +374,6 @@ void OTableEditorCtrl::PaintCell(OutputDevice& rDev, const Rectangle& rRect, { DBG_CHKTHIS(OTableEditorCtrl,NULL); const String aText( GetCellText( m_nCurrentPos, nColumnId )); - const Size TxtSize(GetDataWindow().GetTextWidth(aText), GetDataWindow().GetTextHeight()); rDev.Push( PUSH_CLIPREGION ); rDev.SetClipRegion( rRect ); diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx index dd1f6aab9666..0a0b7f811c2d 100644 --- a/dbaccess/source/ui/tabledesign/TableController.cxx +++ b/dbaccess/source/ui/tabledesign/TableController.cxx @@ -823,7 +823,6 @@ void OTableController::loadData() OSL_ENSURE(xColSup.is(),"No XColumnsSupplier!"); Reference xColumns = xColSup->getColumns(); OFieldDescription* pActFieldDescr = NULL; - String aType; ////////////////////////////////////////////////////////////////////// // ReadOnly-Flag // Bei Drop darf keine Zeile editierbar sein. -- cgit