#i107450#: move method CreateGraphicObjectFromURL to class GraphicObject

4 files changed, 3 insertions, 45 deletions

diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx
index c30921595bdd..fee6a7295656 100644
--- a/svx/source/unodraw/XPropertyTable.cxx
+++ b/svx/source/unodraw/XPropertyTable.cxx
@@ -718,7 +718,7 @@ XPropertyEntry* SvxUnoXBitmapTable::getEntry( const OUString& rName, const uno::
     if(!(rAny >>= aURL))
         return NULL;
 
-    GraphicObject aGrafObj( CreateGraphicObjectFromURL( aURL ) );
+    GraphicObject aGrafObj( GraphicObject::CreateGraphicObjectFromURL( aURL ) );
     XOBitmap aBMP( aGrafObj );
 
     const String aName( rName );
diff --git a/svx/source/unodraw/unobtabl.cxx b/svx/source/unodraw/unobtabl.cxx
index 671de49dc4ba..7aa359ad6e19 100644
--- a/svx/source/unodraw/unobtabl.cxx
+++ b/svx/source/unodraw/unobtabl.cxx
@@ -34,11 +34,6 @@
 #include <vcl/cvtgrf.hxx>
 #include <svl/itemset.hxx>
 #include <svx/xit.hxx>
-#ifndef SVX_LIGHT
-#ifndef _SFXDOCFILE_HXX
-#include <sfx2/docfile.hxx>
-#endif
-#endif
 #include "UnoNameItemTable.hxx"
 
 #include <svx/xbtmpit.hxx>
@@ -127,41 +122,4 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoBitmapTable_createInstance( Sdr
 {
     return *new SvxUnoBitmapTable(pModel);
 }
-#include <tools/stream.hxx>
-#include <unotools/localfilehelper.hxx>
 
-/** returns a GraphicObject for this URL */
-GraphicObject CreateGraphicObjectFromURL( const ::rtl::OUString &rURL ) throw()
-{
-    const String aURL( rURL ), aPrefix( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_GRAPHOBJ_URLPREFIX) );
-
-    if( aURL.Search( aPrefix ) == 0 )
-    {
-        // graphic manager url
-        ByteString aUniqueID( String(rURL.copy( sizeof( UNO_NAME_GRAPHOBJ_URLPREFIX ) - 1 )), RTL_TEXTENCODING_UTF8 );
-        return GraphicObject( aUniqueID );
-    }
-    else
-    {
-        Graphic     aGraphic;
-
-#ifndef SVX_LIGHT
-        if ( aURL.Len() )
-        {
-            SfxMedium   aMedium( aURL, STREAM_READ, TRUE );
-            SvStream*   pStream = aMedium.GetInStream();
-
-            if( pStream )
-                GraphicConverter::Import( *pStream, aGraphic );
-        }
-#else
-        String aSystemPath( rURL );
-        utl::LocalFileHelper::ConvertURLToSystemPath( aSystemPath, aSystemPath );
-        SvFileStream aFile( aSystemPath, STREAM_READ );
-        GraphicConverter::Import( aFile, aGraphic );
-#endif
-
-
-        return GraphicObject( aGraphic );
-    }
-}
diff --git a/svx/source/unodraw/unonrule.cxx b/svx/source/unodraw/unonrule.cxx
index af4a327edb7d..184d3b25d524 100644
--- a/svx/source/unodraw/unonrule.cxx
+++ b/svx/source/unodraw/unonrule.cxx
@@ -458,7 +458,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex( const Sequence< beans::Prope
             OUString aURL;
             if( aVal >>= aURL )
             {
-                GraphicObject aGrafObj( CreateGraphicObjectFromURL( aURL ) );
+                GraphicObject aGrafObj( GraphicObject::CreateGraphicObjectFromURL( aURL ) );
                 SvxBrushItem aBrushItem( aGrafObj, GPOS_AREA, SID_ATTR_BRUSH );
                 aFmt.SetGraphicBrush( &aBrushItem );
                 continue;
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index baad4bbe3813..1ed781f8b097 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -212,7 +212,7 @@ bool SvxOle2Shape::setPropertyValueImpl( const ::rtl::OUString& rName, const Sfx
         OUString aURL;
         if( rValue >>= aURL )
         {
-            GraphicObject aGrafObj( CreateGraphicObjectFromURL( aURL ) );
+            GraphicObject aGrafObj( GraphicObject::CreateGraphicObjectFromURL( aURL ) );
             static_cast<SdrOle2Obj*>(mpObj.get())->SetGraphic( &aGrafObj.GetGraphic() );
             return true;
         }