textattr.cxx (c0739476) textattr.cxx (26734c99)
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

--- 333 unchanged lines hidden (view full) ---

342 aTsbFullWidth.SetState(STATE_DONTKNOW);
343 aTsbFullWidth.Enable( sal_False );
344 aFlPosition.Enable( sal_False );
345 }
346
347 // Am Rahmen anpassen
348 if ( rAttrs.GetItemState( SDRATTR_TEXT_FITTOSIZE ) != SFX_ITEM_DONTCARE )
349 {
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

--- 333 unchanged lines hidden (view full) ---

342 aTsbFullWidth.SetState(STATE_DONTKNOW);
343 aTsbFullWidth.Enable( sal_False );
344 aFlPosition.Enable( sal_False );
345 }
346
347 // Am Rahmen anpassen
348 if ( rAttrs.GetItemState( SDRATTR_TEXT_FITTOSIZE ) != SFX_ITEM_DONTCARE )
349 {
350 const sal_Bool bFTS = ( ( const SdrTextFitToSizeTypeItem& )rAttrs.Get( SDRATTR_TEXT_FITTOSIZE ) ).GetValue();
351 aTsbFitToSize.SetState( bFTS ? STATE_CHECK : STATE_NOCHECK );
350 SdrFitToSizeType eFTS = (SdrFitToSizeType)
351 ( ( const SdrTextFitToSizeTypeItem& )rAttrs.Get( SDRATTR_TEXT_FITTOSIZE ) ).GetValue();
352 aTsbFitToSize.SetState( eFTS == SDRTEXTFIT_NONE ? STATE_NOCHECK : STATE_CHECK );
352 aTsbFitToSize.EnableTriState( sal_False );
353 }
354 else
355 aTsbFitToSize.SetState( STATE_DONTKNOW );
356 aTsbFitToSize.SaveValue();
357
358 // Konturfluss
359 if( rAttrs.GetItemState( SDRATTR_TEXT_CONTOURFRAME ) != SFX_ITEM_DONTCARE )

--- 77 unchanged lines hidden (view full) ---

437 if( eState != aTsbContour.GetSavedValue() )
438 {
439 rAttrs.Put( SdrTextContourFrameItem( (sal_Bool) STATE_CHECK == eState ) );
440 }
441
442 eState = aTsbFitToSize.GetState();
443 if( eState != aTsbFitToSize.GetSavedValue() )
444 {
353 aTsbFitToSize.EnableTriState( sal_False );
354 }
355 else
356 aTsbFitToSize.SetState( STATE_DONTKNOW );
357 aTsbFitToSize.SaveValue();
358
359 // Konturfluss
360 if( rAttrs.GetItemState( SDRATTR_TEXT_CONTOURFRAME ) != SFX_ITEM_DONTCARE )

--- 77 unchanged lines hidden (view full) ---

438 if( eState != aTsbContour.GetSavedValue() )
439 {
440 rAttrs.Put( SdrTextContourFrameItem( (sal_Bool) STATE_CHECK == eState ) );
441 }
442
443 eState = aTsbFitToSize.GetState();
444 if( eState != aTsbFitToSize.GetSavedValue() )
445 {
445 sal_Bool bFTS;
446 SdrFitToSizeType eFTS;
446 switch( eState )
447 {
448 default: ; //prevent warning
449 DBG_ERROR( "svx::SvxTextAttrPage::FillItemSet(), unhandled state!" );
447 switch( eState )
448 {
449 default: ; //prevent warning
450 DBG_ERROR( "svx::SvxTextAttrPage::FillItemSet(), unhandled state!" );
450 case STATE_NOCHECK: bFTS = sal_False; break;
451 case STATE_CHECK: bFTS = sal_True; break;
451 case STATE_NOCHECK: eFTS = SDRTEXTFIT_NONE; break;
452 //case STATE_CHECK: eFTS = SDRTEXTFIT_RESIZEATTR; break;
453 case STATE_CHECK: eFTS = SDRTEXTFIT_PROPORTIONAL; break;
452 }
454 }
453 rAttrs.Put( SdrTextFitToSizeTypeItem( bFTS ) );
455 rAttrs.Put( SdrTextFitToSizeTypeItem( eFTS ) );
454 }
455
456 // zentriert
457 RECT_POINT eRP = aCtlPosition.GetActualRP();
458 SdrTextVertAdjust eTVA, eOldTVA;
459 SdrTextHorzAdjust eTHA, eOldTHA;
460
461 switch( eRP )

--- 333 unchanged lines hidden --- 		456 }
457
458 // zentriert
459 RECT_POINT eRP = aCtlPosition.GetActualRP();
460 SdrTextVertAdjust eTVA, eOldTVA;
461 SdrTextHorzAdjust eTHA, eOldTHA;
462
463 switch( eRP )

--- 333 unchanged lines hidden ---