Kaydet (Commit) 925ca4c2 authored tarafından Katarina Machalkova's avatar Katarina Machalkova Kaydeden (comit) Kohei Yoshida

fdo#38154: convert split win Y coord to 16bit int before xls export

Excel then won't complain about invalid xls file
(this is some fallout from increasing Calc row limit above 65k lines)
Signed-off-by: 's avatarKohei Yoshida <kyoshida@novell.com>
üst 3e8ae241
...@@ -207,7 +207,7 @@ void XclExpPane::SaveXml( XclExpXmlStream& rStrm ) ...@@ -207,7 +207,7 @@ void XclExpPane::SaveXml( XclExpXmlStream& rStrm )
void XclExpPane::WriteBody( XclExpStream& rStrm ) void XclExpPane::WriteBody( XclExpStream& rStrm )
{ {
rStrm << mnSplitX rStrm << mnSplitX
<< mnSplitY << static_cast<sal_uInt16>( mnSplitY )
<< maSecondXclPos << maSecondXclPos
<< mnActivePane; << mnActivePane;
if( rStrm.GetRoot().GetBiff() >= EXC_BIFF5 ) if( rStrm.GetRoot().GetBiff() >= EXC_BIFF5 )
...@@ -369,7 +369,7 @@ XclExpTabViewSettings::XclExpTabViewSettings( const XclExpRoot& rRoot, SCTAB nSc ...@@ -369,7 +369,7 @@ XclExpTabViewSettings::XclExpTabViewSettings( const XclExpRoot& rRoot, SCTAB nSc
{ {
// split window: position is in twips // split window: position is in twips
maData.mnSplitX = ulimit_cast< sal_uInt16 >( rTabSett.maSplitPos.X() ); maData.mnSplitX = ulimit_cast< sal_uInt16 >( rTabSett.maSplitPos.X() );
maData.mnSplitY = ulimit_cast< sal_uInt16 >( rTabSett.maSplitPos.Y() ); maData.mnSplitY = ulimit_cast< sal_uInt32 >( rTabSett.maSplitPos.Y() );
} }
// selection // selection
......
...@@ -198,9 +198,10 @@ void XclImpTabViewSettings::ReadScl( XclImpStream& rStrm ) ...@@ -198,9 +198,10 @@ void XclImpTabViewSettings::ReadScl( XclImpStream& rStrm )
void XclImpTabViewSettings::ReadPane( XclImpStream& rStrm ) void XclImpTabViewSettings::ReadPane( XclImpStream& rStrm )
{ {
rStrm >> maData.mnSplitX rStrm >> maData.mnSplitX;
>> maData.mnSplitY maData.mnSplitY = rStrm.ReaduInt16();
>> maData.maSecondXclPos
rStrm >> maData.maSecondXclPos
>> maData.mnActivePane; >> maData.mnActivePane;
} }
......
...@@ -137,7 +137,7 @@ struct XclTabViewData ...@@ -137,7 +137,7 @@ struct XclTabViewData
XclAddress maFirstXclPos; /// First visible cell. XclAddress maFirstXclPos; /// First visible cell.
XclAddress maSecondXclPos; /// First visible cell in additional panes. XclAddress maSecondXclPos; /// First visible cell in additional panes.
sal_uInt16 mnSplitX; /// Split X position, or number of frozen columns. sal_uInt16 mnSplitX; /// Split X position, or number of frozen columns.
sal_uInt16 mnSplitY; /// Split Y position, or number of frozen rows. sal_uInt32 mnSplitY; /// Split Y position, or number of frozen rows.
sal_uInt16 mnNormalZoom; /// Zoom factor for normal view. sal_uInt16 mnNormalZoom; /// Zoom factor for normal view.
sal_uInt16 mnPageZoom; /// Zoom factor for pagebreak preview. sal_uInt16 mnPageZoom; /// Zoom factor for pagebreak preview.
sal_uInt16 mnCurrentZoom; /// Zoom factor for current view. sal_uInt16 mnCurrentZoom; /// Zoom factor for current view.
......
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