diff options
47 files changed, 4 insertions, 142 deletions
diff --git a/connectivity/source/commontools/TIndex.cxx b/connectivity/source/commontools/TIndex.cxx index 104f2c49ebf5..87ed49f030ae 100644 --- a/connectivity/source/commontools/TIndex.cxx +++ b/connectivity/source/commontools/TIndex.cxx @@ -39,7 +39,6 @@ using namespace connectivity; using namespace connectivity::sdbcx; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; diff --git a/connectivity/source/commontools/TIndexColumns.cxx b/connectivity/source/commontools/TIndexColumns.cxx index 34868623a507..2580e6d493f8 100644 --- a/connectivity/source/commontools/TIndexColumns.cxx +++ b/connectivity/source/commontools/TIndexColumns.cxx @@ -43,7 +43,6 @@ using namespace connectivity; using namespace connectivity::sdbcx; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; diff --git a/connectivity/source/commontools/TKey.cxx b/connectivity/source/commontools/TKey.cxx index 2efd87fc2c5e..fa67a745f2bb 100644 --- a/connectivity/source/commontools/TKey.cxx +++ b/connectivity/source/commontools/TKey.cxx @@ -40,7 +40,6 @@ using namespace connectivity; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; diff --git a/connectivity/source/commontools/TKeyColumns.cxx b/connectivity/source/commontools/TKeyColumns.cxx index 297b91974682..791b735dc652 100644 --- a/connectivity/source/commontools/TKeyColumns.cxx +++ b/connectivity/source/commontools/TKeyColumns.cxx @@ -43,7 +43,6 @@ using namespace connectivity; using namespace connectivity::sdbcx; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index 04f3af9f8676..da48a38bfdf2 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -121,8 +121,6 @@ namespace dbtools using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::task; -// using namespace cppu; -// using namespace osl; //============================================================================== //============================================================================== diff --git a/connectivity/source/drivers/adabas/BColumns.cxx b/connectivity/source/drivers/adabas/BColumns.cxx index 3968154d584a..227646beeb9b 100644 --- a/connectivity/source/drivers/adabas/BColumns.cxx +++ b/connectivity/source/drivers/adabas/BColumns.cxx @@ -43,14 +43,11 @@ #include <comphelper/property.hxx> using namespace ::comphelper; - - using namespace connectivity::adabas; using namespace connectivity::sdbcx; using namespace connectivity; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; diff --git a/connectivity/source/drivers/adabas/BDatabaseMetaData.cxx b/connectivity/source/drivers/adabas/BDatabaseMetaData.cxx index ffb76b1a62d2..2dbd6b22266b 100644 --- a/connectivity/source/drivers/adabas/BDatabaseMetaData.cxx +++ b/connectivity/source/drivers/adabas/BDatabaseMetaData.cxx @@ -35,7 +35,6 @@ using namespace connectivity::adabas; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; @@ -131,11 +130,7 @@ Reference< XResultSet > OAdabasDatabaseMetaData::impl_getTypeInfo_throw( ) switch((sal_Int32)aRow[2]->getValue()) { case DataType::FLOAT: -// aRow[3] = sal_Int32(15); -// break; case DataType::REAL: -// aRow[3] = sal_Int32(16); -// break; case DataType::DOUBLE: aRow[2]->setValue(DataType::DOUBLE); aRow[3]->setValue(sal_Int32(18)); diff --git a/connectivity/source/drivers/adabas/BGroup.cxx b/connectivity/source/drivers/adabas/BGroup.cxx index aca797de83cf..64582b42432b 100644 --- a/connectivity/source/drivers/adabas/BGroup.cxx +++ b/connectivity/source/drivers/adabas/BGroup.cxx @@ -39,7 +39,6 @@ using namespace connectivity::adabas; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; diff --git a/connectivity/source/drivers/adabas/BGroups.cxx b/connectivity/source/drivers/adabas/BGroups.cxx index 2a58ec10ea14..0211a0a7f5aa 100644 --- a/connectivity/source/drivers/adabas/BGroups.cxx +++ b/connectivity/source/drivers/adabas/BGroups.cxx @@ -40,7 +40,6 @@ using namespace connectivity; using namespace connectivity::adabas; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; diff --git a/connectivity/source/drivers/adabas/BIndex.cxx b/connectivity/source/drivers/adabas/BIndex.cxx index 876d0a7fe03f..7374aded7c5f 100644 --- a/connectivity/source/drivers/adabas/BIndex.cxx +++ b/connectivity/source/drivers/adabas/BIndex.cxx @@ -38,7 +38,6 @@ using namespace connectivity::adabas; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; diff --git a/connectivity/source/drivers/adabas/BIndexColumns.cxx b/connectivity/source/drivers/adabas/BIndexColumns.cxx index 9d30208fd288..7365d4c66581 100644 --- a/connectivity/source/drivers/adabas/BIndexColumns.cxx +++ b/connectivity/source/drivers/adabas/BIndexColumns.cxx @@ -44,7 +44,6 @@ using namespace connectivity::adabas; using namespace connectivity::sdbcx; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; diff --git a/connectivity/source/drivers/adabas/BUsers.cxx b/connectivity/source/drivers/adabas/BUsers.cxx index 6b62f495b066..5ca28331d904 100644 --- a/connectivity/source/drivers/adabas/BUsers.cxx +++ b/connectivity/source/drivers/adabas/BUsers.cxx @@ -44,7 +44,6 @@ using namespace connectivity; using namespace connectivity::adabas; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; diff --git a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx index cfbd37918338..c5dd3927311c 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx @@ -50,8 +50,6 @@ using namespace com::sun::star::beans; using namespace com::sun::star::sdbc; -// using namespace connectivity; - ODatabaseMetaData::ODatabaseMetaData(OConnection* _pCon) : ::connectivity::ODatabaseMetaDataBase(_pCon,_pCon->getConnectionInfo()) ,m_pADOConnection(_pCon->getConnection()) @@ -98,7 +96,6 @@ sal_Bool ODatabaseMetaData::getBoolProperty(const ::rtl::OUString& _aProperty) Reference< XResultSet > ODatabaseMetaData::impl_getTypeInfo_throw( ) { ADORecordset *pRecordset = m_pADOConnection->getTypeInfo(); - // ADOS::ThrowException(*m_pADOConnection,*this); ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet(pRecordset); pResult->setTypeInfoMap(ADOS::isJetEngine(m_pConnection->getEngineType())); diff --git a/connectivity/source/drivers/calc/CResultSet.cxx b/connectivity/source/drivers/calc/CResultSet.cxx index 5357c5fd015f..3085e135cd0f 100644 --- a/connectivity/source/drivers/calc/CResultSet.cxx +++ b/connectivity/source/drivers/calc/CResultSet.cxx @@ -44,8 +44,7 @@ using namespace com::sun::star::lang; using namespace com::sun::star::beans; using namespace com::sun::star::sdbc; using namespace com::sun::star::sdbcx; -// using namespace com::sun::star::container; -// using namespace com::sun::star::util; + //------------------------------------------------------------------------------ OCalcResultSet::OCalcResultSet( OStatement_Base* pStmt,connectivity::OSQLParseTreeIterator& _aSQLIterator) : file::OResultSet(pStmt,_aSQLIterator) diff --git a/connectivity/source/drivers/evoab/LResultSet.cxx b/connectivity/source/drivers/evoab/LResultSet.cxx index 762942805431..4ff0e701f8a4 100644 --- a/connectivity/source/drivers/evoab/LResultSet.cxx +++ b/connectivity/source/drivers/evoab/LResultSet.cxx @@ -45,8 +45,7 @@ using namespace com::sun::star::lang; using namespace com::sun::star::beans; using namespace com::sun::star::sdbc; using namespace com::sun::star::sdbcx; -// using namespace com::sun::star::container; -// using namespace com::sun::star::util; + //------------------------------------------------------------------------------ OEvoabResultSet::OEvoabResultSet( OStatement_Base* pStmt,connectivity::OSQLParseTreeIterator& _aSQLIterator) : file::OResultSet(pStmt,_aSQLIterator) diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx index 67c58ad9ca7a..b53226c98fdd 100644 --- a/connectivity/source/drivers/file/fcode.cxx +++ b/connectivity/source/drivers/file/fcode.cxx @@ -43,13 +43,8 @@ using namespace ::comphelper; using namespace connectivity; using namespace connectivity::file; -//using namespace ::com::sun::star::uno; -//using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdb; -//using namespace ::com::sun::star::container; -//using namespace ::com::sun::star::beans; -//using namespace ::com::sun::star::sdbcx; TYPEINIT0(OCode); TYPEINIT1(OOperand, OCode); diff --git a/connectivity/source/drivers/flat/EDatabaseMetaData.cxx b/connectivity/source/drivers/flat/EDatabaseMetaData.cxx index 161ace8941a2..6281142f59ab 100644 --- a/connectivity/source/drivers/flat/EDatabaseMetaData.cxx +++ b/connectivity/source/drivers/flat/EDatabaseMetaData.cxx @@ -49,7 +49,6 @@ using namespace ::comphelper; using namespace connectivity; using namespace connectivity::flat; -// using namespace connectivity::file; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::sdbcx; diff --git a/connectivity/source/drivers/flat/EResultSet.cxx b/connectivity/source/drivers/flat/EResultSet.cxx index a910c87318f7..d484c8f51134 100644 --- a/connectivity/source/drivers/flat/EResultSet.cxx +++ b/connectivity/source/drivers/flat/EResultSet.cxx @@ -45,8 +45,7 @@ using namespace com::sun::star::lang; using namespace com::sun::star::beans; using namespace com::sun::star::sdbc; using namespace com::sun::star::sdbcx; -// using namespace com::sun::star::container; -// using namespace com::sun::star::util; + //------------------------------------------------------------------------------ OFlatResultSet::OFlatResultSet( OStatement_Base* pStmt,connectivity::OSQLParseTreeIterator& _aSQLIterator) : file::OResultSet(pStmt,_aSQLIterator) diff --git a/connectivity/source/drivers/hsqldb/HCatalog.cxx b/connectivity/source/drivers/hsqldb/HCatalog.cxx index a1cb584b8bf6..2dda469c1fb8 100644 --- a/connectivity/source/drivers/hsqldb/HCatalog.cxx +++ b/connectivity/source/drivers/hsqldb/HCatalog.cxx @@ -40,7 +40,6 @@ // ------------------------------------------------------------------------- using namespace connectivity; using namespace connectivity::hsqldb; -//using namespace connectivity::sdbcx; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::sdbcx; diff --git a/connectivity/source/drivers/hsqldb/HUsers.cxx b/connectivity/source/drivers/hsqldb/HUsers.cxx index a99d62bb7d64..8cf6f649db0b 100644 --- a/connectivity/source/drivers/hsqldb/HUsers.cxx +++ b/connectivity/source/drivers/hsqldb/HUsers.cxx @@ -44,7 +44,6 @@ using namespace connectivity; using namespace connectivity::hsqldb; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; diff --git a/connectivity/source/drivers/jdbc/CallableStatement.cxx b/connectivity/source/drivers/jdbc/CallableStatement.cxx index 420d6c34d813..9cfbd19564d5 100644 --- a/connectivity/source/drivers/jdbc/CallableStatement.cxx +++ b/connectivity/source/drivers/jdbc/CallableStatement.cxx @@ -44,7 +44,6 @@ using namespace connectivity; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; diff --git a/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx b/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx index c4571f2f7fef..01c693f71838 100644 --- a/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx +++ b/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx @@ -32,10 +32,10 @@ #include "java/lang/Boolean.hxx" #include "java/tools.hxx" #include "java/lang/String.hxx" + using namespace connectivity; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx index b2d72cb24d50..f900709d103e 100644 --- a/connectivity/source/drivers/jdbc/ResultSet.cxx +++ b/connectivity/source/drivers/jdbc/ResultSet.cxx @@ -65,7 +65,6 @@ using namespace ::comphelper; using namespace connectivity; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; diff --git a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx index c922f77f4664..3d64d67630e8 100644 --- a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx +++ b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx @@ -36,7 +36,6 @@ using namespace connectivity; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; diff --git a/connectivity/source/drivers/jdbc/SQLException.cxx b/connectivity/source/drivers/jdbc/SQLException.cxx index 0a9e2712d070..6df28a63b63b 100644 --- a/connectivity/source/drivers/jdbc/SQLException.cxx +++ b/connectivity/source/drivers/jdbc/SQLException.cxx @@ -34,7 +34,6 @@ using namespace connectivity; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; diff --git a/connectivity/source/drivers/jdbc/tools.cxx b/connectivity/source/drivers/jdbc/tools.cxx index b8c0c8e75051..ae5672b3406f 100644 --- a/connectivity/source/drivers/jdbc/tools.cxx +++ b/connectivity/source/drivers/jdbc/tools.cxx @@ -41,7 +41,6 @@ using namespace connectivity; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; diff --git a/connectivity/source/drivers/mozab/MColumns.cxx b/connectivity/source/drivers/mozab/MColumns.cxx index a3a838a11104..dc8effa590bc 100644 --- a/connectivity/source/drivers/mozab/MColumns.cxx +++ b/connectivity/source/drivers/mozab/MColumns.cxx @@ -49,7 +49,6 @@ using namespace connectivity::sdbcx; using namespace connectivity; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; diff --git a/connectivity/source/drivers/mysql/YUsers.cxx b/connectivity/source/drivers/mysql/YUsers.cxx index ce0273ccd664..a95d1d527c05 100644 --- a/connectivity/source/drivers/mysql/YUsers.cxx +++ b/connectivity/source/drivers/mysql/YUsers.cxx @@ -44,7 +44,6 @@ using namespace connectivity; using namespace connectivity::mysql; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y index c324c7d16b07..498f9aad900f 100644 --- a/connectivity/source/parse/sqlbison.y +++ b/connectivity/source/parse/sqlbison.y @@ -3857,7 +3857,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::util; using namespace ::osl; using namespace ::dbtools; -// using namespace connectivity; //============================================================ //= a helper for static ascii pseudo-unicode strings @@ -3869,7 +3868,6 @@ struct _ConstAsciiString_ sal_Char const* str; operator rtl::OUString () const { return rtl::OUString(str, length, RTL_TEXTENCODING_ASCII_US); } -// operator ::rtl::OUString () const { return ::rtl::OUString(str, length, RTL_TEXTENCODING_ASCII_US); } operator const sal_Char * () const { return str; } operator ::rtl::OString() const { return str; } }; diff --git a/connectivity/workben/testmoz/main.cxx b/connectivity/workben/testmoz/main.cxx index 59d1a16aadea..8de0163edab6 100644 --- a/connectivity/workben/testmoz/main.cxx +++ b/connectivity/workben/testmoz/main.cxx @@ -80,7 +80,6 @@ using namespace com::sun::star::registry; using namespace com::sun::star::ucb; using namespace com::sun::star::beans; -//using namespace com::sun::star; using namespace connectivity; using namespace com::sun::star::sdb; using namespace com::sun::star::sdbc; @@ -103,7 +102,6 @@ void printColumns( Reference<XResultSet> &xRes ) printf( "ColumnCount = %d\n", xMeta->getColumnCount()); for(sal_Int32 i=1;i<=xMeta->getColumnCount();++i) { - // printf(aPat.getStr(), xMeta->getColumnName(i).getStr()); const char *str = OUtoCStr(xMeta->getColumnName(i)); printf( aPat, str ); } diff --git a/connectivity/workben/testmoz/mozthread.cxx b/connectivity/workben/testmoz/mozthread.cxx index cb01c33a835b..3ea344e1d071 100644 --- a/connectivity/workben/testmoz/mozthread.cxx +++ b/connectivity/workben/testmoz/mozthread.cxx @@ -85,7 +85,6 @@ using namespace com::sun::star::registry; using namespace com::sun::star::ucb; using namespace com::sun::star::beans; -//using namespace com::sun::star; using namespace connectivity; using namespace com::sun::star::sdb; using namespace com::sun::star::sdbc; diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx index 4b97711cb24d..cf1364ddf3dc 100644 --- a/linguistic/source/convdiclist.cxx +++ b/linguistic/source/convdiclist.cxx @@ -55,7 +55,6 @@ #include "misc.hxx" #include "defs.hxx" -//using namespace utl; using namespace osl; using namespace rtl; using namespace com::sun::star; @@ -544,8 +543,6 @@ uno::Sequence< OUString > SAL_CALL ConvDicList::queryConversions( { MutexGuard aGuard( GetLinguMutex() ); - /*INT16 nLang = LocaleToLanguage( rLocale );*/ - INT32 nCount = 0; uno::Sequence< OUString > aRes( 20 ); OUString *pRes = aRes.getArray(); diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx index 0cb5ea091bf8..b4a51de2dc25 100644 --- a/linguistic/source/dlistimp.cxx +++ b/linguistic/source/dlistimp.cxx @@ -60,7 +60,6 @@ #include "dicimp.hxx" #include "lngopt.hxx" -//using namespace utl; using namespace osl; using namespace rtl; using namespace com::sun::star; @@ -184,7 +183,6 @@ void SAL_CALL DicEvtListenerHelper::processDictionaryEvent( || xDicEntry.is(), "lng : missing dictionary entry" ); - /*BOOL bActiveDicsModified = FALSE;*/ // // evaluate DictionaryEvents and update data for next DictionaryListEvent // diff --git a/linguistic/source/hyphdta.cxx b/linguistic/source/hyphdta.cxx index 09860fe6dbf1..364ccad150f5 100644 --- a/linguistic/source/hyphdta.cxx +++ b/linguistic/source/hyphdta.cxx @@ -40,11 +40,9 @@ #include <svl/lngmisc.hxx> #include <unotools/localedatawrapper.hxx> -//using namespace utl; using namespace osl; using namespace rtl; using namespace com::sun::star; -//using namespace com::sun::star::beans; using namespace com::sun::star::lang; using namespace com::sun::star::uno; using namespace com::sun::star::linguistic2; diff --git a/linguistic/source/lngprophelp.cxx b/linguistic/source/lngprophelp.cxx index 5f93135dc818..4613faa3f16a 100644 --- a/linguistic/source/lngprophelp.cxx +++ b/linguistic/source/lngprophelp.cxx @@ -43,8 +43,6 @@ #include <lngprophelp.hxx> - -//using namespace utl; using namespace osl; using namespace rtl; using namespace com::sun::star; diff --git a/linguistic/source/thesdta.cxx b/linguistic/source/thesdta.cxx index 1a1846a856dc..46880f41862b 100644 --- a/linguistic/source/thesdta.cxx +++ b/linguistic/source/thesdta.cxx @@ -35,7 +35,6 @@ #include "thesdta.hxx" -//using namespace utl; using namespace osl; using namespace rtl; using namespace com::sun::star; diff --git a/linguistic/workben/sprophelp.cxx b/linguistic/workben/sprophelp.cxx index 26480de208d8..9a81205def23 100644 --- a/linguistic/workben/sprophelp.cxx +++ b/linguistic/workben/sprophelp.cxx @@ -42,7 +42,6 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <osl/mutex.hxx> -//using namespace utl; using namespace osl; using namespace rtl; using namespace com::sun::star; diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 94e428eef29c..c8485cda9d88 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -108,7 +108,6 @@ #include <comphelper/uieventslogger.hxx> #include <com/sun/star/frame/XModuleManager.hpp> -//using namespace ::com::sun::star::awt; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::frame::status; diff --git a/svx/inc/svx/svdmodel.hxx b/svx/inc/svx/svdmodel.hxx index 68633c14b575..13e294f30a85 100644 --- a/svx/inc/svx/svdmodel.hxx +++ b/svx/inc/svx/svdmodel.hxx @@ -269,7 +269,6 @@ public: UINT16 nStarDrawPreviewMasterPageNum; // Reserven fuer kompatible Erweiterungen -//-/ SfxItemPool* pUndoItemPool; SotStorage* pModelStorage; SvxForbiddenCharactersTable* mpForbiddenCharactersTable; ULONG nSwapGraphicsMode; diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx index d7c2cb8fcc27..f39809572213 100644 --- a/svx/source/dialog/fontwork.cxx +++ b/svx/source/dialog/fontwork.cxx @@ -282,9 +282,6 @@ SvxFontWorkDialog::SvxFontWorkDialog( SfxBindings *pBindinx, aTbxShadow.SetSizePixel(aSize); aTbxShadow.SetSelectHdl( LINK(this, SvxFontWorkDialog, SelectShadowHdl_Impl) ); -// aFbShadowX.SetBitmap(Bitmap(FW_RESID(RID_SVXBMP_SHADOW_XDIST))); -// aFbShadowY.SetBitmap(Bitmap(FW_RESID(RID_SVXBMP_SHADOW_YDIST))); - Link aLink = LINK(this, SvxFontWorkDialog, ModifyInputHdl_Impl); aMtrFldDistance.SetModifyHdl( aLink ); aMtrFldTextStart.SetModifyHdl( aLink ); @@ -338,22 +335,11 @@ SvxFontWorkDialog::~SvxFontWorkDialog() DELETEZ(pCtrlItems[i]); } -/************************************************************************* -|* -\************************************************************************/ - void SvxFontWorkDialog::Zoom() { SfxDockingWindow::Roll(); } - -/************************************************************************* -|* -|* -|* -\************************************************************************/ - SfxChildAlignment SvxFontWorkDialog::CheckAlignment( SfxChildAlignment eActAlign, SfxChildAlignment eAlign ) { @@ -604,8 +590,6 @@ void SvxFontWorkDialog::SetShadow_Impl(const XFormTextShadowItem* pItem, nId = TBI_SHADOW_NORMAL; const FieldUnit eDlgUnit = rBindings.GetDispatcher()->GetModule()->GetFieldUnit(); -// aFbShadowX.SetBitmap( Bitmap( ResId(RID_SVXBMP_SHADOW_XDIST, _pMgr ) ) ); - //aMtrFldShadowX.SetUnit(FUNIT_MM); aMtrFldShadowX.SetUnit( eDlgUnit ); aMtrFldShadowX.SetDecimalDigits(2); aMtrFldShadowX.SetMin(LONG_MIN); @@ -615,8 +599,6 @@ void SvxFontWorkDialog::SetShadow_Impl(const XFormTextShadowItem* pItem, else aMtrFldShadowX.SetSpinSize( 10 ); -// aFbShadowY.SetBitmap( Bitmap( ResId( RID_SVXBMP_SHADOW_YDIST, _pMgr ) ) ); - //aMtrFldShadowY.SetUnit(FUNIT_MM); aMtrFldShadowY.SetUnit( eDlgUnit ); aMtrFldShadowY.SetDecimalDigits(2); aMtrFldShadowY.SetMin(LONG_MIN); @@ -642,14 +624,12 @@ void SvxFontWorkDialog::SetShadow_Impl(const XFormTextShadowItem* pItem, { nId = TBI_SHADOW_SLANT; -// aFbShadowX.SetBitmap( Bitmap( ResId( RID_SVXBMP_SHADOW_ANGLE, _pMgr ) ) ); aMtrFldShadowX.SetUnit(FUNIT_CUSTOM); aMtrFldShadowX.SetDecimalDigits(1); aMtrFldShadowX.SetMin(-1800); aMtrFldShadowX.SetMax( 1800); aMtrFldShadowX.SetSpinSize(10); -// aFbShadowY.SetBitmap( Bitmap( ResId( RID_SVXBMP_SHADOW_SIZE, _pMgr ) ) ); aMtrFldShadowY.SetUnit(FUNIT_CUSTOM); aMtrFldShadowY.SetDecimalDigits(0); aMtrFldShadowY.SetMin(-999); @@ -758,10 +738,6 @@ void SvxFontWorkDialog::SetShadowYVal_Impl(const XFormTextShadowYValItem* pItem) } } -/************************************************************************* -|* -\************************************************************************/ - IMPL_LINK( SvxFontWorkDialog, SelectStyleHdl_Impl, void *, EMPTYARG ) { USHORT nId = aTbxStyle.GetCurItemId(); @@ -790,10 +766,6 @@ IMPL_LINK( SvxFontWorkDialog, SelectStyleHdl_Impl, void *, EMPTYARG ) return 0; } -/************************************************************************* -|* -\************************************************************************/ - IMPL_LINK( SvxFontWorkDialog, SelectAdjustHdl_Impl, void *, EMPTYARG ) { USHORT nId = aTbxAdjust.GetCurItemId(); @@ -821,10 +793,6 @@ IMPL_LINK( SvxFontWorkDialog, SelectAdjustHdl_Impl, void *, EMPTYARG ) return 0; } -/************************************************************************* -|* -\************************************************************************/ - IMPL_LINK( SvxFontWorkDialog, SelectShadowHdl_Impl, void *, EMPTYARG ) { USHORT nId = aTbxShadow.GetCurItemId(); @@ -865,10 +833,6 @@ IMPL_LINK( SvxFontWorkDialog, SelectShadowHdl_Impl, void *, EMPTYARG ) return 0; } -/************************************************************************* -|* -\************************************************************************/ - IMPL_LINK_INLINE_START( SvxFontWorkDialog, ModifyInputHdl_Impl, void *, EMPTYARG ) { aInputTimer.Start(); @@ -876,10 +840,6 @@ IMPL_LINK_INLINE_START( SvxFontWorkDialog, ModifyInputHdl_Impl, void *, EMPTYARG } IMPL_LINK_INLINE_END( SvxFontWorkDialog, ModifyInputHdl_Impl, void *, EMPTYARG ) -/************************************************************************* -|* -\************************************************************************/ - IMPL_LINK( SvxFontWorkDialog, InputTimoutHdl_Impl, void *, EMPTYARG ) { // System-Metrik evtl. neu setzen @@ -934,10 +894,6 @@ IMPL_LINK( SvxFontWorkDialog, InputTimoutHdl_Impl, void *, EMPTYARG ) return 0; } -/************************************************************************* -|* -\************************************************************************/ - IMPL_LINK( SvxFontWorkDialog, FormSelectHdl_Impl, void *, EMPTYARG ) { XFormTextStdFormItem aItem; @@ -951,25 +907,14 @@ IMPL_LINK( SvxFontWorkDialog, FormSelectHdl_Impl, void *, EMPTYARG ) return 0; } -/************************************************************************* -|* -\************************************************************************/ - IMPL_LINK( SvxFontWorkDialog, ColorSelectHdl_Impl, void *, EMPTYARG ) { -// Changed by obo. Linux-Compiler can't parse commented lines XFormTextShadowColorItem aItem( (const String &) String(), (const Color &) aShadowColorLB.GetSelectEntryColor() ); -// XFormTextShadowColorItem aItem( String(), -// aShadowColorLB.GetSelectEntryColor() ); GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_SHDWCOLOR, SFX_CALLMODE_RECORD, &aItem, 0L ); return 0; } -/************************************************************************* -|* -\************************************************************************/ - void SvxFontWorkDialog::SetColorTable(const XColorTable* pTable) { if ( pTable && pTable != pColorTable ) @@ -980,10 +925,6 @@ void SvxFontWorkDialog::SetColorTable(const XColorTable* pTable) } } -/************************************************************************* -|* -\************************************************************************/ - void SvxFontWorkDialog::SetActive(BOOL /*bActivate*/) { } @@ -1005,7 +946,6 @@ void SvxFontWorkDialog::CreateStdFormObj(SdrView& rView, SdrPageView& rPV, Rectangle aRect; XFormTextAdjust eAdjust = XFT_AUTOSIZE; -//-/ rOldObj.TakeAttributes(aAttr, TRUE, FALSE); aAttr.Put(rOldObj.GetMergedItemSet()); const XFormTextStdFormItem& rOldForm = (const XFormTextStdFormItem&) @@ -1256,7 +1196,6 @@ void SvxFontWorkDialog::ApplyImageList() aFbShadowX.SetImage( rImgLst.GetImage( TBI_SHADOW_ANGLE ) ); aFbShadowY.SetImage( rImgLst.GetImage( TBI_SHADOW_SIZE ) ); break; -// case TBI_SHADOW_NORMAL: default: aFbShadowX.SetImage( rImgLst.GetImage( TBI_SHADOW_XDIST ) ); aFbShadowY.SetImage( rImgLst.GetImage( TBI_SHADOW_YDIST ) ); diff --git a/ucb/source/ucp/file/filrow.cxx b/ucb/source/ucp/file/filrow.cxx index 4bd7954917ef..5a49ed16dd0d 100644 --- a/ucb/source/ucp/file/filrow.cxx +++ b/ucb/source/ucp/file/filrow.cxx @@ -35,8 +35,6 @@ using namespace fileaccess; using namespace com::sun::star; using namespace com::sun::star::uno; -//using namespace com::sun::star::ucb; - // Funktion for TypeConverting @@ -57,10 +55,6 @@ sal_Bool convert( shell* pShell, xConverter = uno::Reference< script::XTypeConverter >( pShell->m_xMultiServiceFactory->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter")) ), uno::UNO_QUERY ); - -/* DBG_ASSERT( m_xTypeConverter.is(), - "PropertyValueSet::getTypeConverter() - " - "Service 'com.sun.star.script.Converter' n/a!" );*/ } try diff --git a/xmloff/source/text/XMLIndexSimpleEntryContext.cxx b/xmloff/source/text/XMLIndexSimpleEntryContext.cxx index 6e6eae8afbe1..4e8a0e65eb3c 100644 --- a/xmloff/source/text/XMLIndexSimpleEntryContext.cxx +++ b/xmloff/source/text/XMLIndexSimpleEntryContext.cxx @@ -40,9 +40,6 @@ #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> - -//using namespace ::com::sun::star::text; - using ::rtl::OUString; using ::com::sun::star::beans::PropertyValue; using ::com::sun::star::beans::PropertyValues; diff --git a/xmloff/source/text/XMLIndexTemplateContext.cxx b/xmloff/source/text/XMLIndexTemplateContext.cxx index 5509c447f949..1c3dee00a6d1 100644 --- a/xmloff/source/text/XMLIndexTemplateContext.cxx +++ b/xmloff/source/text/XMLIndexTemplateContext.cxx @@ -50,7 +50,6 @@ using namespace ::std; -//using namespace ::com::sun::star::text; using namespace ::xmloff::token; using ::rtl::OUString; diff --git a/xmloff/source/text/XMLTextHeaderFooterContext.cxx b/xmloff/source/text/XMLTextHeaderFooterContext.cxx index 3de0e70bfc52..ffd2d02597b0 100644 --- a/xmloff/source/text/XMLTextHeaderFooterContext.cxx +++ b/xmloff/source/text/XMLTextHeaderFooterContext.cxx @@ -43,12 +43,8 @@ using ::rtl::OUStringBuffer; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; -//using namespace ::com::sun::star::style; using namespace ::com::sun::star::text; using namespace ::com::sun::star::beans; -//using namespace ::com::sun::star::container; -//using namespace ::com::sun::star::lang; -//using namespace ::com::sun::star::text; TYPEINIT1( XMLTextHeaderFooterContext, SvXMLImportContext ); diff --git a/xmloff/source/text/XMLTextMasterPageContext.cxx b/xmloff/source/text/XMLTextMasterPageContext.cxx index 40fcdeb5594b..e884076bfae6 100644 --- a/xmloff/source/text/XMLTextMasterPageContext.cxx +++ b/xmloff/source/text/XMLTextMasterPageContext.cxx @@ -52,7 +52,6 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -//using namespace ::com::sun::star::text; using namespace ::xmloff::token; Reference < XStyle > XMLTextMasterPageContext::Create() diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx index 297b9e295bbc..219c421b4fea 100644 --- a/xmloff/source/text/txtprhdl.cxx +++ b/xmloff/source/text/txtprhdl.cxx @@ -59,11 +59,8 @@ using ::rtl::OUString; using ::rtl::OUStringBuffer; -//using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::style; -//using namespace ::com::sun::star::container; -//using namespace ::com::sun::star::beans; using namespace ::com::sun::star::text; using namespace ::xmloff::token; diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx index 589c3a1d69ee..354f28f48bd1 100644 --- a/xmloff/source/text/txtstyli.cxx +++ b/xmloff/source/text/txtstyli.cxx @@ -70,7 +70,6 @@ using namespace ::com::sun::star::frame; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; -//using namespace ::com::sun::star::text; using namespace ::xmloff::token; static SvXMLEnumMapEntry aCategoryMap[] = |