Kaydet (Commit) 56f45018 authored tarafından Noel Power's avatar Noel Power

Revert "tweak imported shape position for xls( binary ) format fdo#49430"

This reverts commit 5813422d.
üst 3ed479a1
...@@ -52,7 +52,6 @@ ...@@ -52,7 +52,6 @@
#include "root.hxx" #include "root.hxx"
#include "imp_op.hxx" #include "imp_op.hxx"
#include "excimp8.hxx" #include "excimp8.hxx"
#include <sfx2/objsh.hxx>
FltError ImportExcel::Read( void ) FltError ImportExcel::Read( void )
{ {
...@@ -1310,14 +1309,6 @@ FltError ImportExcel8::Read( void ) ...@@ -1310,14 +1309,6 @@ FltError ImportExcel8::Read( void )
PostDocLoad(); PostDocLoad();
pD->CalcAfterLoad(); pD->CalcAfterLoad();
SfxObjectShell* pDocShell = GetDocShell();
if ( pDocShell )
{
std::vector< OrientationInfo > savedOrientations;
ScGlobal::CaptureShapeOrientationInfo( savedOrientations, pDocShell->GetModel() );
ScGlobal::ApplyShapeOrientationInfo( savedOrientations, pDocShell->GetModel(), *pD );
}
// import change tracking data // import change tracking data
XclImpChangeTrack aImpChTr( GetRoot(), maStrm ); XclImpChangeTrack aImpChTr( GetRoot(), maStrm );
......
...@@ -497,28 +497,6 @@ void XclImpDrawObjBase::PreProcessSdrObject( XclImpDffConverter& rDffConv, SdrOb ...@@ -497,28 +497,6 @@ void XclImpDrawObjBase::PreProcessSdrObject( XclImpDffConverter& rDffConv, SdrOb
} }
} }
if ( GetAnchor() )
{
ScDrawObjData* pAnchor = ScDrawLayer::GetObjData( &rSdrObj, sal_True);
if ( pAnchor )
{
// Temporarily get start position of shape.
// At the end of the import we do some post processing
// to adjust the shape position to take into account
// errors between the drawing layer and the view/grid
pAnchor->maStart.SetRow( GetAnchor()->maFirst.mnRow );
pAnchor->maStart.SetCol( GetAnchor()->maFirst.mnCol );
pAnchor->maStart.SetTab( GetTab() );
XclObjAnchor tmpAnchor( *GetAnchor() );
// Calculate the start offset ( from the cell postion )
Rectangle withOffset = tmpAnchor.GetRect( GetRoot(), GetTab(), MAP_100TH_MM );
tmpAnchor.mnLX = tmpAnchor.mnTY = tmpAnchor.mnRX = tmpAnchor.mnBY = 0;
Rectangle noOffset = tmpAnchor.GetRect( GetRoot(), GetTab(), MAP_100TH_MM );
pAnchor->maStartOffset.X() = withOffset.Left() - noOffset.Left();
pAnchor->maStartOffset.Y() = withOffset.Top() - noOffset.Top();
}
}
// call virtual function for object type specific processing // call virtual function for object type specific processing
DoPreProcessSdrObj( rDffConv, rSdrObj ); DoPreProcessSdrObj( rDffConv, rSdrObj );
} }
......
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