mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

convert include/sfx2/frmdescr.hxx from String to OUString

Browse Source 
Change-Id: I8ba4348d92145eb73b9b5ade9f4763acbe80001e
This commit is contained in:
Noel Grandin
2013-08-26 16:02:06 +02:00
parent 5498a8b9c5
commit aca6fd6512
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/sfx2/frmdescr.hxx
View File

@@ -71,7 +71,7 @@ class SFX2_DLLPUBLIC SfxFrameDescriptor
{ {
INetURLObject aURL; INetURLObject aURL;
INetURLObject aActualURL; INetURLObject aActualURL;
String aName; OUString aName;
Size aMargin; Size aMargin;
long nWidth; long nWidth;
ScrollingMode eScroll; ScrollingMode eScroll;
@@ -92,11 +92,11 @@ public:
SfxItemSet* GetArgs(); SfxItemSet* GetArgs();
const INetURLObject& GetURL() const const INetURLObject& GetURL() const
{ return aURL; } { return aURL; }
void SetURL( const String& rURL ); void SetURL( const OUString& rURL );
const INetURLObject& GetActualURL() const const INetURLObject& GetActualURL() const
{ return aActualURL; } { return aActualURL; }
void SetActualURL( const INetURLObject& rURL ); void SetActualURL( const INetURLObject& rURL );
void SetActualURL( const String& rURL ); void SetActualURL( const OUString& rURL );
void SetReadOnly( sal_Bool bSet ) { bReadOnly = bSet;} void SetReadOnly( sal_Bool bSet ) { bReadOnly = bSet;}
sal_Bool IsReadOnly( ) const { return bReadOnly;} sal_Bool IsReadOnly( ) const { return bReadOnly;}
void SetEditable( sal_Bool bSet ); void SetEditable( sal_Bool bSet );
@@ -121,9 +121,9 @@ public:
{ bResizeHorizontal = bResizeVertical = bRes; } { bResizeHorizontal = bResizeVertical = bRes; }
// FrameName // FrameName
const String& GetName() const const OUString& GetName() const
{ return aName; } { return aName; }
void SetName( const String& rName ) void SetName( const OUString& rName )
{ aName = rName; } { aName = rName; }
// Margin, Scrolling // Margin, Scrolling
@@ -172,8 +172,8 @@ public:
// No block to implement a =operator // No block to implement a =operator
struct SfxFrameProperties struct SfxFrameProperties
{ {
String aURL; OUString aURL;
String aName; OUString aName;
long lMarginWidth; long lMarginWidth;
long lMarginHeight; long lMarginHeight;
long lSize; long lSize;

4
sfx2/source/doc/frmdescr.cxx
View File

@@ -72,13 +72,13 @@ SfxItemSet* SfxFrameDescriptor::GetArgs()
return pImp->pArgs; return pImp->pArgs;
} }
void SfxFrameDescriptor::SetURL( const String& rURL ) void SfxFrameDescriptor::SetURL( const OUString& rURL )
{ {
aURL = INetURLObject(rURL); aURL = INetURLObject(rURL);
SetActualURL( aURL ); SetActualURL( aURL );
} }
void SfxFrameDescriptor::SetActualURL( const String& rURL ) void SfxFrameDescriptor::SetActualURL( const OUString& rURL )
{ {
aActualURL = INetURLObject(rURL); aActualURL = INetURLObject(rURL);
if ( pImp->pArgs ) if ( pImp->pArgs )