Kaydet (Commit) 4bd9d494 authored tarafından Miklos Vajna's avatar Miklos Vajna

writerfilter: nobody generates PICF references anymore, only doctok did

Change-Id: I65576f09cbc39f98f3d27739e06ec9520d5032c5
üst 01a32b7d
...@@ -3034,11 +3034,7 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, size_t len) ...@@ -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) void DomainMapper::lcl_props(writerfilter::Reference<Properties>::Pointer_t ref)
{ {
std::string sType = ref->getType(); std::string sType = ref->getType();
if( sType == "PICF" ) if( sType == "FSPA" )
{
m_pImpl->ImportGraphic(ref, IMPORT_AS_GRAPHIC);
}
else if( sType == "FSPA" )
{ {
m_pImpl->ImportGraphic(ref, IMPORT_AS_SHAPE); m_pImpl->ImportGraphic(ref, IMPORT_AS_SHAPE);
} }
......
...@@ -1162,7 +1162,7 @@ uno::Reference< text::XTextContent > GraphicImport::createGraphicObject( const b ...@@ -1162,7 +1162,7 @@ uno::Reference< text::XTextContent > GraphicImport::createGraphicObject( const b
table::BorderLine2 aBorderLine; table::BorderLine2 aBorderLine;
for( sal_Int32 nBorder = 0; nBorder < 4; ++nBorder ) 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)]; GraphicBorderLine& rBorderLine = m_pImpl->aBorders[m_pImpl->eGraphicImportType == IMPORT_AS_SHAPE ? BORDER_TOP : static_cast<BorderPosition>(nBorder)];
if (rBorderLine.isEmpty() && xShapeProps.is()) if (rBorderLine.isEmpty() && xShapeProps.is())
......
...@@ -57,7 +57,6 @@ class DomainMapper; ...@@ -57,7 +57,6 @@ class DomainMapper;
enum GraphicImportType enum GraphicImportType
{ {
IMPORT_AS_GRAPHIC,
IMPORT_AS_SHAPE, IMPORT_AS_SHAPE,
IMPORT_AS_DETECTED_INLINE, IMPORT_AS_DETECTED_INLINE,
IMPORT_AS_DETECTED_ANCHOR IMPORT_AS_DETECTED_ANCHOR
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment