From 709040e0adf0a533700576b14c8498f986a601e9 Mon Sep 17 00:00:00 2001 From: Jochen Nitschke Date: Tue, 30 May 2017 10:57:29 +0200 Subject: remove duplicate 'using namespace' Change-Id: I7f8828f677cfb588135ff75c03ffb75895773440 Reviewed-on: https://gerrit.libreoffice.org/38201 Tested-by: Jenkins Reviewed-by: Noel Grandin --- bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx | 2 -- bridges/source/cpp_uno/gcc3_linux_mips64/cpp2uno.cxx | 2 -- chart2/source/controller/dialogs/dlg_ChartType.cxx | 1 - connectivity/source/commontools/dbtools.cxx | 7 +------ .../source/drivers/ado/ADatabaseMetaDataResultSet.cxx | 1 - cui/source/options/treeopt.cxx | 1 - dbaccess/source/filter/xml/xmlExport.cxx | 17 ++++++----------- dbaccess/source/ui/querydesign/querycontroller.cxx | 5 ----- extensions/source/bibliography/bibbeam.cxx | 2 -- forms/source/component/Grid.cxx | 1 - oox/source/export/drawingml.cxx | 1 - oox/source/vml/vmlshape.cxx | 1 - sc/source/core/tool/compiler.cxx | 1 - sc/source/filter/html/htmlexp.cxx | 1 - sc/source/filter/oox/pivottablebuffer.cxx | 4 ---- sd/source/ui/remotecontrol/Receiver.cxx | 1 - sd/source/ui/view/ViewShellBase.cxx | 13 +++++-------- sfx2/source/appl/workwin.cxx | 1 - svl/source/numbers/zforlist.cxx | 6 ------ svx/source/fmcomp/fmgridif.cxx | 1 - svx/source/fmcomp/xmlexchg.cxx | 1 - svx/source/form/datanavi.cxx | 2 -- svx/source/form/fmPropBrw.cxx | 17 ++++++++--------- sw/source/core/doc/tblrwcl.cxx | 2 -- sw/source/filter/ww8/ww8par.cxx | 9 --------- sw/source/ui/dbui/mmoutputtypepage.cxx | 1 - sw/source/ui/index/swuiidxmrk.cxx | 1 - sw/source/uibase/app/swmodule.cxx | 3 --- sw/source/uibase/shells/annotsh.cxx | 2 -- toolkit/source/awt/vclxwindow.cxx | 2 -- unotools/source/i18n/localedatawrapper.cxx | 1 - vcl/source/window/accessibility.cxx | 2 -- vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 2 -- vcl/workben/mtfdemo.cxx | 2 -- vcl/workben/vcldemo.cxx | 2 -- xmloff/source/chart/SchXMLExport.cxx | 1 - 36 files changed, 20 insertions(+), 99 deletions(-) diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx index 8caba36ab7fb..c434f5d9fbc4 100644 --- a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx @@ -57,8 +57,6 @@ using namespace ::rtl; #define IS_BIG_ENDIAN 0 #endif -using namespace ::com::sun::star::uno; - namespace { diff --git a/bridges/source/cpp_uno/gcc3_linux_mips64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_mips64/cpp2uno.cxx index 13f67594c981..7b1f4ef27b93 100644 --- a/bridges/source/cpp_uno/gcc3_linux_mips64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_mips64/cpp2uno.cxx @@ -52,8 +52,6 @@ using namespace ::rtl; #include #endif -using namespace ::com::sun::star::uno; - namespace CPPU_CURRENT_NAMESPACE { bool is_complex_struct(const typelib_TypeDescription * type) diff --git a/chart2/source/controller/dialogs/dlg_ChartType.cxx b/chart2/source/controller/dialogs/dlg_ChartType.cxx index fa260e003022..96c10ebc9710 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType.cxx +++ b/chart2/source/controller/dialogs/dlg_ChartType.cxx @@ -26,7 +26,6 @@ #include #include -using namespace ::com::sun::star; namespace chart { diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index 35b5bf818b6c..97316e5e2536 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -99,17 +99,12 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdbcx; +using namespace ::com::sun::star::task; using namespace ::com::sun::star::form; using namespace connectivity; namespace dbtools { - using namespace ::com::sun::star::uno; - using namespace ::com::sun::star::beans; - using namespace ::com::sun::star::util; - using namespace ::com::sun::star::lang; - using namespace ::com::sun::star::sdbc; - using namespace ::com::sun::star::task; namespace { diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx index a411f9363c0f..df4d7e274681 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx @@ -42,7 +42,6 @@ using namespace connectivity::ado; using namespace cppu; using namespace ::comphelper; -using namespace ::com::sun::star::lang; using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::beans; diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 96ac53d0f283..9c859b39e10c 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -503,7 +503,6 @@ void OfaTreeOptionsDialog::InitWidgets() } // Ctor() with Frame ----------------------------------------------------- -using namespace ::com::sun::star; OfaTreeOptionsDialog::OfaTreeOptionsDialog( vcl::Window* pParent, const Reference< XFrame >& _xFrame, diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx index 484a6a15bb52..707a8b778d8d 100644 --- a/dbaccess/source/filter/xml/xmlExport.cxx +++ b/dbaccess/source/filter/xml/xmlExport.cxx @@ -56,14 +56,14 @@ #include #include +using namespace comphelper; +using namespace ::com::sun::star::sdb; +using namespace ::com::sun::star::sdbcx; +using namespace ::com::sun::star::util; +using namespace ::com::sun::star; + namespace dbaxml { - using namespace comphelper; - using namespace ::com::sun::star::sdb; - using namespace ::com::sun::star::sdbcx; - using namespace ::com::sun::star::util; - using namespace ::com::sun::star; - class ODBExportHelper { public: @@ -102,11 +102,6 @@ extern "C" void SAL_CALL createRegistryInfo_OFullExport( ) namespace dbaxml { - using namespace comphelper; - using namespace ::com::sun::star::sdb; - using namespace ::com::sun::star::sdbcx; - using namespace ::com::sun::star::util; - Reference< XInterface > SAL_CALL ODBExportHelper::Create(const Reference< XMultiServiceFactory >& _rxORB) { return static_cast< XServiceInfo* >(new ODBExport(comphelper::getComponentContext(_rxORB), getImplementationName_Static(), SvXMLExportFlags::SETTINGS | SvXMLExportFlags::PRETTY )); diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index f9819bf7cd07..6a5ad4796f18 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -222,12 +222,7 @@ namespace dbaui } } -using namespace ::com::sun::star::uno; using namespace ::com::sun::star::io; -using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::frame; -using namespace ::com::sun::star::util; -using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx index b0dd0c032927..fe7f72e5783c 100644 --- a/extensions/source/bibliography/bibbeam.cxx +++ b/extensions/source/bibliography/bibbeam.cxx @@ -45,8 +45,6 @@ using namespace ::com::sun::star::uno; namespace bib { - using namespace ::com::sun::star::uno; - void HandleTaskPaneList( vcl::Window* pWindow, bool bAddToList ) { vcl::Window* pParent = pWindow->GetParent(); diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx index 54b6809f6a41..c8b7f55c476d 100644 --- a/forms/source/component/Grid.cxx +++ b/forms/source/component/Grid.cxx @@ -41,7 +41,6 @@ using namespace ::com::sun::star::uno; namespace frm { using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdbcx; diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 94c70ffdb642..f12d63c999b7 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -99,7 +99,6 @@ using namespace ::css::style; using namespace ::css::text; using namespace ::css::uno; using namespace ::css::container; -using namespace ::css::text; using ::css::io::XOutputStream; using ::sax_fastparser::FSHelperPtr; diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx index 6a3a5f8e1bec..7c78234e511f 100644 --- a/oox/source/vml/vmlshape.cxx +++ b/oox/source/vml/vmlshape.cxx @@ -78,7 +78,6 @@ using namespace ::com::sun::star::text; namespace oox { namespace vml { -using namespace ::com::sun::star; using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::graphic; using namespace ::com::sun::star::uno; diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index a83e13f33a7a..943c89dcc960 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -1828,7 +1828,6 @@ ScCompiler::~ScCompiler() void ScCompiler::CheckTabQuotes( OUString& rString, const FormulaGrammar::AddressConvention eConv ) { - using namespace ::com::sun::star::i18n; sal_Int32 nStartFlags = KParseTokens::ANY_LETTER_OR_NUMBER | KParseTokens::ASC_UNDERSCORE; sal_Int32 nContFlags = nStartFlags; ParseResult aRes = ScGlobal::pCharClass->parsePredefinedToken( diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx index bb07232d3d43..4f1b1038acfe 100644 --- a/sc/source/filter/html/htmlexp.cxx +++ b/sc/source/filter/html/htmlexp.cxx @@ -319,7 +319,6 @@ void ScHTMLExport::WriteHeader() } else { - using namespace ::com::sun::star; uno::Reference xDPS( pDoc->GetDocumentShell()->GetModel(), uno::UNO_QUERY_THROW); uno::Reference xDocProps diff --git a/sc/source/filter/oox/pivottablebuffer.cxx b/sc/source/filter/oox/pivottablebuffer.cxx index f9da29ea2a64..eaeab3b07c38 100644 --- a/sc/source/filter/oox/pivottablebuffer.cxx +++ b/sc/source/filter/oox/pivottablebuffer.cxx @@ -516,7 +516,6 @@ void PivotTableField::convertPageField( const PTPageFieldModel& rPageField ) if( xDPField.is() ) { PropertySet aPropSet( xDPField ); - using namespace ::com::sun::star::sheet; // find cache item used as 'selected page' sal_Int32 nCacheItem = -1; @@ -564,7 +563,6 @@ void PivotTableField::convertDataField( const PTDataFieldModel& rDataField ) if( xDPField.is() ) { PropertySet aPropSet( xDPField ); - using namespace ::com::sun::star::sheet; // field orientation aPropSet.setProperty( PROP_Orientation, DataPilotFieldOrientation_DATA ); @@ -644,7 +642,6 @@ Reference< XDataPilotField > PivotTableField::convertRowColPageField( sal_Int32 ScDPObject* pDPObj = mrPivotTable.getDPObject(); PropertySet aPropSet( xDPField ); - using namespace ::com::sun::star::sheet; // field orientation DataPilotFieldOrientation eFieldOrient = DataPilotFieldOrientation_HIDDEN; @@ -876,7 +873,6 @@ void PivotTableFilter::finalizeImport() PropertySet aPropSet( mrPivotTable.getDataPilotField( maModel.mnField ) ); if( aPropSet.is() ) { - using namespace ::com::sun::star::sheet; DataPilotFieldAutoShowInfo aAutoShowInfo; aAutoShowInfo.IsEnabled = true; aAutoShowInfo.ShowItemsMode = maModel.mbTopFilter ? DataPilotFieldShowItemsMode::FROM_TOP : DataPilotFieldShowItemsMode::FROM_BOTTOM; diff --git a/sd/source/ui/remotecontrol/Receiver.cxx b/sd/source/ui/remotecontrol/Receiver.cxx index 27874e688254..85c80b19bfeb 100644 --- a/sd/source/ui/remotecontrol/Receiver.cxx +++ b/sd/source/ui/remotecontrol/Receiver.cxx @@ -25,7 +25,6 @@ #include using namespace sd; -using namespace ::com::sun::star; using namespace ::osl; using namespace std; using namespace ::com::sun::star; diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 308e28f890af..28fd17b14d32 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -92,11 +92,13 @@ using namespace sd; #include "sdslots.hxx" using ::sd::framework::FrameworkHelper; -using namespace com::sun::star::uno; -using namespace com::sun::star::frame; + +using namespace com::sun::star; +using namespace com::sun::star::beans; using namespace com::sun::star::container; +using namespace com::sun::star::drawing::framework; using namespace com::sun::star::lang; -using namespace com::sun::star::beans; +using namespace com::sun::star::uno; namespace { @@ -111,11 +113,6 @@ private: } // end of anonymous namespace -using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::drawing::framework; -using ::sd::framework::FrameworkHelper; - namespace sd { class ViewShellBase::Implementation diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index 31e3475211e5..3147151e116e 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -2199,7 +2199,6 @@ void SfxWorkWindow::InitializeChild_Impl(SfxChildWin_Impl *pCW) { try { - using namespace ::com::sun::star; uno::Reference< frame::XModuleManager2 > xModuleManager( frame::ModuleManager::create(::comphelper::getProcessComponentContext())); sModule = xModuleManager->identify(pViewFrame->GetFrame().GetFrameInterface()); diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index 27d5a3a50592..876dfbde187e 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -2098,8 +2098,6 @@ void SvNumberFormatter::ImpAdjustFormatCodeDefault( css::i18n::NumberFormatCode * pFormatArr, sal_Int32 nCnt ) { - using namespace ::com::sun::star; - if ( !nCnt ) return; if (LocaleDataWrapper::areChecksEnabled()) @@ -2221,8 +2219,6 @@ const SvNumberformat* SvNumberFormatter::GetEntry( sal_uInt32 nKey ) const void SvNumberFormatter::ImpGenerateFormats( sal_uInt32 CLOffset, bool bNoAdditionalFormats ) { - using namespace ::com::sun::star; - bool bOldConvertMode = pFormatScanner->GetConvertMode(); if (bOldConvertMode) { @@ -2663,8 +2659,6 @@ void SvNumberFormatter::ImpGenerateAdditionalFormats( sal_uInt32 CLOffset, css::uno::Reference< css::i18n::XNumberFormatCode > const & rNumberFormatCode, bool bAfterChangingSystemCL ) { - using namespace ::com::sun::star; - SvNumberformat* pStdFormat = GetFormatEntry( CLOffset + ZF_STANDARD ); if ( !pStdFormat ) { diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index 343ad110a2a5..ee4f1c23aa84 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -1127,7 +1127,6 @@ sal_Int64 SAL_CALL FmXGridPeer::getSomething( const Sequence< sal_Int8 >& _rIden void FmXGridPeer::disposing(const EventObject& e) { -using namespace ::com::sun::star::util; bool bKnownSender = false; Reference< XIndexContainer > xCols( e.Source, UNO_QUERY ); diff --git a/svx/source/fmcomp/xmlexchg.cxx b/svx/source/fmcomp/xmlexchg.cxx index c1cb11e17b8d..b543f431bd5f 100644 --- a/svx/source/fmcomp/xmlexchg.cxx +++ b/svx/source/fmcomp/xmlexchg.cxx @@ -50,7 +50,6 @@ namespace svx const OXFormsDescriptor &OXFormsTransferable::extractDescriptor( const TransferableDataHelper &_rData ) { using namespace ::com::sun::star::uno; - using namespace ::com::sun::star::datatransfer; Reference &transfer = const_cast &>(_rData.GetTransferable()); XTransferable *pInterface = transfer.get(); OXFormsTransferable& rThis = dynamic_cast(*pInterface); diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index cb9cb26a4d1e..0be72783d6c3 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -188,8 +188,6 @@ namespace svxform if(!xDataTypes.is()) return; - using namespace ::com::sun::star::uno; - ItemNode *pItemNode = static_cast(pSelected->GetUserData()); if ( !pItemNode ) diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index 2819be221ed4..e6abfa619dd4 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -69,10 +69,16 @@ #include using namespace ::com::sun::star; +using namespace ::com::sun::star::beans; +using namespace ::com::sun::star::container; +using namespace ::com::sun::star::form; +using namespace ::com::sun::star::form::inspection; +using namespace ::com::sun::star::frame; +using namespace ::com::sun::star::inspection; +using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; -using namespace ::com::sun::star::inspection; -using namespace ::com::sun::star::form::inspection; +using namespace ::svxform; using ::com::sun::star::awt::XWindow; //= FmPropBrwMgr @@ -96,13 +102,6 @@ const long STD_WIN_SIZE_Y = 350; const long STD_MIN_SIZE_X = 250; const long STD_MIN_SIZE_Y = 250; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::form; -using namespace ::com::sun::star::frame; -using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::container; -using namespace ::svxform; OUString GetUIHeadlineName(sal_Int16 nClassId, const Any& aUnoObj) { diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx index 13494cfe9317..e343f15a5116 100644 --- a/sw/source/core/doc/tblrwcl.cxx +++ b/sw/source/core/doc/tblrwcl.cxx @@ -68,8 +68,6 @@ using namespace com::sun::star::uno; #define COLFUZZY 20 #define ROWFUZZY 10 -using namespace ::com::sun::star; - #ifdef DBG_UTIL #define CHECK_TABLE(t) (t).CheckConsistency(); #else diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 9190f05c6ca2..fb89ecf97b22 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -1367,7 +1367,6 @@ void SwWW8FltControlStack::SetAttrInDoc(const SwPosition& rTmpPos, b) adjust the writer style tabstops relative to the old paragraph indent to be relative to the new paragraph indent */ - using namespace sw::util; SwPaM aRegion(rTmpPos); if (rEntry.MakeRegion(pDoc, aRegion, false)) { @@ -1781,7 +1780,6 @@ void SwWW8ImplReader::Read_Tab(sal_uInt16 , const sal_uInt8* pData, short nLen) // balance if (!m_pAktColl) // not importing into a style { - using namespace sw::util; SvxTabStopItem aOrig = pSty ? ItemGet(*pSty, RES_PARATR_TABSTOP) : DefaultItemGet(m_rDoc, RES_PARATR_TABSTOP); @@ -1907,8 +1905,6 @@ void SwWW8ImplReader::ImportDop() // disable form design mode to be able to use imported controls directly // #i31239# always disable form design mode, not only in protected docs { - using namespace com::sun::star; - uno::Reference xModelComp(m_pDocShell->GetModel(), uno::UNO_QUERY); uno::Reference xDocProps(xModelComp, @@ -1939,7 +1935,6 @@ void SwWW8ImplReader::ImportDop() void SwWW8ImplReader::ImportDopTypography(const WW8DopTypography &rTypo) { - using namespace com::sun::star; switch (rTypo.iLevelOfKinsoku) { case 2: // custom @@ -4683,8 +4678,6 @@ void SwWW8ImplReader::ReadDocVars() m_pWwFib->m_lcbStwUser, m_bVer67 ? 2 : 0, m_eStructCharSet, aDocVarStrings, &aDocVarStringIds, &aDocValueStrings); if (!m_bVer67) { - using namespace ::com::sun::star; - uno::Reference xDPS( m_pDocShell->GetModel(), uno::UNO_QUERY_THROW); uno::Reference xDocProps( @@ -5499,8 +5492,6 @@ namespace { OUString aPassw; - using namespace com::sun::star; - const SfxItemSet* pSet = rMedium.GetItemSet(); const SfxPoolItem *pPasswordItem; diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx index 6ba3cbe9486c..e5183576d1ac 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.cxx +++ b/sw/source/ui/dbui/mmoutputtypepage.cxx @@ -133,7 +133,6 @@ const SwMailDescriptor* SwSendMailDialog_Impl::GetNextDescriptor() return nullptr; } -using namespace ::com::sun::star; class SwMailDispatcherListener_Impl : public IMailDispatcherListener { VclPtr m_pSendMailDialog; diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index a4b817296e76..1d07e066f894 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -73,7 +73,6 @@ using namespace com::sun::star::i18n; using namespace com::sun::star::lang; using namespace com::sun::star::util; using namespace ::comphelper; -using namespace ::com::sun::star; // dialog to insert a directory selection SwIndexMarkPane::SwIndexMarkPane(Dialog &rDialog, bool bNewDlg, diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx index 9296b29096df..9b5c6f6debb5 100644 --- a/sw/source/uibase/app/swmodule.cxx +++ b/sw/source/uibase/app/swmodule.cxx @@ -138,9 +138,6 @@ bool g_bNoInterrupt = false; #include "swdllimpl.hxx" using namespace com::sun::star; - - -using namespace ::com::sun::star; using namespace ::com::sun::star::uno; SwModule::SwModule( SfxObjectFactory* pWebFact, diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx index d3cb2063951b..658aa97baa39 100644 --- a/sw/source/uibase/shells/annotsh.cxx +++ b/sw/source/uibase/shells/annotsh.cxx @@ -1433,8 +1433,6 @@ void SwAnnotationShell::ExecTransliteration(SfxRequest &rReq) if (!pOLV) return; - using namespace ::com::sun::star::i18n; - TransliterationFlags nMode = TransliterationFlags::NONE; switch( rReq.GetSlot() ) diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index 4eecba3f6a82..ae2fc3e0b753 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -2347,8 +2347,6 @@ void SAL_CALL VCLXWindow::disposing( const css::lang::EventObject& _rSource ) // css::accessibility::XAccessible css::uno::Reference< css::accessibility::XAccessibleContext > VCLXWindow::getAccessibleContext( ) { - using namespace ::com::sun::star; - SolarMutexGuard aGuard; // already disposed diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx index 5df0206ff681..e65713cb7d15 100644 --- a/unotools/source/i18n/localedatawrapper.cxx +++ b/unotools/source/i18n/localedatawrapper.cxx @@ -1452,7 +1452,6 @@ OUString LocaleDataWrapper::getLongDate( const Date& rDate, CalendarWrapper& rCa bool bTwoDigitYear ) const { ::utl::ReadWriteGuard aGuard( aMutex, ReadWriteGuardMode::BlockCritical ); - using namespace css::i18n; sal_Unicode aBuf[20]; sal_Unicode* pBuf; OUString aStr; diff --git a/vcl/source/window/accessibility.cxx b/vcl/source/window/accessibility.cxx index 01eaf5fd7709..2e7e315f9005 100644 --- a/vcl/source/window/accessibility.cxx +++ b/vcl/source/window/accessibility.cxx @@ -409,8 +409,6 @@ sal_uInt16 Window::getDefaultAccessibleRole() const sal_uInt16 Window::GetAccessibleRole() const { - using namespace ::com::sun::star; - sal_uInt16 nRole = mpWindowImpl->mpAccessibleInfos ? mpWindowImpl->mpAccessibleInfos->nAccessibleRole : 0xFFFF; if ( nRole == 0xFFFF ) nRole = getDefaultAccessibleRole(); diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx index ea58932bb194..10ececc28181 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx @@ -1943,8 +1943,6 @@ SalGtkFilePicker::~SalGtkFilePicker() gtk_widget_destroy( m_pVBox ); } -using namespace ::com::sun::star; - uno::Reference< ui::dialogs::XFilePicker2 > GtkInstance::createFilePicker( const css::uno::Reference< css::uno::XComponentContext > &xMSF ) { diff --git a/vcl/workben/mtfdemo.cxx b/vcl/workben/mtfdemo.cxx index 9e0ead81a10e..e450309a659e 100644 --- a/vcl/workben/mtfdemo.cxx +++ b/vcl/workben/mtfdemo.cxx @@ -29,8 +29,6 @@ #include -using namespace com::sun::star; - using namespace css; class DemoMtfWin : public WorkWindow diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index e2ab80017c22..4cee52f526fa 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -76,8 +76,6 @@ namespace { } -using namespace css; - enum RenderStyle { RENDER_THUMB, // small view to a page RENDER_EXPANDED, // expanded view of this renderer diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index 3c7191cc1eb1..cec2ceeaf143 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -111,7 +111,6 @@ using namespace com::sun::star; using namespace ::xmloff::token; -using namespace ::com::sun::star; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; -- cgit