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 | 461b4f32a40c16996b429c8aa5822eb0c191f397 (patch) | |
| tree | f909037523413e9e8d6e261977477654cc760baa /sc | |
| parent | c788c07dcf3a98f0656d1eb5f56c0058a0778f4e (diff) | |
More String removal etc.
Diffstat (limited to 'sc')
| -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 3c8d66106a3c..9b1a3ba78e1c 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 526bc0dc5619..dc1daf1c77f3 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 |