diff options
| author | Kohei Yoshida <kohei.yoshida@suse.com> | 2011-08-04 00:25:48 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@suse.com> | 2011-08-04 00:25:48 -0400 |
| commit | 2fe8d81ba4326c7f71e2099b70db95fc9a4f471f (patch) | |
| tree | 14f47e1587e158174bbed26aa8cae30100b11c9a | |
| parent | 7cf28a714e23df14654548c1d82d62515ee1a116 (diff) | |
More String removal etc.
| -rw-r--r-- | sc/source/filter/html/htmlpars.cxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/inc/eeparser.hxx | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index 3c8d66106..9b1a3ba78 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -1401,7 +1401,7 @@ void ScHTMLLayoutParser::Image( ImportInfo* pInfo ) break; } } - if ( !pImage->aURL.Len() ) + if (pImage->aURL.isEmpty()) { OSL_FAIL( "Image: Grafik ohne URL ?!?" ); return ; diff --git a/sc/source/filter/inc/eeparser.hxx b/sc/source/filter/inc/eeparser.hxx index a5a80e1ab..c90813b6d 100644 --- a/sc/source/filter/inc/eeparser.hxx +++ b/sc/source/filter/inc/eeparser.hxx @@ -45,19 +45,19 @@ const sal_Char nHoriVerti = nHorizontal | nVertical; struct ScHTMLImage { - String aURL; + rtl::OUString aURL; Size aSize; Point aSpace; - String aFilterName; + rtl::OUString aFilterName; Graphic* pGraphic; // wird von WriteToDocument uebernommen sal_Char nDir; // 1==hori, 2==verti, 3==beides - ScHTMLImage() : - aSize( 0, 0 ), aSpace( 0, 0 ), pGraphic( NULL ), - nDir( nHorizontal ) - {} - ~ScHTMLImage() - { if ( pGraphic ) delete pGraphic; } + ScHTMLImage() : + aSize( 0, 0 ), aSpace( 0, 0 ), pGraphic( NULL ), + nDir( nHorizontal ) + {} + + ~ScHTMLImage() { delete pGraphic; } }; struct ScEEParseEntry |