summaryrefslogtreecommitdiffstats
path: root/include/svtools
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-08-15 09:10:28 +0200
committerNoel Grandin <noel@peralex.com>2013-08-15 09:11:37 +0200
commit67ad3dc892ea9c64792b06654c3f035a6b059a65 (patch)
tree40fb5126a46773ff933adc1c20609ecfefcca2a9 /include/svtools
parentconvert include/svtools/inetimg.hxx from String to OUString (diff)
downloadcore-67ad3dc892ea9c64792b06654c3f035a6b059a65.tar.gz
core-67ad3dc892ea9c64792b06654c3f035a6b059a65.zip
convert include/svtools/imap*.hxx from String to OUString
Change-Id: Iacfb93a4cf9a7b7ac0ae27b9fa6f765e74604dc2
Diffstat (limited to 'include/svtools')
-rw-r--r--include/svtools/imap.hxx36
-rw-r--r--include/svtools/imapcirc.hxx14
-rw-r--r--include/svtools/imapobj.hxx50
-rw-r--r--include/svtools/imappoly.hxx16
-rw-r--r--include/svtools/imaprect.hxx14
5 files changed, 65 insertions, 65 deletions
diff --git a/include/svtools/imap.hxx b/include/svtools/imap.hxx
index 790cdebef60f..60dafcb4e130 100644
--- a/include/svtools/imap.hxx
+++ b/include/svtools/imap.hxx
@@ -38,27 +38,27 @@ class SVT_DLLPUBLIC ImageMap
private:
IMapObjectList_impl maList;
- String aName;
+ OUString aName;
protected:
// Binaer laden/speichern
- void ImpWriteImageMap( SvStream& rOStm, const String& ) const ;
- void ImpReadImageMap( SvStream& rIStm, size_t nCount, const String& );
+ void ImpWriteImageMap( SvStream& rOStm, const OUString& ) const ;
+ void ImpReadImageMap( SvStream& rIStm, size_t nCount, const OUString& );
// Im-/Export
- void ImpWriteCERN( SvStream& rOStm, const String& rBaseURL ) const;
- void ImpWriteNCSA( SvStream& rOStm, const String& rBaseURL ) const;
- sal_uLong ImpReadCERN( SvStream& rOStm, const String& rBaseURL );
- sal_uLong ImpReadNCSA( SvStream& rOStm, const String& rBaseURL );
+ void ImpWriteCERN( SvStream& rOStm, const OUString& rBaseURL ) const;
+ void ImpWriteNCSA( SvStream& rOStm, const OUString& rBaseURL ) const;
+ sal_uLong ImpReadCERN( SvStream& rOStm, const OUString& rBaseURL );
+ sal_uLong ImpReadNCSA( SvStream& rOStm, const OUString& rBaseURL );
- void ImpReadCERNLine( const OString& rLine, const String& rBaseURL );
+ void ImpReadCERNLine( const OString& rLine, const OUString& rBaseURL );
Point ImpReadCERNCoords( const char** ppStr );
long ImpReadCERNRadius( const char** ppStr );
- String ImpReadCERNURL( const char** ppStr, const String& rBaseURL );
+ OUString ImpReadCERNURL( const char** ppStr, const OUString& rBaseURL );
- void ImpReadNCSALine( const OString& rLine, const String& rBaseURL );
- String ImpReadNCSAURL( const char** ppStr, const String& rBaseURL );
+ void ImpReadNCSALine( const OString& rLine, const OUString& rBaseURL );
+ OUString ImpReadNCSAURL( const char** ppStr, const OUString& rBaseURL );
Point ImpReadNCSACoords( const char** ppStr );
sal_uLong ImpDetectFormat( SvStream& rIStm );
@@ -68,7 +68,7 @@ public:
TYPEINFO();
ImageMap() {};
- ImageMap( const String& rName );
+ ImageMap( const OUString& rName );
ImageMap( const ImageMap& rImageMap );
// Der Dtor gibt den intern belegten
@@ -114,18 +114,18 @@ public:
sal_uInt16 GetVersion() const;
// liefert / setzt den Namen der ImageMap
- const String& GetName() const { return aName; }
- void SetName( const String& rName ) { aName = rName; }
+ const OUString& GetName() const { return aName; }
+ void SetName( const OUString& rName ) { aName = rName; }
// skaliert alle Objekte der ImageMap entpr. dem uebergebenen Faktor
void Scale( const Fraction& rFractX, const Fraction& rFracY );
// Im-/Export
- void Write ( SvStream& rOStm, const String& rBaseURL ) const;
- void Read( SvStream& rIStm, const String& rBaseURL );
+ void Write ( SvStream& rOStm, const OUString& rBaseURL ) const;
+ void Read( SvStream& rIStm, const OUString& rBaseURL );
- void Write( SvStream& rOStm, sal_uLong nFormat, const String& rBaseURL ) const;
- sal_uLong Read( SvStream& rIStm, sal_uLong nFormat, const String& rBaseURL );
+ void Write( SvStream& rOStm, sal_uLong nFormat, const OUString& rBaseURL ) const;
+ sal_uLong Read( SvStream& rIStm, sal_uLong nFormat, const OUString& rBaseURL );
};
class IMapCompat
diff --git a/include/svtools/imapcirc.hxx b/include/svtools/imapcirc.hxx
index 057561adad98..9ba93d4f5dfa 100644
--- a/include/svtools/imapcirc.hxx
+++ b/include/svtools/imapcirc.hxx
@@ -42,11 +42,11 @@ public:
IMapCircleObject() {};
IMapCircleObject( const Point& rCenter, sal_uLong nRad,
- const String& rURL,
- const String& rAltText,
- const String& rDesc,
- const String& rTarget,
- const String& rName,
+ const OUString& rURL,
+ const OUString& rAltText,
+ const OUString& rDesc,
+ const OUString& rTarget,
+ const OUString& rName,
sal_Bool bActive = sal_True,
sal_Bool bPixelCoords = sal_True );
virtual ~IMapCircleObject() {};
@@ -66,8 +66,8 @@ public:
sal_Bool IsEqual( const IMapCircleObject& rEqObj );
// Im-/Export
- void WriteCERN( SvStream& rOStm, const String& rBaseURL ) const;
- void WriteNCSA( SvStream& rOStm, const String& rBaseURL ) const;
+ void WriteCERN( SvStream& rOStm, const OUString& rBaseURL ) const;
+ void WriteNCSA( SvStream& rOStm, const OUString& rBaseURL ) const;
};
#endif
diff --git a/include/svtools/imapobj.hxx b/include/svtools/imapobj.hxx
index e90902bec0f0..7f383de1197c 100644
--- a/include/svtools/imapobj.hxx
+++ b/include/svtools/imapobj.hxx
@@ -54,13 +54,13 @@ class SVT_DLLPUBLIC IMapObject
{
friend class ImageMap;
- String aURL;
- String aAltText;
- String aDesc;
- String aTarget;
- String aName;
+ OUString aURL;
+ OUString aAltText;
+ OUString aDesc;
+ OUString aTarget;
+ OUString aName;
SvxMacroTableDtor aEventList;
- sal_Bool bActive;
+ sal_Bool bActive;
protected:
sal_uInt16 nReadVersion;
@@ -71,20 +71,20 @@ protected:
// Hilfsmethoden
void AppendCERNCoords(OStringBuffer& rBuf, const Point& rPoint100) const;
- void AppendCERNURL(OStringBuffer& rBuf, const String& rBaseURL) const;
+ void AppendCERNURL(OStringBuffer& rBuf, const OUString& rBaseURL) const;
void AppendNCSACoords(OStringBuffer& rBuf, const Point& rPoint100) const;
- void AppendNCSAURL(OStringBuffer&rBuf, const String& rBaseURL) const;
+ void AppendNCSAURL(OStringBuffer&rBuf, const OUString& rBaseURL) const;
public:
static rtl_TextEncoding nActualTextEncoding;
IMapObject();
- IMapObject( const String& rURL,
- const String& rAltText,
- const String& rDesc,
- const String& rTarget,
- const String& rName,
+ IMapObject( const OUString& rURL,
+ const OUString& rAltText,
+ const OUString& rDesc,
+ const OUString& rTarget,
+ const OUString& rName,
sal_Bool bActive );
virtual ~IMapObject() {};
@@ -92,25 +92,25 @@ public:
virtual sal_uInt16 GetType() const = 0;
virtual sal_Bool IsHit( const Point& rPoint ) const = 0;
- void Write ( SvStream& rOStm, const String& rBaseURL ) const;
- void Read( SvStream& rIStm, const String& rBaseURL );
+ void Write ( SvStream& rOStm, const OUString& rBaseURL ) const;
+ void Read( SvStream& rIStm, const OUString& rBaseURL );
virtual Rectangle GetBoundRect() const = 0;
- const String& GetURL() const { return aURL; }
- void SetURL( const String& rURL ) { aURL = rURL; }
+ const OUString& GetURL() const { return aURL; }
+ void SetURL( const OUString& rURL ) { aURL = rURL; }
- const String& GetAltText() const { return aAltText; }
- void SetAltText( const String& rAltText) { aAltText = rAltText; }
+ const OUString& GetAltText() const { return aAltText; }
+ void SetAltText( const OUString& rAltText) { aAltText = rAltText; }
- const String& GetDesc() const { return aDesc; }
- void SetDesc( const String& rDesc ) { aDesc = rDesc; }
+ const OUString& GetDesc() const { return aDesc; }
+ void SetDesc( const OUString& rDesc ) { aDesc = rDesc; }
- const String& GetTarget() const { return aTarget; }
- void SetTarget( const String& rTarget ) { aTarget = rTarget; }
+ const OUString& GetTarget() const { return aTarget; }
+ void SetTarget( const OUString& rTarget ) { aTarget = rTarget; }
- const String& GetName() const { return aName; }
- void SetName( const String& rName ) { aName = rName; }
+ const OUString& GetName() const { return aName; }
+ void SetName( const OUString& rName ) { aName = rName; }
sal_Bool IsActive() const { return bActive; }
void SetActive( sal_Bool bSetActive = sal_True ) { bActive = bSetActive; }
diff --git a/include/svtools/imappoly.hxx b/include/svtools/imappoly.hxx
index b4a0eafdb07d..172c163b6e64 100644
--- a/include/svtools/imappoly.hxx
+++ b/include/svtools/imappoly.hxx
@@ -40,16 +40,16 @@ protected:
virtual void WriteIMapObject( SvStream& rOStm ) const;
virtual void ReadIMapObject( SvStream& rIStm );
- sal_Bool ReadPreProLine( SvStream& rIStm, String& rStr );
+ sal_Bool ReadPreProLine( SvStream& rIStm, OUString& rStr );
public:
IMapPolygonObject() {};
IMapPolygonObject( const Polygon& rPoly,
- const String& rURL,
- const String& rAltText,
- const String& rDesc,
- const String& rTarget,
- const String& rName,
+ const OUString& rURL,
+ const OUString& rAltText,
+ const OUString& rDesc,
+ const OUString& rTarget,
+ const OUString& rName,
sal_Bool bActive = sal_True,
sal_Bool bPixelCoords = sal_True );
virtual ~IMapPolygonObject() {};
@@ -72,8 +72,8 @@ public:
sal_Bool IsEqual( const IMapPolygonObject& rEqObj );
// Im-/Export
- void WriteCERN( SvStream& rOStm, const String& rBaseURL ) const;
- void WriteNCSA( SvStream& rOStm, const String& rBaseURL ) const;
+ void WriteCERN( SvStream& rOStm, const OUString& rBaseURL ) const;
+ void WriteNCSA( SvStream& rOStm, const OUString& rBaseURL ) const;
};
#endif
diff --git a/include/svtools/imaprect.hxx b/include/svtools/imaprect.hxx
index b7d6ab54288a..d2a257c758e2 100644
--- a/include/svtools/imaprect.hxx
+++ b/include/svtools/imaprect.hxx
@@ -41,11 +41,11 @@ public:
IMapRectangleObject() {};
IMapRectangleObject( const Rectangle& rRect,
- const String& rURL,
- const String& rAltText,
- const String& rDesc,
- const String& rTarget,
- const String& rName,
+ const OUString& rURL,
+ const OUString& rAltText,
+ const OUString& rDesc,
+ const OUString& rTarget,
+ const OUString& rName,
sal_Bool bActive = sal_True,
sal_Bool bPixelCoords = sal_True );
virtual ~IMapRectangleObject() {};
@@ -64,8 +64,8 @@ public:
sal_Bool IsEqual( const IMapRectangleObject& rEqObj );
// Im-/Export
- void WriteCERN( SvStream& rOStm, const String& rBaseURL ) const;
- void WriteNCSA( SvStream& rOStm, const String& rBaseURL ) const;
+ void WriteCERN( SvStream& rOStm, const OUString& rBaseURL ) const;
+ void WriteNCSA( SvStream& rOStm, const OUString& rBaseURL ) const;
};
#endif