diff options
author | Noel Power <noel.power@novell.com> | 2012-05-24 17:11:21 +0100 |
---|---|---|
committer | Noel Power <noel.power@novell.com> | 2012-05-25 11:34:06 +0100 |
commit | 56f450187343688f20f88e68a849c8dcd660b629 (patch) | |
tree | 331c9b9d32382b921d5c7a0dec451f9c7a43706a /sc | |
parent | 3ed479a1d83916cb5dc3be0eee0aa6fbe65a844a (diff) |
Revert "tweak imported shape position for xls( binary ) format fdo#49430"
This reverts commit 5813422d3eb9657c5a818057be0ebf831ca6a794.
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/filter/excel/read.cxx | 9 | ||||
-rw-r--r-- | sc/source/filter/excel/xiescher.cxx | 22 |
2 files changed, 0 insertions, 31 deletions
diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx index 0b45e5fa67fd..08b56bc72d66 100644 --- a/sc/source/filter/excel/read.cxx +++ b/sc/source/filter/excel/read.cxx @@ -52,7 +52,6 @@ #include "root.hxx" #include "imp_op.hxx" #include "excimp8.hxx" -#include <sfx2/objsh.hxx> FltError ImportExcel::Read( void ) { @@ -1310,14 +1309,6 @@ FltError ImportExcel8::Read( void ) PostDocLoad(); 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 XclImpChangeTrack aImpChTr( GetRoot(), maStrm ); diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index 932f9563dcbd..74ed03b8d6e9 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -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 DoPreProcessSdrObj( rDffConv, rSdrObj ); } |