summaryrefslogtreecommitdiff
path: root/dtrans/source/win32
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-04-07 12:06:47 +0200
committerLuboš Luňák <l.lunak@suse.cz>2013-04-07 14:23:11 +0200
commit1946794ae09ba732022fe6a74ea45e304ab70b84 (patch)
treee32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /dtrans/source/win32
parent5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff)
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'dtrans/source/win32')
-rw-r--r--dtrans/source/win32/clipb/WinClipbImpl.cxx1
-rw-r--r--dtrans/source/win32/clipb/WinClipbImpl.hxx6
-rw-r--r--dtrans/source/win32/clipb/WinClipboard.cxx1
-rw-r--r--dtrans/source/win32/clipb/WinClipboard.hxx10
-rw-r--r--dtrans/source/win32/clipb/wcbentry.cxx2
-rw-r--r--dtrans/source/win32/dnd/source.cxx1
-rw-r--r--dtrans/source/win32/dnd/source.hxx3
-rw-r--r--dtrans/source/win32/dnd/target.cxx1
-rw-r--r--dtrans/source/win32/dnd/target.hxx3
-rw-r--r--dtrans/source/win32/dtobj/DOTransferable.cxx1
-rw-r--r--dtrans/source/win32/dtobj/DOTransferable.hxx4
-rw-r--r--dtrans/source/win32/dtobj/DataFmtTransl.cxx1
-rw-r--r--dtrans/source/win32/dtobj/DataFmtTransl.hxx6
-rw-r--r--dtrans/source/win32/dtobj/FetcList.cxx1
-rw-r--r--dtrans/source/win32/dtobj/FetcList.hxx2
-rw-r--r--dtrans/source/win32/dtobj/FmtFilter.cxx1
-rw-r--r--dtrans/source/win32/dtobj/MimeAttrib.hxx10
-rw-r--r--dtrans/source/win32/dtobj/XTDataObject.cxx1
-rw-r--r--dtrans/source/win32/ftransl/ftransl.cxx15
-rw-r--r--dtrans/source/win32/ftransl/ftransl.hxx20
-rw-r--r--dtrans/source/win32/misc/ImplHelper.cxx2
-rw-r--r--dtrans/source/win32/misc/ImplHelper.hxx14
22 files changed, 44 insertions, 62 deletions
diff --git a/dtrans/source/win32/clipb/WinClipbImpl.cxx b/dtrans/source/win32/clipb/WinClipbImpl.cxx
index 84d5a2664678..f10b3e5e66af 100644
--- a/dtrans/source/win32/clipb/WinClipbImpl.cxx
+++ b/dtrans/source/win32/clipb/WinClipbImpl.cxx
@@ -50,7 +50,6 @@ using namespace com::sun::star::datatransfer;
using namespace com::sun::star::datatransfer::clipboard;
using namespace com::sun::star::datatransfer::clipboard::RenderingCapabilities;
-using ::rtl::OUString;
// definition of static members
CWinClipbImpl* CWinClipbImpl::s_pCWinClipbImpl = NULL;
diff --git a/dtrans/source/win32/clipb/WinClipbImpl.hxx b/dtrans/source/win32/clipb/WinClipbImpl.hxx
index 51100caa8a9b..15eea430dd67 100644
--- a/dtrans/source/win32/clipb/WinClipbImpl.hxx
+++ b/dtrans/source/win32/clipb/WinClipbImpl.hxx
@@ -50,7 +50,7 @@ public:
~CWinClipbImpl( );
protected:
- CWinClipbImpl( const ::rtl::OUString& aClipboardName, CWinClipboard* theWinClipboard );
+ CWinClipbImpl( const OUString& aClipboardName, CWinClipboard* theWinClipboard );
::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getContents( )
throw( ::com::sun::star::uno::RuntimeException );
@@ -60,7 +60,7 @@ protected:
const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner )
throw( ::com::sun::star::uno::RuntimeException );
- ::rtl::OUString SAL_CALL getName( ) throw( ::com::sun::star::uno::RuntimeException );
+ OUString SAL_CALL getName( ) throw( ::com::sun::star::uno::RuntimeException );
//------------------------------------------------
// XClipboardEx
@@ -93,7 +93,7 @@ private:
void SAL_CALL onReleaseDataObject( CXNotifyingDataObject* theCaller );
private:
- ::rtl::OUString m_itsName;
+ OUString m_itsName;
CMtaOleClipboard m_MtaOleClipboard;
CWinClipboard* m_pWinClipboard;
CXNotifyingDataObject* m_pCurrentClipContent;
diff --git a/dtrans/source/win32/clipb/WinClipboard.cxx b/dtrans/source/win32/clipb/WinClipboard.cxx
index 80ef257f489c..5a2c1e9daac6 100644
--- a/dtrans/source/win32/clipb/WinClipboard.cxx
+++ b/dtrans/source/win32/clipb/WinClipboard.cxx
@@ -37,7 +37,6 @@ using namespace com::sun::star::datatransfer;
using namespace com::sun::star::datatransfer::clipboard;
using namespace com::sun::star::lang;
-using ::rtl::OUString;
#define WINCLIPBOARD_IMPL_NAME "com.sun.star.datatransfer.clipboard.ClipboardW32"
diff --git a/dtrans/source/win32/clipb/WinClipboard.hxx b/dtrans/source/win32/clipb/WinClipboard.hxx
index 65688d526513..608f9e9ceece 100644
--- a/dtrans/source/win32/clipb/WinClipboard.hxx
+++ b/dtrans/source/win32/clipb/WinClipboard.hxx
@@ -70,7 +70,7 @@ class CWinClipboard :
{
public:
CWinClipboard( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
- const ::rtl::OUString& aClipboardName );
+ const OUString& aClipboardName );
//------------------------------------------------
// XClipboard
@@ -84,7 +84,7 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner )
throw( ::com::sun::star::uno::RuntimeException );
- virtual ::rtl::OUString SAL_CALL getName( )
+ virtual OUString SAL_CALL getName( )
throw( ::com::sun::star::uno::RuntimeException );
//------------------------------------------------
@@ -122,13 +122,13 @@ public:
// XServiceInfo
//------------------------------------------------
- virtual ::rtl::OUString SAL_CALL getImplementationName( )
+ virtual OUString SAL_CALL getImplementationName( )
throw(::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
throw(::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( )
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
throw(::com::sun::star::uno::RuntimeException);
private:
diff --git a/dtrans/source/win32/clipb/wcbentry.cxx b/dtrans/source/win32/clipb/wcbentry.cxx
index ad589d7b4958..6135f84e1dfe 100644
--- a/dtrans/source/win32/clipb/wcbentry.cxx
+++ b/dtrans/source/win32/clipb/wcbentry.cxx
@@ -59,7 +59,7 @@ namespace
Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceFactory >& rServiceManager )
{
- return Reference< XInterface >( static_cast< XClipboard* >( new CWinClipboard( comphelper::getComponentContext(rServiceManager), rtl::OUString( "" ) ) ) );
+ return Reference< XInterface >( static_cast< XClipboard* >( new CWinClipboard( comphelper::getComponentContext(rServiceManager), OUString( "" ) ) ) );
}
}
diff --git a/dtrans/source/win32/dnd/source.cxx b/dtrans/source/win32/dnd/source.cxx
index 6b2351b32b83..1c3e6fd88538 100644
--- a/dtrans/source/win32/dnd/source.cxx
+++ b/dtrans/source/win32/dnd/source.cxx
@@ -51,7 +51,6 @@ using namespace com::sun::star::awt::MouseButton;
using namespace com::sun::star::awt;
using namespace com::sun::star::lang;
-using ::rtl::OUString;
extern rtl_StandardModuleCount g_moduleCount;
diff --git a/dtrans/source/win32/dnd/source.hxx b/dtrans/source/win32/dnd/source.hxx
index 736e2bc9f4c0..aed4af9b9126 100644
--- a/dtrans/source/win32/dnd/source.hxx
+++ b/dtrans/source/win32/dnd/source.hxx
@@ -39,9 +39,6 @@ using namespace osl;
using namespace ::com::sun::star::datatransfer;
using namespace ::com::sun::star::datatransfer::dnd;
-using ::rtl::OUString;
-
-
class SourceContext;
// RIGHT MOUSE BUTTON drag and drop not supportet currently.
// ALT modifier is considered to effect a user selection of effects
diff --git a/dtrans/source/win32/dnd/target.cxx b/dtrans/source/win32/dnd/target.cxx
index 21d46718235a..21c20a8a2e3b 100644
--- a/dtrans/source/win32/dnd/target.cxx
+++ b/dtrans/source/win32/dnd/target.cxx
@@ -34,7 +34,6 @@ using namespace com::sun::star::datatransfer;
using namespace com::sun::star::datatransfer::dnd;
using namespace com::sun::star::datatransfer::dnd::DNDConstants;
-using ::rtl::OUString;
#define WM_REGISTERDRAGDROP WM_USER + 1
#define WM_REVOKEDRAGDROP WM_USER + 2
diff --git a/dtrans/source/win32/dnd/target.hxx b/dtrans/source/win32/dnd/target.hxx
index 16e5b8921ec4..98ccb2d14de4 100644
--- a/dtrans/source/win32/dnd/target.hxx
+++ b/dtrans/source/win32/dnd/target.hxx
@@ -46,9 +46,6 @@ using namespace osl;
using namespace ::com::sun::star::datatransfer;
using namespace ::com::sun::star::datatransfer::dnd;
-using ::rtl::OUString;
-
-
// The client
// has to call XComponent::dispose. The thread that calls initialize
// must also execute the destruction of the instance. This is because
diff --git a/dtrans/source/win32/dtobj/DOTransferable.cxx b/dtrans/source/win32/dtobj/DOTransferable.cxx
index 4295bd47fb5e..b3910af33f37 100644
--- a/dtrans/source/win32/dtobj/DOTransferable.cxx
+++ b/dtrans/source/win32/dtobj/DOTransferable.cxx
@@ -48,7 +48,6 @@ using namespace com::sun::star::io;
using namespace com::sun::star::lang;
using namespace com::sun::star::container;
-using ::rtl::OUString;
//------------------------------------------------------------------------
//
diff --git a/dtrans/source/win32/dtobj/DOTransferable.hxx b/dtrans/source/win32/dtobj/DOTransferable.hxx
index 4634216aebe1..d8fcf77d3327 100644
--- a/dtrans/source/win32/dtobj/DOTransferable.hxx
+++ b/dtrans/source/win32/dtobj/DOTransferable.hxx
@@ -76,12 +76,12 @@ private:
com::sun::star::datatransfer::DataFlavor SAL_CALL formatEtcToDataFlavor( const FORMATETC& aFormatEtc );
ByteSequence_t SAL_CALL getClipboardData( CFormatEtc& aFormatEtc );
- rtl::OUString SAL_CALL synthesizeUnicodeText( );
+ OUString SAL_CALL synthesizeUnicodeText( );
void SAL_CALL clipDataToByteStream( CLIPFORMAT cf, STGMEDIUM stgmedium, ByteSequence_t& aByteSequence );
::com::sun::star::uno::Any SAL_CALL byteStreamToAny( ByteSequence_t& aByteStream, const com::sun::star::uno::Type& aRequestedDataType );
- rtl::OUString SAL_CALL byteStreamToOUString( ByteSequence_t& aByteStream );
+ OUString SAL_CALL byteStreamToOUString( ByteSequence_t& aByteStream );
LCID SAL_CALL getLocaleFromClipboard( );
diff --git a/dtrans/source/win32/dtobj/DataFmtTransl.cxx b/dtrans/source/win32/dtobj/DataFmtTransl.cxx
index 4a9ca7ae0362..058ab5dc0f1b 100644
--- a/dtrans/source/win32/dtobj/DataFmtTransl.cxx
+++ b/dtrans/source/win32/dtobj/DataFmtTransl.cxx
@@ -50,7 +50,6 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::datatransfer;
using namespace com::sun::star::lang;
-using ::rtl::OUString;
const Type CPPUTYPE_SALINT32 = getCppuType((sal_Int32*)0);
const Type CPPUTYPE_SALINT8 = getCppuType((sal_Int8*)0);
diff --git a/dtrans/source/win32/dtobj/DataFmtTransl.hxx b/dtrans/source/win32/dtobj/DataFmtTransl.hxx
index 7cb0684a526d..5f8b9e1cca47 100644
--- a/dtrans/source/win32/dtobj/DataFmtTransl.hxx
+++ b/dtrans/source/win32/dtobj/DataFmtTransl.hxx
@@ -51,8 +51,8 @@ public:
const FORMATETC& aFormatEtc, LCID lcid = GetThreadLocale( ) ) const;
CFormatEtc SAL_CALL getFormatEtcForClipformat( CLIPFORMAT cf ) const;
- CFormatEtc SAL_CALL getFormatEtcForClipformatName( const rtl::OUString& aClipFmtName ) const;
- rtl::OUString SAL_CALL getClipboardFormatName( CLIPFORMAT aClipformat ) const;
+ CFormatEtc SAL_CALL getFormatEtcForClipformatName( const OUString& aClipFmtName ) const;
+ OUString SAL_CALL getClipboardFormatName( CLIPFORMAT aClipformat ) const;
sal_Bool SAL_CALL isHTMLFormat( CLIPFORMAT cf ) const;
sal_Bool SAL_CALL isTextHtmlFormat( CLIPFORMAT cf ) const;
@@ -61,7 +61,7 @@ public:
sal_Bool SAL_CALL isTextFormat( CLIPFORMAT cf ) const;
private:
- rtl::OUString SAL_CALL getTextCharsetFromLCID( LCID lcid, CLIPFORMAT aClipformat ) const;
+ OUString SAL_CALL getTextCharsetFromLCID( LCID lcid, CLIPFORMAT aClipformat ) const;
private:
com::sun::star::uno::Reference< com::sun::star::datatransfer::XDataFormatTranslator > m_XDataFormatTranslator;
diff --git a/dtrans/source/win32/dtobj/FetcList.cxx b/dtrans/source/win32/dtobj/FetcList.cxx
index 00bc9d32a235..b728850fc72b 100644
--- a/dtrans/source/win32/dtobj/FetcList.cxx
+++ b/dtrans/source/win32/dtobj/FetcList.cxx
@@ -41,7 +41,6 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::container;
using namespace std;
-using ::rtl::OUString;
//------------------------------------------------------------------------
//
diff --git a/dtrans/source/win32/dtobj/FetcList.hxx b/dtrans/source/win32/dtobj/FetcList.hxx
index 7e3058b08bbc..2352578cdea1 100644
--- a/dtrans/source/win32/dtobj/FetcList.hxx
+++ b/dtrans/source/win32/dtobj/FetcList.hxx
@@ -113,7 +113,7 @@ public:
private:
sal_Bool SAL_CALL isEqualCurrentSystemCodePage( sal_uInt32 aCodePage ) const;
- rtl::OUString SAL_CALL getCharsetFromDataFlavor( const com::sun::star::datatransfer::DataFlavor& aFlavor );
+ OUString SAL_CALL getCharsetFromDataFlavor( const com::sun::star::datatransfer::DataFlavor& aFlavor );
sal_Bool SAL_CALL hasUnicodeFlavor(
const com::sun::star::uno::Reference< com::sun::star::datatransfer::XTransferable >& aXTransferable ) const;
diff --git a/dtrans/source/win32/dtobj/FmtFilter.cxx b/dtrans/source/win32/dtobj/FmtFilter.cxx
index 7456ce598bf5..f9327d8e82df 100644
--- a/dtrans/source/win32/dtobj/FmtFilter.cxx
+++ b/dtrans/source/win32/dtobj/FmtFilter.cxx
@@ -43,7 +43,6 @@
#include <systools/win32/comtools.hxx>
using namespace com::sun::star::uno;
-using rtl::OString;
#pragma pack(2)
struct METAFILEHEADER
diff --git a/dtrans/source/win32/dtobj/MimeAttrib.hxx b/dtrans/source/win32/dtobj/MimeAttrib.hxx
index 1d5422e21d7f..7eba4d058372 100644
--- a/dtrans/source/win32/dtobj/MimeAttrib.hxx
+++ b/dtrans/source/win32/dtobj/MimeAttrib.hxx
@@ -23,12 +23,12 @@
#include <rtl/ustring.hxx>
-const rtl::OUString TEXTPLAIN_PARAM_CHARSET("charset");
+const OUString TEXTPLAIN_PARAM_CHARSET("charset");
-const rtl::OUString PRE_WINDOWS_CODEPAGE ("windows");
-const rtl::OUString PRE_OEM_CODEPAGE ("cp");
-const rtl::OUString CHARSET_UTF16 ("utf-16");
-const rtl::OUString CHARSET_UNICODE ("unicode");
+const OUString PRE_WINDOWS_CODEPAGE ("windows");
+const OUString PRE_OEM_CODEPAGE ("cp");
+const OUString CHARSET_UTF16 ("utf-16");
+const OUString CHARSET_UNICODE ("unicode");
#endif
diff --git a/dtrans/source/win32/dtobj/XTDataObject.cxx b/dtrans/source/win32/dtobj/XTDataObject.cxx
index 5b8bb978ed6b..c213517cdd19 100644
--- a/dtrans/source/win32/dtobj/XTDataObject.cxx
+++ b/dtrans/source/win32/dtobj/XTDataObject.cxx
@@ -54,7 +54,6 @@ using namespace com::sun::star::datatransfer::clipboard;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
-using ::rtl::OUString;
//------------------------------------------------------------------------
// a helper class that will be thrown by the function validateFormatEtc
diff --git a/dtrans/source/win32/ftransl/ftransl.cxx b/dtrans/source/win32/ftransl/ftransl.cxx
index 1f141f2faf56..70724c1600a8 100644
--- a/dtrans/source/win32/ftransl/ftransl.cxx
+++ b/dtrans/source/win32/ftransl/ftransl.cxx
@@ -39,19 +39,18 @@
#define MODULE_PRIVATE
#define CPPUTYPE_SEQSALINT8 getCppuType( (const Sequence< sal_Int8 >*) 0 )
#define CPPUTYPE_DEFAULT CPPUTYPE_SEQSALINT8
-#define CPPUTYPE_OUSTR getCppuType( (const ::rtl::OUString*) 0 )
+#define CPPUTYPE_OUSTR getCppuType( (const OUString*) 0 )
#define CPPUTYPE_SALINT32 getCppuType( ( sal_Int32 * ) 0 )
#define EMPTY_OUSTR OUString()
-const rtl::OUString Windows_FormatName ("windows_formatname");
+const OUString Windows_FormatName ("windows_formatname");
const com::sun::star::uno::Type CppuType_ByteSequence = ::getCppuType((const com::sun::star::uno::Sequence<sal_Int8>*)0);
-const com::sun::star::uno::Type CppuType_String = ::getCppuType((const ::rtl::OUString*)0);
+const com::sun::star::uno::Type CppuType_String = ::getCppuType((const OUString*)0);
//------------------------------------------------------------------------
// namespace directives
//------------------------------------------------------------------------
-using ::rtl::OUString;
using namespace osl;
using namespace cppu;
using namespace std;
@@ -93,14 +92,14 @@ FormatEntry::FormatEntry(
CLIPFORMAT std_clipboard_format_id,
::com::sun::star::uno::Type const & cppu_type)
{
- aDataFlavor.MimeType = rtl::OUString::createFromAscii(mime_content_type);
- aDataFlavor.HumanPresentableName = rtl::OUString::createFromAscii(human_presentable_name);
+ aDataFlavor.MimeType = OUString::createFromAscii(mime_content_type);
+ aDataFlavor.HumanPresentableName = OUString::createFromAscii(human_presentable_name);
aDataFlavor.DataType = cppu_type;
if (native_format_name)
- aNativeFormatName = rtl::OUString::createFromAscii(native_format_name);
+ aNativeFormatName = OUString::createFromAscii(native_format_name);
else
- aNativeFormatName = rtl::OUString::createFromAscii(human_presentable_name);
+ aNativeFormatName = OUString::createFromAscii(human_presentable_name);
aStandardFormatId = std_clipboard_format_id;
}
diff --git a/dtrans/source/win32/ftransl/ftransl.hxx b/dtrans/source/win32/ftransl/ftransl.hxx
index 4650fc06cd1c..8340050dafff 100644
--- a/dtrans/source/win32/ftransl/ftransl.hxx
+++ b/dtrans/source/win32/ftransl/ftransl.hxx
@@ -53,7 +53,7 @@ struct FormatEntry
);
com::sun::star::datatransfer::DataFlavor aDataFlavor;
- rtl::OUString aNativeFormatName;
+ OUString aNativeFormatName;
sal_Int32 aStandardFormatId;
};
@@ -83,29 +83,29 @@ public:
// XServiceInfo
//------------------------------------------------
- virtual ::rtl::OUString SAL_CALL getImplementationName( )
+ virtual OUString SAL_CALL getImplementationName( )
throw(::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
throw(::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( )
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
throw(::com::sun::star::uno::RuntimeException);
private:
void SAL_CALL initTranslationTable( );
void SAL_CALL findDataFlavorForStandardFormatId( sal_Int32 aStandardFormatId, com::sun::star::datatransfer::DataFlavor& aDataFlavor ) const;
- void SAL_CALL findDataFlavorForNativeFormatName( const rtl::OUString& aNativeFormatName, com::sun::star::datatransfer::DataFlavor& aDataFlavor ) const;
- void SAL_CALL findStandardFormatIdForCharset( const rtl::OUString& aCharset, com::sun::star::uno::Any& aAny ) const;
- void SAL_CALL setStandardFormatIdForNativeFormatName( const rtl::OUString& aNativeFormatName, com::sun::star::uno::Any& aAny ) const;
+ void SAL_CALL findDataFlavorForNativeFormatName( const OUString& aNativeFormatName, com::sun::star::datatransfer::DataFlavor& aDataFlavor ) const;
+ void SAL_CALL findStandardFormatIdForCharset( const OUString& aCharset, com::sun::star::uno::Any& aAny ) const;
+ void SAL_CALL setStandardFormatIdForNativeFormatName( const OUString& aNativeFormatName, com::sun::star::uno::Any& aAny ) const;
void SAL_CALL findStdFormatIdOrNativeFormatNameForFullMediaType(
const com::sun::star::uno::Reference< com::sun::star::datatransfer::XMimeContentTypeFactory >& aRefXMimeFactory,
- const rtl::OUString& aFullMediaType, com::sun::star::uno::Any& aAny ) const;
+ const OUString& aFullMediaType, com::sun::star::uno::Any& aAny ) const;
- sal_Bool isTextPlainMediaType( const rtl::OUString& fullMediaType ) const;
+ sal_Bool isTextPlainMediaType( const OUString& fullMediaType ) const;
- com::sun::star::datatransfer::DataFlavor SAL_CALL mkDataFlv( const rtl::OUString& cnttype, const rtl::OUString& hpname, ::com::sun::star::uno::Type dtype );
+ com::sun::star::datatransfer::DataFlavor SAL_CALL mkDataFlv( const OUString& cnttype, const OUString& hpname, ::com::sun::star::uno::Type dtype );
private:
std::vector< FormatEntry > m_TranslTable;
diff --git a/dtrans/source/win32/misc/ImplHelper.cxx b/dtrans/source/win32/misc/ImplHelper.cxx
index d85674dc6375..7e8d5f79d8c1 100644
--- a/dtrans/source/win32/misc/ImplHelper.cxx
+++ b/dtrans/source/win32/misc/ImplHelper.cxx
@@ -44,8 +44,6 @@
// namespace directives
//------------------------------------------------------------------------
-using ::rtl::OUString;
-using ::rtl::OString;
//------------------------------------------------------------------------
// returns a windows codepage appropriate to the
diff --git a/dtrans/source/win32/misc/ImplHelper.hxx b/dtrans/source/win32/misc/ImplHelper.hxx
index 811849e332bf..10fb2593cc54 100644
--- a/dtrans/source/win32/misc/ImplHelper.hxx
+++ b/dtrans/source/win32/misc/ImplHelper.hxx
@@ -47,14 +47,14 @@ DVTARGETDEVICE* SAL_CALL CopyTargetDevice(DVTARGETDEVICE* ptdSrc);
//--------------------------------------------------
sal_uInt32 SAL_CALL getWinCPFromMimeCharset(
- const rtl::OUString& charset );
+ const OUString& charset );
//--------------------------------------------------
// returns a windows codepage appropriate to the
// given locale and locale type
//--------------------------------------------------
-rtl::OUString SAL_CALL getWinCPFromLocaleId(
+OUString SAL_CALL getWinCPFromLocaleId(
LCID lcid, LCTYPE lctype );
//--------------------------------------------------
@@ -63,8 +63,8 @@ rtl::OUString SAL_CALL getWinCPFromLocaleId(
// given, e.g. "windows-" or "cp"
//--------------------------------------------------
-rtl::OUString SAL_CALL getMimeCharsetFromWinCP(
- sal_uInt32 cp, const rtl::OUString& aPrefix );
+OUString SAL_CALL getMimeCharsetFromWinCP(
+ sal_uInt32 cp, const OUString& aPrefix );
//--------------------------------------------------
// returns a mime charset parameter value appropriate
@@ -72,8 +72,8 @@ rtl::OUString SAL_CALL getMimeCharsetFromWinCP(
// prefix can be given, e.g. "windows-" or "cp"
//--------------------------------------------------
-rtl::OUString SAL_CALL getMimeCharsetFromLocaleId(
- LCID lcid, LCTYPE lctype, const rtl::OUString& aPrefix );
+OUString SAL_CALL getMimeCharsetFromLocaleId(
+ LCID lcid, LCTYPE lctype, const OUString& aPrefix );
//-----------------------------------------------------
// returns true, if a given codepage is an oem codepage
@@ -85,7 +85,7 @@ sal_Bool SAL_CALL IsOEMCP( sal_uInt32 codepage );
// converts a codepage into a string representation
//--------------------------------------------------
-rtl::OUString SAL_CALL cptostr( sal_uInt32 codepage );
+OUString SAL_CALL cptostr( sal_uInt32 codepage );
#endif