drawsh4.cxx (97e8a929) | drawsh4.cxx (ef076a15) |
---|---|
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 --- 21 unchanged lines hidden (view full) --- 30 31#include "scitems.hxx" 32#include <svx/drawitem.hxx> 33#include <svx/fontwork.hxx> 34#include <svx/svdotext.hxx> 35#include <svx/xdef.hxx> 36#include <sfx2/objsh.hxx> 37#include <sfx2/viewfrm.hxx> | 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 --- 21 unchanged lines hidden (view full) --- 30 31#include "scitems.hxx" 32#include <svx/drawitem.hxx> 33#include <svx/fontwork.hxx> 34#include <svx/svdotext.hxx> 35#include <svx/xdef.hxx> 36#include <sfx2/objsh.hxx> 37#include <sfx2/viewfrm.hxx> |
38 | 38#include <svx/svdoashp.hxx> |
39#include "drawsh.hxx" 40#include "drawview.hxx" 41#include "viewdata.hxx" 42#include "tabvwsh.hxx" 43#include "sc.hrc" 44 45 46//------------------------------------------------------------------ --- 8 unchanged lines hidden (view full) --- 55 56 SfxViewFrame* pViewFrm = pViewData->GetViewShell()->GetViewFrame(); 57 if ( pViewFrm->HasChildWindow(nId) ) 58 pDlg = (SvxFontWorkDialog*)(pViewFrm->GetChildWindow(nId)->GetWindow()); 59 60 if ( rMarkList.GetMarkCount() == 1 ) 61 pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); 62 | 39#include "drawsh.hxx" 40#include "drawview.hxx" 41#include "viewdata.hxx" 42#include "tabvwsh.hxx" 43#include "sc.hrc" 44 45 46//------------------------------------------------------------------ --- 8 unchanged lines hidden (view full) --- 55 56 SfxViewFrame* pViewFrm = pViewData->GetViewShell()->GetViewFrame(); 57 if ( pViewFrm->HasChildWindow(nId) ) 58 pDlg = (SvxFontWorkDialog*)(pViewFrm->GetChildWindow(nId)->GetWindow()); 59 60 if ( rMarkList.GetMarkCount() == 1 ) 61 pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); 62 |
63 if ( pObj == NULL || !pObj->ISA(SdrTextObj) || 64 !((SdrTextObj*) pObj)->HasText() ) | 63 const SdrTextObj* pTextObj = dynamic_cast< const SdrTextObj* >(pObj); 64 const bool bDeactivate( 65 !pObj || 66 !pTextObj || 67 !pTextObj->HasText() || 68 dynamic_cast< const SdrObjCustomShape* >(pObj)); // #121538# no FontWork for CustomShapes 69 70 if(bDeactivate) |
65 { 66 if ( pDlg ) 67 pDlg->SetActive(sal_False); 68 69 rSet.DisableItem(XATTR_FORMTXTSTYLE); 70 rSet.DisableItem(XATTR_FORMTXTADJUST); 71 rSet.DisableItem(XATTR_FORMTXTDISTANCE); 72 rSet.DisableItem(XATTR_FORMTXTSTART); --- 10 unchanged lines hidden (view full) --- 83 { 84 if ( pDlg ) 85 { 86 SfxObjectShell* pDocSh = SfxObjectShell::Current(); 87 88 if ( pDocSh ) 89 { 90 const SfxPoolItem* pItem = pDocSh->GetItem( SID_COLOR_TABLE ); | 71 { 72 if ( pDlg ) 73 pDlg->SetActive(sal_False); 74 75 rSet.DisableItem(XATTR_FORMTXTSTYLE); 76 rSet.DisableItem(XATTR_FORMTXTADJUST); 77 rSet.DisableItem(XATTR_FORMTXTDISTANCE); 78 rSet.DisableItem(XATTR_FORMTXTSTART); --- 10 unchanged lines hidden (view full) --- 89 { 90 if ( pDlg ) 91 { 92 SfxObjectShell* pDocSh = SfxObjectShell::Current(); 93 94 if ( pDocSh ) 95 { 96 const SfxPoolItem* pItem = pDocSh->GetItem( SID_COLOR_TABLE ); |
91 XColorList* pColorTable = NULL; | 97 XColorTable* pColorTable = NULL; |
92 93 if ( pItem ) 94 pColorTable = ((SvxColorTableItem*)pItem)->GetColorTable(); 95 96 pDlg->SetActive(); 97 98 if ( pColorTable ) 99 pDlg->SetColorTable( pColorTable ); --- 12 unchanged lines hidden --- | 98 99 if ( pItem ) 100 pColorTable = ((SvxColorTableItem*)pItem)->GetColorTable(); 101 102 pDlg->SetActive(); 103 104 if ( pColorTable ) 105 pDlg->SetColorTable( pColorTable ); --- 12 unchanged lines hidden --- |