diff options
| author | Noel Grandin <noel@peralex.com> | 2013-08-26 16:02:06 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-08-29 09:30:07 +0200 |
| commit | aca6fd651270227b44e3e67d6517b79bafb6229b (patch) | |
| tree | 4db9a200c6a49f03193e3e2c85c610d44309b43f | |
| parent | 5498a8b9c59593f025edb83b3dc20248718c43e0 (diff) | |
convert include/sfx2/frmdescr.hxx from String to OUString
Change-Id: I8ba4348d92145eb73b9b5ade9f4763acbe80001e
| -rw-r--r-- | include/sfx2/frmdescr.hxx | 14 | ||||
| -rw-r--r-- | sfx2/source/doc/frmdescr.cxx | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/include/sfx2/frmdescr.hxx b/include/sfx2/frmdescr.hxx index 2c0c178a3795..dae89392d709 100644 --- a/include/sfx2/frmdescr.hxx +++ b/include/sfx2/frmdescr.hxx @@ -71,7 +71,7 @@ class SFX2_DLLPUBLIC SfxFrameDescriptor { INetURLObject aURL; INetURLObject aActualURL; - String aName; + OUString aName; Size aMargin; long nWidth; ScrollingMode eScroll; @@ -92,11 +92,11 @@ public: SfxItemSet* GetArgs(); const INetURLObject& GetURL() const { return aURL; } - void SetURL( const String& rURL ); + void SetURL( const OUString& rURL ); const INetURLObject& GetActualURL() const { return aActualURL; } void SetActualURL( const INetURLObject& rURL ); - void SetActualURL( const String& rURL ); + void SetActualURL( const OUString& rURL ); void SetReadOnly( sal_Bool bSet ) { bReadOnly = bSet;} sal_Bool IsReadOnly( ) const { return bReadOnly;} void SetEditable( sal_Bool bSet ); @@ -121,9 +121,9 @@ public: { bResizeHorizontal = bResizeVertical = bRes; } // FrameName - const String& GetName() const + const OUString& GetName() const { return aName; } - void SetName( const String& rName ) + void SetName( const OUString& rName ) { aName = rName; } // Margin, Scrolling @@ -172,8 +172,8 @@ public: // No block to implement a =operator struct SfxFrameProperties { - String aURL; - String aName; + OUString aURL; + OUString aName; long lMarginWidth; long lMarginHeight; long lSize; diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx index 6fb6a10caef6..94ad20b687a4 100644 --- a/sfx2/source/doc/frmdescr.cxx +++ b/sfx2/source/doc/frmdescr.cxx @@ -72,13 +72,13 @@ SfxItemSet* SfxFrameDescriptor::GetArgs() return pImp->pArgs; } -void SfxFrameDescriptor::SetURL( const String& rURL ) +void SfxFrameDescriptor::SetURL( const OUString& rURL ) { aURL = INetURLObject(rURL); SetActualURL( aURL ); } -void SfxFrameDescriptor::SetActualURL( const String& rURL ) +void SfxFrameDescriptor::SetActualURL( const OUString& rURL ) { aActualURL = INetURLObject(rURL); if ( pImp->pArgs ) |