diff options
-rw-r--r-- | vcl/win/dtrans/DOTransferable.cxx | 1 | ||||
-rw-r--r-- | vcl/win/dtrans/DataFmtTransl.cxx | 1 | ||||
-rw-r--r-- | vcl/win/dtrans/FetcList.cxx | 1 | ||||
-rw-r--r-- | vcl/win/dtrans/clipboardmanager.cxx | 5 | ||||
-rw-r--r-- | vcl/win/dtrans/ftransl.cxx | 9 | ||||
-rw-r--r-- | vcl/win/gdi/salnativewidgets-luna.cxx | 4 | ||||
-rw-r--r-- | vcl/workben/win/dnd/atlwindow.cxx | 1 |
7 files changed, 7 insertions, 15 deletions
diff --git a/vcl/win/dtrans/DOTransferable.cxx b/vcl/win/dtrans/DOTransferable.cxx index 61edcb9a9348..7b9f28203d7e 100644 --- a/vcl/win/dtrans/DOTransferable.cxx +++ b/vcl/win/dtrans/DOTransferable.cxx @@ -37,7 +37,6 @@ #include <com/sun/star/io/IOException.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> -using namespace std; using namespace osl; using namespace cppu; using namespace com::sun::star::uno; diff --git a/vcl/win/dtrans/DataFmtTransl.cxx b/vcl/win/dtrans/DataFmtTransl.cxx index 5e2382213a0e..5daf0b453f27 100644 --- a/vcl/win/dtrans/DataFmtTransl.cxx +++ b/vcl/win/dtrans/DataFmtTransl.cxx @@ -36,7 +36,6 @@ #include <windows.h> #include <shlobj.h> -using namespace std; using namespace com::sun::star::uno; using namespace com::sun::star::datatransfer; using namespace com::sun::star::lang; diff --git a/vcl/win/dtrans/FetcList.cxx b/vcl/win/dtrans/FetcList.cxx index e9a1c0dac5f1..5ace3cdca6e4 100644 --- a/vcl/win/dtrans/FetcList.cxx +++ b/vcl/win/dtrans/FetcList.cxx @@ -36,7 +36,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::datatransfer; using namespace com::sun::star::lang; using namespace com::sun::star::container; -using namespace std; LCID CFormatRegistrar::m_TxtLocale = 0; sal_uInt32 CFormatRegistrar::m_TxtCodePage = GetACP( ); diff --git a/vcl/win/dtrans/clipboardmanager.cxx b/vcl/win/dtrans/clipboardmanager.cxx index 8cea07171f78..2e04d39e1457 100644 --- a/vcl/win/dtrans/clipboardmanager.cxx +++ b/vcl/win/dtrans/clipboardmanager.cxx @@ -34,7 +34,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::uno; using namespace cppu; using namespace osl; -using namespace std; using ::dtrans::ClipboardManager; @@ -105,11 +104,11 @@ void SAL_CALL ClipboardManager::addClipboard( const Reference< XClipboard >& xCl ClearableMutexGuard aGuard(m_aMutex); if (!rBHelper.bDisposed && !rBHelper.bInDispose) { - pair< const OUString, Reference< XClipboard > > value ( + std::pair< const OUString, Reference< XClipboard > > value ( aName.getLength() ? aName : m_aDefaultName, xClipboard ); - pair< ClipboardMap::iterator, bool > p = m_aClipboardMap.insert(value); + std::pair< ClipboardMap::iterator, bool > p = m_aClipboardMap.insert(value); aGuard.clear(); // insert failed, element must exist already diff --git a/vcl/win/dtrans/ftransl.cxx b/vcl/win/dtrans/ftransl.cxx index 45ab9a79ef64..ea3735832e93 100644 --- a/vcl/win/dtrans/ftransl.cxx +++ b/vcl/win/dtrans/ftransl.cxx @@ -40,7 +40,6 @@ const css::uno::Type CppuType_String = ::cppu::UnoType<OUString>::get(); using namespace osl; using namespace cppu; -using namespace std; using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::datatransfer; @@ -353,7 +352,7 @@ void findDataFlavorForStandardFormatId( sal_Int32 aStandardFormatId, DataFlavor& standard clipboard format id appear before the other entries with CF_INVALID */ - vector< FormatEntry >::const_iterator citer = std::find_if(g_TranslTable.begin(), g_TranslTable.end(), + std::vector< FormatEntry >::const_iterator citer = std::find_if(g_TranslTable.begin(), g_TranslTable.end(), [&aStandardFormatId](const FormatEntry& rEntry) { return rEntry.aStandardFormatId == aStandardFormatId || rEntry.aStandardFormatId == CF_INVALID; @@ -364,7 +363,7 @@ void findDataFlavorForStandardFormatId( sal_Int32 aStandardFormatId, DataFlavor& void findDataFlavorForNativeFormatName( const OUString& aNativeFormatName, DataFlavor& aDataFlavor ) { - vector< FormatEntry >::const_iterator citer = std::find_if(g_TranslTable.begin(), g_TranslTable.end(), + std::vector< FormatEntry >::const_iterator citer = std::find_if(g_TranslTable.begin(), g_TranslTable.end(), [&aNativeFormatName](const FormatEntry& rEntry) { return aNativeFormatName.equalsIgnoreAsciiCase(rEntry.aNativeFormatName); }); if (citer != g_TranslTable.end()) @@ -385,7 +384,7 @@ void findStandardFormatIdForCharset( const OUString& aCharset, Any& aAny ) void setStandardFormatIdForNativeFormatName( const OUString& aNativeFormatName, Any& aAny ) { - vector< FormatEntry >::const_iterator citer = std::find_if(g_TranslTable.begin(), g_TranslTable.end(), + std::vector< FormatEntry >::const_iterator citer = std::find_if(g_TranslTable.begin(), g_TranslTable.end(), [&aNativeFormatName](const FormatEntry& rEntry) { return aNativeFormatName.equalsIgnoreAsciiCase(rEntry.aNativeFormatName) && (CF_INVALID != rEntry.aStandardFormatId); @@ -399,7 +398,7 @@ void findStdFormatIdOrNativeFormatNameForFullMediaType( const OUString& aFullMediaType, Any& aAny ) { - vector< FormatEntry >::const_iterator citer = std::find_if(g_TranslTable.begin(), g_TranslTable.end(), + std::vector< FormatEntry >::const_iterator citer = std::find_if(g_TranslTable.begin(), g_TranslTable.end(), [&aRefXMimeFactory, &aFullMediaType](const FormatEntry& rEntry) { Reference<XMimeContentType> refXMime( aRefXMimeFactory->createMimeContentType(rEntry.aDataFlavor.MimeType) ); return aFullMediaType.equalsIgnoreAsciiCase(refXMime->getFullMediaType()); diff --git a/vcl/win/gdi/salnativewidgets-luna.cxx b/vcl/win/gdi/salnativewidgets-luna.cxx index dd67c91b9fc7..eeef9b69e203 100644 --- a/vcl/win/gdi/salnativewidgets-luna.cxx +++ b/vcl/win/gdi/salnativewidgets-luna.cxx @@ -54,9 +54,7 @@ #include <optional> #include <ControlCacheKey.hxx> -using namespace std; - -typedef map< wstring, HTHEME > ThemeMap; +typedef std::map< std::wstring, HTHEME > ThemeMap; static ThemeMap aThemeMap; /**************************************************** diff --git a/vcl/workben/win/dnd/atlwindow.cxx b/vcl/workben/win/dnd/atlwindow.cxx index 0d8d5d77646a..61781e18f5dd 100644 --- a/vcl/workben/win/dnd/atlwindow.cxx +++ b/vcl/workben/win/dnd/atlwindow.cxx @@ -36,7 +36,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::datatransfer::dnd; using namespace com::sun::star::datatransfer::dnd::DNDConstants; using namespace cppu; -using namespace std; LRESULT APIENTRY EditSubclassProc( HWND hwnd, UINT uMsg,WPARAM wParam, LPARAM lParam) ; |