summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--editeng/source/items/paraitem.cxx2
-rw-r--r--filter/inc/filter/msfilter/svdfppt.hxx2
-rw-r--r--filter/source/msfilter/svdfppt.cxx2
-rw-r--r--sd/source/filter/eppt/epptso.cxx4
-rw-r--r--sd/source/filter/ppt/pptin.cxx17
-rw-r--r--svx/source/accessibility/svxrectctaccessiblecontext.cxx6
6 files changed, 15 insertions, 18 deletions
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index d7736d1c7878..b1ab1fde2995 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -887,7 +887,7 @@ XubString SvxTabStop::GetValueString() const
XubString aStr;
aStr += sal_Unicode( '(' );
- aStr += UniString::CreateFromInt32(nTabPos);
+ aStr += rtl::OUString::valueOf(static_cast<sal_Int32>(nTabPos));
aStr += cpDelim;
aStr += XubString( EditResId( RID_SVXITEMS_TAB_ADJUST_BEGIN + (sal_uInt16)eAdjustment ) );
diff --git a/filter/inc/filter/msfilter/svdfppt.hxx b/filter/inc/filter/msfilter/svdfppt.hxx
index f1ac113188fd..8a6d1edbc452 100644
--- a/filter/inc/filter/msfilter/svdfppt.hxx
+++ b/filter/inc/filter/msfilter/svdfppt.hxx
@@ -423,7 +423,7 @@ protected:
sal_Bool bTimesNewRomanChecked : 1;
sal_Bool bTimesNewRomanAvailable : 1;
- sal_Bool ReadString( String& rStr ) const;
+ sal_Bool ReadString( rtl::OUString& rStr ) const;
// nur fuer PowerPoint-Filter:
virtual const PptSlideLayoutAtom* GetSlideLayoutAtom() const;
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 1df7ffb9741b..9e4d709d2b36 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -547,7 +547,7 @@ const PptSlideLayoutAtom* SdrEscherImport::GetSlideLayoutAtom() const
return NULL;
}
-sal_Bool SdrEscherImport::ReadString( String& rStr ) const
+sal_Bool SdrEscherImport::ReadString( rtl::OUString& rStr ) const
{
sal_Bool bRet = sal_False;
DffRecordHeader aStrHd;
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 6eec4bf1472b..6841e545db6d 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -1232,7 +1232,7 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u
if ( pIter != maSlideNameList.end() )
{
nPageIndex = pIter - maSlideNameList.begin();
- aPageUrl = UniString::CreateFromInt32( 256 + nPageIndex );
+ aPageUrl = rtl::OUString::valueOf(static_cast<sal_Int32>(256 + nPageIndex));
aPageUrl.Append( String( RTL_CONSTASCII_USTRINGPARAM( "," ) ) );
aPageUrl.Append( String::CreateFromInt32( nPageIndex + 1 ) );
aPageUrl.Append( String( RTL_CONSTASCII_USTRINGPARAM( ",Slide " ) ) );
@@ -2057,7 +2057,7 @@ void PPTWriter::ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentat
nHyperLinkType = 7;
String aEmpty;
- String aHyperString = UniString::CreateFromInt32( 256 + nIndex );
+ String aHyperString = rtl::OUString::valueOf(static_cast<sal_Int32>(256 + nIndex));
aHyperString.Append( String( RTL_CONSTASCII_USTRINGPARAM( "," ) ) );
aHyperString.Append( String::CreateFromInt32( nIndex + 1 ) );
aHyperString.Append( String( RTL_CONSTASCII_USTRINGPARAM( ",Slide " ) ) );
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 069af5b479f9..147813b34293 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -1266,7 +1266,7 @@ sal_Bool ImplSdPPTImport::Import()
DffRecordHeader aContent;
if ( SeekToRec( rStCtrl, PPT_PST_CString, aCuHeader.GetRecEndFilePos(), &aContent ) )
{
- String aCuShow;
+ rtl::OUString aCuShow;
aContent.SeekToBegOfRecord( rStCtrl );
if ( ReadString( aCuShow ) )
{
@@ -1868,7 +1868,7 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat
String ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const
{
- String aRetval;
+ rtl::OUString aRetval;
sal_uInt32 nPosMerk = rStCtrl.Tell();
DffRecordHeader aDocHd;
if ( SeekToDocument( &aDocHd ) )
@@ -1885,7 +1885,7 @@ String ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const
while( !bDone && SeekToRec( rStCtrl, PPT_PST_Sound, nDataLen, &aSoundRecHd ) )
{
sal_uInt32 nStrLen = aSoundRecHd.GetRecEndFilePos();
- String aRefStr;
+ rtl::OUString aRefStr;
sal_uInt32 nPosMerk2 = rStCtrl.Tell();
if ( SeekToRec( rStCtrl, PPT_PST_CString, nStrLen, NULL, 2 ) )
{
@@ -1894,7 +1894,7 @@ String ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const
}
if ( bRefStrValid )
{
- if ( UniString::CreateFromInt32( nSoundRef ) == aRefStr )
+ if ( rtl::OUString::valueOf(static_cast<sal_Int32>(nSoundRef)) == aRefStr )
{
rStCtrl.Seek( nPosMerk2 );
if ( SeekToRec( rStCtrl, PPT_PST_CString, nStrLen, NULL, 0 ) )
@@ -1915,12 +1915,11 @@ String ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const
GalleryExplorer::FillObjList( GALLERY_THEME_SOUNDS, aSoundList );
GalleryExplorer::FillObjList( GALLERY_THEME_USERSOUNDS, aSoundList );
- for( size_t n = 0; ( n < aSoundList.size() ) && !bSoundExists; n++ )
+ for( size_t n = 0; ( n < aSoundList.size() ) && !bSoundExists; ++n )
{
INetURLObject aURL( aSoundList[ n ] );
- String aSoundName( aURL.GetName() );
- if( aSoundName == aRetval )
+ if( aURL.GetName() == aRetval )
{
aRetval = aSoundList[ n ];
bSoundExists = sal_True;
@@ -2013,7 +2012,7 @@ String ImplSdPPTImport::ReadMedia( sal_uInt32 nMediaRef ) const
case PPT_PST_CString :
{
aHd.SeekToBegOfRecord( rStCtrl );
- String aStr;
+ rtl::OUString aStr;
if ( ReadString( aStr ) )
{
if( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aStr, aRetVal ) )
@@ -2622,7 +2621,7 @@ SdrObject* ImplSdPPTImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
case PPT_PST_InteractiveInfo:
{
sal_uInt32 nFilePosMerk2 = rSt.Tell();
- String aMacroName;
+ rtl::OUString aMacroName;
if(SeekToRec( rSt, PPT_PST_CString, nHdRecEnd, NULL, 0 ) )
ReadString(aMacroName);
diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
index ab5c4bb8d9c2..a15410e71dbc 100644
--- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
@@ -300,10 +300,8 @@ Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleChil
if( !xChild.is() )
{
const ChildIndexToPointData* p = IndexToPoint( nIndex, mbAngleMode );
- UniString tmp = SVX_RESSTR( p->nResIdName );
- ::rtl::OUString aName( tmp );
- tmp = SVX_RESSTR( p->nResIdDescr );
- ::rtl::OUString aDescr( tmp );
+ ::rtl::OUString aName(SVX_RESSTR(p->nResIdName));
+ ::rtl::OUString aDescr(SVX_RESSTR(p->nResIdDescr));
Rectangle aFocusRect( mpRepr->CalculateFocusRectangle( p->ePoint ) );
generated by cgit (git 2.34.1) at 2025-02-21 04:26:11 +0000