[Libreoffice-commits] .: sw/source

[Kohei Yoshida]

 sw/source/filter/html/htmlplug.cxx |   54 ++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

New commits:
commit 71e760a7ec552e0524f9917f6d3fe4393ba54226
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Fri Jul 22 23:14:11 2011 -0400

    More adjustment for the GetOptions return type change.

diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx
index b8e4687..57c9580 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -681,50 +681,50 @@ void SwHTMLParser::InsertApplet()
         delete pAppletImpl;
     pAppletImpl = new SwApplet_Impl( pDoc->GetAttrPool(), RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
 
-    const HTMLOptions *pHTMLOptions = GetOptions();
-    for( sal_uInt16 i = pHTMLOptions->Count(); i; )
+    const HTMLOptions& rHTMLOptions = GetOptions();
+    for (size_t i = rHTMLOptions.size(); i; )
     {
-        const HTMLOption *pOption = (*pHTMLOptions)[--i];
-        switch( pOption->GetToken() )
+        const HTMLOption& rOption = rHTMLOptions[--i];
+        switch( rOption.GetToken() )
         {
         case HTML_O_ID:
-            aId = pOption->GetString();
+            aId = rOption.GetString();
             break;
         case HTML_O_STYLE:
-            aStyle = pOption->GetString();
+            aStyle = rOption.GetString();
             break;
         case HTML_O_CLASS:
-            aClass = pOption->GetString();
+            aClass = rOption.GetString();
             break;
         case HTML_O_CODEBASE:
-            aCodeBase = pOption->GetString();
+            aCodeBase = rOption.GetString();
             break;
         case HTML_O_CODE:
-            aCode = pOption->GetString();
+            aCode = rOption.GetString();
             break;
         case HTML_O_NAME:
-            aName = pOption->GetString();
+            aName = rOption.GetString();
             break;
         case HTML_O_ALT:
-            aAlt = pOption->GetString();
+            aAlt = rOption.GetString();
             break;
         case HTML_O_ALIGN:
-            eVertOri = pOption->GetEnum( aHTMLImgVAlignTable, eVertOri );
-            eHoriOri = pOption->GetEnum( aHTMLImgHAlignTable, eHoriOri );
+            eVertOri = rOption.GetEnum( aHTMLImgVAlignTable, eVertOri );
+            eHoriOri = rOption.GetEnum( aHTMLImgHAlignTable, eHoriOri );
             break;
         case HTML_O_WIDTH:
-            bPrcWidth = (pOption->GetString().Search('%') != STRING_NOTFOUND);
-            aSize.Width() = (long)pOption->GetNumber();
+            bPrcWidth = (rOption.GetString().Search('%') != STRING_NOTFOUND);
+            aSize.Width() = (long)rOption.GetNumber();
             break;
         case HTML_O_HEIGHT:
-            bPrcHeight = (pOption->GetString().Search('%') != STRING_NOTFOUND);
-            aSize.Height() = (long)pOption->GetNumber();
+            bPrcHeight = (rOption.GetString().Search('%') != STRING_NOTFOUND);
+            aSize.Height() = (long)rOption.GetNumber();
             break;
         case HTML_O_HSPACE:
-            aSpace.Width() = (long)pOption->GetNumber();
+            aSpace.Width() = (long)rOption.GetNumber();
             break;
         case HTML_O_VSPACE:
-            aSpace.Height() = (long)pOption->GetNumber();
+            aSpace.Height() = (long)rOption.GetNumber();
             break;
         case HTML_O_MAYSCRIPT:
             bMayScript = sal_True;
@@ -732,8 +732,8 @@ void SwHTMLParser::InsertApplet()
         }
 
         // Es werden alle Parameter auch an das Applet weitergereicht
-        pAppletImpl->AppendParam( pOption->GetTokenString(),
-                                  pOption->GetString() );
+        pAppletImpl->AppendParam( rOption.GetTokenString(),
+                                  rOption.GetString() );
     }
 
     if( !aCode.Len() )
@@ -806,17 +806,17 @@ void SwHTMLParser::InsertParam()
 
     String aName, aValue;
 
-    const HTMLOptions *pHTMLOptions = GetOptions();
-    for( sal_uInt16 i = pHTMLOptions->Count(); i; )
+    const HTMLOptions& rHTMLOptions = GetOptions();
+    for (size_t i = rHTMLOptions.size(); i; )
     {
-        const HTMLOption *pOption = (*pHTMLOptions)[--i];
-        switch( pOption->GetToken() )
+        const HTMLOption& rOption = rHTMLOptions[--i];
+        switch( rOption.GetToken() )
         {
         case HTML_O_NAME:
-            aName = pOption->GetString();
+            aName = rOption.GetString();
             break;
         case HTML_O_VALUE:
-            aValue = pOption->GetString();
+            aValue = rOption.GetString();
             break;
         }
     }