sd/source/filter/xml/sdxmlwrp.cxx | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 018c22d37878f1fc349085143ee4241165a4802a
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri May 31 10:51:44 2013 +0200
UniString::CompareToAscii(RTL_CONSTASCII_STRINGPARAM("x"))==COMPARE_EQUAL
...
...corresponds to OUString::startsWith("x"), not
UniString::CompareToAscii("x")==COMPARE_EQUAL. Regression introduced with
5b26722ace02f71c79573b3795b2bf7b9412090f "Remove
RTL_CONSTASCII_(U)STRINGPARAM
(sd)."
Change-Id: I116defec056ff1e2260a20ba5279180683eefd87
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx
b/sd/source/filter/xml/sdxmlwrp.cxx
index 554fff5..9763062 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -803,10 +803,9 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
const SfxFilter * pFilter = mrMedium.GetFilter();
if( pFilter )
{
- const String& rTypeName = pFilter->GetRealTypeName();
-
- if( (rTypeName.CompareToAscii( "impress_StarImpress" )
== 0) ||
- (rTypeName.CompareToAscii( "draw_StarDraw" ) == 0)
)
+ OUString typeName(pFilter->GetRealTypeName());
+ if( typeName.startsWith( "impress_StarImpress" ) ||
+ typeName.startsWith( "draw_StarDraw" ) )
{
bTransform = true;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
