From 4bd9d49498e958d49697b1482ca8f29b8e626796 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Thu, 23 Oct 2014 18:59:11 +0200
Subject: writerfilter: nobody generates PICF references anymore, only doctok
 did

Change-Id: I65576f09cbc39f98f3d27739e06ec9520d5032c5
---
 writerfilter/source/dmapper/DomainMapper.cxx  | 6 +-----
 writerfilter/source/dmapper/GraphicImport.cxx | 2 +-
 writerfilter/source/dmapper/GraphicImport.hxx | 1 -
 3 files changed, 2 insertions(+), 7 deletions(-)

(limited to 'writerfilter')

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 12763b9bd91f..0309c0babcd8 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3034,11 +3034,7 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, size_t len)
 void DomainMapper::lcl_props(writerfilter::Reference<Properties>::Pointer_t ref)
 {
     std::string sType = ref->getType();
-    if( sType == "PICF" )
-    {
-        m_pImpl->ImportGraphic(ref, IMPORT_AS_GRAPHIC);
-    }
-    else if( sType == "FSPA" )
+    if( sType == "FSPA" )
     {
         m_pImpl->ImportGraphic(ref, IMPORT_AS_SHAPE);
     }
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index 0b58ddcc16ab..f916d4c416b2 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -1162,7 +1162,7 @@ uno::Reference< text::XTextContent > GraphicImport::createGraphicObject( const b
             table::BorderLine2 aBorderLine;
             for( sal_Int32 nBorder = 0; nBorder < 4; ++nBorder )
             {
-                if( m_pImpl->eGraphicImportType == IMPORT_AS_GRAPHIC || !nBorder )
+                if( !nBorder )
                 {
                     GraphicBorderLine& rBorderLine = m_pImpl->aBorders[m_pImpl->eGraphicImportType == IMPORT_AS_SHAPE ? BORDER_TOP : static_cast<BorderPosition>(nBorder)];
                     if (rBorderLine.isEmpty() && xShapeProps.is())
diff --git a/writerfilter/source/dmapper/GraphicImport.hxx b/writerfilter/source/dmapper/GraphicImport.hxx
index 5b8e10177c33..06c542364fd4 100644
--- a/writerfilter/source/dmapper/GraphicImport.hxx
+++ b/writerfilter/source/dmapper/GraphicImport.hxx
@@ -57,7 +57,6 @@ class DomainMapper;
 
 enum GraphicImportType
 {
-    IMPORT_AS_GRAPHIC,
     IMPORT_AS_SHAPE,
     IMPORT_AS_DETECTED_INLINE,
     IMPORT_AS_DETECTED_ANCHOR
-- 
cgit