fontworkbar.cxx (c0739476) fontworkbar.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

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

65
66 sal_Int32 nAlignment = -1;
67 for( i = 0; i < nCount; i++ )
68 {
69 SdrObject* pObj = rMarkList.GetMark( i )->GetMarkedSdrObj();
70 if( pObj->ISA(SdrObjCustomShape) )
71 {
72 sal_Int32 nOldAlignment = nAlignment;
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

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

65
66 sal_Int32 nAlignment = -1;
67 for( i = 0; i < nCount; i++ )
68 {
69 SdrObject* pObj = rMarkList.GetMark( i )->GetMarkedSdrObj();
70 if( pObj->ISA(SdrObjCustomShape) )
71 {
72 sal_Int32 nOldAlignment = nAlignment;
73 SdrTextHorzAdjustItem& rTextHorzAdjustItem = (SdrTextHorzAdjustItem&)pObj->GetMergedItem( SDRATTR_TEXT_HORZADJUST );
74 SdrTextFitToSizeTypeItem& rTextFitToSizeTypeItem = (SdrTextFitToSizeTypeItem&)pObj->GetMergedItem( SDRATTR_TEXT_FITTOSIZE );
73 SdrTextHorzAdjustItem& rTextHorzAdjustItem = (SdrTextHorzAdjustItem&)pObj->GetMergedItem( SDRATTR_TEXT_HORZADJUST );
74 SdrTextFitToSizeTypeItem& rTextFitToSizeTypeItem = (SdrTextFitToSizeTypeItem&)pObj->GetMergedItem( SDRATTR_TEXT_FITTOSIZE );
75 switch ( rTextHorzAdjustItem.GetValue() )
76 {
77 case SDRTEXTHORZADJUST_LEFT : nAlignment = 0; break;
78 case SDRTEXTHORZADJUST_CENTER : nAlignment = 1; break;
79 case SDRTEXTHORZADJUST_RIGHT : nAlignment = 2; break;
80 case SDRTEXTHORZADJUST_BLOCK :
81 {
75 switch ( rTextHorzAdjustItem.GetValue() )
76 {
77 case SDRTEXTHORZADJUST_LEFT : nAlignment = 0; break;
78 case SDRTEXTHORZADJUST_CENTER : nAlignment = 1; break;
79 case SDRTEXTHORZADJUST_RIGHT : nAlignment = 2; break;
80 case SDRTEXTHORZADJUST_BLOCK :
81 {
82 if ( rTextFitToSizeTypeItem.GetValue() == sal_False )
82 if ( rTextFitToSizeTypeItem.GetValue() == SDRTEXTFIT_NONE )
83 nAlignment = 3;
83 nAlignment = 3;
84 else
84 else if ( rTextFitToSizeTypeItem.GetValue() == SDRTEXTFIT_ALLLINES )
85 nAlignment = 4;
86 }
87 }
88 if ( ( nOldAlignment != -1 ) && ( nOldAlignment != nAlignment ) )
89 {
90 nAlignment = -1;
91 break;
92 }

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

297
298 case SID_FONTWORK_ALIGNMENT:
299 {
300 if( rReq.GetArgs() && rReq.GetArgs()->GetItemState( SID_FONTWORK_ALIGNMENT ) == SFX_ITEM_SET )
301 {
302 sal_Int32 nValue = ((const SfxInt32Item*)rReq.GetArgs()->GetItem(SID_FONTWORK_ALIGNMENT))->GetValue();
303 if ( ( nValue >= 0 ) && ( nValue < 5 ) )
304 {
85 nAlignment = 4;
86 }
87 }
88 if ( ( nOldAlignment != -1 ) && ( nOldAlignment != nAlignment ) )
89 {
90 nAlignment = -1;
91 break;
92 }

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

297
298 case SID_FONTWORK_ALIGNMENT:
299 {
300 if( rReq.GetArgs() && rReq.GetArgs()->GetItemState( SID_FONTWORK_ALIGNMENT ) == SFX_ITEM_SET )
301 {
302 sal_Int32 nValue = ((const SfxInt32Item*)rReq.GetArgs()->GetItem(SID_FONTWORK_ALIGNMENT))->GetValue();
303 if ( ( nValue >= 0 ) && ( nValue < 5 ) )
304 {
305 sal_Bool bFTS = sal_False;
305 SdrFitToSizeType eFTS = SDRTEXTFIT_NONE;
306 SdrTextHorzAdjust eHorzAdjust;
307 switch ( nValue )
308 {
306 SdrTextHorzAdjust eHorzAdjust;
307 switch ( nValue )
308 {
309 case 4 : bFTS = sal_True; // passthrough
309 case 4 : eFTS = SDRTEXTFIT_ALLLINES; // passthrough
310 case 3 : eHorzAdjust = SDRTEXTHORZADJUST_BLOCK; break;
311 default:
312 case 0 : eHorzAdjust = SDRTEXTHORZADJUST_LEFT; break;
313 case 1 : eHorzAdjust = SDRTEXTHORZADJUST_CENTER; break;
314 case 2 : eHorzAdjust = SDRTEXTHORZADJUST_RIGHT; break;
315 }
316 pObj->SetMergedItem( SdrTextHorzAdjustItem( eHorzAdjust ) );
310 case 3 : eHorzAdjust = SDRTEXTHORZADJUST_BLOCK; break;
311 default:
312 case 0 : eHorzAdjust = SDRTEXTHORZADJUST_LEFT; break;
313 case 1 : eHorzAdjust = SDRTEXTHORZADJUST_CENTER; break;
314 case 2 : eHorzAdjust = SDRTEXTHORZADJUST_RIGHT; break;
315 }
316 pObj->SetMergedItem( SdrTextHorzAdjustItem( eHorzAdjust ) );
317 pObj->SetMergedItem( SdrTextFitToSizeTypeItem( bFTS ) );
317 pObj->SetMergedItem( SdrTextFitToSizeTypeItem( eFTS ) );
318 pObj->BroadcastObjectChange();
319 }
320 }
321 }
322 break;
323
324 case SID_FONTWORK_CHARACTER_SPACING:
325 {

--- 312 unchanged lines hidden --- 		318 pObj->BroadcastObjectChange();
319 }
320 }
321 }
322 break;
323
324 case SID_FONTWORK_CHARACTER_SPACING:
325 {

--- 312 unchanged lines hidden ---