tpshadow.cxx (2ee96f1c) | tpshadow.cxx (c7be74b1) |
---|---|
1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 67 unchanged lines hidden (view full) --- 76 aFtDistance ( this, CUI_RES( FT_DISTANCE ) ), 77 aMtrDistance ( this, CUI_RES( MTR_FLD_DISTANCE ) ), 78 aFtShadowColor ( this, CUI_RES( FT_SHADOW_COLOR ) ), 79 aLbShadowColor ( this, CUI_RES( LB_SHADOW_COLOR ) ), 80 aFtTransparent ( this, CUI_RES( FT_TRANSPARENT ) ), 81 aMtrTransparent ( this, CUI_RES( MTR_SHADOW_TRANSPARENT ) ), 82 aCtlXRectPreview ( this, CUI_RES( CTL_COLOR_PREVIEW ) ), 83 rOutAttrs ( rInAttrs ), | 1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 67 unchanged lines hidden (view full) --- 76 aFtDistance ( this, CUI_RES( FT_DISTANCE ) ), 77 aMtrDistance ( this, CUI_RES( MTR_FLD_DISTANCE ) ), 78 aFtShadowColor ( this, CUI_RES( FT_SHADOW_COLOR ) ), 79 aLbShadowColor ( this, CUI_RES( LB_SHADOW_COLOR ) ), 80 aFtTransparent ( this, CUI_RES( FT_TRANSPARENT ) ), 81 aMtrTransparent ( this, CUI_RES( MTR_SHADOW_TRANSPARENT ) ), 82 aCtlXRectPreview ( this, CUI_RES( CTL_COLOR_PREVIEW ) ), 83 rOutAttrs ( rInAttrs ), |
84 pColorTab( NULL ), | 84 maColorTab(), |
85 bDisable ( sal_False ), 86 pXPool ( (XOutdevItemPool*) rInAttrs.GetPool() ), 87 aXFillAttr ( pXPool ), 88 rXFSet ( aXFillAttr.GetItemSet() ) 89{ 90 FreeResource(); 91 92 // diese Page braucht ExchangeSupport --- 95 unchanged lines hidden (view full) --- 188 aCtlPosition.SetAccessibleRelationMemberOf( &aFlProp ); 189} 190 191// ----------------------------------------------------------------------- 192 193void SvxShadowTabPage::Construct() 194{ 195 // Farbtabelle fuellen | 85 bDisable ( sal_False ), 86 pXPool ( (XOutdevItemPool*) rInAttrs.GetPool() ), 87 aXFillAttr ( pXPool ), 88 rXFSet ( aXFillAttr.GetItemSet() ) 89{ 90 FreeResource(); 91 92 // diese Page braucht ExchangeSupport --- 95 unchanged lines hidden (view full) --- 188 aCtlPosition.SetAccessibleRelationMemberOf( &aFlProp ); 189} 190 191// ----------------------------------------------------------------------- 192 193void SvxShadowTabPage::Construct() 194{ 195 // Farbtabelle fuellen |
196 aLbShadowColor.Fill( pColorTab ); | 196 aLbShadowColor.Fill( maColorTab ); |
197 198 if( bDisable ) 199 { 200 aTsbShowShadow.Disable(); 201 aFtPosition.Disable(); 202 aCtlPosition.Disable(); 203 aFtDistance.Disable(); 204 aMtrDistance.Disable(); --- 12 unchanged lines hidden (view full) --- 217 sal_uInt16 nCount; 218 //add CHINA001 Begin 219 SFX_ITEMSET_ARG (&rSet,pPageTypeItem,SfxUInt16Item,SID_PAGE_TYPE,sal_False); 220 if (pPageTypeItem) 221 SetPageType(pPageTypeItem->GetValue()); 222 //add CHINA001 end 223 if( nDlgType == 0 ) //CHINA001 // Flaechen-Dialogif( *pDlgType == 0 ) // Flaechen-Dialog 224 { | 197 198 if( bDisable ) 199 { 200 aTsbShowShadow.Disable(); 201 aFtPosition.Disable(); 202 aCtlPosition.Disable(); 203 aFtDistance.Disable(); 204 aMtrDistance.Disable(); --- 12 unchanged lines hidden (view full) --- 217 sal_uInt16 nCount; 218 //add CHINA001 Begin 219 SFX_ITEMSET_ARG (&rSet,pPageTypeItem,SfxUInt16Item,SID_PAGE_TYPE,sal_False); 220 if (pPageTypeItem) 221 SetPageType(pPageTypeItem->GetValue()); 222 //add CHINA001 end 223 if( nDlgType == 0 ) //CHINA001 // Flaechen-Dialogif( *pDlgType == 0 ) // Flaechen-Dialog 224 { |
225 if( pColorTab ) | 225 if( maColorTab.get() ) |
226 { 227 // ColorTable 228 if( *pnColorTableState & CT_CHANGED || 229 *pnColorTableState & CT_MODIFIED ) 230 { 231 if( *pnColorTableState & CT_CHANGED ) 232 { 233 SvxAreaTabDialog* pArea = dynamic_cast< SvxAreaTabDialog* >( DLGWIN ); 234 if( pArea ) 235 { | 226 { 227 // ColorTable 228 if( *pnColorTableState & CT_CHANGED || 229 *pnColorTableState & CT_MODIFIED ) 230 { 231 if( *pnColorTableState & CT_CHANGED ) 232 { 233 SvxAreaTabDialog* pArea = dynamic_cast< SvxAreaTabDialog* >( DLGWIN ); 234 if( pArea ) 235 { |
236 pColorTab = pArea->GetNewColorTable(); | 236 maColorTab = pArea->GetNewColorTable(); |
237 } 238 else 239 { 240 SvxLineTabDialog* pLine = dynamic_cast< SvxLineTabDialog* >( DLGWIN ); 241 if( pLine ) | 237 } 238 else 239 { 240 SvxLineTabDialog* pLine = dynamic_cast< SvxLineTabDialog* >( DLGWIN ); 241 if( pLine ) |
242 pColorTab = pLine->GetNewColorTable(); | 242 maColorTab = pLine->GetNewColorTable(); |
243 } 244 } 245 246 // aLbShadowColor 247 nPos = aLbShadowColor.GetSelectEntryPos(); 248 aLbShadowColor.Clear(); | 243 } 244 } 245 246 // aLbShadowColor 247 nPos = aLbShadowColor.GetSelectEntryPos(); 248 aLbShadowColor.Clear(); |
249 aLbShadowColor.Fill( pColorTab ); | 249 aLbShadowColor.Fill( maColorTab ); |
250 nCount = aLbShadowColor.GetEntryCount(); 251 if( nCount == 0 ) 252 ; // Dieser Fall sollte nicht auftreten 253 else if( nCount <= nPos ) 254 aLbShadowColor.SelectEntryPos( 0 ); 255 else 256 aLbShadowColor.SelectEntryPos( nPos ); 257 --- 351 unchanged lines hidden --- | 250 nCount = aLbShadowColor.GetEntryCount(); 251 if( nCount == 0 ) 252 ; // Dieser Fall sollte nicht auftreten 253 else if( nCount <= nPos ) 254 aLbShadowColor.SelectEntryPos( 0 ); 255 else 256 aLbShadowColor.SelectEntryPos( nPos ); 257 --- 351 unchanged lines hidden --- |