summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cui/source/dialogs/pastedlg.cxx22
-rw-r--r--cui/source/inc/pastedlg.hxx2
-rw-r--r--include/svtools/insdlg.hxx12
-rw-r--r--sc/source/ui/view/cellsh.cxx6
-rw-r--r--sd/source/ui/view/drviews7.cxx4
-rw-r--r--svtools/source/dialogs/insdlg.cxx10
-rw-r--r--sw/source/ui/dochdl/swdtflvr.cxx2
7 files changed, 29 insertions, 29 deletions
diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx
index 795dae49cb1b..3b4ffb73cb82 100644
--- a/cui/source/dialogs/pastedlg.cxx
+++ b/cui/source/dialogs/pastedlg.cxx
@@ -102,7 +102,7 @@ sal_uLong SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper,
pFormats = &rHelper.GetDataFlavorExVector();
// create and fill dialog box
- String aSourceName, aTypeName;
+ OUString aSourceName, aTypeName;
sal_uLong nSelFormat = 0;
SvGlobalName aEmptyNm;
@@ -115,19 +115,19 @@ sal_uLong SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper,
::com::sun::star::datatransfer::DataFlavor aFlavor( *aIter );
SotFormatStringId nFormat = (*aIter++).mnSotId;
- ::std::map< SotFormatStringId, String >::iterator itName =
+ ::std::map< SotFormatStringId, OUString >::iterator itName =
aSupplementMap.find( nFormat );
// if there is an "Embed Source" or and "Embedded Object" on the
// Clipboard we read the Description and the Source of this object
// from an accompanied "Object Descriptor" format on the clipboard
// Remember: these formats mostly appear together on the clipboard
- String aName;
- const String* pName = NULL;
+ OUString aName;
+ const OUString* pName = NULL;
if ( itName == aSupplementMap.end() )
{
SvPasteObjectHelper::GetEmbeddedName(rHelper,aName,aSourceName,nFormat);
- if ( aName.Len() )
+ if ( !aName.isEmpty() )
pName = &aName;
}
else
@@ -155,7 +155,7 @@ sal_uLong SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper,
{
continue;
}
- else if( !aName.Len() )
+ else if( aName.isEmpty() )
aName = SvPasteObjectHelper::GetSotFormatUIName( nFormat );
if( LISTBOX_ENTRY_NOTFOUND == ObjectLB().GetEntryPos( aName ) )
@@ -164,7 +164,7 @@ sal_uLong SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper,
}
}
- if( !aTypeName.Len() && !aSourceName.Len() )
+ if( aTypeName.isEmpty() && aSourceName.isEmpty() )
{
if( aDesc.maClassName != aEmptyNm )
{
@@ -172,7 +172,7 @@ sal_uLong SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper,
aTypeName = aDesc.maTypeName;
}
- if( !aTypeName.Len() && !aSourceName.Len() )
+ if( aTypeName.isEmpty() && aSourceName.isEmpty() )
{
ResMgr* pMgr = ResMgr::CreateResMgr( "svt", Application::GetSettings().GetUILanguageTag() );
// global resource from svtools (former so3 resource)
@@ -185,10 +185,10 @@ sal_uLong SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper,
ObjectLB().SetUpdateMode( sal_True );
SelectObject();
- if( aSourceName.Len() )
+ if( !aSourceName.isEmpty() )
{
- if( aTypeName.Len() )
- aTypeName += '\n';
+ if( !aTypeName.isEmpty() )
+ aTypeName += "\n";
aTypeName += aSourceName;
aTypeName = convertLineEnd(aTypeName, GetSystemLineEnd());
diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx
index 30be129e9faa..7cd13f620eab 100644
--- a/cui/source/inc/pastedlg.hxx
+++ b/cui/source/inc/pastedlg.hxx
@@ -42,7 +42,7 @@ class SvPasteObjectDialog : public ModalDialog
FixedText* m_pFtObjectSource;
ListBox* m_pLbInsertList;
OKButton* m_pOKButton;
- ::std::map< SotFormatStringId, String > aSupplementMap;
+ ::std::map< SotFormatStringId, OUString > aSupplementMap;
SvGlobalName aObjClassName;
String aObjName;
diff --git a/include/svtools/insdlg.hxx b/include/svtools/insdlg.hxx
index 241f3cd128d2..419bde308e09 100644
--- a/include/svtools/insdlg.hxx
+++ b/include/svtools/insdlg.hxx
@@ -33,15 +33,15 @@ class SvObjectServer
{
private:
SvGlobalName aClassName;
- String aHumanName;
+ OUString aHumanName;
public:
- SvObjectServer( const SvGlobalName & rClassP, const String & rHumanP ) :
+ SvObjectServer( const SvGlobalName & rClassP, const OUString & rHumanP ) :
aClassName( rClassP ),
aHumanName( rHumanP ) {}
const SvGlobalName & GetClassName() const { return aClassName; }
- const String & GetHumanName() const { return aHumanName; }
+ const OUString & GetHumanName() const { return aHumanName; }
};
typedef ::std::vector< SvObjectServer > SvObjectServerList_impl;
@@ -52,7 +52,7 @@ private:
SvObjectServerList_impl aObjectServerList;
public:
- const SvObjectServer * Get( const String & rHumanName ) const;
+ const SvObjectServer * Get( const OUString & rHumanName ) const;
const SvObjectServer * Get( const SvGlobalName & ) const;
void Remove( const SvGlobalName & );
void FillInsertObjects();
@@ -70,8 +70,8 @@ public:
class SVT_DLLPUBLIC SvPasteObjectHelper
{
public:
- static String GetSotFormatUIName( SotFormatStringId nId );
- static sal_Bool GetEmbeddedName(const TransferableDataHelper& rData, String& _rName, String& _rSource, SotFormatStringId& _nFormat);
+ static OUString GetSotFormatUIName( SotFormatStringId nId );
+ static sal_Bool GetEmbeddedName(const TransferableDataHelper& rData, OUString& _rName, OUString& _rSource, SotFormatStringId& _nFormat);
};
#endif // _SVTOOLS_INSDLG_HXX
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index 239d1be952f2..8484ed2ad44d 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -345,7 +345,7 @@ static sal_Bool lcl_TestFormat( SvxClipboardFmtItem& rFormats, const Transferabl
// translated format name strings are no longer inserted here,
// handled by "paste special" dialog / toolbox controller instead.
// Only the object type name has to be set here:
- String aStrVal;
+ OUString aStrVal;
if ( nFormatId == SOT_FORMATSTR_ID_EMBED_SOURCE )
{
TransferableObjectDescriptor aDesc;
@@ -356,11 +356,11 @@ static sal_Bool lcl_TestFormat( SvxClipboardFmtItem& rFormats, const Transferabl
else if ( nFormatId == SOT_FORMATSTR_ID_EMBED_SOURCE_OLE
|| nFormatId == SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE )
{
- String aSource;
+ OUString aSource;
SvPasteObjectHelper::GetEmbeddedName( rDataHelper, aStrVal, aSource, nFormatId );
}
- if ( aStrVal.Len() )
+ if ( !aStrVal.isEmpty() )
rFormats.AddClipbrdFormat( nFormatId, aStrVal );
else
rFormats.AddClipbrdFormat( nFormatId );
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index f91881d6c64c..4b578fad3d74 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -162,8 +162,8 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
}
if (bHasFormat)
{
- String sName;
- String sSource;
+ OUString sName;
+ OUString sSource;
if (SvPasteObjectHelper::GetEmbeddedName (rDataHelper, sName, sSource, nFormat))
pResult->AddClipbrdFormat (nFormat, sName);
}
diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx
index 795a58933241..2490b0751db8 100644
--- a/svtools/source/dialogs/insdlg.cxx
+++ b/svtools/source/dialogs/insdlg.cxx
@@ -55,7 +55,7 @@ struct OleObjectDescriptor
/********************** SvObjectServerList ********************************
**************************************************************************/
-const SvObjectServer * SvObjectServerList::Get( const String & rHumanName ) const
+const SvObjectServer * SvObjectServerList::Get( const OUString & rHumanName ) const
{
for( size_t i = 0; i < aObjectServerList.size(); i++ )
{
@@ -189,7 +189,7 @@ void SvObjectServerList::FillInsertObjects()
}
}
-String SvPasteObjectHelper::GetSotFormatUIName( SotFormatStringId nId )
+OUString SvPasteObjectHelper::GetSotFormatUIName( SotFormatStringId nId )
{
struct SotResourcePair
{
@@ -284,7 +284,7 @@ String SvPasteObjectHelper::GetSotFormatUIName( SotFormatStringId nId )
return aUIName;
}
// -----------------------------------------------------------------------------
-sal_Bool SvPasteObjectHelper::GetEmbeddedName(const TransferableDataHelper& rData,String& _rName,String& _rSource,SotFormatStringId& _nFormat)
+sal_Bool SvPasteObjectHelper::GetEmbeddedName(const TransferableDataHelper& rData, OUString& _rName, OUString& _rSource, SotFormatStringId& _nFormat)
{
sal_Bool bRet = sal_False;
if( _nFormat == SOT_FORMATSTR_ID_EMBED_SOURCE_OLE || _nFormat == SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE )
@@ -314,7 +314,7 @@ sal_Bool SvPasteObjectHelper::GetEmbeddedName(const TransferableDataHelper& rDat
reinterpret_cast< sal_Char* >( pOleObjDescr ) +
pOleObjDescr->dwFullUserTypeName );
- _rName.Append( pUserTypeName );
+ _rName += pUserTypeName;
// the following statement was here for historical reasons, it is commented out since it causes bug i49460
// _nFormat = SOT_FORMATSTR_ID_EMBED_SOURCE_OLE;
}
@@ -331,7 +331,7 @@ sal_Bool SvPasteObjectHelper::GetEmbeddedName(const TransferableDataHelper& rDat
reinterpret_cast< sal_Char* >( pOleObjDescr ) +
pOleObjDescr->dwSrcOfCopy );
- _rSource.Append( pSrcOfCopy );
+ _rSource += pSrcOfCopy;
}
else
_rSource = SVT_RESSTR(STR_UNKNOWN_SOURCE);
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index ef9f0a16b7c2..b1f658329819 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -2921,7 +2921,7 @@ void SwTransferable::FillClipFmtItem( const SwWrtShell& rSh,
SotFormatStringId nFormat;
if ( rData.HasFormat(nFormat = SOT_FORMATSTR_ID_EMBED_SOURCE_OLE) || rData.HasFormat(nFormat = SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE) )
{
- String sName,sSource;
+ OUString sName,sSource;
if ( SvPasteObjectHelper::GetEmbeddedName(rData,sName,sSource,nFormat) )
rToFill.AddClipbrdFormat( nFormat, sName );
}
generated by cgit (git 2.34.1) at 2025-02-03 19:35:49 +0000