[Libreoffice-commits] core.git: 2 commits - sw/source

[Luboš Luňák]

 sw/source/filter/html/htmlcss1.cxx |   12 ++++++------
 sw/source/filter/html/htmlgrin.cxx |    8 ++++----
 sw/source/filter/html/svxcss1.cxx  |    2 --
 3 files changed, 10 insertions(+), 12 deletions(-)

New commits:
commit 89aeec9b1d2f771310eeb0fa4c820c19599df0f7
Author: Luboš Luňák <l.lu...@suse.cz>
Date:   Tue Aug 6 23:30:28 2013 +0200

    remove unused variable
    
    Change-Id: Iaf22f259fa396deee3cab84cc9549427b76017c2

diff --git a/sw/source/filter/html/svxcss1.cxx 
b/sw/source/filter/html/svxcss1.cxx
index b16349e..a065c3c 100644
--- a/sw/source/filter/html/svxcss1.cxx
+++ b/sw/source/filter/html/svxcss1.cxx
@@ -888,8 +888,6 @@ sal_Bool SvxCSS1Parser::ParseStyleOption( const OUString& 
rIn,
 sal_Bool SvxCSS1Parser::GetEnum( const CSS1PropertyEnum *pPropTable,
                           const OUString &rValue, sal_uInt16& rEnum )
 {
-    OUString aValue( rValue.toAsciiLowerCase() );
-
     while( pPropTable->pName )
     {
         if( !rValue.equalsIgnoreAsciiCaseAscii( pPropTable->pName ) )
commit 2349d8073072acbf07c36d9fe0dcb4a812779a97
Author: Luboš Luňák <l.lu...@suse.cz>
Date:   Tue Aug 6 23:25:48 2013 +0200

    equalsIgnoreAsciiCaseAscii -> equalsIgnoreAsciiCase
    
    Change-Id: I218389623e8774a7aabbbd0be58d4d17acbef631

diff --git a/sw/source/filter/html/htmlcss1.cxx 
b/sw/source/filter/html/htmlcss1.cxx
index 7086555..77871a1 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -861,9 +861,9 @@ sal_Bool SwCSS1Parser::StyleParsed( const CSS1Selector 
*pSelector,
              ('s' == aClass[0] || 'S' == aClass[0]) )
     {
         sal_uInt16 nPoolFmtId = 0;
-        if( 
aClass.equalsIgnoreAsciiCaseAscii(OOO_STRING_SVTOOLS_HTML_sdendnote_sym) )
+        if( 
aClass.equalsIgnoreAsciiCase(OOO_STRING_SVTOOLS_HTML_sdendnote_sym) )
             nPoolFmtId = RES_POOLCHR_ENDNOTE;
-        else if( 
aClass.equalsIgnoreAsciiCaseAscii(OOO_STRING_SVTOOLS_HTML_sdfootnote_sym) )
+        else if( 
aClass.equalsIgnoreAsciiCase(OOO_STRING_SVTOOLS_HTML_sdfootnote_sym) )
             nPoolFmtId = RES_POOLCHR_FOOTNOTE;
         if( nPoolFmtId )
         {
@@ -909,9 +909,9 @@ sal_Bool SwCSS1Parser::StyleParsed( const CSS1Selector 
*pSelector,
         if( aClass.getLength() >= 9 &&
             ('s' == aClass[0] || 'S' == aClass[0]) )
         {
-            if( 
aClass.equalsIgnoreAsciiCaseAscii(OOO_STRING_SVTOOLS_HTML_sdendnote) )
+            if( 
aClass.equalsIgnoreAsciiCase(OOO_STRING_SVTOOLS_HTML_sdendnote) )
                 nPoolCollId = RES_POOLCOLL_ENDNOTE;
-            else if( 
aClass.equalsIgnoreAsciiCaseAscii(OOO_STRING_SVTOOLS_HTML_sdfootnote) )
+            else if( 
aClass.equalsIgnoreAsciiCase(OOO_STRING_SVTOOLS_HTML_sdfootnote) )
                 nPoolCollId = RES_POOLCOLL_FOOTNOTE;
 
             if( nPoolCollId )
@@ -1277,12 +1277,12 @@ SwTxtFmtColl *SwCSS1Parser::GetTxtFmtColl( sal_uInt16 
nTxtColl,
     if( RES_POOLCOLL_TEXT == nTxtColl && aClass.getLength() >= 9 &&
         ('s' == aClass[0] || 'S' == aClass[0] ) )
     {
-        if( 
aClass.equalsIgnoreAsciiCaseAscii(OOO_STRING_SVTOOLS_HTML_sdendnote) )
+        if( aClass.equalsIgnoreAsciiCase(OOO_STRING_SVTOOLS_HTML_sdendnote) )
         {
             nTxtColl = RES_POOLCOLL_ENDNOTE;
             aClass = aEmptyStr;
         }
-        else if( 
aClass.equalsIgnoreAsciiCaseAscii(OOO_STRING_SVTOOLS_HTML_sdfootnote) )
+        else if( 
aClass.equalsIgnoreAsciiCase(OOO_STRING_SVTOOLS_HTML_sdfootnote) )
         {
             nTxtColl = RES_POOLCOLL_FOOTNOTE;
             aClass = aEmptyStr;
diff --git a/sw/source/filter/html/htmlgrin.cxx 
b/sw/source/filter/html/htmlgrin.cxx
index d61ecae..bf5163c 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -1150,12 +1150,12 @@ ANCHOR_SETEVENT:
         ('s' == aStrippedClass[0] || 'S' == aStrippedClass[0]) &&
         ('d' == aStrippedClass[1] || 'D' == aStrippedClass[1]) )
     {
-        if( aStrippedClass.equalsIgnoreAsciiCaseAscii( 
OOO_STRING_SVTOOLS_HTML_sdendnote_anc ) )
+        if( aStrippedClass.equalsIgnoreAsciiCase( 
OOO_STRING_SVTOOLS_HTML_sdendnote_anc ) )
             bEnAnchor = sal_True;
-        else if( aStrippedClass.equalsIgnoreAsciiCaseAscii( 
OOO_STRING_SVTOOLS_HTML_sdfootnote_anc ) )
+        else if( aStrippedClass.equalsIgnoreAsciiCase( 
OOO_STRING_SVTOOLS_HTML_sdfootnote_anc ) )
             bFtnAnchor = sal_True;
-        else if( aStrippedClass.equalsIgnoreAsciiCaseAscii( 
OOO_STRING_SVTOOLS_HTML_sdendnote_sym ) ||
-                 aStrippedClass.equalsIgnoreAsciiCaseAscii( 
OOO_STRING_SVTOOLS_HTML_sdfootnote_sym ) )
+        else if( aStrippedClass.equalsIgnoreAsciiCase( 
OOO_STRING_SVTOOLS_HTML_sdendnote_sym ) ||
+                 aStrippedClass.equalsIgnoreAsciiCase( 
OOO_STRING_SVTOOLS_HTML_sdfootnote_sym ) )
             bFtnEnSymbol = sal_True;
         if( bEnAnchor || bFtnAnchor || bFtnEnSymbol )
         {

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits