[Libreoffice-commits] .: 2 commits - editeng/source sfx2/inc sfx2/source
Kohei Yoshida
kohei at kemper.freedesktop.org
Fri Jul 22 19:08:29 PDT 2011
editeng/source/editeng/eehtml.cxx | 39 +++++++++++++++++---------------------
sfx2/inc/sfx2/frmhtml.hxx | 2 -
sfx2/inc/sfx2/sfxhtml.hxx | 9 +++-----
sfx2/source/bastyp/frmhtml.cxx | 32 +++++++++++++++----------------
sfx2/source/bastyp/sfxhtml.cxx | 38 +++++++++++++++++--------------------
5 files changed, 57 insertions(+), 63 deletions(-)
New commits:
commit 7346524245242c5c16fc4743ad8e2dec15929838
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Fri Jul 22 15:56:02 2011 -0400
Adjusted for GetOptions() return type change.
diff --git a/sfx2/inc/sfx2/frmhtml.hxx b/sfx2/inc/sfx2/frmhtml.hxx
index 10e744d..c95e1d8 100644
--- a/sfx2/inc/sfx2/frmhtml.hxx
+++ b/sfx2/inc/sfx2/frmhtml.hxx
@@ -52,7 +52,7 @@ protected:
public:
// These methods can also be used by other parsers.
- static void ParseFrameOptions(SfxFrameDescriptor*, const HTMLOptions*, const String& );
+ static void ParseFrameOptions(SfxFrameDescriptor*, const HTMLOptions&, const String& );
};
diff --git a/sfx2/inc/sfx2/sfxhtml.hxx b/sfx2/inc/sfx2/sfxhtml.hxx
index d5335dd..3c00f53 100644
--- a/sfx2/inc/sfx2/sfxhtml.hxx
+++ b/sfx2/inc/sfx2/sfxhtml.hxx
@@ -65,12 +65,11 @@ public:
// Read the options of an image map
// <MAP>: sal_True = Image-Map has a name
// <AREA>: sal_True = Image-Map has now one Region more
- static sal_Bool ParseMapOptions(ImageMap * pImageMap,
- const HTMLOptions * pOptions );
- sal_Bool ParseMapOptions(ImageMap * pImageMap)
+ static bool ParseMapOptions(ImageMap* pImageMap, const HTMLOptions& rOptions);
+ bool ParseMapOptions(ImageMap * pImageMap)
{ return ParseMapOptions(pImageMap, GetOptions()); }
- static sal_Bool ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL,
- const HTMLOptions * pOptions,
+ static bool ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL,
+ const HTMLOptions& rOptions,
sal_uInt16 nEventMouseOver = 0,
sal_uInt16 nEventMouseOut = 0 );
inline sal_Bool ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL,
diff --git a/sfx2/source/bastyp/frmhtml.cxx b/sfx2/source/bastyp/frmhtml.cxx
index 5a8f720..60f2867 100644
--- a/sfx2/source/bastyp/frmhtml.cxx
+++ b/sfx2/source/bastyp/frmhtml.cxx
@@ -65,7 +65,8 @@ static HTMLOptionEnum const aScollingTable[] =
{ 0, 0 }
};
-void SfxFrameHTMLParser::ParseFrameOptions( SfxFrameDescriptor *pFrame, const HTMLOptions *pOptions, const String& rBaseURL )
+void SfxFrameHTMLParser::ParseFrameOptions(
+ SfxFrameDescriptor *pFrame, const HTMLOptions& rOptions, const String& rBaseURL )
{
// Get and set the options
Size aMargin( pFrame->GetMargin() );
@@ -77,16 +78,15 @@ void SfxFrameHTMLParser::ParseFrameOptions( SfxFrameDescriptor *pFrame, const HT
// We will not mimic that bug !
sal_Bool bMarginWidth = sal_False, bMarginHeight = sal_False;
- sal_uInt16 nArrLen = pOptions->Count();
- for ( sal_uInt16 i=0; i<nArrLen; i++ )
+ for (size_t i = 0, n = rOptions.size(); i < n; ++i)
{
- const HTMLOption *pOption = (*pOptions)[i];
- switch( pOption->GetToken() )
+ const HTMLOption& aOption = rOptions[i];
+ switch( aOption.GetToken() )
{
case HTML_O_BORDERCOLOR:
{
Color aColor;
- pOption->GetColor( aColor );
+ aOption.GetColor( aColor );
pFrame->SetWallpaper( Wallpaper( aColor ) );
break;
}
@@ -94,20 +94,20 @@ void SfxFrameHTMLParser::ParseFrameOptions( SfxFrameDescriptor *pFrame, const HT
pFrame->SetURL(
String(
INetURLObject::GetAbsURL(
- rBaseURL, pOption->GetString())) );
+ rBaseURL, aOption.GetString())) );
break;
case HTML_O_NAME:
- pFrame->SetName( pOption->GetString() );
+ pFrame->SetName( aOption.GetString() );
break;
case HTML_O_MARGINWIDTH:
- aMargin.Width() = pOption->GetNumber();
+ aMargin.Width() = aOption.GetNumber();
if( !bMarginHeight )
aMargin.Height() = 0;
bMarginWidth = sal_True;
break;
case HTML_O_MARGINHEIGHT:
- aMargin.Height() = pOption->GetNumber();
+ aMargin.Height() = aOption.GetNumber();
if( !bMarginWidth )
aMargin.Width() = 0;
@@ -115,12 +115,12 @@ void SfxFrameHTMLParser::ParseFrameOptions( SfxFrameDescriptor *pFrame, const HT
break;
case HTML_O_SCROLLING:
pFrame->SetScrollingMode(
- (ScrollingMode)pOption->GetEnum( aScollingTable,
+ (ScrollingMode)aOption.GetEnum( aScollingTable,
ScrollingAuto ) );
break;
case HTML_O_FRAMEBORDER:
{
- String aStr = pOption->GetString();
+ String aStr = aOption.GetString();
sal_Bool bBorder = sal_True;
if ( aStr.EqualsIgnoreCaseAscii("NO") ||
aStr.EqualsIgnoreCaseAscii("0") )
@@ -132,19 +132,19 @@ void SfxFrameHTMLParser::ParseFrameOptions( SfxFrameDescriptor *pFrame, const HT
pFrame->SetResizable( sal_False );
break;
default:
- if ( pOption->GetTokenString().EqualsIgnoreCaseAscii(
+ if ( aOption.GetTokenString().EqualsIgnoreCaseAscii(
HTML_O_READONLY ) )
{
- String aStr = pOption->GetString();
+ String aStr = aOption.GetString();
sal_Bool bReadonly = sal_True;
if ( aStr.EqualsIgnoreCaseAscii("FALSE") )
bReadonly = sal_False;
pFrame->SetReadOnly( bReadonly );
}
- else if ( pOption->GetTokenString().EqualsIgnoreCaseAscii(
+ else if ( aOption.GetTokenString().EqualsIgnoreCaseAscii(
HTML_O_EDIT ) )
{
- String aStr = pOption->GetString();
+ String aStr = aOption.GetString();
sal_Bool bEdit = sal_True;
if ( aStr.EqualsIgnoreCaseAscii("FALSE") )
bEdit = sal_False;
diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx
index f41c4f5..a7e469d 100644
--- a/sfx2/source/bastyp/sfxhtml.cxx
+++ b/sfx2/source/bastyp/sfxhtml.cxx
@@ -96,21 +96,20 @@ SfxHTMLParser::~SfxHTMLParser()
delete pDLMedium;
}
-sal_Bool SfxHTMLParser::ParseMapOptions(ImageMap * pImageMap,
- const HTMLOptions * pOptions)
+bool SfxHTMLParser::ParseMapOptions(
+ ImageMap* pImageMap, const HTMLOptions& rOptions)
{
DBG_ASSERT( pImageMap, "ParseMapOptions: No Image-Map" );
- DBG_ASSERT( pOptions, "ParseMapOptions: No Options" );
String aName;
- for( sal_uInt16 i=pOptions->Count(); i; )
+ for (size_t i = rOptions.size(); i; )
{
- const HTMLOption *pOption = (*pOptions)[--i];
- switch( pOption->GetToken() )
+ const HTMLOption& aOption = rOptions[--i];
+ switch( aOption.GetToken() )
{
case HTML_O_NAME:
- aName = pOption->GetString();
+ aName = aOption.GetString();
break;
}
}
@@ -121,13 +120,12 @@ sal_Bool SfxHTMLParser::ParseMapOptions(ImageMap * pImageMap,
return aName.Len() > 0;
}
-sal_Bool SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL,
- const HTMLOptions * pOptions,
+bool SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL,
+ const HTMLOptions& rOptions,
sal_uInt16 nEventMouseOver,
sal_uInt16 nEventMouseOut )
{
DBG_ASSERT( pImageMap, "ParseAreaOptions: no Image-Map" );
- DBG_ASSERT( pOptions, "ParseAreaOptions: no Options" );
sal_uInt16 nShape = IMAP_OBJ_RECTANGLE;
SvULongs aCoords;
@@ -135,33 +133,33 @@ sal_Bool SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const String& rBa
sal_Bool bNoHRef = sal_False;
SvxMacroTableDtor aMacroTbl;
- for( sal_uInt16 i=pOptions->Count(); i; )
+ for (size_t i = rOptions.size(); i; )
{
sal_uInt16 nEvent = 0;
ScriptType eScrpType = STARBASIC;
- const HTMLOption *pOption = (*pOptions)[--i];
- switch( pOption->GetToken() )
+ const HTMLOption& rOption = rOptions[--i];
+ switch( rOption.GetToken() )
{
case HTML_O_NAME:
- aName = pOption->GetString();
+ aName = rOption.GetString();
break;
case HTML_O_SHAPE:
- pOption->GetEnum( nShape, aAreaShapeOptEnums );
+ rOption.GetEnum( nShape, aAreaShapeOptEnums );
break;
case HTML_O_COORDS:
- pOption->GetNumbers( aCoords, sal_True );
+ rOption.GetNumbers( aCoords, sal_True );
break;
case HTML_O_HREF:
- aHRef = INetURLObject::GetAbsURL( rBaseURL, pOption->GetString() );
+ aHRef = INetURLObject::GetAbsURL( rBaseURL, rOption.GetString() );
break;
case HTML_O_NOHREF:
bNoHRef = sal_True;
break;
case HTML_O_ALT:
- aAlt = pOption->GetString();
+ aAlt = rOption.GetString();
break;
case HTML_O_TARGET:
- aTarget = pOption->GetString();
+ aTarget = rOption.GetString();
break;
case HTML_O_ONMOUSEOVER:
@@ -178,7 +176,7 @@ sal_Bool SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const String& rBa
IMAPOBJ_SETEVENT:
if( nEvent )
{
- String sTmp( pOption->GetString() );
+ String sTmp( rOption.GetString() );
if( sTmp.Len() )
{
sTmp.ConvertLineEnd();
commit cfd32a65858bab00b5178ea5794f9f331aac9a91
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Fri Jul 22 15:44:14 2011 -0400
Adjusted for HTMLParser::GetOptions return type change.
diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx
index a13e97b..0071d2b 100644
--- a/editeng/source/editeng/eehtml.cxx
+++ b/editeng/source/editeng/eehtml.cxx
@@ -127,13 +127,13 @@ void EditHTMLParser::NextToken( int nToken )
{
case HTML_META:
{
- const HTMLOptions *_pOptions = GetOptions();
- sal_uInt16 nArrLen = _pOptions->Count();
+ const HTMLOptions& aOptions = GetOptions();
+ size_t nArrLen = aOptions.size();
bool bEquiv = false;
- for ( sal_uInt16 i = 0; i < nArrLen; i++ )
+ for ( size_t i = 0; i < nArrLen; i++ )
{
- const HTMLOption *pOption = (*_pOptions)[i];
- switch( pOption->GetToken() )
+ const HTMLOption& aOption = aOptions[i];
+ switch( aOption.GetToken() )
{
case HTML_O_HTTPEQUIV:
{
@@ -144,7 +144,7 @@ void EditHTMLParser::NextToken( int nToken )
{
if ( bEquiv )
{
- rtl_TextEncoding eEnc = GetEncodingByMIME( pOption->GetString() );
+ rtl_TextEncoding eEnc = GetEncodingByMIME( aOption.GetString() );
if ( eEnc != RTL_TEXTENCODING_DONTKNOW )
SetSrcEncoding( eEnc );
}
@@ -711,21 +711,20 @@ void EditHTMLParser::StartPara( bool bReal )
{
if ( bReal )
{
- const HTMLOptions *_pOptions = GetOptions();
- sal_uInt16 nArrLen = _pOptions->Count();
+ const HTMLOptions& aOptions = GetOptions();
SvxAdjust eAdjust = SVX_ADJUST_LEFT;
- for ( sal_uInt16 i = 0; i < nArrLen; i++ )
+ for ( size_t i = 0, n = aOptions.size(); i < n; ++i )
{
- const HTMLOption *pOption = (*_pOptions)[i];
- switch( pOption->GetToken() )
+ const HTMLOption& aOption = aOptions[i];
+ switch( aOption.GetToken() )
{
case HTML_O_ALIGN:
{
- if ( pOption->GetString().CompareIgnoreCaseToAscii( OOO_STRING_SVTOOLS_HTML_AL_right ) == COMPARE_EQUAL )
+ if ( aOption.GetString().CompareIgnoreCaseToAscii( OOO_STRING_SVTOOLS_HTML_AL_right ) == COMPARE_EQUAL )
eAdjust = SVX_ADJUST_RIGHT;
- else if ( pOption->GetString().CompareIgnoreCaseToAscii( OOO_STRING_SVTOOLS_HTML_AL_middle ) == COMPARE_EQUAL )
+ else if ( aOption.GetString().CompareIgnoreCaseToAscii( OOO_STRING_SVTOOLS_HTML_AL_middle ) == COMPARE_EQUAL )
eAdjust = SVX_ADJUST_CENTER;
- else if ( pOption->GetString().CompareIgnoreCaseToAscii( OOO_STRING_SVTOOLS_HTML_AL_center ) == COMPARE_EQUAL )
+ else if ( aOption.GetString().CompareIgnoreCaseToAscii( OOO_STRING_SVTOOLS_HTML_AL_center ) == COMPARE_EQUAL )
eAdjust = SVX_ADJUST_CENTER;
else
eAdjust = SVX_ADJUST_LEFT;
@@ -771,18 +770,16 @@ void EditHTMLParser::AnchorStart()
// ignore anchor in anchor
if ( !pCurAnchor )
{
- const HTMLOptions* _pOptions = GetOptions();
- sal_uInt16 nArrLen = _pOptions->Count();
-
+ const HTMLOptions& aOptions = GetOptions();
String aRef;
- for ( sal_uInt16 i = 0; i < nArrLen; i++ )
+ for ( size_t i = 0, n = aOptions.size(); i < n; ++i )
{
- const HTMLOption* pOption = (*_pOptions)[i];
- switch( pOption->GetToken() )
+ const HTMLOption& aOption = aOptions[i];
+ switch( aOption.GetToken() )
{
case HTML_O_HREF:
- aRef = pOption->GetString();
+ aRef = aOption.GetString();
break;
}
}
More information about the Libreoffice-commits
mailing list