From 084414f1db812898d5ccb476d637c47f3d6dd0c4 Mon Sep 17 00:00:00 2001
From: Mathias Bauer <mba@openoffice.org>
Date: Thu, 10 Dec 2009 23:58:52 +0100
Subject: SvxBrushItem does not use sfx code anymore

---
 cui/source/tabpages/backgrnd.cxx | 5 ++---
 cui/source/tabpages/tpline.cxx   | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'cui')

diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 004b79817b32..58393bfb674b 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -1883,7 +1883,7 @@ void SvxBackgroundTabPage::FillControls_Impl( const SvxBrushItem& rBgdAttr,
 
         if(bGraphTransparency)
         {
-            const GraphicObject* pObject = rBgdAttr.GetGraphicObject(SfxObjectShell::Current());
+            const GraphicObject* pObject = rBgdAttr.GetGraphicObject();
             if(pObject)
                 aGraphTransMF.SetValue(lcl_TransparencyToPercent(pObject->GetAttr().GetTransparency()));
             else
@@ -1903,8 +1903,7 @@ void SvxBackgroundTabPage::FillControls_Impl( const SvxBrushItem& rBgdAttr,
             // Grafik ist im Item vorhanden und muss nicht
             // geladen werden:
 
-            const Graphic* pGraphic =
-                rBgdAttr.GetGraphic( SfxObjectShell::Current() );
+            const Graphic* pGraphic = rBgdAttr.GetGraphic();
 
             if ( !pGraphic && aBtnPreview.IsChecked() )
                 bIsGraphicValid = LoadLinkedGraphic_Impl();
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 2b42b27fa02b..84410641305f 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -1555,7 +1555,6 @@ IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton )
 
         PopupMenu* pPopup = new PopupMenu;
         String aEmptyStr;
-        SfxObjectShell *pDocSh = SfxObjectShell::Current();
 
         nNumMenuGalleryItems=aGrfNames.Count();
         for(long i = 0; i < nNumMenuGalleryItems; i++)
@@ -1575,7 +1574,7 @@ IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton )
             pInfo->pBrushItem = pBrushItem;
             pInfo->nItemId = (UINT16)(MN_GALLERY_ENTRY + i);
             aGrfBrushItems.Insert(pInfo, i);
-            const Graphic* pGraphic = pBrushItem->GetGraphic(pDocSh);
+            const Graphic* pGraphic = pBrushItem->GetGraphic();
 
             if(pGraphic)
             {
-- 
cgit