[Libreoffice-commits] core.git: 22 commits - chart2/source cui/source dbaccess/source editeng/source extensions/source include/editeng include/svtools sc/source sd/source sfx2/source svtools/source svx/source sw/source
Noel Grandin
noel at peralex.com
Thu Aug 15 00:12:27 PDT 2013
chart2/source/controller/dialogs/dlg_CreationWizard.cxx | 2
chart2/source/controller/inc/dlg_CreationWizard.hxx | 2
cui/source/dialogs/hltpbase.cxx | 2
cui/source/dialogs/pastedlg.cxx | 22 -
cui/source/inc/pastedlg.hxx | 2
dbaccess/source/ui/dlg/dbwizsetup.cxx | 4
dbaccess/source/ui/inc/dbwizsetup.hxx | 2
dbaccess/source/ui/misc/RtfReader.cxx | 2
editeng/source/editeng/eehtml.cxx | 8
editeng/source/rtf/svxrtf.cxx | 18 -
extensions/source/abpilot/abspilot.cxx | 4
extensions/source/abpilot/abspilot.hxx | 2
include/editeng/svxrtf.hxx | 2
include/svtools/fileurlbox.hxx | 2
include/svtools/imap.hxx | 36 +-
include/svtools/imapcirc.hxx | 14
include/svtools/imapobj.hxx | 50 +--
include/svtools/imappoly.hxx | 16 -
include/svtools/imaprect.hxx | 14
include/svtools/inetimg.hxx | 36 +-
include/svtools/inettbc.hxx | 22 -
include/svtools/insdlg.hxx | 12
include/svtools/ivctrl.hxx | 12
include/svtools/langtab.hxx | 6
include/svtools/openfiledroptargetlistener.hxx | 2
include/svtools/parhtml.hxx | 24 -
include/svtools/roadmapwizard.hxx | 4
include/svtools/rtfout.hxx | 9
include/svtools/rtftoken.h | 6
include/svtools/ruler.hxx | 2
include/svtools/svmedit2.hxx | 2
include/svtools/svparser.hxx | 30 -
include/svtools/svtabbx.hxx | 10
include/svtools/svxbox.hxx | 180 -----------
include/svtools/table/tablemodel.hxx | 8
include/svtools/toolbarmenu.hxx | 6
include/svtools/transfer.hxx | 7
include/svtools/treelistbox.hxx | 1
include/svtools/urlcontrol.hxx | 4
include/svtools/wizardmachine.hxx | 6
sc/source/filter/html/htmlpars.cxx | 10
sc/source/ui/drawfunc/fusel.cxx | 2
sc/source/ui/view/cellsh.cxx | 6
sc/source/ui/view/viewfun5.cxx | 16 -
sd/source/ui/dlg/sdtreelb.cxx | 2
sd/source/ui/func/fusel.cxx | 2
sd/source/ui/view/drviews7.cxx | 4
sfx2/source/bastyp/frmhtml.cxx | 4
sfx2/source/bastyp/sfxhtml.cxx | 4
sfx2/source/doc/objmisc.cxx | 4
svtools/source/contnr/ivctrl.cxx | 6
svtools/source/contnr/svtabbx.cxx | 2
svtools/source/control/inettbc.cxx | 46 +--
svtools/source/control/ruler.cxx | 2
svtools/source/control/toolbarmenu.cxx | 6
svtools/source/dialogs/insdlg.cxx | 10
svtools/source/dialogs/roadmapwizard.cxx | 6
svtools/source/dialogs/wizardmachine.cxx | 4
svtools/source/edit/svmedit2.cxx | 2
svtools/source/misc/imap.cxx | 48 +--
svtools/source/misc/imap2.cxx | 36 +-
svtools/source/misc/langtab.cxx | 10
svtools/source/misc/openfiledroptargetlistener.cxx | 4
svtools/source/misc/stringtransfer.cxx | 2
svtools/source/misc/transfer.cxx | 58 +--
svtools/source/misc/transfer2.cxx | 8
svtools/source/svhtml/htmlout.cxx | 2
svtools/source/svhtml/parhtml.cxx | 241 +++++++---------
svtools/source/svrtf/parrtf.cxx | 7
svtools/source/svrtf/rtfkeywd.cxx | 12
svtools/source/svrtf/rtfout.cxx | 6
svtools/source/svrtf/svparser.cxx | 2
svtools/source/uno/unogridcolumnfacade.cxx | 8
svtools/source/uno/unogridcolumnfacade.hxx | 8
svtools/source/uno/wizard/wizardshell.cxx | 2
svtools/source/uno/wizard/wizardshell.hxx | 2
svtools/source/urlobj/inetimg.cxx | 8
svx/source/fmcomp/dbaexchange.cxx | 10
svx/source/gallery2/galtheme.cxx | 4
sw/source/core/frmedt/fefly1.cxx | 4
sw/source/filter/html/htmlbas.cxx | 24 -
sw/source/filter/html/htmldraw.cxx | 6
sw/source/filter/html/htmlform.cxx | 8
sw/source/filter/html/htmlgrin.cxx | 9
sw/source/filter/html/htmlnum.cxx | 9
sw/source/filter/html/htmlplug.cxx | 20 -
sw/source/filter/html/htmlsect.cxx | 2
sw/source/filter/html/htmltab.cxx | 36 +-
sw/source/filter/html/swhtml.cxx | 40 +-
sw/source/ui/dbui/mailmergewizard.cxx | 2
sw/source/ui/dochdl/swdtflvr.cxx | 46 +--
sw/source/ui/inc/mailmergewizard.hxx | 2
sw/source/ui/inc/swdtflvr.hxx | 2
sw/source/ui/utlui/content.cxx | 10
sw/source/ui/utlui/navipi.cxx | 4
95 files changed, 614 insertions(+), 819 deletions(-)
New commits:
commit 67ad3dc892ea9c64792b06654c3f035a6b059a65
Author: Noel Grandin <noel at peralex.com>
Date: Thu Aug 15 09:10:28 2013 +0200
convert include/svtools/imap*.hxx from String to OUString
Change-Id: Iacfb93a4cf9a7b7ac0ae27b9fa6f765e74604dc2
diff --git a/include/svtools/imap.hxx b/include/svtools/imap.hxx
index 790cdeb..60dafcb 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 057561a..9ba93d4 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 e90902b..7f383de 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 b4a0eaf..172c163 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 b7d6ab5..d2a257c 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
diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx
index 356c659..5a127d5 100644
--- a/sc/source/ui/drawfunc/fusel.cxx
+++ b/sc/source/ui/drawfunc/fusel.cxx
@@ -239,7 +239,7 @@ sal_Bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
{
const IMapObject* pIMapObj =
ScDrawLayer::GetHitIMapObject( aVEvt.pObj, aMDPos, *pWindow );
- if ( pIMapObj && pIMapObj->GetURL().Len() )
+ if ( pIMapObj && !pIMapObj->GetURL().isEmpty() )
{
sURL = pIMapObj->GetURL();
sTarget = pIMapObj->GetTarget();
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index 263569a..fb7fcbb 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -1158,7 +1158,7 @@ sal_Bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
{
const IMapObject* pIMapObj = mpDoc->GetHitIMapObject( pObj, rPos, *mpWindow );
- if ( pIMapObj && pIMapObj->GetURL().Len() )
+ if ( pIMapObj && !pIMapObj->GetURL().isEmpty() )
{
// Jump to Document
mpWindow->ReleaseMouse();
diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx
index 597d90a..583978a 100644
--- a/svtools/source/misc/imap.cxx
+++ b/svtools/source/misc/imap.cxx
@@ -53,8 +53,8 @@ IMapObject::IMapObject()
{
}
-IMapObject::IMapObject( const String& rURL, const String& rAltText, const String& rDesc,
- const String& rTarget, const String& rName, sal_Bool bURLActive )
+IMapObject::IMapObject( const OUString& rURL, const OUString& rAltText, const OUString& rDesc,
+ const OUString& rTarget, const OUString& rName, sal_Bool bURLActive )
: aURL( rURL )
, aAltText( rAltText )
, aDesc( rDesc )
@@ -77,7 +77,7 @@ sal_uInt16 IMapObject::GetVersion() const
return IMAP_OBJ_VERSION;
}
-void IMapObject::Write( SvStream& rOStm, const String& rBaseURL ) const
+void IMapObject::Write( SvStream& rOStm, const OUString& rBaseURL ) const
{
IMapCompat* pCompat;
const rtl_TextEncoding eEncoding = osl_getThreadTextEncoding();
@@ -109,7 +109,7 @@ void IMapObject::Write( SvStream& rOStm, const String& rBaseURL ) const
|*
\******************************************************************************/
-void IMapObject::Read( SvStream& rIStm, const String& rBaseURL )
+void IMapObject::Read( SvStream& rIStm, const OUString& rBaseURL )
{
IMapCompat* pCompat;
rtl_TextEncoding nTextEncoding;
@@ -153,11 +153,11 @@ sal_Bool IMapObject::IsEqual( const IMapObject& rEqObj )
}
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 bURLActive,
sal_Bool bPixelCoords ) :
IMapObject ( rURL, rAltText, rDesc, rTarget, rName, bURLActive )
@@ -253,11 +253,11 @@ sal_Bool IMapRectangleObject::IsEqual( const IMapRectangleObject& rEqObj )
}
IMapCircleObject::IMapCircleObject( const Point& rCenter, sal_uLong nCircleRadius,
- 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 bURLActive,
sal_Bool bPixelCoords ) :
IMapObject ( rURL, rAltText, rDesc, rTarget, rName, bURLActive )
@@ -401,11 +401,11 @@ sal_Bool IMapCircleObject::IsEqual( const IMapCircleObject& rEqObj )
}
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 bURLActive,
sal_Bool bPixelCoords ) :
IMapObject ( rURL, rAltText, rDesc, rTarget, rName, bURLActive ),
@@ -567,7 +567,7 @@ sal_Bool IMapPolygonObject::IsEqual( const IMapPolygonObject& rEqObj )
|*
\******************************************************************************/
-ImageMap::ImageMap( const String& rName )
+ImageMap::ImageMap( const OUString& rName )
: aName( rName )
{
}
@@ -869,7 +869,7 @@ void ImageMap::Scale( const Fraction& rFracX, const Fraction& rFracY )
|*
\******************************************************************************/
-void ImageMap::ImpWriteImageMap( SvStream& rOStm, const String& rBaseURL ) const
+void ImageMap::ImpWriteImageMap( SvStream& rOStm, const OUString& rBaseURL ) const
{
IMapObject* pObj;
size_t nCount = maList.size();
@@ -888,7 +888,7 @@ void ImageMap::ImpWriteImageMap( SvStream& rOStm, const String& rBaseURL ) const
|*
\******************************************************************************/
-void ImageMap::ImpReadImageMap( SvStream& rIStm, size_t nCount, const String& rBaseURL )
+void ImageMap::ImpReadImageMap( SvStream& rIStm, size_t nCount, const OUString& rBaseURL )
{
// neue Objekte einlesen
for ( size_t i = 0; i < nCount; i++ )
@@ -937,7 +937,7 @@ void ImageMap::ImpReadImageMap( SvStream& rIStm, size_t nCount, const String& rB
|*
\******************************************************************************/
-void ImageMap::Write( SvStream& rOStm, const String& rBaseURL ) const
+void ImageMap::Write( SvStream& rOStm, const OUString& rBaseURL ) const
{
IMapCompat* pCompat;
String aImageName( GetName() );
@@ -973,7 +973,7 @@ void ImageMap::Write( SvStream& rOStm, const String& rBaseURL ) const
|*
\******************************************************************************/
-void ImageMap::Read( SvStream& rIStm, const String& rBaseURL )
+void ImageMap::Read( SvStream& rIStm, const OUString& rBaseURL )
{
char cMagic[6];
sal_uInt16 nOldFormat = rIStm.GetNumberFormatInt();
diff --git a/svtools/source/misc/imap2.cxx b/svtools/source/misc/imap2.cxx
index bec3886..f9ff161 100644
--- a/svtools/source/misc/imap2.cxx
+++ b/svtools/source/misc/imap2.cxx
@@ -60,18 +60,18 @@ void IMapObject::AppendNCSACoords(OStringBuffer& rBuf, const Point& rPoint100) c
rBuf.append(' ');
}
-void IMapObject::AppendCERNURL(OStringBuffer& rBuf, const String& rBaseURL) const
+void IMapObject::AppendCERNURL(OStringBuffer& rBuf, const OUString& rBaseURL) const
{
rBuf.append(OUStringToOString(URIHelper::simpleNormalizedMakeRelative(rBaseURL, aURL), osl_getThreadTextEncoding()));
}
-void IMapObject::AppendNCSAURL(OStringBuffer& rBuf, const String& rBaseURL) const
+void IMapObject::AppendNCSAURL(OStringBuffer& rBuf, const OUString& rBaseURL) const
{
rBuf.append(OUStringToOString(URIHelper::simpleNormalizedMakeRelative(rBaseURL, aURL), osl_getThreadTextEncoding()));
rBuf.append(' ');
}
-void IMapRectangleObject::WriteCERN( SvStream& rOStm, const String& rBaseURL ) const
+void IMapRectangleObject::WriteCERN( SvStream& rOStm, const OUString& rBaseURL ) const
{
OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("rectangle "));
@@ -82,7 +82,7 @@ void IMapRectangleObject::WriteCERN( SvStream& rOStm, const String& rBaseURL ) c
rOStm.WriteLine(aStrBuf.makeStringAndClear());
}
-void IMapRectangleObject::WriteNCSA( SvStream& rOStm, const String& rBaseURL ) const
+void IMapRectangleObject::WriteNCSA( SvStream& rOStm, const OUString& rBaseURL ) const
{
OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("rect "));
@@ -93,7 +93,7 @@ void IMapRectangleObject::WriteNCSA( SvStream& rOStm, const String& rBaseURL ) c
rOStm.WriteLine(aStrBuf.makeStringAndClear());
}
-void IMapCircleObject::WriteCERN( SvStream& rOStm, const String& rBaseURL ) const
+void IMapCircleObject::WriteCERN( SvStream& rOStm, const OUString& rBaseURL ) const
{
OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("circle "));
@@ -105,7 +105,7 @@ void IMapCircleObject::WriteCERN( SvStream& rOStm, const String& rBaseURL ) cons
rOStm.WriteLine(aStrBuf.makeStringAndClear());
}
-void IMapCircleObject::WriteNCSA( SvStream& rOStm, const String& rBaseURL ) const
+void IMapCircleObject::WriteNCSA( SvStream& rOStm, const OUString& rBaseURL ) const
{
OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("circle "));
@@ -116,7 +116,7 @@ void IMapCircleObject::WriteNCSA( SvStream& rOStm, const String& rBaseURL ) cons
rOStm.WriteLine(aStrBuf.makeStringAndClear());
}
-void IMapPolygonObject::WriteCERN( SvStream& rOStm, const String& rBaseURL ) const
+void IMapPolygonObject::WriteCERN( SvStream& rOStm, const OUString& rBaseURL ) const
{
OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("polygon "));
const sal_uInt16 nCount = aPoly.GetSize();
@@ -129,7 +129,7 @@ void IMapPolygonObject::WriteCERN( SvStream& rOStm, const String& rBaseURL ) co
rOStm.WriteLine(aStrBuf.makeStringAndClear());
}
-void IMapPolygonObject::WriteNCSA( SvStream& rOStm, const String& rBaseURL ) const
+void IMapPolygonObject::WriteNCSA( SvStream& rOStm, const OUString& rBaseURL ) const
{
OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("poly "));
const sal_uInt16 nCount = std::min( aPoly.GetSize(), (sal_uInt16) 100 );
@@ -142,7 +142,7 @@ void IMapPolygonObject::WriteNCSA( SvStream& rOStm, const String& rBaseURL ) co
rOStm.WriteLine(aStrBuf.makeStringAndClear());
}
-void ImageMap::Write( SvStream& rOStm, sal_uLong nFormat, const String& rBaseURL ) const
+void ImageMap::Write( SvStream& rOStm, sal_uLong nFormat, const OUString& rBaseURL ) const
{
switch( nFormat )
{
@@ -155,7 +155,7 @@ void ImageMap::Write( SvStream& rOStm, sal_uLong nFormat, const String& rBaseURL
}
}
-void ImageMap::ImpWriteCERN( SvStream& rOStm, const String& rBaseURL ) const
+void ImageMap::ImpWriteCERN( SvStream& rOStm, const OUString& rBaseURL ) const
{
IMapObject* pObj;
size_t nCount = maList.size();
@@ -184,7 +184,7 @@ void ImageMap::ImpWriteCERN( SvStream& rOStm, const String& rBaseURL ) const
}
}
-void ImageMap::ImpWriteNCSA( SvStream& rOStm, const String& rBaseURL ) const
+void ImageMap::ImpWriteNCSA( SvStream& rOStm, const OUString& rBaseURL ) const
{
IMapObject* pObj;
size_t nCount = maList.size();
@@ -213,7 +213,7 @@ void ImageMap::ImpWriteNCSA( SvStream& rOStm, const String& rBaseURL ) const
}
}
-sal_uLong ImageMap::Read( SvStream& rIStm, sal_uLong nFormat, const String& rBaseURL )
+sal_uLong ImageMap::Read( SvStream& rIStm, sal_uLong nFormat, const OUString& rBaseURL )
{
sal_uLong nRet = IMAP_ERR_FORMAT;
@@ -236,7 +236,7 @@ sal_uLong ImageMap::Read( SvStream& rIStm, sal_uLong nFormat, const String& rBas
return nRet;
}
-sal_uLong ImageMap::ImpReadCERN( SvStream& rIStm, const String& rBaseURL )
+sal_uLong ImageMap::ImpReadCERN( SvStream& rIStm, const OUString& rBaseURL )
{
// alten Inhalt loeschen
ClearImageMap();
@@ -248,7 +248,7 @@ sal_uLong ImageMap::ImpReadCERN( SvStream& rIStm, const String& rBaseURL )
return IMAP_ERR_OK;
}
-void ImageMap::ImpReadCERNLine( const OString& rLine, const String& rBaseURL )
+void ImageMap::ImpReadCERNLine( const OString& rLine, const OUString& rBaseURL )
{
OString aStr = comphelper::string::stripStart(rLine, ' ');
aStr = comphelper::string::stripStart(aStr, '\t');
@@ -366,7 +366,7 @@ long ImageMap::ImpReadCERNRadius( const char** ppStr )
return aStr.ToInt32();
}
-String ImageMap::ImpReadCERNURL( const char** ppStr, const String& rBaseURL )
+OUString ImageMap::ImpReadCERNURL( const char** ppStr, const OUString& rBaseURL )
{
OUString aStr(OUString::createFromAscii(*ppStr));
@@ -378,7 +378,7 @@ String ImageMap::ImpReadCERNURL( const char** ppStr, const String& rBaseURL )
return INetURLObject::GetAbsURL( rBaseURL, aStr );
}
-sal_uLong ImageMap::ImpReadNCSA( SvStream& rIStm, const String& rBaseURL )
+sal_uLong ImageMap::ImpReadNCSA( SvStream& rIStm, const OUString& rBaseURL )
{
// alten Inhalt loeschen
ClearImageMap();
@@ -390,7 +390,7 @@ sal_uLong ImageMap::ImpReadNCSA( SvStream& rIStm, const String& rBaseURL )
return IMAP_ERR_OK;
}
-void ImageMap::ImpReadNCSALine( const OString& rLine, const String& rBaseURL )
+void ImageMap::ImpReadNCSALine( const OString& rLine, const OUString& rBaseURL )
{
OString aStr = comphelper::string::stripStart(rLine, ' ');
aStr = comphelper::string::stripStart(aStr, '\t');
@@ -448,7 +448,7 @@ void ImageMap::ImpReadNCSALine( const OString& rLine, const String& rBaseURL )
}
}
-String ImageMap::ImpReadNCSAURL( const char** ppStr, const String& rBaseURL )
+OUString ImageMap::ImpReadNCSAURL( const char** ppStr, const OUString& rBaseURL )
{
String aStr;
char cChar = *(*ppStr)++;
diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx
index 75568ee..9afd119 100644
--- a/svtools/source/svhtml/htmlout.cxx
+++ b/svtools/source/svhtml/htmlout.cxx
@@ -612,7 +612,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream,
if( RTL_TEXTENCODING_DONTKNOW == eDestEnc )
eDestEnc = osl_getThreadTextEncoding();
- const String& rOutName = rName.Len() ? rName : rIMap.GetName();
+ const String& rOutName = rName.Len() ? rName : String(rIMap.GetName());
DBG_ASSERT( rOutName.Len(), "Kein ImageMap-Name" );
if( !rOutName.Len() )
return rStream;
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index fa630b2..78f792f 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -1571,11 +1571,11 @@ const SwFrmFmt* SwFEShell::IsURLGrfAtPos( const Point& rPt, String* pURL,
if ( rURL.GetMap() )
{
IMapObject *pObject = pFly->GetFmt()->GetIMapObject( rPt, pFly );
- if ( pObject && pObject->GetURL().Len() )
+ if ( pObject && !pObject->GetURL().isEmpty() )
{
if( pURL )
*pURL = pObject->GetURL();
- if ( bSetTargetFrameName && pObject->GetTarget().Len() )
+ if ( bSetTargetFrameName && !pObject->GetTarget().isEmpty() )
{
bSetTargetFrameName = false;
*pTargetFrameName = pObject->GetTarget();
commit d6740be71dec92644a14ebda4ad87b6678c6b95a
Author: Noel Grandin <noel at peralex.com>
Date: Wed Aug 14 17:45:27 2013 +0200
convert include/svtools/inetimg.hxx from String to OUString
Change-Id: I1ccca64a1e66e178e7dc35f926fefff26ab0598e
diff --git a/include/svtools/inetimg.hxx b/include/svtools/inetimg.hxx
index f28ac2c..e5a80b5 100644
--- a/include/svtools/inetimg.hxx
+++ b/include/svtools/inetimg.hxx
@@ -29,28 +29,28 @@ class SotDataObject;
class INetImage
{
- String aImageURL;
- String aTargetURL;
- String aTargetFrame;
- String aAlternateText;
+ OUString aImageURL;
+ OUString aTargetURL;
+ OUString aTargetFrame;
+ OUString aAlternateText;
Size aSizePixel;
protected:
- String CopyExchange() const;
- void PasteExchange( const String& rString );
+ OUString CopyExchange() const;
+ void PasteExchange( const OUString& rString );
- void SetImageURL( const String& rS ) { aImageURL = rS; }
- void SetTargetURL( const String& rS ) { aTargetURL = rS; }
- void SetTargetFrame( const String& rS ) { aTargetFrame = rS; }
- void SetAlternateText( const String& rS ){ aAlternateText = rS; }
+ void SetImageURL( const OUString& rS ) { aImageURL = rS; }
+ void SetTargetURL( const OUString& rS ) { aTargetURL = rS; }
+ void SetTargetFrame( const OUString& rS ) { aTargetFrame = rS; }
+ void SetAlternateText( const OUString& rS ){ aAlternateText = rS; }
void SetSizePixel( const Size& rSize ) { aSizePixel = rSize; }
public:
INetImage(
- const String& rImageURL,
- const String& rTargetURL,
- const String& rTargetFrame,
- const String& rAlternateText,
+ const OUString& rImageURL,
+ const OUString& rTargetURL,
+ const OUString& rTargetFrame,
+ const OUString& rAlternateText,
const Size& rSizePixel )
: aImageURL( rImageURL ),
aTargetURL( rTargetURL ),
@@ -61,10 +61,10 @@ public:
INetImage()
{}
- const String& GetImageURL() const { return aImageURL; }
- const String& GetTargetURL() const { return aTargetURL; }
- const String& GetTargetFrame() const { return aTargetFrame; }
- const String& GetAlternateText() const { return aAlternateText; }
+ const OUString& GetImageURL() const { return aImageURL; }
+ const OUString& GetTargetURL() const { return aTargetURL; }
+ const OUString& GetTargetFrame() const { return aTargetFrame; }
+ const OUString& GetAlternateText() const { return aAlternateText; }
const Size& GetSizePixel() const { return aSizePixel; }
// Im-/Export
diff --git a/svtools/source/urlobj/inetimg.cxx b/svtools/source/urlobj/inetimg.cxx
index e57c194..17591c7 100644
--- a/svtools/source/urlobj/inetimg.cxx
+++ b/svtools/source/urlobj/inetimg.cxx
@@ -115,16 +115,16 @@ sal_Bool INetImage::Read( SvStream& rIStm, sal_uLong nFormat )
rIStm.Seek( nFilePos + nAltOffset );
aAlternateText = read_zeroTerminated_uInt8s_ToOUString(rIStm, eSysCSet);
}
- else if( aAlternateText.Len() )
- aAlternateText.Erase();
+ else if( !aAlternateText.isEmpty() )
+ aAlternateText = "";
if( nAnchorOffset )
{
rIStm.Seek( nFilePos + nAnchorOffset );
aTargetURL = read_zeroTerminated_uInt8s_ToOUString(rIStm, eSysCSet);
}
- else if( aTargetURL.Len() )
- aTargetURL.Erase();
+ else if( !aTargetURL.isEmpty() )
+ aTargetURL = "";
bRet = 0 == rIStm.GetError();
}
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index b1f6583..a09a057 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -1909,7 +1909,7 @@ int SwTransferable::_PasteTargetURL( TransferableDataHelper& rData,
( rData.HasFormat( SOT_FORMATSTR_ID_NETSCAPE_IMAGE ) &&
rData.GetINetImage( SOT_FORMATSTR_ID_NETSCAPE_IMAGE, aINetImg )) )
{
- if( aINetImg.GetImageURL().Len() && bInsertGRF )
+ if( !aINetImg.GetImageURL().isEmpty() && bInsertGRF )
{
OUString sURL( aINetImg.GetImageURL() );
SwTransferable::_CheckForURLOrLNKFile( rData, sURL );
commit e4915084e55ed06378486cdb943efdbb2b744048
Author: Noel Grandin <noel at peralex.com>
Date: Wed Aug 14 17:40:20 2013 +0200
convert include/svtools/inettbc.hxx from String to OUString
Change-Id: Id33704ec35eb9d76988d367f02bee303bbf7c24d
diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx
index 3b8dbca..1041436 100644
--- a/include/svtools/inettbc.hxx
+++ b/include/svtools/inettbc.hxx
@@ -34,8 +34,8 @@ class SVT_DLLPUBLIC SvtURLBox : public ComboBox
friend class SvtMatchContext_Impl;
friend class SvtURLBox_Impl;
Link aOpenHdl;
- String aBaseURL;
- String aPlaceHolder;
+ OUString aBaseURL;
+ OUString aPlaceHolder;
rtl::Reference< SvtMatchContext_Impl > pCtx;
SvtURLBox_Impl* pImp;
INetProtocol eSmartProtocol;
@@ -64,8 +64,8 @@ public:
SvtURLBox( Window* pParent, const ResId& _rResId, INetProtocol eSmart = INET_PROT_NOT_VALID, bool bSetDefaultHelpID = true );
~SvtURLBox();
- void SetBaseURL( const String& rURL );
- const String& GetBaseURL() const { return aBaseURL; }
+ void SetBaseURL( const OUString& rURL );
+ const OUString& GetBaseURL() const { return aBaseURL; }
void SetOpenHdl( const Link& rLink ) { aOpenHdl = rLink; }
const Link& GetOpenHdl() const { return aOpenHdl; }
void SetOnlyDirectories( sal_Bool bDir = sal_True );
@@ -74,20 +74,22 @@ public:
void SetSmartProtocol( INetProtocol eProt );
sal_Bool IsCtrlOpen()
{ return bCtrlClick; }
- String GetURL();
+ OUString GetURL();
void DisableHistory();
void UpdatePickList( );
- static String ParseSmart( String aText, String aBaseURL, String aWorkDir );
+ static OUString ParseSmart( OUString aText, OUString aBaseURL, const OUString& aWorkDir );
- void SetFilter(const String& _sFilter);
+ void SetFilter(const OUString& _sFilter);
inline void EnableAutocompletion( sal_Bool _bEnable = sal_True )
{ bIsAutoCompleteEnabled = _bEnable; }
- void SetPlaceHolder( const String& sPlaceHolder ) { aPlaceHolder = sPlaceHolder; }
- String GetPlaceHolder() { return aPlaceHolder; }
- bool MatchesPlaceHolder( const String& sToMatch ) { return ( ( aPlaceHolder.Len() > 0 ) && ( aPlaceHolder == sToMatch ) ); }
+ void SetPlaceHolder( const OUString& sPlaceHolder )
+ { aPlaceHolder = sPlaceHolder; }
+ OUString GetPlaceHolder() { return aPlaceHolder; }
+ bool MatchesPlaceHolder( const OUString& sToMatch ) const
+ { return ( !aPlaceHolder.isEmpty() ) && ( aPlaceHolder == sToMatch ); }
};
#endif
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index be664ee..d56688d 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -79,9 +79,9 @@ class SvtURLBox_Impl
public:
std::vector<OUString> aURLs;
std::vector<OUString> aCompletions;
- ::std::vector< WildCard > m_aFilters;
+ std::vector<WildCard> m_aFilters;
- static sal_Bool TildeParsing( String& aText, String& aBaseUrl );
+ static sal_Bool TildeParsing( OUString& aText, OUString& aBaseUrl );
inline SvtURLBox_Impl( )
{
@@ -470,22 +470,22 @@ void SvtMatchContext_Impl::ReadFolder( const String& rURL,
}
//-------------------------------------------------------------------------
-String SvtURLBox::ParseSmart( String aText, String aBaseURL, String aWorkDir )
+OUString SvtURLBox::ParseSmart( OUString aText, OUString aBaseURL, const OUString& aWorkDir )
{
String aMatch;
// parse ~ for Unix systems
// does nothing for Windows
if( !SvtURLBox_Impl::TildeParsing( aText, aBaseURL ) )
- return String();
+ return OUString();
INetURLObject aURLObject;
- if( aBaseURL.Len() )
+ if( !aBaseURL.isEmpty() )
{
INetProtocol eBaseProt = INetURLObject::CompareProtocolScheme( aBaseURL );
// if a base URL is set the string may be parsed relative
- if( aText.Search( '/' ) == 0 )
+ if( aText.indexOf( '/' ) == 0 )
{
// text starting with slashes means absolute file URLs
String aTemp = INetURLObject::GetScheme( eBaseProt );
@@ -501,7 +501,7 @@ String SvtURLBox::ParseSmart( String aText, String aBaseURL, String aWorkDir )
}
else
{
- String aSmart( aText );
+ OUString aSmart( aText );
INetURLObject aObj( aBaseURL );
// HRO: I suppose this hack should only be done for Windows !!!???
@@ -536,7 +536,7 @@ String SvtURLBox::ParseSmart( String aText, String aBaseURL, String aWorkDir )
INetURLObject aTmp( aObj.smartRel2Abs( aSmart, bWasAbsolute ) );
#endif
- if ( aText.GetChar( aText.Len() - 1 ) == '.' )
+ if ( aText[ aText.getLength() - 1 ] == '.' )
// INetURLObject appends a final slash for the directories "." and "..", this is a bug!
// Remove it as a workaround
aTmp.removeFinalSlash();
@@ -547,7 +547,7 @@ String SvtURLBox::ParseSmart( String aText, String aBaseURL, String aWorkDir )
else
{
OUString aTmpMatch;
- ::utl::LocalFileHelper::ConvertSystemPathToURL( OUString(aText), OUString(aWorkDir), aTmpMatch );
+ ::utl::LocalFileHelper::ConvertSystemPathToURL( aText, aWorkDir, aTmpMatch );
aMatch = aTmpMatch;
}
@@ -1187,12 +1187,12 @@ void SvtURLBox::SetNoURLSelection( sal_Bool bSet )
}
//-------------------------------------------------------------------------
-String SvtURLBox::GetURL()
+OUString SvtURLBox::GetURL()
{
// wait for end of autocompletion
::osl::MutexGuard aGuard( theSvtMatchContextMutex::get() );
- String aText( GetText() );
+ OUString aText( GetText() );
if ( MatchesPlaceHolder( aText ) )
return aPlaceHolder;
@@ -1213,7 +1213,7 @@ String SvtURLBox::GetURL()
#endif
INetURLObject aObj( aText );
- if( aText.Search( '*' ) != STRING_NOTFOUND || aText.Search( '?' ) != STRING_NOTFOUND )
+ if( aText.indexOf( '*' ) != -1 || aText.indexOf( '?' ) != -1 )
{
// no autocompletion for wildcards
INetURLObject aTempObj;
@@ -1272,7 +1272,7 @@ void SvtURLBox::DisableHistory()
UpdatePicklistForSmartProtocol_Impl();
}
-void SvtURLBox::SetBaseURL( const String& rURL )
+void SvtURLBox::SetBaseURL( const OUString& rURL )
{
::osl::MutexGuard aGuard( theSvtMatchContextMutex::get() );
@@ -1287,23 +1287,23 @@ void SvtURLBox::SetBaseURL( const String& rURL )
does nothing for Windows
*/
sal_Bool SvtURLBox_Impl::TildeParsing(
- String&
+ OUString&
#ifdef UNX
aText
#endif
- , String&
+ , OUString&
#ifdef UNX
aBaseURL
#endif
)
{
#ifdef UNX
- if( aText.Search( '~' ) == 0 )
+ if( aText.indexOf( '~' ) == 0 )
{
String aParseTilde;
sal_Bool bTrailingSlash = sal_True; // use trailing slash
- if( aText.Len() == 1 || aText.GetChar( 1 ) == '/' )
+ if( aText.getLength() == 1 || aText[ 1 ] == '/' )
{
// covers "~" or "~/..." cases
const char* aHomeLocation = getenv( "HOME" );
@@ -1314,14 +1314,14 @@ sal_Bool SvtURLBox_Impl::TildeParsing(
// in case the whole path is just "~" then there should
// be no trailing slash at the end
- if( aText.Len() == 1 )
+ if( aText.getLength() == 1 )
bTrailingSlash = sal_False;
}
else
{
// covers "~username" and "~username/..." cases
- xub_StrLen nNameEnd = aText.Search( '/' );
- OUString aUserName = aText.Copy( 1, ( nNameEnd != STRING_NOTFOUND ) ? nNameEnd : ( aText.Len() - 1 ) );
+ sal_Int32 nNameEnd = aText.indexOf( '/' );
+ OUString aUserName = aText.copy( 1, ( nNameEnd != -1 ) ? nNameEnd : ( aText.getLength() - 1 ) );
struct passwd* pPasswd = NULL;
#ifdef SOLARIS
@@ -1367,8 +1367,8 @@ sal_Bool SvtURLBox_Impl::TildeParsing(
{
if( aParseTilde.GetChar( aParseTilde.Len() - 1 ) != '/' )
aParseTilde += '/';
- if( aText.Len() > 2 )
- aParseTilde += aText.Copy( 2 );
+ if( aText.getLength() > 2 )
+ aParseTilde += aText.copy( 2 );
}
aText = aParseTilde;
@@ -1379,7 +1379,7 @@ sal_Bool SvtURLBox_Impl::TildeParsing(
return sal_True;
}
-void SvtURLBox::SetFilter(const String& _sFilter)
+void SvtURLBox::SetFilter(const OUString& _sFilter)
{
pImp->m_aFilters.clear();
FilterMatch::createWildCardFilterList(_sFilter,pImp->m_aFilters);
commit 3994dd5e347d140c4fa7d6f962b2e4089f1c6153
Author: Noel Grandin <noel at peralex.com>
Date: Wed Aug 14 17:19:45 2013 +0200
convert include/svtools/insdlg.hxx from String to OUString
Change-Id: I72c5e3e47040e78976f46f585b50ab6c12f84986
diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx
index 795dae4..3b4ffb7 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 30be129..7cd13f6 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 241f3cd..419bde3 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 239d1be..8484ed2 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 f91881d..4b578fa 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 795a589..2490b07 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 ef9f0a1..b1f6583 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 );
}
commit a067546dec428f8d467aa498bf0fd3968582e7eb
Author: Noel Grandin <noel at peralex.com>
Date: Wed Aug 14 15:47:05 2013 +0200
convert include/svtools/ivctrl.hxx from String to OUString
and de-virtualize the GetEntryText method, because nothing
is overriding it.
Change-Id: Ica8bea0a9332a53791122f637026083beba72f89
diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx
index 81726c7..0a8e059 100644
--- a/include/svtools/ivctrl.hxx
+++ b/include/svtools/ivctrl.hxx
@@ -66,7 +66,7 @@ class SvxIconChoiceCtrlEntry
Image aImage;
OUString aText;
- String aQuickHelpText;
+ OUString aQuickHelpText;
void* pUserData;
friend class SvxIconChoiceCtrl_Impl;
@@ -111,16 +111,16 @@ class SvxIconChoiceCtrlEntry
}
public:
- SvxIconChoiceCtrlEntry( const String& rText, const Image& rImage, sal_uInt16 nFlags = 0 );
+ SvxIconChoiceCtrlEntry( const OUString& rText, const Image& rImage, sal_uInt16 nFlags = 0 );
~SvxIconChoiceCtrlEntry () {}
void SetImage ( const Image& rImage ) { aImage = rImage; }
Image GetImage () const { return aImage; }
void SetText ( const OUString& rText ) { aText = rText; }
OUString GetText () const { return aText; }
- String SVT_DLLPUBLIC GetDisplayText() const;
- void SetQuickHelpText( const String& rText ) { aQuickHelpText = rText; }
- String GetQuickHelpText() const { return aQuickHelpText; }
+ OUString SVT_DLLPUBLIC GetDisplayText() const;
+ void SetQuickHelpText( const OUString& rText ) { aQuickHelpText = rText; }
+ OUString GetQuickHelpText() const { return aQuickHelpText; }
void SetUserData ( void* _pUserData ) { pUserData = _pUserData; }
void* GetUserData () { return pUserData; }
@@ -252,7 +252,7 @@ protected:
const Point& rPos,
OutputDevice& rDev );
- virtual String GetEntryText(
+ OUString GetEntryText(
SvxIconChoiceCtrlEntry* pEntry,
sal_Bool bInplaceEdit );
diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx
index 298981c..a48bb0d 100644
--- a/svtools/source/contnr/ivctrl.cxx
+++ b/svtools/source/contnr/ivctrl.cxx
@@ -31,7 +31,7 @@ using namespace ::com::sun::star::accessibility;
|
\*****************************************************************************/
-SvxIconChoiceCtrlEntry::SvxIconChoiceCtrlEntry( const String& rText, const Image& rImage, sal_uInt16 _nFlags )
+SvxIconChoiceCtrlEntry::SvxIconChoiceCtrlEntry( const OUString& rText, const Image& rImage, sal_uInt16 _nFlags )
{
aText = rText;
aImage = rImage;
@@ -43,7 +43,7 @@ SvxIconChoiceCtrlEntry::SvxIconChoiceCtrlEntry( const String& rText, const Image
pflink = 0;
}
-String SvxIconChoiceCtrlEntry::GetDisplayText() const
+OUString SvxIconChoiceCtrlEntry::GetDisplayText() const
{
return MnemonicGenerator::EraseAllMnemonicChars( aText );
}
@@ -110,7 +110,7 @@ void SvtIconChoiceCtrl::DrawEntryImage( SvxIconChoiceCtrlEntry* pEntry, const Po
rDev.DrawImage( rPos, pEntry->GetImage() );
}
-String SvtIconChoiceCtrl::GetEntryText( SvxIconChoiceCtrlEntry* pEntry, sal_Bool )
+OUString SvtIconChoiceCtrl::GetEntryText( SvxIconChoiceCtrlEntry* pEntry, sal_Bool )
{
return pEntry->GetText();
}
commit 6dcb7199db421848ff53167e71fa367417dd70c8
Author: Noel Grandin <noel at peralex.com>
Date: Wed Aug 14 15:10:01 2013 +0200
convert include/svtools/langtab.hxx from String to OUString
Change-Id: Iae97d742a46a9090a70b247b35b5cecb7bb9883c
diff --git a/include/svtools/langtab.hxx b/include/svtools/langtab.hxx
index 1ef5875..9242354 100644
--- a/include/svtools/langtab.hxx
+++ b/include/svtools/langtab.hxx
@@ -41,16 +41,16 @@ public:
If FALSE, do replace.
*/
const OUString GetString( const LanguageType eType, bool bUserInterfaceSelection = false ) const;
- LanguageType GetType( const String& rStr ) const;
+ LanguageType GetType( const OUString& rStr ) const;
sal_uInt32 GetEntryCount() const;
LanguageType GetTypeAtIndex( sal_uInt32 nIndex ) const;
- static String GetLanguageString( const LanguageType eType );
+ static OUString GetLanguageString( const LanguageType eType );
};
// Add LRE or RLE embedding characters to the string based on the
// String content (see #i78466#, #i32179#)
-SVT_DLLPUBLIC const String ApplyLreOrRleEmbedding( const String &rText );
+SVT_DLLPUBLIC const OUString ApplyLreOrRleEmbedding( const OUString &rText );
#endif
diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx
index 4fcaa73..96a46c7 100644
--- a/svtools/source/misc/langtab.cxx
+++ b/svtools/source/misc/langtab.cxx
@@ -37,9 +37,9 @@ using namespace ::com::sun::star;
//------------------------------------------------------------------------
-SVT_DLLPUBLIC const String ApplyLreOrRleEmbedding( const String &rText )
+SVT_DLLPUBLIC const OUString ApplyLreOrRleEmbedding( const OUString &rText )
{
- const sal_uInt16 nLen = rText.Len();
+ const sal_Int32 nLen = rText.getLength();
if (nLen == 0)
return String();
@@ -49,7 +49,7 @@ SVT_DLLPUBLIC const String ApplyLreOrRleEmbedding( const String &rText )
// check if there are alreay embedding characters at the strings start
// if so change nothing
- const sal_Unicode cChar = rText.GetBuffer()[0];
+ const sal_Unicode cChar = rText[0];
if (cChar == cLRE_Embedding || cChar == cRLE_Embedding)
return rText;
@@ -151,7 +151,7 @@ const OUString SvtLanguageTable::GetString( const LanguageType eType, bool bUser
return sLangTag;
}
-String SvtLanguageTable::GetLanguageString( const LanguageType eType )
+OUString SvtLanguageTable::GetLanguageString( const LanguageType eType )
{
static const SvtLanguageTable aLangTable;
return aLangTable.GetString( eType );
@@ -159,7 +159,7 @@ String SvtLanguageTable::GetLanguageString( const LanguageType eType )
//------------------------------------------------------------------------
-LanguageType SvtLanguageTable::GetType( const String& rStr ) const
+LanguageType SvtLanguageTable::GetType( const OUString& rStr ) const
{
LanguageType eType = LANGUAGE_DONTKNOW;
sal_uInt32 nCount = Count();
commit f4d750cf892888d3377a0568fb8092fc275ec78c
Author: Noel Grandin <noel at peralex.com>
Date: Wed Aug 14 10:02:36 2013 +0200
convert includes/svtools/openfiledroptargetlistener.hxx to OUString
Change-Id: I09fe1739e92aa522c7c6f085d0355fd7c03c047d
diff --git a/include/svtools/openfiledroptargetlistener.hxx b/include/svtools/openfiledroptargetlistener.hxx
index 2a6832d..1bebf7d 100644
--- a/include/svtools/openfiledroptargetlistener.hxx
+++ b/include/svtools/openfiledroptargetlistener.hxx
@@ -64,7 +64,7 @@ class SVT_DLLPUBLIC OpenFileDropTargetListener : public ::cppu::WeakImplHelper1<
void implts_BeginDrag( const css::uno::Sequence< css::datatransfer::DataFlavor >& rSupportedDataFlavors );
void implts_EndDrag();
sal_Bool implts_IsDropFormatSupported( SotFormatStringId nFormat );
- void implts_OpenFile( const String& rFilePath );
+ void implts_OpenFile( const OUString& rFilePath );
};
#endif // SVTOOLS_DROPTARGETLISTENER_HXX
diff --git a/svtools/source/misc/openfiledroptargetlistener.cxx b/svtools/source/misc/openfiledroptargetlistener.cxx
index 5d37383..5286a7e 100644
--- a/svtools/source/misc/openfiledroptargetlistener.cxx
+++ b/svtools/source/misc/openfiledroptargetlistener.cxx
@@ -191,7 +191,7 @@ sal_Bool OpenFileDropTargetListener::implts_IsDropFormatSupported( SotFormatStri
return bRet;
}
-void OpenFileDropTargetListener::implts_OpenFile( const String& rFilePath )
+void OpenFileDropTargetListener::implts_OpenFile( const OUString& rFilePath )
{
OUString aFileURL;
if ( !::utl::LocalFileHelper::ConvertPhysicalNameToURL( rFilePath, aFileURL ) )
commit 55f2f0864e0fb45001477c5f16217aa8f55d790f
Author: Noel Grandin <noel at peralex.com>
Date: Wed Aug 14 09:49:17 2013 +0200
convert include/svtools/parhtml.hxx from String to OUString
Change-Id: I20adfc9148b8afa7a59245349f233604bd9a1d2e
diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx
index c322bed..300c671 100644
--- a/editeng/source/editeng/eehtml.cxx
+++ b/editeng/source/editeng/eehtml.cxx
@@ -717,11 +717,11 @@ void EditHTMLParser::StartPara( bool bReal )
{
case HTML_O_ALIGN:
{
- if ( aOption.GetString().CompareIgnoreCaseToAscii( OOO_STRING_SVTOOLS_HTML_AL_right ) == COMPARE_EQUAL )
+ if ( aOption.GetString().equalsIgnoreAsciiCaseAscii( OOO_STRING_SVTOOLS_HTML_AL_right ) )
eAdjust = SVX_ADJUST_RIGHT;
- else if ( aOption.GetString().CompareIgnoreCaseToAscii( OOO_STRING_SVTOOLS_HTML_AL_middle ) == COMPARE_EQUAL )
+ else if ( aOption.GetString().equalsIgnoreAsciiCaseAscii( OOO_STRING_SVTOOLS_HTML_AL_middle ) )
eAdjust = SVX_ADJUST_CENTER;
- else if ( aOption.GetString().CompareIgnoreCaseToAscii( OOO_STRING_SVTOOLS_HTML_AL_center ) == COMPARE_EQUAL )
+ else if ( aOption.GetString().equalsIgnoreAsciiCaseAscii( OOO_STRING_SVTOOLS_HTML_AL_center ) )
eAdjust = SVX_ADJUST_CENTER;
else
eAdjust = SVX_ADJUST_LEFT;
diff --git a/include/svtools/parhtml.hxx b/include/svtools/parhtml.hxx
index 52b11fa..f57b1ce 100644
--- a/include/svtools/parhtml.hxx
+++ b/include/svtools/parhtml.hxx
@@ -87,20 +87,20 @@ struct HTMLOptionEnum
class SVT_DLLPUBLIC HTMLOption
{
- String aValue; // der Wert der Option (immer als String)
- String aToken; // der Name der Option als String
- sal_uInt16 nToken; // und das entsprechende Token
+ OUString aValue; // der Wert der Option (immer als String)
+ OUString aToken; // der Name der Option als String
+ sal_uInt16 nToken; // und das entsprechende Token
public:
- HTMLOption( sal_uInt16 nTyp, const String& rToken, const String& rValue );
+ HTMLOption( sal_uInt16 nTyp, const OUString& rToken, const OUString& rValue );
// der Name der Option ...
sal_uInt16 GetToken() const { return nToken; } // ... als Enum
- const String& GetTokenString() const { return aToken; } // ... als String
+ const OUString& GetTokenString() const { return aToken; } // ... als String
// der Wert der Option ...
- const String& GetString() const { return aValue; } // ... als String
+ const OUString& GetString() const { return aValue; } // ... als String
sal_uInt32 GetNumber() const; // ... als Zahl
sal_Int32 GetSNumber() const; // ... als Zahl
@@ -146,10 +146,10 @@ private:
int mnPendingOffToken; ///< OFF token pending for a <XX.../> ON/OFF ON token
- String aEndToken;
+ OUString aEndToken;
protected:
- String sSaveToken; // das gelesene Tag als String
+ OUString sSaveToken; // das gelesene Tag als String
int ScanText( const sal_Unicode cBreak = 0U );
@@ -208,7 +208,7 @@ public:
// Lesen eines <SCRIPT> aufgerufen werden
void EndScanScript() { bReadScript = false; }
- void ReadRawData( const sal_Char *pEndToken ) { aEndToken.AssignAscii(pEndToken); }
+ void ReadRawData( const OUString &rEndToken ) { aEndToken = rEndToken; }
// Token ohne \-Sequenzen
void UnescapeToken();
@@ -224,7 +224,7 @@ public:
protected:
- static rtl_TextEncoding GetEncodingByMIME( const String& rMime );
+ static rtl_TextEncoding GetEncodingByMIME( const OUString& rMime );
/// template method: called when ParseMetaOptions adds a user-defined meta
virtual void AddMetaUserDefined( OUString const & i_rMetaName );
@@ -260,7 +260,7 @@ public:
// entfernt (fuer JavaSript)
static void RemoveSGMLComment( OUString &rString, sal_Bool bFull );
- static bool InternalImgToPrivateURL( String& rURL );
+ static bool InternalImgToPrivateURL( OUString& rURL );
static rtl_TextEncoding GetEncodingByHttpHeader( SvKeyValueIterator *pHTTPHeader );
bool SetEncodingByHTTPHeader( SvKeyValueIterator *pHTTPHeader );
};
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index 6d93c4e..c47bf32 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -1007,12 +1007,12 @@ void ScHTMLLayoutParser::TableDataOn( ImportInfo* pInfo )
{
case HTML_O_COLSPAN:
{
- pActEntry->nColOverlap = ( SCCOL ) rOption.GetString().ToInt32();
+ pActEntry->nColOverlap = ( SCCOL ) rOption.GetString().toInt32();
}
break;
case HTML_O_ROWSPAN:
{
- pActEntry->nRowOverlap = ( SCROW ) rOption.GetString().ToInt32();
+ pActEntry->nRowOverlap = ( SCROW ) rOption.GetString().toInt32();
}
break;
case HTML_O_ALIGN:
@@ -1995,7 +1995,7 @@ ScHTMLTable::ScHTMLTable( ScHTMLTable& rParentTable, const ImportInfo& rInfo, bo
switch( itr->GetToken() )
{
case HTML_O_BORDER:
- mbBorderOn = ((itr->GetString().Len() == 0) || (itr->GetNumber() != 0));
+ mbBorderOn = itr->GetString().isEmpty() || (itr->GetNumber() != 0);
break;
case HTML_O_ID:
maTableName = itr->GetString();
@@ -2221,10 +2221,10 @@ void ScHTMLTable::DataOn( const ImportInfo& rInfo )
switch (itr->GetToken())
{
case HTML_O_COLSPAN:
- aSpanSize.mnCols = static_cast<SCCOL>( getLimitedValue<sal_Int32>( itr->GetString().ToInt32(), 1, 256 ) );
+ aSpanSize.mnCols = static_cast<SCCOL>( getLimitedValue<sal_Int32>( itr->GetString().toInt32(), 1, 256 ) );
break;
case HTML_O_ROWSPAN:
- aSpanSize.mnRows = static_cast<SCROW>( getLimitedValue<sal_Int32>( itr->GetString().ToInt32(), 1, 256 ) );
+ aSpanSize.mnRows = static_cast<SCROW>( getLimitedValue<sal_Int32>( itr->GetString().toInt32(), 1, 256 ) );
break;
case HTML_O_SDVAL:
pValStr.reset(new OUString(itr->GetString()));
diff --git a/sfx2/source/bastyp/frmhtml.cxx b/sfx2/source/bastyp/frmhtml.cxx
index a907782..37cf469 100644
--- a/sfx2/source/bastyp/frmhtml.cxx
+++ b/sfx2/source/bastyp/frmhtml.cxx
@@ -113,7 +113,7 @@ void SfxFrameHTMLParser::ParseFrameOptions(
pFrame->SetResizable( sal_False );
break;
default:
- if ( aOption.GetTokenString().EqualsIgnoreCaseAscii(
+ if ( aOption.GetTokenString().equalsIgnoreAsciiCaseAscii(
HTML_O_READONLY ) )
{
String aStr = aOption.GetString();
@@ -122,7 +122,7 @@ void SfxFrameHTMLParser::ParseFrameOptions(
bReadonly = sal_False;
pFrame->SetReadOnly( bReadonly );
}
- else if ( aOption.GetTokenString().EqualsIgnoreCaseAscii(
+ else if ( aOption.GetTokenString().equalsIgnoreAsciiCaseAscii(
HTML_O_EDIT ) )
{
String aStr = aOption.GetString();
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx
index d41f438..9c40438 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -98,7 +98,7 @@ sal_uInt16 HTMLOption::GetEnum( const HTMLOptionEnum *pOptEnums, sal_uInt16 nDfl
sal_uInt16 nValue = nDflt;
while( pOptEnums->pName )
- if( aValue.EqualsIgnoreCaseAscii( pOptEnums->pName ) )
+ if( aValue.equalsIgnoreAsciiCaseAscii( pOptEnums->pName ) )
break;
else
pOptEnums++;
@@ -113,7 +113,7 @@ bool HTMLOption::GetEnum( sal_uInt16 &rEnum, const HTMLOptionEnum *pOptEnums ) c
{
while( pOptEnums->pName )
{
- if( aValue.EqualsIgnoreCaseAscii( pOptEnums->pName ) )
+ if( aValue.equalsIgnoreAsciiCaseAscii( pOptEnums->pName ) )
break;
else
pOptEnums++;
@@ -126,8 +126,8 @@ bool HTMLOption::GetEnum( sal_uInt16 &rEnum, const HTMLOptionEnum *pOptEnums ) c
return (pName != 0);
}
-HTMLOption::HTMLOption( sal_uInt16 nTok, const String& rToken,
- const String& rValue )
+HTMLOption::HTMLOption( sal_uInt16 nTok, const OUString& rToken,
+ const OUString& rValue )
: aValue(rValue)
, aToken(rToken)
, nToken( nTok )
@@ -168,9 +168,9 @@ void HTMLOption::GetNumbers( std::vector<sal_uInt32> &rNumbers, bool bSpaceDelim
// numerals in the string.
bool bInNum = false;
sal_uLong nNum = 0;
- for( xub_StrLen i=0; i<aValue.Len(); i++ )
+ for( sal_Int32 i=0; i<aValue.getLength(); i++ )
{
- sal_Unicode c = aValue.GetChar( i );
+ sal_Unicode c = aValue[ i ];
if( c>='0' && c<='9' )
{
nNum *= 10;
@@ -193,30 +193,29 @@ void HTMLOption::GetNumbers( std::vector<sal_uInt32> &rNumbers, bool bSpaceDelim
{
// Check whether numbers are separated by ',' and
// insert 0 if necessary
- xub_StrLen nPos = 0;
- while( nPos < aValue.Len() )
+ sal_Int32 nPos = 0;
+ while( nPos < aValue.getLength() )
{
sal_Unicode c;
- while( nPos < aValue.Len() &&
- ((c=aValue.GetChar(nPos)) == ' ' || c == '\t' ||
+ while( nPos < aValue.getLength() &&
+ ((c=aValue[nPos]) == ' ' || c == '\t' ||
c == '\n' || c== '\r' ) )
nPos++;
- if( nPos==aValue.Len() )
+ if( nPos==aValue.getLength() )
rNumbers.push_back(0);
else
{
- xub_StrLen nEnd = aValue.Search( (sal_Unicode)',', nPos );
- if( STRING_NOTFOUND==nEnd )
+ sal_Int32 nEnd = aValue.indexOf( (sal_Unicode)',', nPos );
+ if( -1 == nEnd )
{
- sal_Int32 nTmp = aValue.Copy(nPos).ToInt32();
+ sal_Int32 nTmp = aValue.copy(nPos).toInt32();
rNumbers.push_back( nTmp >= 0 ? (sal_uInt32)nTmp : 0 );
- nPos = aValue.Len();
+ nPos = aValue.getLength();
}
else
{
- sal_Int32 nTmp =
- aValue.Copy(nPos,nEnd-nPos).ToInt32();
+ sal_Int32 nTmp = aValue.copy(nPos,nEnd-nPos).toInt32();
rNumbers.push_back( nTmp >= 0 ? (sal_uInt32)nTmp : 0 );
nPos = nEnd+1;
}
@@ -840,7 +839,7 @@ int HTMLParser::_GetNextRawToken()
// thus we don't have to search it again.
bReadScript = false;
bReadStyle = false;
- aEndToken.Erase();
+ aEndToken = "";
bEndTokenFound = false;
return 0;
@@ -891,7 +890,7 @@ int HTMLParser::_GetNextRawToken()
String aTok( sTmpBuffer.toString() );
aTok.ToUpperAscii();
bool bDone = false;
- if( bReadScript || aEndToken.Len() )
+ if( bReadScript || !aEndToken.isEmpty() )
{
if( !bReadComment )
{
@@ -944,7 +943,7 @@ int HTMLParser::_GetNextRawToken()
// and parse the end token
bReadScript = false;
bReadStyle = false;
- aEndToken.Erase();
+ aEndToken = "";
nToken = 0;
}
else
@@ -1024,7 +1023,7 @@ int HTMLParser::_GetNextRawToken()
{
bReadScript = false;
bReadStyle = false;
- aEndToken.Erase();
+ aEndToken = "";
nToken = 0;
}
break;
@@ -1056,7 +1055,7 @@ int HTMLParser::_GetNextRawToken()
int HTMLParser::_GetNextToken()
{
int nRet = 0;
- sSaveToken.Erase();
+ sSaveToken = "";
if (mnPendingOffToken)
{
@@ -1085,7 +1084,7 @@ int HTMLParser::_GetNextToken()
bReadNextChar = false;
}
- if( bReadScript || bReadStyle || aEndToken.Len() )
+ if( bReadScript || bReadStyle || !aEndToken.isEmpty() )
{
nRet = _GetNextRawToken();
if( nRet || !IsParserWorking() )
@@ -1816,16 +1815,15 @@ int HTMLParser::FilterXMP( int nToken )
{
if( (HTML_TOKEN_ONOFF & nToken) && (1 & nToken) )
{
- sSaveToken.Insert( '<', 0 );
- sSaveToken.Insert( '/', 1 );
+ sSaveToken = "</" + sSaveToken;
}
else
- sSaveToken.Insert( '<', 0 );
+ sSaveToken = "<" + sSaveToken;
if( !aToken.isEmpty() )
{
UnescapeToken();
- sSaveToken += (sal_Unicode)' ';
- aToken = aToken.replaceAt( 0, 0, sSaveToken );
+ sSaveToken += " ";
+ aToken = " " + aToken;
}
else
aToken = sSaveToken;
@@ -1977,69 +1975,69 @@ bool HTMLParser::IsHTMLFormat( const sal_Char* pHeader,
return false;
}
-bool HTMLParser::InternalImgToPrivateURL( String& rURL )
+bool HTMLParser::InternalImgToPrivateURL( OUString& rURL )
{
- if( rURL.Len() < 19 || 'i' != rURL.GetChar(0) ||
- rURL.CompareToAscii( OOO_STRING_SVTOOLS_HTML_internal_gopher, 9 ) != COMPARE_EQUAL )
+ if( rURL.getLength() < 19 || 'i' != rURL[0] ||
+ rURL.compareTo( OOO_STRING_SVTOOLS_HTML_internal_gopher, 9 ) != 0 )
return false;
bool bFound = false;
- if( rURL.CompareToAscii( OOO_STRING_SVTOOLS_HTML_internal_gopher,16) == COMPARE_EQUAL )
+ if( rURL.compareTo( OOO_STRING_SVTOOLS_HTML_internal_gopher,16) == 0 )
{
- String aName( rURL.Copy(16) );
- switch( aName.GetChar(0) )
+ OUString aName( rURL.copy(16) );
+ switch( aName[0] )
{
case 'b':
- bFound = aName.EqualsAscii( OOO_STRING_SVTOOLS_HTML_INT_GOPHER_binary );
+ bFound = aName == OOO_STRING_SVTOOLS_HTML_INT_GOPHER_binary;
break;
case 'i':
- bFound = aName.EqualsAscii( OOO_STRING_SVTOOLS_HTML_INT_GOPHER_image ) ||
- aName.EqualsAscii( OOO_STRING_SVTOOLS_HTML_INT_GOPHER_index );
+ bFound = aName == OOO_STRING_SVTOOLS_HTML_INT_GOPHER_image ||
+ aName == OOO_STRING_SVTOOLS_HTML_INT_GOPHER_index;
break;
case 'm':
- bFound = aName.EqualsAscii( OOO_STRING_SVTOOLS_HTML_INT_GOPHER_menu ) ||
- aName.EqualsAscii( OOO_STRING_SVTOOLS_HTML_INT_GOPHER_movie );
+ bFound = aName == OOO_STRING_SVTOOLS_HTML_INT_GOPHER_menu ||
+ aName == OOO_STRING_SVTOOLS_HTML_INT_GOPHER_movie;
break;
case 's':
- bFound = aName.EqualsAscii( OOO_STRING_SVTOOLS_HTML_INT_GOPHER_sound );
+ bFound = aName == OOO_STRING_SVTOOLS_HTML_INT_GOPHER_sound;
break;
case 't':
- bFound = aName.EqualsAscii( OOO_STRING_SVTOOLS_HTML_INT_GOPHER_telnet ) ||
- aName.EqualsAscii( OOO_STRING_SVTOOLS_HTML_INT_GOPHER_text );
+ bFound = aName == OOO_STRING_SVTOOLS_HTML_INT_GOPHER_telnet ||
+ aName == OOO_STRING_SVTOOLS_HTML_INT_GOPHER_text;
break;
case 'u':
- bFound = aName.EqualsAscii( OOO_STRING_SVTOOLS_HTML_INT_GOPHER_unknown );
+ bFound = aName == OOO_STRING_SVTOOLS_HTML_INT_GOPHER_unknown;
break;
}
}
- else if( rURL.CompareToAscii( OOO_STRING_SVTOOLS_HTML_internal_icon,14) == COMPARE_EQUAL )
+ else if( rURL.compareTo( OOO_STRING_SVTOOLS_HTML_internal_icon,14) == 0 )
{
- String aName( rURL.Copy(14) );
- switch( aName.GetChar(0) )
+ OUString aName( rURL.copy(14) );
+ switch( aName[0] )
{
case 'b':
- bFound = aName.EqualsAscii( OOO_STRING_SVTOOLS_HTML_INT_ICON_baddata );
+ bFound = aName == OOO_STRING_SVTOOLS_HTML_INT_ICON_baddata;
break;
case 'd':
- bFound = aName.EqualsAscii( OOO_STRING_SVTOOLS_HTML_INT_ICON_delayed );
+ bFound = aName == OOO_STRING_SVTOOLS_HTML_INT_ICON_delayed;
break;
case 'e':
- bFound = aName.EqualsAscii( OOO_STRING_SVTOOLS_HTML_INT_ICON_embed );
+ bFound = aName == OOO_STRING_SVTOOLS_HTML_INT_ICON_embed;
break;
case 'i':
- bFound = aName.EqualsAscii( OOO_STRING_SVTOOLS_HTML_INT_ICON_insecure );
+ bFound = aName == OOO_STRING_SVTOOLS_HTML_INT_ICON_insecure;
break;
case 'n':
- bFound = aName.EqualsAscii( OOO_STRING_SVTOOLS_HTML_INT_ICON_notfound );
+ bFound = aName == OOO_STRING_SVTOOLS_HTML_INT_ICON_notfound;
break;
}
}
if( bFound )
{
- String sTmp ( rURL );
- rURL.AssignAscii( OOO_STRING_SVTOOLS_HTML_private_image );
- rURL.Append( sTmp );
+ OUString sTmp ( rURL );
+ rURL = OOO_STRING_SVTOOLS_HTML_private_image;
+ rURL += sTmp;
}
return bFound;
@@ -2259,7 +2257,7 @@ bool HTMLParser::ParseMetaOptions(
return bRet;
}
-rtl_TextEncoding HTMLParser::GetEncodingByMIME( const String& rMime )
+rtl_TextEncoding HTMLParser::GetEncodingByMIME( const OUString& rMime )
{
OUString sType;
OUString sSubType;
diff --git a/sw/source/filter/html/htmldraw.cxx b/sw/source/filter/html/htmldraw.cxx
index cf7eade..af8ae2f 100644
--- a/sw/source/filter/html/htmldraw.cxx
+++ b/sw/source/filter/html/htmldraw.cxx
@@ -312,7 +312,7 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
case HTML_O_LOOP:
if( rOption.GetString().
- EqualsIgnoreCaseAscii(OOO_STRING_SVTOOLS_HTML_LOOP_infinite) )
+ equalsIgnoreAsciiCaseAscii(OOO_STRING_SVTOOLS_HTML_LOOP_infinite) )
{
nCount = 0;
}
@@ -334,7 +334,7 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
case HTML_O_WIDTH:
// erstmal nur als Pixelwerte merken!
nWidth = rOption.GetNumber();
- bPrcWidth = rOption.GetString().Search('%') != STRING_NOTFOUND;
+ bPrcWidth = rOption.GetString().indexOf('%') != -1;
if( bPrcWidth && nWidth>100 )
nWidth = 100;
break;
@@ -342,7 +342,7 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
case HTML_O_HEIGHT:
// erstmal nur als Pixelwerte merken!
nHeight = rOption.GetNumber();
- if( rOption.GetString().Search('%') != STRING_NOTFOUND )
+ if( rOption.GetString().indexOf('%') != -1 )
nHeight = 0;
break;
diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx
index 1469a78..2a125cb 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -309,7 +309,8 @@ void SwHTMLParser::GetDefaultScriptType( ScriptType& rType,
void SwHTMLParser::InsertImage()
{
// und jetzt auswerten
- String sGrfNm, sAltNm, aId, aClass, aStyle, aMap, sHTMLGrfName;
+ String sAltNm, aId, aClass, aStyle, aMap, sHTMLGrfName;
+ OUString sGrfNm;
sal_Int16 eVertOri = text::VertOrientation::TOP;
sal_Int16 eHoriOri = text::HoriOrientation::NONE;
long nWidth=0, nHeight=0;
@@ -358,14 +359,14 @@ void SwHTMLParser::InsertImage()
case HTML_O_WIDTH:
// erstmal nur als Pixelwerte merken!
nWidth = rOption.GetNumber();
- bPrcWidth = (rOption.GetString().Search('%') != STRING_NOTFOUND);
+ bPrcWidth = (rOption.GetString().indexOf('%') != -1);
if( bPrcWidth && nWidth>100 )
nWidth = 100;
break;
case HTML_O_HEIGHT:
// erstmal nur als Pixelwerte merken!
nHeight = rOption.GetNumber();
- bPrcHeight = (rOption.GetString().Search('%') != STRING_NOTFOUND);
+ bPrcHeight = (rOption.GetString().indexOf('%') != -1);
if( bPrcHeight && nHeight>100 )
nHeight = 100;
break;
@@ -425,7 +426,7 @@ IMAGE_SETEVENT:
}
}
- if( !sGrfNm.Len() )
+ if( sGrfNm.isEmpty() )
return;
// Wenn wir in einer Numerierung stehen und der Absatz noch leer und
diff --git a/sw/source/filter/html/htmlnum.cxx b/sw/source/filter/html/htmlnum.cxx
index 9379ba0..12f4928 100644
--- a/sw/source/filter/html/htmlnum.cxx
+++ b/sw/source/filter/html/htmlnum.cxx
@@ -163,7 +163,8 @@ void SwHTMLParser::NewNumBulList( int nToken )
}
// und es ggf. durch die Optionen veraendern
- String aId, aStyle, aClass, aBulletSrc, aLang, aDir;
+ String aId, aStyle, aClass, aLang, aDir;
+ OUString aBulletSrc;
sal_Int16 eVertOri = text::VertOrientation::NONE;
sal_uInt16 nWidth=USHRT_MAX, nHeight=USHRT_MAX;
const HTMLOptions& rHTMLOptions = GetOptions();
@@ -176,13 +177,13 @@ void SwHTMLParser::NewNumBulList( int nToken )
aId = rOption.GetString();
break;
case HTML_O_TYPE:
- if( bNewNumFmt && rOption.GetString().Len() )
+ if( bNewNumFmt && !rOption.GetString().isEmpty() )
{
switch( nToken )
{
case HTML_ORDERLIST_ON:
bChangeNumFmt = sal_True;
- switch( rOption.GetString().GetChar(0) )
+ switch( rOption.GetString()[0] )
{
case 'A': aNumFmt.SetNumberingType(SVX_NUM_CHARS_UPPER_LETTER); break;
case 'a': aNumFmt.SetNumberingType(SVX_NUM_CHARS_LOWER_LETTER); break;
@@ -248,7 +249,7 @@ void SwHTMLParser::NewNumBulList( int nToken )
}
}
- if( aBulletSrc.Len() )
+ if( !aBulletSrc.isEmpty() )
{
// Eine Bullet-Liste mit Grafiken
aNumFmt.SetNumberingType(SVX_NUM_BITMAP);
diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx
index 14bd504..51efbf9d 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -343,14 +343,14 @@ void SwHTMLParser::InsertEmbed()
case HTML_O_WIDTH:
if( USHRT_MAX==aSize.Width() )
{
- bPrcWidth = (rOption.GetString().Search('%') != STRING_NOTFOUND);
+ bPrcWidth = (rOption.GetString().indexOf('%') != -1);
aSize.Width() = (long)rOption.GetNumber();
}
break;
case HTML_O_HEIGHT:
if( USHRT_MAX==aSize.Height() )
{
- bPrcHeight = (rOption.GetString().Search('%') != STRING_NOTFOUND);
+ bPrcHeight = (rOption.GetString().indexOf('%') != -1);
aSize.Height() = (long)rOption.GetNumber();
}
break;
@@ -363,9 +363,9 @@ void SwHTMLParser::InsertEmbed()
aSpace.Height() = (long)rOption.GetNumber();
break;
case HTML_O_UNKNOWN:
- if( rOption.GetTokenString().EqualsIgnoreCaseAscii( OOO_STRING_SW_HTML_O_Hidden ) )
+ if( rOption.GetTokenString().equalsIgnoreAsciiCaseAscii( OOO_STRING_SW_HTML_O_Hidden ) )
bHidden =
- !rOption.GetString().EqualsIgnoreCaseAscii( sHTML_O_Hidden_False );
+ !rOption.GetString().equalsIgnoreAsciiCaseAscii( sHTML_O_Hidden_False );
break;
}
@@ -533,11 +533,11 @@ void SwHTMLParser::NewObject()
aStandBy = rOption.GetString();
break;
case HTML_O_WIDTH:
- bPrcWidth = (rOption.GetString().Search('%') != STRING_NOTFOUND);
+ bPrcWidth = (rOption.GetString().indexOf('%') != -1);
aSize.Width() = (long)rOption.GetNumber();
break;
case HTML_O_HEIGHT:
- bPrcHeight = (rOption.GetString().Search('%') != STRING_NOTFOUND);
+ bPrcHeight = (rOption.GetString().indexOf('%') != -1);
aSize.Height() = (long)rOption.GetNumber();
break;
case HTML_O_ALIGN:
@@ -697,11 +697,11 @@ void SwHTMLParser::InsertApplet()
eHoriOri = rOption.GetEnum( aHTMLImgHAlignTable, eHoriOri );
break;
case HTML_O_WIDTH:
- bPrcWidth = (rOption.GetString().Search('%') != STRING_NOTFOUND);
+ bPrcWidth = (rOption.GetString().indexOf('%') != -1);
aSize.Width() = (long)rOption.GetNumber();
break;
case HTML_O_HEIGHT:
- bPrcHeight = (rOption.GetString().Search('%') != STRING_NOTFOUND);
+ bPrcHeight = (rOption.GetString().indexOf('%') != -1);
aSize.Height() = (long)rOption.GetNumber();
break;
case HTML_O_HSPACE:
@@ -848,11 +848,11 @@ void SwHTMLParser::InsertFloatingFrame()
eHoriOri = rOption.GetEnum( aHTMLImgHAlignTable, eHoriOri );
break;
case HTML_O_WIDTH:
- bPrcWidth = (rOption.GetString().Search('%') != STRING_NOTFOUND);
+ bPrcWidth = (rOption.GetString().indexOf('%') != -1);
aSize.Width() = (long)rOption.GetNumber();
break;
case HTML_O_HEIGHT:
- bPrcHeight = (rOption.GetString().Search('%') != STRING_NOTFOUND);
+ bPrcHeight = (rOption.GetString().indexOf('%') != -1);
aSize.Height() = (long)rOption.GetNumber();
break;
case HTML_O_HSPACE:
diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx
index 30de1bd..954606d 100644
--- a/sw/source/filter/html/htmlsect.cxx
+++ b/sw/source/filter/html/htmlsect.cxx
@@ -572,7 +572,7 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss )
break;
case HTML_O_WIDTH:
nWidth = rOption.GetNumber();
- bPrcWidth = (rOption.GetString().Search('%') != STRING_NOTFOUND);
+ bPrcWidth = (rOption.GetString().indexOf('%') != -1);
if( bPrcWidth && nWidth>100 )
nWidth = 100;
break;
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index a82386e..ad700b2 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -3222,19 +3222,19 @@ _CellSaveStruct::_CellSaveStruct( SwHTMLParser& rParser, HTMLTable *pCurTable,
break;
case HTML_O_WIDTH:
nWidth = (sal_uInt16)rOption.GetNumber(); // nur fuer Netscape
- bPrcWidth = (rOption.GetString().Search('%') != STRING_NOTFOUND);
+ bPrcWidth = (rOption.GetString().indexOf('%') != -1);
if( bPrcWidth && nWidth>100 )
nWidth = 100;
break;
case HTML_O_HEIGHT:
nHeight = (sal_uInt16)rOption.GetNumber(); // nur fuer Netscape
- if( rOption.GetString().Search('%') != STRING_NOTFOUND)
+ if( rOption.GetString().indexOf('%') != -1)
nHeight = 0; // keine %-Angaben beruecksichtigen
break;
case HTML_O_BGCOLOR:
// Leere BGCOLOR bei <TABLE>, <TR> und <TD>/<TH> wie Netscape
// ignorieren, bei allen anderen Tags *wirklich* nicht.
- if( rOption.GetString().Len() )
+ if( !rOption.GetString().isEmpty() )
{
rOption.GetColor( aBGColor );
bBGColor = sal_True;
@@ -4275,7 +4275,7 @@ void SwHTMLParser::BuildTableRow( HTMLTable *pCurTable, sal_Bool bReadOptions,
case HTML_O_BGCOLOR:
// Leere BGCOLOR bei <TABLE>, <TR> und <TD>/<TH> wie Netsc.
// ignorieren, bei allen anderen Tags *wirklich* nicht.
- if( rOption.GetString().Len() )
+ if( !rOption.GetString().isEmpty() )
{
rOption.GetColor( aBGColor );
bBGColor = sal_True;
@@ -4657,7 +4657,7 @@ void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable,
case HTML_O_WIDTH:
pSaveStruct->nColGrpWidth = (sal_uInt16)rOption.GetNumber();
pSaveStruct->bRelColGrpWidth =
- (rOption.GetString().Search('*') != STRING_NOTFOUND);
+ (rOption.GetString().indexOf('*') != -1);
break;
case HTML_O_ALIGN:
pSaveStruct->eColGrpAdjust =
@@ -4740,7 +4740,7 @@ void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable,
case HTML_O_WIDTH:
nColWidth = (sal_uInt16)rOption.GetNumber();
bRelColWidth =
- (rOption.GetString().Search('*') != STRING_NOTFOUND);
+ (rOption.GetString().indexOf('*') != -1);
break;
case HTML_O_ALIGN:
eColAdjust =
@@ -4876,7 +4876,7 @@ void SwHTMLParser::BuildTableCaption( HTMLTable *pCurTable )
const HTMLOption& rOption = rHTMLOptions[--i];
if( HTML_O_ALIGN == rOption.GetToken() )
{
- if( rOption.GetString().EqualsIgnoreCaseAscii(OOO_STRING_SVTOOLS_HTML_VA_bottom))
+ if( rOption.GetString().equalsIgnoreAsciiCaseAscii(OOO_STRING_SVTOOLS_HTML_VA_bottom))
bTop = sal_False;
}
}
@@ -5112,13 +5112,13 @@ HTMLTableOptions::HTMLTableOptions( const HTMLOptions& rOptions,
break;
case HTML_O_WIDTH:
nWidth = (sal_uInt16)rOption.GetNumber();
- bPrcWidth = (rOption.GetString().Search('%') != STRING_NOTFOUND);
+ bPrcWidth = (rOption.GetString().indexOf('%') != -1);
if( bPrcWidth && nWidth>100 )
nWidth = 100;
break;
case HTML_O_HEIGHT:
nHeight = (sal_uInt16)rOption.GetNumber();
- if( rOption.GetString().Search('%') != STRING_NOTFOUND )
+ if( rOption.GetString().indexOf('%') != -1 )
nHeight = 0; // keine %-Anagben benutzen!!!
break;
case HTML_O_CELLPADDING:
@@ -5142,8 +5142,8 @@ HTMLTableOptions::HTMLTableOptions( const HTMLOptions& rOptions,
break;
case HTML_O_BORDER:
// BORDER und BORDER=BORDER wie BORDER=1 behandeln
- if( rOption.GetString().Len() &&
- !rOption.GetString().EqualsIgnoreCaseAscii(OOO_STRING_SVTOOLS_HTML_O_border) )
+ if( !rOption.GetString().isEmpty() &&
+ !rOption.GetString().equalsIgnoreAsciiCaseAscii(OOO_STRING_SVTOOLS_HTML_O_border) )
nBorder = (sal_uInt16)rOption.GetNumber();
else
nBorder = 1;
@@ -5164,7 +5164,7 @@ HTMLTableOptions::HTMLTableOptions( const HTMLOptions& rOptions,
case HTML_O_BGCOLOR:
// Leere BGCOLOR bei <TABLE>, <TR> und <TD>/<TH> wie Netscape
// ignorieren, bei allen anderen Tags *wirklich* nicht.
- if( rOption.GetString().Len() )
+ if( !rOption.GetString().isEmpty() )
{
rOption.GetColor( aBGColor );
bBGColor = sal_True;
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index c096cf1..22f2318 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -2009,8 +2009,8 @@ void SwHTMLParser::NextToken( int nToken )
// (but judging from the code, also if does not start with a '%')
// (and also if we're not somewhere we consider PRE)
if( IsInHeader() && !IsReadPRE() && aUnknownToken.isEmpty() &&
- sSaveToken.Len() && '!' != sSaveToken.GetChar(0) &&
- '%' != sSaveToken.GetChar(0) )
+ !sSaveToken.isEmpty() && '!' != sSaveToken[0] &&
+ '%' != sSaveToken[0] )
aUnknownToken = sSaveToken;
// no break
@@ -3672,11 +3672,11 @@ void SwHTMLParser::NewFontAttr( int nToken )
switch( rOption.GetToken() )
{
case HTML_O_SIZE:
- if( HTML_FONT_ON==nToken && rOption.GetString().Len() )
+ if( HTML_FONT_ON==nToken && !rOption.GetString().isEmpty() )
{
sal_Int32 nSSize;
- if( '+' == rOption.GetString().GetChar(0) ||
- '-' == rOption.GetString().GetChar(0) )
+ if( '+' == rOption.GetString()[0] ||
+ '-' == rOption.GetString()[0] )
nSSize = nBaseSize + rOption.GetSNumber();
else
nSSize = (sal_Int32)rOption.GetNumber();
@@ -4874,12 +4874,12 @@ void SwHTMLParser::InsertSpacer()
break;
case HTML_O_WIDTH:
// erstmal nur als Pixelwerte merken!
- bPrcWidth = (rOption.GetString().Search('%') != STRING_NOTFOUND);
+ bPrcWidth = (rOption.GetString().indexOf('%') != -1);
aSize.Width() = (long)rOption.GetNumber();
break;
case HTML_O_HEIGHT:
// erstmal nur als Pixelwerte merken!
- bPrcHeight = (rOption.GetString().Search('%') != STRING_NOTFOUND);
+ bPrcHeight = (rOption.GetString().indexOf('%') != -1);
aSize.Height() = (long)rOption.GetNumber();
break;
case HTML_O_SIZE:
@@ -5257,7 +5257,7 @@ void SwHTMLParser::InsertHorzRule()
nSize = (sal_uInt16)rOption.GetNumber();
break;
case HTML_O_WIDTH:
- bPrcWidth = (rOption.GetString().Search('%') != STRING_NOTFOUND);
+ bPrcWidth = (rOption.GetString().indexOf('%') != -1);
nWidth = (sal_uInt16)rOption.GetNumber();
if( bPrcWidth && nWidth>=100 )
{
commit 00f5fde6c4520afe08650c257b8d2c279635eb09
Author: Noel Grandin <noel at peralex.com>
Date: Tue Aug 13 13:47:59 2013 +0200
convert include/svtools/roadmapwizard.hxx from String to OUString
Change-Id: I1b5a0c3f5946aac9d353550091616cf5a31e6f82
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
index 4a8a2c1..74c0695 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
@@ -196,7 +196,7 @@ void CreationWizard::setValidPage( TabPage * /* pTabPage */ )
m_bCanTravel = true;
}
-String CreationWizard::getStateDisplayName( WizardState nState ) const
+OUString CreationWizard::getStateDisplayName( WizardState nState ) const
{
sal_uInt16 nResId = 0;
switch( nState )
diff --git a/chart2/source/controller/inc/dlg_CreationWizard.hxx b/chart2/source/controller/inc/dlg_CreationWizard.hxx
index ecc84a1..d5d1b9d 100644
--- a/chart2/source/controller/inc/dlg_CreationWizard.hxx
+++ b/chart2/source/controller/inc/dlg_CreationWizard.hxx
@@ -63,7 +63,7 @@ protected:
virtual WizardState determineNextState(WizardState nCurrentState) const;
virtual void enterState(WizardState nState);
- virtual String getStateDisplayName( WizardState nState ) const;
+ virtual OUString getStateDisplayName( WizardState nState ) const;
private:
//no default constructor
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list