[Libreoffice-commits] .: dtrans/source
Gert Faller
gfaller at kemper.freedesktop.org
Tue Nov 23 10:18:40 PST 2010
dtrans/source/cnttype/mcnttfactory.cxx | 2 +-
dtrans/source/cnttype/mcnttype.cxx | 8 ++++----
dtrans/source/generic/clipboardmanager.cxx | 2 +-
dtrans/source/generic/dtrans.cxx | 4 ++--
dtrans/source/generic/generic_clipboard.cxx | 2 +-
dtrans/source/os2/clipb/Os2Clipboard.cxx | 6 +++---
dtrans/source/os2/clipb/Os2Transferable.cxx | 4 ++--
dtrans/source/win32/clipb/WinClipboard.cxx | 2 +-
dtrans/source/win32/dtobj/FetcList.cxx | 4 ++--
dtrans/source/win32/ftransl/ftransl.cxx | 4 ++--
10 files changed, 19 insertions(+), 19 deletions(-)
New commits:
commit c758fb94d451052c2f47c706bdd2682db870a13c
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date: Tue Nov 23 19:18:07 2010 +0100
RTL_CONSTASCII_USTRINGPARAM in libs-gui 14
diff --git a/dtrans/source/cnttype/mcnttfactory.cxx b/dtrans/source/cnttype/mcnttfactory.cxx
index b656bc1..613fde2 100644
--- a/dtrans/source/cnttype/mcnttfactory.cxx
+++ b/dtrans/source/cnttype/mcnttfactory.cxx
@@ -94,7 +94,7 @@ Reference< XMimeContentType > CMimeContentTypeFactory::createMimeContentType( co
OUString SAL_CALL CMimeContentTypeFactory::getImplementationName( )
throw( RuntimeException )
{
- return OUString::createFromAscii( MIMECONTENTTYPEFACTORY_IMPL_NAME );
+ return OUString(RTL_CONSTASCII_USTRINGPARAM( MIMECONTENTTYPEFACTORY_IMPL_NAME ));
}
// -------------------------------------------------
diff --git a/dtrans/source/cnttype/mcnttype.cxx b/dtrans/source/cnttype/mcnttype.cxx
index 87c52cd..65968b7 100644
--- a/dtrans/source/cnttype/mcnttype.cxx
+++ b/dtrans/source/cnttype/mcnttype.cxx
@@ -49,7 +49,7 @@ using namespace osl;
// constants
//------------------------------------------------------------------------
-const OUString TSPECIALS = OUString::createFromAscii( "()<>@,;:\\\"/[]?=" );
+const OUString TSPECIALS (RTL_CONSTASCII_USTRINGPARAM( "()<>@,;:\\\"/[]?=" ));
const OUString TOKEN (RTL_CONSTASCII_USTRINGPARAM("!#$%&'*+-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ^_`abcdefghijklmnopqrstuvwxyz{|}~."));
const OUString SPACE (RTL_CONSTASCII_USTRINGPARAM(" "));
const OUString SEMICOLON (RTL_CONSTASCII_USTRINGPARAM(";"));
@@ -323,12 +323,12 @@ OUString SAL_CALL CMimeContentType::pValue( )
OUString pvalue;
// quoted pvalue
- if ( m_nxtSym == OUString::createFromAscii( "\"" ) )
+ if ( m_nxtSym == OUString(RTL_CONSTASCII_USTRINGPARAM( "\"" )) )
{
getSym( );
pvalue = quotedPValue( );
- if ( OUString( &pvalue[pvalue.getLength() - 1], 1 ) != OUString::createFromAscii( "\"" ) )
+ if ( OUString( &pvalue[pvalue.getLength() - 1], 1 ) != OUString(RTL_CONSTASCII_USTRINGPARAM( "\"" )) )
throw IllegalArgumentException( );
// remove the last quote-sign
@@ -366,7 +366,7 @@ OUString SAL_CALL CMimeContentType::quotedPValue( )
else if ( isInRange( m_nxtSym, TOKEN + TSPECIALS + SPACE ) )
{
pvalue += m_nxtSym;
- if ( m_nxtSym == OUString::createFromAscii( "\"" ) )
+ if ( m_nxtSym == OUString(RTL_CONSTASCII_USTRINGPARAM( "\"" )) )
bAfterQuoteSign = sal_True;
else
bAfterQuoteSign = sal_False;
diff --git a/dtrans/source/generic/clipboardmanager.cxx b/dtrans/source/generic/clipboardmanager.cxx
index 76c7efa..8344c23 100644
--- a/dtrans/source/generic/clipboardmanager.cxx
+++ b/dtrans/source/generic/clipboardmanager.cxx
@@ -63,7 +63,7 @@ ClipboardManager::~ClipboardManager()
OUString SAL_CALL ClipboardManager::getImplementationName( )
throw(RuntimeException)
{
- return OUString::createFromAscii(CLIPBOARDMANAGER_IMPLEMENTATION_NAME);
+ return OUString(RTL_CONSTASCII_USTRINGPARAM(CLIPBOARDMANAGER_IMPLEMENTATION_NAME));
}
// ------------------------------------------------------------------------
diff --git a/dtrans/source/generic/dtrans.cxx b/dtrans/source/generic/dtrans.cxx
index a25e95b..a0dbbd1 100644
--- a/dtrans/source/generic/dtrans.cxx
+++ b/dtrans/source/generic/dtrans.cxx
@@ -61,7 +61,7 @@ sal_Bool SAL_CALL component_writeInfo(void * /*pServiceManager*/, void * pRegist
{
Reference< XRegistryKey > xNewKey(
reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
- OUString::createFromAscii("/" CLIPBOARDMANAGER_IMPLEMENTATION_NAME "/UNO/SERVICES" ) ) );
+ OUString(RTL_CONSTASCII_USTRINGPARAM("/" CLIPBOARDMANAGER_IMPLEMENTATION_NAME "/UNO/SERVICES" )) ) );
const Sequence< OUString > & rSNL = ClipboardManager_getSupportedServiceNames();
const OUString * pArray = rSNL.getConstArray();
@@ -70,7 +70,7 @@ sal_Bool SAL_CALL component_writeInfo(void * /*pServiceManager*/, void * pRegist
xNewKey->createKey( pArray[nPos] );
xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey(
- OUString::createFromAscii("/" GENERIC_CLIPBOARD_IMPLEMENTATION_NAME "/UNO/SERVICES" ) );
+ OUString(RTL_CONSTASCII_USTRINGPARAM("/" GENERIC_CLIPBOARD_IMPLEMENTATION_NAME "/UNO/SERVICES" )) );
const Sequence< OUString > & rSNL2 = GenericClipboard_getSupportedServiceNames();
pArray = rSNL2.getConstArray();
diff --git a/dtrans/source/generic/generic_clipboard.cxx b/dtrans/source/generic/generic_clipboard.cxx
index a42cfb3..743482b 100644
--- a/dtrans/source/generic/generic_clipboard.cxx
+++ b/dtrans/source/generic/generic_clipboard.cxx
@@ -76,7 +76,7 @@ void SAL_CALL GenericClipboard::initialize( const Sequence< Any >& aArguments )
OUString SAL_CALL GenericClipboard::getImplementationName( )
throw(RuntimeException)
{
- return OUString::createFromAscii(GENERIC_CLIPBOARD_IMPLEMENTATION_NAME);
+ return OUString(RTL_CONSTASCII_USTRINGPARAM(GENERIC_CLIPBOARD_IMPLEMENTATION_NAME));
}
// ------------------------------------------------------------------------
diff --git a/dtrans/source/os2/clipb/Os2Clipboard.cxx b/dtrans/source/os2/clipb/Os2Clipboard.cxx
index d1016b3..497b6f9 100644
--- a/dtrans/source/os2/clipb/Os2Clipboard.cxx
+++ b/dtrans/source/os2/clipb/Os2Clipboard.cxx
@@ -134,7 +134,7 @@ void SAL_CALL Os2Clipboard::initialize( const Sequence< Any >& aArguments )
OUString SAL_CALL Os2Clipboard::getImplementationName() throw( RuntimeException )
{
debug_printf("Os2Clipboard::getImplementationName\n");
- return OUString::createFromAscii( OS2_CLIPBOARD_IMPL_NAME );
+ return OUString(RTL_CONSTASCII_USTRINGPARAM( OS2_CLIPBOARD_IMPL_NAME ));
}
sal_Bool SAL_CALL Os2Clipboard::supportsService( const OUString& ServiceName ) throw( RuntimeException )
@@ -239,7 +239,7 @@ void SAL_CALL Os2Clipboard::setContents( const Reference< XTransferable >& xTran
// we can only export text or bitmap
DataFlavor nFlavorText( OUString(RTL_CONSTASCII_USTRINGPARAM("text/plain;charset=utf-16")),
OUString(RTL_CONSTASCII_USTRINGPARAM("Unicode-Text")), CPPUTYPE_OUSTRING);
- DataFlavor nFlavorBitmap( OUString::createFromAscii( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" ),
+ DataFlavor nFlavorBitmap( OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" )),
OUString(RTL_CONSTASCII_USTRINGPARAM("Bitmap")), CPPUTYPE_DEFAULT);
// try text transfer data (if any)
@@ -414,7 +414,7 @@ void SAL_CALL Os2Clipboard::notifyAllClipboardListener( )
Sequence< OUString > SAL_CALL Os2Clipboard_getSupportedServiceNames()
{
Sequence< OUString > aRet(1);
- aRet[0] = OUString::createFromAscii( OS2_CLIPBOARD_SERVICE_NAME );
+ aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( OS2_CLIPBOARD_SERVICE_NAME ));
return aRet;
}
diff --git a/dtrans/source/os2/clipb/Os2Transferable.cxx b/dtrans/source/os2/clipb/Os2Transferable.cxx
index 4c4c528..21afdfb 100644
--- a/dtrans/source/os2/clipb/Os2Transferable.cxx
+++ b/dtrans/source/os2/clipb/Os2Transferable.cxx
@@ -66,7 +66,7 @@ Os2Transferable::Os2Transferable(
}
handle = UWinQueryClipbrdData( hAB, UCLIP_CF_BITMAP);
if (handle) {
- aFlavor.MimeType = OUString::createFromAscii( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" );
+ aFlavor.MimeType = OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" ));
aFlavor.DataType = getCppuType( (OUString*)0 );
//debug_printf("Os2Transferable::Os2Transferable pszText %s\n", pszText);
}
@@ -115,7 +115,7 @@ Any SAL_CALL Os2Transferable::getTransferData( const DataFlavor& rFlavor )
}
// retrieve bitmap
- if( rFlavor.MimeType.equalsIgnoreAsciiCase( OUString::createFromAscii( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" ) ) )
+ if( rFlavor.MimeType.equalsIgnoreAsciiCase( OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" )) ) )
{
if( UWinOpenClipbrd( hAB ) )
{
diff --git a/dtrans/source/win32/clipb/WinClipboard.cxx b/dtrans/source/win32/clipb/WinClipboard.cxx
index 31c6f50..d7ad868 100644
--- a/dtrans/source/win32/clipb/WinClipboard.cxx
+++ b/dtrans/source/win32/clipb/WinClipboard.cxx
@@ -293,7 +293,7 @@ void SAL_CALL CWinClipboard::disposing()
OUString SAL_CALL CWinClipboard::getImplementationName( )
throw(RuntimeException)
{
- return OUString::createFromAscii( WINCLIPBOARD_IMPL_NAME );
+ return OUString(RTL_CONSTASCII_USTRINGPARAM( WINCLIPBOARD_IMPL_NAME ));
}
// -------------------------------------------------
diff --git a/dtrans/source/win32/dtobj/FetcList.cxx b/dtrans/source/win32/dtobj/FetcList.cxx
index ab6e758..b0c1f50 100644
--- a/dtrans/source/win32/dtobj/FetcList.cxx
+++ b/dtrans/source/win32/dtobj/FetcList.cxx
@@ -361,8 +361,8 @@ OUString SAL_CALL CFormatRegistrar::getCharsetFromDataFlavor( const DataFlavor&
try
{
Reference< XMimeContentTypeFactory > xMimeFac(
- m_SrvMgr->createInstance( OUString::createFromAscii( \
- "com.sun.star.datatransfer.MimeContentTypeFactory" ) ), UNO_QUERY );
+ m_SrvMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM( \
+ "com.sun.star.datatransfer.MimeContentTypeFactory" )) ), UNO_QUERY );
if( xMimeFac.is( ) )
{
diff --git a/dtrans/source/win32/ftransl/ftransl.cxx b/dtrans/source/win32/ftransl/ftransl.cxx
index cd6f3a8..e1b96a6 100644
--- a/dtrans/source/win32/ftransl/ftransl.cxx
+++ b/dtrans/source/win32/ftransl/ftransl.cxx
@@ -60,7 +60,7 @@
#define CPPUTYPE_SALINT32 getCppuType( ( sal_Int32 * ) 0 )
#define OUSTR( str ) OUString::createFromAscii( #str )
#define OUSTR_( str ) OUString::createFromAscii( str )
-#define EMPTY_OUSTR OUString(RTL_CONSTASCII_USTRINGPARAM(""))
+#define EMPTY_OUSTR OUString()
//#define PRIVATE_OO OUString::createFromAscii( "application/x-openoffice;" "windows_formatname=" )
const rtl::OUString Windows_FormatName (RTL_CONSTASCII_USTRINGPARAM("windows_formatname"));
@@ -236,7 +236,7 @@ DataFlavor SAL_CALL CDataFormatTranslator::getDataFlavorFromSystemDataType( cons
OUString SAL_CALL CDataFormatTranslator::getImplementationName( )
throw( RuntimeException )
{
- return OUString::createFromAscii( IMPL_NAME );
+ return OUString(RTL_CONSTASCII_USTRINGPARAM( IMPL_NAME ));
}
// -------------------------------------------------
More information about the Libreoffice-commits
mailing list