summaryrefslogtreecommitdiff
path: root/sc/source/ui/view
diff options
context:
space:
mode:
authorNoel Power <noel.power@novell.com>2012-05-24 16:49:55 +0100
committerNoel Power <noel.power@novell.com>2012-05-25 11:34:05 +0100
commit3ed479a1d83916cb5dc3be0eee0aa6fbe65a844a (patch)
tree6c71f2ed6746fc6820baf87c9f7d68d92798ccd1 /sc/source/ui/view
parent0a8de8d937ea1e9cb26ea7c89951f559961b49de (diff)
Revert "fix bad import positions of shapes & controls fdo#49430"
This reverts commit 9dc4fa1b22a533ba0a6ce0353112c55eef8a14ef.
Diffstat (limited to 'sc/source/ui/view')
-rw-r--r--sc/source/ui/view/viewdata.cxx7
1 files changed, 3 insertions, 4 deletions
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 71877e83f360..b09c188697ce 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -2486,8 +2486,7 @@ void ScViewData::ReadExtOptions( const ScExtDocOptions& rDocOpt )
/* Width of the tabbar, relative to frame window width. We do not have the
correct width of the frame window here -> store in ScTabView, which sets
the size in the next resize. */
- if ( pView )
- pView->SetPendingRelTabBarWidth( rDocSett.mfTabBarWidth );
+ pView->SetPendingRelTabBarWidth( rDocSett.mfTabBarWidth );
// sheet settings
for( SCTAB nTab = 0; nTab < static_cast<SCTAB>(maTabData.size()); ++nTab )
@@ -2790,12 +2789,12 @@ void ScViewData::ReadUserDataSequence(const uno::Sequence <beans::PropertyValue>
nTabNo = nTab;
}
}
- else if (pView && sName.compareToAscii(SC_HORIZONTALSCROLLBARWIDTH) == 0)
+ else if (sName.compareToAscii(SC_HORIZONTALSCROLLBARWIDTH) == 0)
{
if (rSettings[i].Value >>= nTemp32)
pView->SetTabBarWidth(nTemp32);
}
- else if (pView && sName.compareToAscii(SC_RELHORIZONTALTABBARWIDTH) == 0 )
+ else if (sName.compareToAscii(SC_RELHORIZONTALTABBARWIDTH) == 0)
{
double fWidth = 0.0;
if (rSettings[i].Value >>= fWidth)