sw/source/filter/html/svxcss1.cxx | 2 +-
sw/source/filter/html/swhtml.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 6e84be040be7d3ec214c2b19462cafcc3f4b277e
Author: Ivan Timofeev <timofeev....@gmail.com>
Date: Sat Aug 17 13:20:32 2013 +0400
fix copypasta
Change-Id: I92f2203988c5a4843ce512029ec60750fe4d25ff
diff --git a/sw/source/filter/html/svxcss1.cxx
b/sw/source/filter/html/svxcss1.cxx
index 14d881d..e04ccbd 100644
--- a/sw/source/filter/html/svxcss1.cxx
+++ b/sw/source/filter/html/svxcss1.cxx
@@ -185,7 +185,7 @@ static CSS1PropertyEnum const aBorderStyleTable[] =
{ "groove", CSS1_BS_GROOVE },
{ "ridge", CSS1_BS_RIDGE },
{ "inset", CSS1_BS_INSET },
- { "inset", CSS1_BS_OUTSET },
+ { "outset", CSS1_BS_OUTSET },
{ 0, 0 }
};
commit befc3e457df9daa7955752bb30cbad632da913de
Author: Ivan Timofeev <timofeev....@gmail.com>
Date: Sat Aug 17 12:56:49 2013 +0400
fix string conversion
before commit 7a504c8752bf7c5accbb9bcc33a98f79b31b8bf2 there was:
aUnknownToken.CompareTo(sSaveToken) != COMPARE_EQUAL
Change-Id: I4c6411777f342e160c78b0ec591456e284e4e385
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 87fc2c2..1f88229 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -1225,7 +1225,7 @@ void SwHTMLParser::NextToken( int nToken )
switch( nToken )
{
case HTML_UNKNOWNCONTROL_OFF:
- if( aUnknownToken.startsWith(sSaveToken) )
+ if( aUnknownToken != sSaveToken )
return;
case HTML_FRAMESET_ON:
case HTML_HEAD_OFF:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
