[PATCH] String=>OUString svl ddedummy
Norbert Thiebaud (via Code Review)
gerrit at gerrit.libreoffice.org
Thu Jun 13 06:19:26 PDT 2013
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4252
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/52/4252/1
String=>OUString svl ddedummy
Change-Id: If502fbf8aac64a1776a64713babf3c0549d2cf76
---
M framework/source/fwe/helper/undomanagerhelper.cxx
M include/svl/svdde.hxx
M include/svl/undo.hxx
M svl/source/svdde/ddecli.cxx
M svl/source/svdde/ddedata.cxx
M svl/source/svdde/ddeimp.hxx
M svl/source/svdde/ddesvr.cxx
M svl/source/undo/undo.cxx
M svl/unx/source/svdde/ddedummy.cxx
9 files changed, 158 insertions(+), 151 deletions(-)
diff --git a/framework/source/fwe/helper/undomanagerhelper.cxx b/framework/source/fwe/helper/undomanagerhelper.cxx
index e3c1de4..047d2b6 100644
--- a/framework/source/fwe/helper/undomanagerhelper.cxx
+++ b/framework/source/fwe/helper/undomanagerhelper.cxx
@@ -254,14 +254,14 @@
}
// SfxUndoListener
- virtual void actionUndone( const String& i_actionComment );
- virtual void actionRedone( const String& i_actionComment );
- virtual void undoActionAdded( const String& i_actionComment );
+ virtual void actionUndone( const OUString& i_actionComment );
+ virtual void actionRedone( const OUString& i_actionComment );
+ virtual void undoActionAdded( const OUString& i_actionComment );
virtual void cleared();
virtual void clearedRedo();
virtual void resetAll();
- virtual void listActionEntered( const String& i_comment );
- virtual void listActionLeft( const String& i_comment );
+ virtual void listActionEntered( const OUString& i_comment );
+ virtual void listActionLeft( const OUString& i_comment );
virtual void listActionLeftAndMerged();
virtual void listActionCancelled();
virtual void undoManagerDying();
@@ -800,7 +800,7 @@
}
//------------------------------------------------------------------------------------------------------------------
- void UndoManagerHelper_Impl::actionUndone( const String& i_actionComment )
+ void UndoManagerHelper_Impl::actionUndone( const OUString& i_actionComment )
{
UndoManagerEvent aEvent;
aEvent.Source = getXUndoManager();
@@ -811,7 +811,7 @@
}
//------------------------------------------------------------------------------------------------------------------
- void UndoManagerHelper_Impl::actionRedone( const String& i_actionComment )
+ void UndoManagerHelper_Impl::actionRedone( const OUString& i_actionComment )
{
UndoManagerEvent aEvent;
aEvent.Source = getXUndoManager();
@@ -822,7 +822,7 @@
}
//------------------------------------------------------------------------------------------------------------------
- void UndoManagerHelper_Impl::undoActionAdded( const String& i_actionComment )
+ void UndoManagerHelper_Impl::undoActionAdded( const OUString& i_actionComment )
{
if ( m_bAPIActionRunning )
return;
@@ -858,7 +858,7 @@
}
//------------------------------------------------------------------------------------------------------------------
- void UndoManagerHelper_Impl::listActionEntered( const String& i_comment )
+ void UndoManagerHelper_Impl::listActionEntered( const OUString& i_comment )
{
#if OSL_DEBUG_LEVEL > 0
m_aContextAPIFlags.push( m_bAPIActionRunning );
@@ -871,7 +871,7 @@
}
//------------------------------------------------------------------------------------------------------------------
- void UndoManagerHelper_Impl::listActionLeft( const String& i_comment )
+ void UndoManagerHelper_Impl::listActionLeft( const OUString& i_comment )
{
#if OSL_DEBUG_LEVEL > 0
const bool bCurrentContextIsAPIContext = m_aContextAPIFlags.top();
diff --git a/include/svl/svdde.hxx b/include/svl/svdde.hxx
index 0a1d22b..97b9679 100644
--- a/include/svl/svdde.hxx
+++ b/include/svl/svdde.hxx
@@ -67,7 +67,7 @@
public:
DdeData();
DdeData( SAL_UNUSED_PARAMETER const void*, SAL_UNUSED_PARAMETER long, SAL_UNUSED_PARAMETER sal_uLong = FORMAT_STRING );
- DdeData( SAL_UNUSED_PARAMETER const String& );
+ DdeData( SAL_UNUSED_PARAMETER const OUString& );
DdeData( const DdeData& );
~DdeData();
@@ -102,7 +102,7 @@
Link aDone;
bool bBusy;
- DdeTransaction( DdeConnection&, SAL_UNUSED_PARAMETER const String&, SAL_UNUSED_PARAMETER long = 0 );
+ DdeTransaction( DdeConnection&, SAL_UNUSED_PARAMETER const OUString&, SAL_UNUSED_PARAMETER long = 0 );
public:
virtual ~DdeTransaction();
@@ -141,7 +141,7 @@
Link aNotify;
public:
- DdeLink( DdeConnection&, const String&, long = 0 );
+ DdeLink( DdeConnection&, const OUString&, long = 0 );
virtual ~DdeLink();
void SetNotifyHdl( const Link& rLink ) { aNotify = rLink; }
@@ -156,7 +156,7 @@
class SVL_DLLPUBLIC DdeWarmLink : public DdeLink
{
public:
- DdeWarmLink( DdeConnection&, const String&, long = 0 );
+ DdeWarmLink( DdeConnection&, const OUString&, long = 0 );
};
// --------------
@@ -166,7 +166,7 @@
class SVL_DLLPUBLIC DdeHotLink : public DdeLink
{
public:
- DdeHotLink( DdeConnection&, const String&, long = 0 );
+ DdeHotLink( DdeConnection&, const OUString&, long = 0 );
};
// --------------
@@ -176,7 +176,7 @@
class SVL_DLLPUBLIC DdeRequest : public DdeTransaction
{
public:
- DdeRequest( DdeConnection&, const String&, long = 0 );
+ DdeRequest( DdeConnection&, const OUString&, long = 0 );
};
// -----------
@@ -186,10 +186,10 @@
class SVL_DLLPUBLIC DdePoke : public DdeTransaction
{
public:
- DdePoke( DdeConnection&, const String&, const char*, long,
+ DdePoke( DdeConnection&, const OUString&, const char*, long,
sal_uLong = FORMAT_STRING, long = 0 );
- DdePoke( DdeConnection&, const String&, SAL_UNUSED_PARAMETER const DdeData&, long = 0 );
- DdePoke( DdeConnection&, const String&, const String&, long = 0 );
+ DdePoke( DdeConnection&, const OUString&, SAL_UNUSED_PARAMETER const DdeData&, long = 0 );
+ DdePoke( DdeConnection&, const OUString&, const OUString&, long = 0 );
};
// --------------
@@ -199,7 +199,7 @@
class SVL_DLLPUBLIC DdeExecute : public DdeTransaction
{
public:
- DdeExecute( DdeConnection&, const String&, long = 0 );
+ DdeExecute( DdeConnection&, const OUString&, long = 0 );
};
// -----------------
@@ -216,7 +216,7 @@
DdeImp* pImp;
public:
- DdeConnection( SAL_UNUSED_PARAMETER const String&, SAL_UNUSED_PARAMETER const String& );
+ DdeConnection( SAL_UNUSED_PARAMETER const OUString&, SAL_UNUSED_PARAMETER const OUString& );
~DdeConnection();
long GetError();
@@ -226,8 +226,8 @@
sal_Bool IsConnected();
- const String& GetServiceName();
- const String& GetTopicName();
+ const OUString& GetServiceName();
+ const OUString& GetTopicName();
private:
DdeConnection( const DdeConnection& );
@@ -254,7 +254,7 @@
public:
DdeItem( const sal_Unicode* );
- DdeItem( SAL_UNUSED_PARAMETER const String& );
+ DdeItem( SAL_UNUSED_PARAMETER const OUString& );
DdeItem( const DdeItem& );
virtual ~DdeItem();
@@ -271,7 +271,7 @@
{
public:
DdeGetPutItem( const sal_Unicode* p );
- DdeGetPutItem( const String& rStr );
+ DdeGetPutItem( const OUString& rStr );
DdeGetPutItem( const DdeItem& rItem );
virtual DdeData* Get( sal_uLong );
@@ -292,7 +292,7 @@
virtual void Disconnect( sal_IntPtr );
virtual DdeData* Get( sal_uLong );
virtual sal_Bool Put( const DdeData* );
- virtual sal_Bool Execute( const String* );
+ virtual sal_Bool Execute( const OUString* );
// evt. ein neues anlegen; return 0 -> es konnte nicht angelegt werden
virtual sal_Bool MakeItem( const OUString& rItem );
@@ -334,7 +334,7 @@
void SetExecuteHdl( const Link& rLink ) { aExecLink = rLink; }
const Link& GetExecuteHdl() const { return aExecLink; }
- void NotifyClient( const String& );
+ void NotifyClient( const OUString& );
sal_Bool IsSystemTopic();
void InsertItem( DdeItem* ); // fuer eigene Ableitungen!
@@ -358,17 +358,17 @@
public:
virtual sal_Bool IsBusy();
- virtual String GetHelp();
+ virtual OUString GetHelp();
// evt. ein neues anlegen; return 0 -> es konnte nicht angelegt werden
virtual sal_Bool MakeTopic( const OUString& rItem );
protected:
- virtual String Topics();
- virtual String Formats();
- virtual String SysItems();
- virtual String Status();
- virtual String SysTopicGet( const String& );
- virtual sal_Bool SysTopicExecute( const String* );
+ virtual OUString Topics();
+ virtual OUString Formats();
+ virtual OUString SysItems();
+ virtual OUString Status();
+ virtual OUString SysTopicGet( const OUString& );
+ virtual sal_Bool SysTopicExecute( const OUString* );
const DdeTopic* GetSysTopic() const { return pSysTopic; }
private:
@@ -382,7 +382,7 @@
SVL_DLLPRIVATE sal_Bool HasCbFormat( sal_uInt16 );
public:
- DdeService( SAL_UNUSED_PARAMETER const String& );
+ DdeService( SAL_UNUSED_PARAMETER const OUString& );
virtual ~DdeService();
const OUString GetName() const;
diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx
index f36cd81..69c0642 100644
--- a/include/svl/undo.hxx
+++ b/include/svl/undo.hxx
@@ -194,14 +194,14 @@
class SAL_NO_VTABLE SfxUndoListener
{
public:
- virtual void actionUndone( const String& i_actionComment ) = 0;
- virtual void actionRedone( const String& i_actionComment ) = 0;
- virtual void undoActionAdded( const String& i_actionComment ) = 0;
+ virtual void actionUndone( const OUString& i_actionComment ) = 0;
+ virtual void actionRedone( const OUString& i_actionComment ) = 0;
+ virtual void undoActionAdded( const OUString& i_actionComment ) = 0;
virtual void cleared() = 0;
virtual void clearedRedo() = 0;
virtual void resetAll() = 0;
- virtual void listActionEntered( const String& i_comment ) = 0;
- virtual void listActionLeft( const String& i_comment ) = 0;
+ virtual void listActionEntered( const OUString& i_comment ) = 0;
+ virtual void listActionLeft( const OUString& i_comment ) = 0;
virtual void listActionLeftAndMerged() = 0;
virtual void listActionCancelled() = 0;
virtual void undoManagerDying() = 0;
diff --git a/svl/source/svdde/ddecli.cxx b/svl/source/svdde/ddecli.cxx
index 1688811..f4a22da 100644
--- a/svl/source/svdde/ddecli.cxx
+++ b/svl/source/svdde/ddecli.cxx
@@ -143,7 +143,7 @@
// --- DdeConnection::DdeConnection() ------------------------------
-DdeConnection::DdeConnection( const String& rService, const String& rTopic )
+DdeConnection::DdeConnection( const OUString& rService, const OUString& rTopic )
{
pImp = new DdeImp;
pImp->nStatus = DMLERR_NO_ERROR;
@@ -169,7 +169,7 @@
if ( pImp->nStatus == DMLERR_NO_ERROR )
{
- pImp->hConv = DdeConnect( pInst->hDdeInstCli,*pService,*pTopic, NULL);
+ pImp->hConv = DdeConnect( pInst->hDdeInstCli, *pService, *pTopic, NULL);
if( !pImp->hConv )
pImp->nStatus = DdeGetLastError( pInst->hDdeInstCli );
}
@@ -229,16 +229,16 @@
// --- DdeConnection::GetServiceName() -----------------------------
-const String& DdeConnection::GetServiceName()
+const OUString& DdeConnection::GetServiceName()
{
- return (const String&)*pService;
+ return (const OUString&)*pService;
}
// --- DdeConnection::GetTopicName() -------------------------------
-const String& DdeConnection::GetTopicName()
+const OUString& DdeConnection::GetTopicName()
{
- return (const String&)*pTopic;
+ return (const OUString&)*pTopic;
}
// --- DdeConnection::GetConvId() ----------------------------------
@@ -257,7 +257,7 @@
// --- DdeTransaction::DdeTransaction() ----------------------------
-DdeTransaction::DdeTransaction( DdeConnection& d, const String& rItemName,
+DdeTransaction::DdeTransaction( DdeConnection& d, const OUString& rItemName,
long n ) :
rDde( d )
{
@@ -368,7 +368,7 @@
// --- DdeLink::DdeLink() ------------------------------------------
-DdeLink::DdeLink( DdeConnection& d, const String& aItemName, long n ) :
+DdeLink::DdeLink( DdeConnection& d, const OUString& aItemName, long n ) :
DdeTransaction (d, aItemName, n)
{
}
@@ -390,7 +390,7 @@
// --- DdeRequest::DdeRequest() ------------------------------------
-DdeRequest::DdeRequest( DdeConnection& d, const String& i, long n ) :
+DdeRequest::DdeRequest( DdeConnection& d, const OUString& i, long n ) :
DdeTransaction( d, i, n )
{
nType = XTYP_REQUEST;
@@ -398,7 +398,7 @@
// --- DdeWarmLink::DdeWarmLink() ----------------------------------
-DdeWarmLink::DdeWarmLink( DdeConnection& d, const String& i, long n ) :
+DdeWarmLink::DdeWarmLink( DdeConnection& d, const OUString& i, long n ) :
DdeLink( d, i, n )
{
nType = XTYP_ADVSTART | XTYPF_NODATA;
@@ -406,7 +406,7 @@
// --- DdeHotLink::DdeHotLink() ------------------------------------
-DdeHotLink::DdeHotLink( DdeConnection& d, const String& i, long n ) :
+DdeHotLink::DdeHotLink( DdeConnection& d, const OUString& i, long n ) :
DdeLink( d, i, n )
{
nType = XTYP_ADVSTART;
@@ -414,7 +414,7 @@
// --- DdePoke::DdePoke() ------------------------------------------
-DdePoke::DdePoke( DdeConnection& d, const String& i, const char* p,
+DdePoke::DdePoke( DdeConnection& d, const OUString& i, const char* p,
long l, sal_uLong f, long n ) :
DdeTransaction( d, i, n )
{
@@ -424,7 +424,7 @@
// --- DdePoke::DdePoke() ------------------------------------------
-DdePoke::DdePoke( DdeConnection& d, const String& i, const String& rData,
+DdePoke::DdePoke( DdeConnection& d, const OUString& i, const OUString& rData,
long n ) :
DdeTransaction( d, i, n )
{
@@ -434,7 +434,7 @@
// --- DdePoke::DdePoke() ------------------------------------------
-DdePoke::DdePoke( DdeConnection& d, const String& i, const DdeData& rData,
+DdePoke::DdePoke( DdeConnection& d, const OUString& i, const DdeData& rData,
long n ) :
DdeTransaction( d, i, n )
{
@@ -444,8 +444,8 @@
// --- DdeExecute::DdeExecute() ------------------------------------
-DdeExecute::DdeExecute( DdeConnection& d, const String& rData, long n ) :
- DdeTransaction( d, String(), n )
+DdeExecute::DdeExecute( DdeConnection& d, const OUString& rData, long n ) :
+ DdeTransaction( d, OUString(), n )
{
aDdeData = DdeData( (void*)rData.GetBuffer(), sizeof(sal_Unicode) * (rData.Len() + 1), CF_TEXT );
nType = XTYP_EXECUTE;
diff --git a/svl/source/svdde/ddedata.cxx b/svl/source/svdde/ddedata.cxx
index 4b4c051..a32f05c 100644
--- a/svl/source/svdde/ddedata.cxx
+++ b/svl/source/svdde/ddedata.cxx
@@ -55,12 +55,12 @@
// --- DdeData::DdeData() ------------------------------------------
-DdeData::DdeData( const String& s )
+DdeData::DdeData( const OUString& s )
{
pImp = new DdeDataImp;
pImp->hData = NULL;
pImp->pData = (LPBYTE)s.GetBuffer();
- pImp->nData = s.Len()+1;
+ pImp->nData = s.getLength()+1;
pImp->nFmt = CF_TEXT;
}
@@ -151,8 +151,8 @@
default:
{
#if defined(WNT)
- String aName( SotExchange::GetFormatName( nFmt ) );
- if( aName.Len() )
+ OUString aName( SotExchange::GetFormatName( nFmt ) );
+ if( !aName.isEmpty() )
nFmt = RegisterClipboardFormat( reinterpret_cast<LPCWSTR>(aName.GetBuffer()) );
#endif
}
diff --git a/svl/source/svdde/ddeimp.hxx b/svl/source/svdde/ddeimp.hxx
index 21307ff..df34711 100644
--- a/svl/source/svdde/ddeimp.hxx
+++ b/svl/source/svdde/ddeimp.hxx
@@ -23,7 +23,6 @@
#include <windows.h>
#include <ddeml.h>
-#include <tools/string.hxx>
#include <tools/shl.hxx>
#include <boost/noncopyable.hpp>
#include <svl/svdde.hxx>
diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx
index eaafebb..4bfc130 100644
--- a/svl/source/svdde/ddesvr.cxx
+++ b/svl/source/svdde/ddesvr.cxx
@@ -81,7 +81,7 @@
pService = *aI;
if ( !hText2 || ( *pService->pName == hText2 ) )
{
- String sTopics( pService->Topics() );
+ OUString sTopics( pService->Topics() );
if( sTopics.Len() )
{
if( hText1 )
@@ -113,11 +113,11 @@
pService = *aI;
if ( !hText2 || (*pService->pName == hText2 ) )
{
- String sTopics( pService->Topics() );
+ OUString sTopics( pService->Topics() );
sal_Int32 n = 0;
while( -1 != n )
{
- OUString s( sTopics.GetToken( 0, '\t', n ));
+ OUString s( sTopics.getToken( 0, '\t', n ));
s = comphelper::string::remove(s, '\n');
s = comphelper::string::remove(s, '\r');
if( !hText1 || s == reinterpret_cast<const sal_Unicode*>(chTopicBuf) )
@@ -227,7 +227,7 @@
case XTYP_REQUEST:
case XTYP_ADVREQ:
{
- String aRes; // darf erst am Ende freigegeben werden!!
+ OUString aRes; // darf erst am Ende freigegeben werden!!
if ( pTopic->IsSystemTopic() )
{
if ( pTopic->aItem == reinterpret_cast<const sal_Unicode*>(SZDDESYS_ITEM_TOPICS) )
@@ -337,7 +337,7 @@
aExec.pImp->hData = hData;
aExec.pImp->nFmt = DdeData::GetInternalFormat( nCbType );
aExec.Lock();
- String aName;
+ OUString aName;
aName = (const sal_Unicode *)aExec.pImp->pData;
@@ -435,7 +435,7 @@
// --- DdeService::DdeService() ------------------------------------
-DdeService::DdeService( const String& rService )
+DdeService::DdeService( const OUString& rService )
{
DdeInstData* pInst = ImpGetInstData();
if( !pInst )
@@ -690,7 +690,7 @@
// --- DdeTopic::NotifyClient() ------------------------------------
-void DdeTopic::NotifyClient( const String& rItem )
+void DdeTopic::NotifyClient( const OUString& rItem )
{
std::vector<DdeItem*>::iterator iter;
DdeInstData* pInst = ImpGetInstData();
@@ -752,7 +752,7 @@
// --- DdeTopic::Execute() -----------------------------------------
-sal_Bool DdeTopic::Execute( const String* r )
+sal_Bool DdeTopic::Execute( const OUString* r )
{
if ( aExecLink.IsSet() )
return (sal_Bool)aExecLink.Call( (void*)r );
@@ -797,7 +797,7 @@
// --- DdeItem::DdeItem() ------------------------------------------
-DdeItem::DdeItem( const String& r)
+DdeItem::DdeItem( const OUString& r)
{
DdeInstData* pInst = ImpGetInstData();
DBG_ASSERT(pInst,"SVDDE:No instance data");
@@ -925,7 +925,7 @@
// --- DdeGetPutItem::DdeGetPutItem() ------------------------------
-DdeGetPutItem::DdeGetPutItem( const String& rStr )
+DdeGetPutItem::DdeGetPutItem( const OUString& rStr )
: DdeItem( rStr )
{
nType = DDEGETPUTITEM;
@@ -963,9 +963,9 @@
// --- DdeService::SysItems() --------------------------------------
-String DdeService::SysItems()
+OUString DdeService::SysItems()
{
- String s;
+ OUString s;
std::vector<DdeTopic*>::iterator iter;
std::vector<DdeItem*>::iterator iterItem;
for ( iter = aTopics.begin(); iter != aTopics.end(); ++iter )
@@ -988,16 +988,16 @@
// --- DdeService::Topics() ----------------------------------------
-String DdeService::Topics()
+OUString DdeService::Topics()
{
- String s;
+ OUString s;
std::vector<DdeTopic*>::iterator iter;
short n = 0;
for ( iter = aTopics.begin(); iter != aTopics.end(); ++iter, n++ )
{
if ( n )
- s += '\t';
+ s += "\t";
s += (*iter)->GetName();
}
s += OUString("\r\n");
@@ -1007,9 +1007,9 @@
// --- DdeService::Formats() ---------------------------------------
-String DdeService::Formats()
+OUString DdeService::Formats()
{
- String s;
+ OUString s;
long f;
short n = 0;
@@ -1022,10 +1022,10 @@
switch( (sal_uInt16)f )
{
case CF_TEXT:
- s += OUString("TEXT");
+ s += "TEXT";
break;
case CF_BITMAP:
- s += OUString("BITMAP");
+ s += "BITMAP";
break;
default:
{
@@ -1044,7 +1044,7 @@
// --- DdeService::Status() ----------------------------------------
-String DdeService::Status()
+OUString DdeService::Status()
{
return IsBusy() ? OUString("Busy\r\n") : OUString("Ready\r\n");
}
@@ -1058,9 +1058,9 @@
// --- DdeService::GetHelp() ----------------------------------------
-String DdeService::GetHelp()
+OUString DdeService::GetHelp()
{
- return String();
+ return OUString();
}
sal_Bool DdeTopic::MakeItem( const OUString& )
@@ -1073,12 +1073,12 @@
return sal_False;
}
-String DdeService::SysTopicGet( const String& )
+OUString DdeService::SysTopicGet( const OUString& )
{
- return String();
+ return OUString();
}
-sal_Bool DdeService::SysTopicExecute( const String* )
+sal_Bool DdeService::SysTopicExecute( const OUString* )
{
return sal_False;
}
diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx
index 72929b7..7df392c 100644
--- a/svl/source/undo/undo.cxx
+++ b/svl/source/undo/undo.cxx
@@ -228,7 +228,7 @@
//--------------------------------------------------------------------
typedef void ( SfxUndoListener::*UndoListenerVoidMethod )();
- typedef void ( SfxUndoListener::*UndoListenerStringMethod )( const String& );
+ typedef void ( SfxUndoListener::*UndoListenerStringMethod )( const OUString& );
//--------------------------------------------------------------------
struct SVL_DLLPRIVATE NotifyUndoListener : public ::std::unary_function< SfxUndoListener*, void >
@@ -247,7 +247,7 @@
{
}
- NotifyUndoListener( UndoListenerStringMethod i_notificationMethod, const String& i_actionComment )
+ NotifyUndoListener( UndoListenerStringMethod i_notificationMethod, const OUString& i_actionComment )
:m_notificationMethod( NULL )
,m_altNotificationMethod( i_notificationMethod )
,m_sActionComment( i_actionComment )
@@ -275,7 +275,7 @@
private:
UndoListenerVoidMethod m_notificationMethod;
UndoListenerStringMethod m_altNotificationMethod;
- String m_sActionComment;
+ OUString m_sActionComment;
};
//--------------------------------------------------------------------
@@ -328,7 +328,7 @@
m_notifiers.push_back( NotifyUndoListener( i_notificationMethod ) );
}
- void scheduleNotification( UndoListenerStringMethod i_notificationMethod, const String& i_actionComment )
+ void scheduleNotification( UndoListenerStringMethod i_notificationMethod, const OUString& i_actionComment )
{
m_notifiers.push_back( NotifyUndoListener( i_notificationMethod, i_actionComment ) );
}
@@ -784,7 +784,7 @@
}
SfxUndoAction* pAction = m_pData->pActUndoArray->aUndoActions[ --m_pData->pActUndoArray->nCurUndoAction ].pAction;
- const String sActionComment = pAction->GetComment();
+ const OUString sActionComment = pAction->GetComment();
try
{
// clear the guard/mutex before calling into the SfxUndoAction - this can be an extension-implemented UNO component
@@ -884,7 +884,7 @@
}
SfxUndoAction* pAction = m_pData->pActUndoArray->aUndoActions[ m_pData->pActUndoArray->nCurUndoAction++ ].pAction;
- const String sActionComment = pAction->GetComment();
+ const OUString sActionComment = pAction->GetComment();
try
{
// clear the guard/mutex before calling into the SfxUndoAction - this can be a extension-implemented UNO component
diff --git a/svl/unx/source/svdde/ddedummy.cxx b/svl/unx/source/svdde/ddedummy.cxx
index 70104ef..cc3a0b2 100644
--- a/svl/unx/source/svdde/ddedummy.cxx
+++ b/svl/unx/source/svdde/ddedummy.cxx
@@ -24,7 +24,7 @@
{
}
-DdeData::DdeData( const String& )
+DdeData::DdeData( const OUString& )
{
}
@@ -46,30 +46,30 @@
sal_uLong DdeData::GetFormat() const
{
- return 0L;
+ return 0L;
}
DdeData& DdeData::operator = ( const DdeData& )
{
- return *this;
+ return *this;
}
DdeData::operator long() const
{
- return 0L;
+ return 0L;
}
DdeData::operator const void*() const
{
- return NULL;
+ return NULL;
}
long DdeConnection::GetError()
{
- return 0L;
+ return 0L;
}
-DdeConnection::DdeConnection( const String&, const String& )
+DdeConnection::DdeConnection( const OUString&, const OUString& )
{
}
@@ -77,23 +77,25 @@
{
}
-const String& DdeConnection::GetServiceName()
+const OUString& DdeConnection::GetServiceName()
{
- return String::EmptyString();
+ static OUString empty("");
+ return empty;
}
-const String& DdeConnection::GetTopicName()
+const OUString& DdeConnection::GetTopicName()
{
- return String::EmptyString();
+ static OUString empty("");
+ return empty;
}
-DdeTransaction::DdeTransaction( DdeConnection& rConnection, const String&, long ) :
- rDde( rConnection )
+DdeTransaction::DdeTransaction( DdeConnection& rConnection, const OUString&, long )
+ : rDde( rConnection )
{
}
-DdeTransaction::DdeTransaction( const DdeTransaction& rTransaction ) :
- rDde( rTransaction.rDde )
+DdeTransaction::DdeTransaction( const DdeTransaction& rTransaction )
+ : rDde( rTransaction.rDde )
{
}
@@ -113,18 +115,18 @@
{
}
-DdeRequest::DdeRequest( DdeConnection& rConnection, const String& rString, long lLong ) :
- DdeTransaction( rConnection, rString, lLong )
+DdeRequest::DdeRequest( DdeConnection& rConnection, const OUString& rString, long lLong ) :
+ DdeTransaction( rConnection, rString, lLong )
{
}
-DdeExecute::DdeExecute( DdeConnection& rConnection, const String& rString, long lLong ) :
- DdeTransaction( rConnection, rString, lLong )
+DdeExecute::DdeExecute( DdeConnection& rConnection, const OUString& rString, long lLong )
+ : DdeTransaction( rConnection, rString, lLong )
{
}
-DdePoke::DdePoke( DdeConnection& rConnection, const String& rString, const DdeData&, long lLong ) :
- DdeTransaction( rConnection, rString, lLong )
+DdePoke::DdePoke( DdeConnection& rConnection, const OUString& rString, const DdeData&, long lLong )
+ : DdeTransaction( rConnection, rString, lLong )
{
}
@@ -151,7 +153,7 @@
DdeItem* DdeTopic::AddItem( const DdeItem& rDdeItem )
{
- return (DdeItem*) &rDdeItem;
+ return (DdeItem*) &rDdeItem;
}
void DdeTopic::RemoveItem( SAL_UNUSED_PARAMETER const DdeItem& )
@@ -160,65 +162,71 @@
DdeData* DdeTopic::Get( SAL_UNUSED_PARAMETER sal_uLong )
{
- return NULL;
+ return NULL;
}
sal_Bool DdeTopic::MakeItem( SAL_UNUSED_PARAMETER const OUString& )
{
- return sal_False;
+ return sal_False;
}
sal_Bool DdeTopic::StartAdviseLoop()
{
- return sal_False;
+ return sal_False;
}
sal_Bool DdeTopic::StopAdviseLoop()
{
- return sal_False;
+ return sal_False;
}
-sal_Bool DdeTopic::Execute( SAL_UNUSED_PARAMETER const String* )
+sal_Bool DdeTopic::Execute( SAL_UNUSED_PARAMETER const OUString* )
{
- return sal_False;
+ return sal_False;
}
sal_Bool DdeTopic::Put( SAL_UNUSED_PARAMETER const DdeData* )
{
- return sal_False;
+ return sal_False;
}
const OUString DdeTopic::GetName() const
{
- return OUString();
+ return OUString();
}
-DdeService::DdeService( const String& )
+DdeService::DdeService( const OUString& )
{
- nStatus = 0;
+ nStatus = 0;
}
-String DdeService::Topics() {
- return String();
+OUString DdeService::Topics()
+{
+ return OUString();
}
-String DdeService::Formats() {
- return String();
+OUString DdeService::Formats()
+{
+ return OUString();
}
-String DdeService::SysItems() {
- return String();
+OUString DdeService::SysItems()
+{
+ return OUString();
}
-String DdeService::Status() {
- return String();
+OUString DdeService::Status()
+{
+ return OUString();
}
-String DdeService::SysTopicGet(const String& rString) {
+OUString DdeService::SysTopicGet(const OUString& rString)
+{
return rString;
}
-sal_Bool DdeService::SysTopicExecute(SAL_UNUSED_PARAMETER const String*) {
+sal_Bool DdeService::SysTopicExecute(SAL_UNUSED_PARAMETER const OUString*)
+{
return sal_False;
}
@@ -228,12 +236,12 @@
sal_Bool DdeService::IsBusy()
{
- return sal_False;
+ return sal_False;
}
-String DdeService::GetHelp()
+OUString DdeService::GetHelp()
{
- return String::EmptyString();
+ return OUString();
}
void DdeService::AddFormat( SAL_UNUSED_PARAMETER sal_uLong )
@@ -250,12 +258,12 @@
sal_Bool DdeService::MakeTopic( SAL_UNUSED_PARAMETER const OUString& )
{
- return sal_False;
+ return sal_False;
}
const OUString DdeService::GetName() const
{
- return OUString();
+ return OUString();
}
namespace
@@ -266,10 +274,10 @@
DdeServices& DdeService::GetServices()
{
- return theDdeServices::get();
+ return theDdeServices::get();
}
-DdeItem::DdeItem( const String& )
+DdeItem::DdeItem( const OUString& )
{
}
@@ -285,32 +293,32 @@
{
}
-DdeGetPutItem::DdeGetPutItem( const String& rStr ) :
-DdeItem( rStr )
+DdeGetPutItem::DdeGetPutItem( const OUString& rStr )
+ : DdeItem( rStr )
{
}
-DdeGetPutItem::DdeGetPutItem( const DdeItem& rItem ) :
-DdeItem( rItem )
+DdeGetPutItem::DdeGetPutItem( const DdeItem& rItem )
+ : DdeItem( rItem )
{
}
DdeData* DdeGetPutItem::Get( SAL_UNUSED_PARAMETER sal_uLong )
{
- return NULL;
+ return NULL;
}
sal_Bool DdeGetPutItem::Put( SAL_UNUSED_PARAMETER const DdeData* )
{
- return sal_False;
+ return sal_False;
}
void DdeGetPutItem::AdviseLoop( SAL_UNUSED_PARAMETER sal_Bool )
{
}
-DdeLink::DdeLink( DdeConnection& rConnection, const String& rString, long l ) :
-DdeTransaction( rConnection, rString, l )
+DdeLink::DdeLink( DdeConnection& rConnection, const OUString& rString, long l )
+ : DdeTransaction( rConnection, rString, l )
{
}
@@ -322,8 +330,8 @@
{
}
-DdeHotLink::DdeHotLink( DdeConnection& rConnection, const String& rString, long l ) :
-DdeLink( rConnection, rString, l )
+DdeHotLink::DdeHotLink( DdeConnection& rConnection, const OUString& rString, long l )
+ : DdeLink( rConnection, rString, l )
{
}
--
To view, visit https://gerrit.libreoffice.org/4252
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If502fbf8aac64a1776a64713babf3c0549d2cf76
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Norbert Thiebaud <nthiebaud at gmail.com>
More information about the LibreOffice
mailing list