diff options
author | Release Engineers <releng@openoffice.org> | 2009-08-05 17:01:07 +0000 |
---|---|---|
committer | Release Engineers <releng@openoffice.org> | 2009-08-05 17:01:07 +0000 |
commit | 0462ef2f79dd75d5fce4dd3192758c313d0473de (patch) | |
tree | 548150a4815369c1d5e28f0982e992aabba26dc4 /sd/source/ui/dlg/prltempl.cxx | |
parent | 31c8faa0b93ffc3e975014c721f71b6d4e3d7141 (diff) |
CWS-TOOLING: integrate CWS impress172
2009-07-30 15:29:39 +0200 cl r274492 : #i102921# remove reference to inssrc.obj which was moved to svx
2009-07-29 11:40:35 +0200 wg r274445 : i103869
2009-07-22 14:39:13 +0200 sj r274241 : #i102713# fixed cloud shape
2009-07-07 15:28:04 +0200 sj r273800 : fixed build problem
2009-07-07 13:27:13 +0200 cl r273792 : #i102921# moved insert col/rows dialog to svx
2009-07-07 10:36:05 +0200 cl r273782 : fixed compiler warnings
2009-07-02 10:40:21 +0200 sj r273626 : fixed build problem
2009-07-02 10:27:56 +0200 cl r273624 : fixed merge problem
2009-07-02 10:27:19 +0200 cl r273623 : fixed compiler warning
2009-07-01 10:04:58 +0200 cl r273550 : CWS-TOOLING: rebase CWS impress172 to trunk@273468 (milestone: DEV300:m51)
2009-06-30 16:22:02 +0200 cl r273518 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 16:20:46 +0200 cl r273517 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 16:20:28 +0200 cl r273516 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 16:19:49 +0200 cl r273515 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 16:19:28 +0200 cl r273514 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 16:17:38 +0200 cl r273513 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 15:45:44 +0200 cl r273511 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 15:37:16 +0200 cl r273510 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 15:33:47 +0200 cl r273509 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 15:32:10 +0200 cl r273508 : #i102921# added insert table row/col dialog for impress tables
2009-06-30 15:30:05 +0200 cl r273507 : #i102921# added insert table row/col dialog for impress tables
2009-06-29 12:32:42 +0200 sj r273465 : #158632# fixed textrange hyperlinks to specific pages, added slide names
2009-06-24 15:17:59 +0200 sj r273349 : #158636# fixed text range hyperlink to first/last slide
2009-06-22 13:18:30 +0200 sj r273224 : #158651# fixed header footer import
2009-06-19 15:18:24 +0200 sj r273160 : #158614# default text of presentation objects now cleared
2009-06-16 15:54:19 +0200 sj r273023 : #i101545# fixed crash - bracketing of graphic links has been done twice leading to a broken graphic state stack
2009-06-15 16:26:26 +0200 sj r272998 : #158635# importing bookmark interactions: firstslide, lastslide, nextslide, previousslide
2009-06-15 16:25:26 +0200 sj r272997 : #158635# added bookmark interactions: firstslide, lastslide, nextslide, previousslide
2009-06-12 13:17:32 +0200 sj r272915 : #i102713# fixed cloud shape
2009-06-10 18:36:58 +0200 sj r272833 : #158674# fixed curvedleftarrow, curvedrightarrow, curveddownarrow, curveduparrow
2009-06-08 19:52:28 +0200 sj r272746 : #158674# fixed curvedleftarrow, curvedrightarrow, curveddownarrow, curveduparrow
2009-06-04 15:28:32 +0200 cl r272640 : #i102358# applied patch to remove warnings
2009-06-04 14:39:45 +0200 cl r272630 : #i99423# applied path to change impress wizard create button to open when opening exisitng documents
2009-06-03 18:21:26 +0200 sj r272601 : #158635# now using the correct paragraph bottom spacing. using font independent linespacing for impress text objects
2009-06-03 15:47:27 +0200 cl r272583 : #i101817# added color collection based on scribus
2009-06-03 14:43:59 +0200 cl r272580 : #i102163# use weak ref to SdrObject instead of listening to the model
2009-06-03 12:39:29 +0200 cl r272556 : #i93308# correct namespace for com.sun.star.text.textfields
2009-06-03 12:27:00 +0200 cl r272555 : #i93308# correct namespace for com.sun.star.text.textfields
2009-06-03 11:33:44 +0200 cl r272553 : #i23221# allow all settings (that make sense) for presentation styles
2009-06-03 11:30:59 +0200 cl r272552 : #i23221# allow all settings (that make sense) for presentation styles
2009-06-03 11:30:22 +0200 cl r272551 : #i23221# allow all settings (that make sense) for presentation styles
2009-06-02 18:41:07 +0200 sj r272527 : #i28358# applied patch (better conversion of dotted lines)
2009-06-02 11:52:13 +0200 cl r272491 : #i98668# applied patch to fix possible endless loop if exception occours
2009-05-28 17:02:55 +0200 sj r272416 : #i102336# retaining graphic file names unchanged
2009-05-28 17:00:25 +0200 sj r272415 : #i102336# retaining graphic file names unchanged
2009-05-28 17:00:10 +0200 sj r272414 : #i102336# retaining graphic file names unchanged
2009-05-25 12:43:58 +0200 sj r272232 : #i102069# added patch from thb (fixed rotated group objects)
Diffstat (limited to 'sd/source/ui/dlg/prltempl.cxx')
-rw-r--r-- | sd/source/ui/dlg/prltempl.cxx | 106 |
1 files changed, 7 insertions, 99 deletions
diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx index 05b7eced53d0..c3375ed67c2c 100644 --- a/sd/source/ui/dlg/prltempl.cxx +++ b/sd/source/ui/dlg/prltempl.cxx @@ -84,7 +84,7 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, pOutSet ( NULL ), pOrgSet ( &rStyleBase.GetItemSet() ) { - if( DlgId.GetId() == TAB_PRES_LAYOUT_TEMPLATE_3 && IS_OUTLINE(ePO)) + if( IS_OUTLINE(ePO)) { // Leider sind die Itemsets unserer Stylesheets nicht discret.. const USHORT* pPtr = pOrgSet->GetRanges(); @@ -129,29 +129,6 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, aInputSet.Put( *pItem ); } -/* #i35937# - // Jetzt noch das mapping von 10er auf 9er und des lrspace. - if( SFX_ITEM_SET == aInputSet.GetItemState(EE_PARA_NUMBULLET, FALSE) ) - { - SdBulletMapper::PreMapNumBulletForDialog( aInputSet ); - SvxNumBulletItem* pBulletItem = (SvxNumBulletItem*)aInputSet.GetItem(EE_PARA_NUMBULLET); - SvxNumRule* pRule = pBulletItem->GetNumRule(); - if(pRule) - { - SvxLRSpaceItem aLRItem(EE_PARA_LRSPACE); - if( SFX_ITEM_SET == aInputSet.GetItemState(EE_PARA_LRSPACE) ) - aLRItem = *(SvxLRSpaceItem*)aInputSet.GetItem(EE_PARA_LRSPACE); - - const SvxNumberFormat& aActFmt = pRule->GetLevel( GetOutlineLevel() ); - - aLRItem.SetTxtLeft( aActFmt.GetAbsLSpace() ); - aLRItem.SetTxtFirstLineOfst( aActFmt.GetFirstLineOffset() ); - - aInputSet.Put(aLRItem); - } - } -*/ - // gewaehlte Ebene im Dialog vorselektieren aInputSet.Put( SfxUInt16Item( SID_PARAM_CUR_NUM_LEVEL, 1<<GetOutlineLevel())); @@ -193,60 +170,27 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, AddTabPage( RID_SVXPAGE_CHAR_NAME ); AddTabPage( RID_SVXPAGE_CHAR_EFFECTS ); AddTabPage( RID_SVXPAGE_STD_PARAGRAPH ); + AddTabPage( RID_SVXPAGE_TEXTATTR ); + AddTabPage( RID_SVXPAGE_TABULATOR ); } break; - case TAB_PRES_LAYOUT_TEMPLATE_1: - AddTabPage( RID_SVXPAGE_LINE); - break; - - case TAB_PRES_LAYOUT_TEMPLATE_2: + case TAB_PRES_LAYOUT_TEMPLATE_BACKGROUND: // background AddTabPage( RID_SVXPAGE_AREA); break; - - case TAB_PRES_LAYOUT_TEMPLATE_3: - { - AddTabPage( RID_SVXPAGE_CHAR_NAME ); - AddTabPage( RID_SVXPAGE_CHAR_EFFECTS ); - AddTabPage( RID_SVXPAGE_STD_PARAGRAPH ); - if(IS_OUTLINE(ePO)) - { - AddTabPage( RID_SVXPAGE_PICK_SINGLE_NUM ); - AddTabPage( RID_SVXPAGE_PICK_BULLET ); - AddTabPage( RID_SVXPAGE_PICK_BMP ); - AddTabPage( RID_SVXPAGE_NUM_OPTIONS ); - } - else - { - RemoveTabPage( RID_SVXPAGE_PICK_SINGLE_NUM ); - RemoveTabPage( RID_SVXPAGE_PICK_BULLET ); - RemoveTabPage( RID_SVXPAGE_PICK_BMP ); - RemoveTabPage( RID_SVXPAGE_NUM_OPTIONS ); - } - } - break; } // #112490# the tabpages Alignment, Tabs and Asian Typography are very // usefull, except for the background style - if( (DlgId.GetId() == TAB_PRES_LAYOUT_TEMPLATE) || (DlgId.GetId() == TAB_PRES_LAYOUT_TEMPLATE_3) ) + if( DlgId.GetId() != TAB_PRES_LAYOUT_TEMPLATE_BACKGROUND ) { SvtCJKOptions aCJKOptions; - if( aCJKOptions.IsAsianTypographyEnabled() && (ePO != PO_BACKGROUND ) ) + if( aCJKOptions.IsAsianTypographyEnabled() ) AddTabPage( RID_SVXPAGE_PARA_ASIAN ); else RemoveTabPage( RID_SVXPAGE_PARA_ASIAN ); - if( ePO != PO_BACKGROUND ) - { - AddTabPage( RID_SVXPAGE_ALIGN_PARAGRAPH ); - AddTabPage( RID_SVXPAGE_TABULATOR ); - } - else - { - RemoveTabPage( RID_SVXPAGE_ALIGN_PARAGRAPH ); - RemoveTabPage( RID_SVXPAGE_TABULATOR ); - } + AddTabPage( RID_SVXPAGE_ALIGN_PARAGRAPH ); } // Titel setzen und @@ -257,12 +201,10 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, { case PO_TITLE: aTitle = String(SdResId( STR_PSEUDOSHEET_TITLE )); - RemoveTabPage( TP_ENUM_BULLET ); break; case PO_SUBTITLE: aTitle = String(SdResId( STR_PSEUDOSHEET_SUBTITLE )); - RemoveTabPage( TP_ENUM_BULLET ); break; case PO_BACKGROUND: @@ -289,7 +231,6 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, case PO_NOTES: aTitle = String(SdResId( STR_PSEUDOSHEET_NOTES )); - RemoveTabPage( TP_ENUM_BULLET ); break; } SetText( aTitle ); @@ -384,39 +325,6 @@ const SfxItemSet* SdPresLayoutTemplateDlg::GetOutputItemSet() const const SvxNumBulletItem *pSvxNumBulletItem = NULL; if( SFX_ITEM_SET == pOutSet->GetItemState(EE_PARA_NUMBULLET, FALSE, (const SfxPoolItem**)&pSvxNumBulletItem )) SdBulletMapper::MapFontsInNumRule( *pSvxNumBulletItem->GetNumRule(), *pOutSet ); - -/* #i35937# - // Wenn das lrspace geaendert wurde muss die Aenderung in das - // Bullet Item gemapt werden... - if( SFX_ITEM_SET == pOutSet->GetItemState( EE_PARA_LRSPACE, FALSE ) ) - { - BOOL bNumBulletHasChanged = pSvxNumBulletItem != NULL; - if( !bNumBulletHasChanged ) - pSvxNumBulletItem = (SvxNumBulletItem*)aInputSet.GetItem(EE_PARA_NUMBULLET); - - if( pSvxNumBulletItem ) - { - SvxLRSpaceItem& rLRItem = *(SvxLRSpaceItem*)pOutSet->GetItem( EE_PARA_LRSPACE ); - - SvxNumRule* pNumRule = pSvxNumBulletItem->GetNumRule(); - if(pNumRule) - { - SvxNumberFormat aFrmt( pNumRule->GetLevel( GetOutlineLevel() )); - - aFrmt.SetLSpace( (short) rLRItem.GetTxtLeft() ); - aFrmt.SetAbsLSpace( (short) rLRItem.GetTxtLeft() ); - aFrmt.SetFirstLineOffset( rLRItem.GetTxtFirstLineOfst() ); - pNumRule->SetLevel( GetOutlineLevel(), aFrmt ); - } - } - - if( !bNumBulletHasChanged && pSvxNumBulletItem ) - pOutSet->Put( SvxNumBulletItem( *pSvxNumBulletItem->GetNumRule(), EE_PARA_NUMBULLET ) ); - } - - SdBulletMapper::PostMapNumBulletForDialog( *pOutSet ); -*/ - return pOutSet; } else |