Skip to content

C
core
Kaydet (Commit) c3366bc7 authored tarafından Oliver-Rainer Wittmann's avatar Oliver-Rainer Wittmann Kaydeden (comit) Caolán McNamara
Dosyalara gözat
Seçenekler

Resolves: fdo#65139# #i122416# SwDoc::GetPageDescFromPool correction 

and refactoring

(cherry picked from commit 384aa00b)

Conflicts:
	sw/source/core/doc/poolfmt.cxx

Change-Id: Ia5567173153e218b754ad73c50b56eff87b49822
üst 301cfb7a
Show whitespace changes
Inline Side-by-side
Showing with 45 additions and 36 deletions
sw/source/core/doc/poolfmt.cxx
Dosyayı görüntüle @ c3366bc7
......@@ -1405,7 +1405,7 @@ bool SwDoc::IsPoolFmtUsed( sal_uInt16 nId ) const
static void lcl_GetStdPgSize( SwDoc* pDoc, SfxItemSet& rSet )
static void lcl_PutStdPageSizeIntoItemSet( SwDoc* pDoc, SfxItemSet& rSet )
{
SwPageDesc* pStdPgDsc = pDoc->GetPageDescFromPool( RES_POOLPAGE_STANDARD );
SwFmtFrmSize aFrmSz( pStdPgDsc->GetMaster().GetFrmSize() );
......@@ -1423,52 +1423,58 @@ SwPageDesc* SwDoc::GetPageDescFromPool( sal_uInt16 nId, bool bRegardLanguage )
OSL_ENSURE( RES_POOLPAGE_BEGIN <= nId && nId < RES_POOLPAGE_END,
"Wrong AutoFormat Id" );
SwPageDesc *pNewPgDsc;
sal_uInt16 n;
for( n = 0; n < maPageDescs.size(); ++n )
if( nId == ( pNewPgDsc = maPageDescs[ n ] )->GetPoolFmtId() )
for( sal_uInt16 n = 0; n < maPageDescs.size(); ++n )
{
return pNewPgDsc;
if ( nId == maPageDescs[ n ]->GetPoolFmtId() )
{
return maPageDescs[ n ];
}
}
// error: unknown Pool style
if( RES_POOLPAGE_BEGIN > nId || nId >= RES_POOLPAGE_END )
{
OSL_ENSURE( !this, "invalid Id" );
// unknown page pool ID
OSL_ENSURE( !this, "<SwDoc::GetPageDescFromPool(..)> - unknown page pool ID" );
nId = RES_POOLPAGE_BEGIN;
}
ResId aResId( sal_uInt32(RC_POOLPAGEDESC_BEGIN + nId - RES_POOLPAGE_BEGIN), *pSwResMgr );
String aNm( aResId );
SwPageDesc* pNewPgDsc = 0;
{
bool bIsModified = IsModified();
const ResId aResId( sal_uInt32(RC_POOLPAGEDESC_BEGIN + nId - RES_POOLPAGE_BEGIN), *pSwResMgr );
const String aNm( aResId );
const bool bIsModified = IsModified();
sal_uInt16 nPageDescIdx = 0;
{
::sw::UndoGuard const undoGuard(GetIDocumentUndoRedo());
n = MakePageDesc( aNm, 0, bRegardLanguage );
nPageDescIdx = MakePageDesc( aNm, 0, bRegardLanguage );
}
pNewPgDsc = maPageDescs[ n ];
pNewPgDsc = maPageDescs[ nPageDescIdx ];
pNewPgDsc->SetPoolFmtId( nId );
if( !bIsModified )
if ( !bIsModified )
{
ResetModified();
}
}
SvxLRSpaceItem aLR( RES_LR_SPACE );
{
aLR.SetLeft( GetMetricVal( CM_1 ) * 2 );
aLR.SetRight( aLR.GetLeft() );
}
SvxULSpaceItem aUL( RES_UL_SPACE );
{
aUL.SetUpper( (sal_uInt16)aLR.GetLeft() );
aUL.SetLower( (sal_uInt16)aLR.GetLeft() );
}
SwAttrSet aSet( GetAttrPool(), aPgFrmFmtSetRange );
bool bSetLeft = true;
switch( nId )
{
case RES_POOLPAGE_STANDARD: // Standard page
case RES_POOLPAGE_STANDARD: // "Default"
{
aSet.Put( aLR );
aSet.Put( aUL );
......@@ -1477,10 +1483,10 @@ SwPageDesc* SwDoc::GetPageDescFromPool( sal_uInt16 nId, bool bRegardLanguage )
}
break;
case RES_POOLPAGE_FIRST: // First page
case RES_POOLPAGE_REGISTER: // ToX
case RES_POOLPAGE_FIRST: // "First Page"
case RES_POOLPAGE_REGISTER: // "Index"
{
lcl_GetStdPgSize( this, aSet );
lcl_PutStdPageSizeIntoItemSet( this, aSet );
aSet.Put( aLR );
aSet.Put( aUL );
if( pNewPgDsc )
......@@ -1492,9 +1498,9 @@ SwPageDesc* SwDoc::GetPageDescFromPool( sal_uInt16 nId, bool bRegardLanguage )
}
break;
case RES_POOLPAGE_LEFT: // Left page
case RES_POOLPAGE_LEFT: // "Left Page"
{
lcl_GetStdPgSize( this, aSet );
lcl_PutStdPageSizeIntoItemSet( this, aSet );
aSet.Put( aLR );
aSet.Put( aUL );
bSetLeft = false;
......@@ -1507,9 +1513,9 @@ SwPageDesc* SwDoc::GetPageDescFromPool( sal_uInt16 nId, bool bRegardLanguage )
}
}
break;
case RES_POOLPAGE_RIGHT: // Right page
case RES_POOLPAGE_RIGHT: // "Right Page"
{
lcl_GetStdPgSize( this, aSet );
lcl_PutStdPageSizeIntoItemSet( this, aSet );
aSet.Put( aLR );
aSet.Put( aUL );
bSetLeft = false;
......@@ -1521,13 +1527,13 @@ SwPageDesc* SwDoc::GetPageDescFromPool( sal_uInt16 nId, bool bRegardLanguage )
}
break;
case RES_POOLPAGE_JAKET: // envelope
case RES_POOLPAGE_JAKET: // "Envelope"
{
aLR.SetLeft( 0 ); aLR.SetRight( 0 );
aUL.SetUpper( 0 ); aUL.SetLower( 0 );
Size aPSize( SvxPaperInfo::GetPaperSize( PAPER_ENV_C65 ) );
LandscapeSwap( aPSize );
aSet.Put( SwFmtFrmSize( ATT_FIX_SIZE, aPSize.Width(), aPSize.Height() ));
aLR.SetLeft( 0 ); aLR.SetRight( 0 );
aUL.SetUpper( 0 ); aUL.SetLower( 0 );
aSet.Put( aLR );
aSet.Put( aUL );
......@@ -1539,9 +1545,9 @@ SwPageDesc* SwDoc::GetPageDescFromPool( sal_uInt16 nId, bool bRegardLanguage )
}
break;
case RES_POOLPAGE_HTML: // HTML
case RES_POOLPAGE_HTML: // "HTML"
{
lcl_GetStdPgSize( this, aSet );
lcl_PutStdPageSizeIntoItemSet( this, aSet );
aLR.SetRight( GetMetricVal( CM_1 ));
aUL.SetUpper( (sal_uInt16)aLR.GetRight() );
aUL.SetLower( (sal_uInt16)aLR.GetRight() );
......@@ -1552,10 +1558,11 @@ SwPageDesc* SwDoc::GetPageDescFromPool( sal_uInt16 nId, bool bRegardLanguage )
pNewPgDsc->SetUseOn( nsUseOnPage::PD_ALL );
}
break;
case RES_POOLPAGE_FOOTNOTE:
case RES_POOLPAGE_ENDNOTE:
case RES_POOLPAGE_FOOTNOTE: // "Footnote"
case RES_POOLPAGE_ENDNOTE: // "Endnote"
{
lcl_GetStdPgSize( this, aSet );
lcl_PutStdPageSizeIntoItemSet( this, aSet );
aSet.Put( aLR );
aSet.Put( aUL );
if( pNewPgDsc )
......@@ -1567,13 +1574,17 @@ SwPageDesc* SwDoc::GetPageDescFromPool( sal_uInt16 nId, bool bRegardLanguage )
pNewPgDsc->SetFtnInfo( aInf );
}
break;
case RES_POOLPAGE_LANDSCAPE:
case RES_POOLPAGE_LANDSCAPE: // "Landscape"
{
SwPageDesc* pStdPgDsc = this->GetPageDescFromPool( RES_POOLPAGE_STANDARD );
SwFmtFrmSize aFrmSz( pStdPgDsc->GetMaster().GetFrmSize() );
SwTwips nTmp = aFrmSz.GetHeight();
if ( !pStdPgDsc->GetLandscape() )
{
const SwTwips nTmp = aFrmSz.GetHeight();
aFrmSz.SetHeight( aFrmSz.GetWidth() );
aFrmSz.SetWidth( nTmp );
}
aSet.Put( aFrmSz );
aSet.Put( aLR );
aSet.Put( aUL );
......@@ -1588,14 +1599,12 @@ SwPageDesc* SwDoc::GetPageDescFromPool( sal_uInt16 nId, bool bRegardLanguage )
}
if( aSet.Count() )
{
{
if( bSetLeft )
pNewPgDsc->GetLeft().SetFmtAttr( aSet );
pNewPgDsc->GetMaster().SetFmtAttr( aSet );
pNewPgDsc->GetFirst().SetFmtAttr( aSet );
}
}
return pNewPgDsc;
}
......
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