textsh1.cxx (da72173f) | textsh1.cxx (eb39ad03) |
---|---|
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 --- 171 unchanged lines hidden (view full) --- 180 SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); 181 DBG_ASSERT(pFact, "SwAbstractDialogFactory fail!"); 182 183 pDlg = pFact->CreateSwCharDlg( rWrtSh.GetView().GetWindow(), rWrtSh.GetView(), aCoreSet, DLG_CHAR ); 184 DBG_ASSERT(pDlg, "Dialogdiet fail!"); 185 if( FN_INSERT_HYPERLINK == nSlot ) 186 pDlg->SetCurPageId(TP_CHAR_URL); 187 } | 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 --- 171 unchanged lines hidden (view full) --- 180 SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); 181 DBG_ASSERT(pFact, "SwAbstractDialogFactory fail!"); 182 183 pDlg = pFact->CreateSwCharDlg( rWrtSh.GetView().GetWindow(), rWrtSh.GetView(), aCoreSet, DLG_CHAR ); 184 DBG_ASSERT(pDlg, "Dialogdiet fail!"); 185 if( FN_INSERT_HYPERLINK == nSlot ) 186 pDlg->SetCurPageId(TP_CHAR_URL); 187 } |
188 if (nSlot == SID_CHAR_DLG_EFFECT) 189 { 190 pDlg->SetCurPageId(TP_CHAR_EXT); 191 } |
|
188 189 const SfxItemSet* pSet = NULL; 190 if ( !bUseDialog ) 191 pSet = pArgs; 192 else if ( NULL != pDlg && pDlg->Execute() == RET_OK ) /* #110771# pDlg can be NULL */ 193 { 194 pSet = pDlg->GetOutputItemSet(); 195 } --- 637 unchanged lines hidden (view full) --- 833 case FN_INSERT_HYPERLINK: 834 { 835 sal_uInt16 nWhich = GetPool().GetWhich( nSlot ); 836 if ( pArgs && pArgs->GetItemState( nWhich ) == SFX_ITEM_SET ) 837 bUseDialog = sal_False; 838 // intentionally no break 839 } 840 case SID_CHAR_DLG: | 192 193 const SfxItemSet* pSet = NULL; 194 if ( !bUseDialog ) 195 pSet = pArgs; 196 else if ( NULL != pDlg && pDlg->Execute() == RET_OK ) /* #110771# pDlg can be NULL */ 197 { 198 pSet = pDlg->GetOutputItemSet(); 199 } --- 637 unchanged lines hidden (view full) --- 837 case FN_INSERT_HYPERLINK: 838 { 839 sal_uInt16 nWhich = GetPool().GetWhich( nSlot ); 840 if ( pArgs && pArgs->GetItemState( nWhich ) == SFX_ITEM_SET ) 841 bUseDialog = sal_False; 842 // intentionally no break 843 } 844 case SID_CHAR_DLG: |
845 case SID_CHAR_DLG_EFFECT: |
|
841 { 842 lcl_CharDialog( rWrtSh, bUseDialog, nSlot, pArgs, &rReq ); 843 } 844 break; 845 case SID_CHAR_DLG_FOR_PARAGRAPH: 846 { 847 rWrtSh.Push(); //save current cursor 848 SwLangHelper::SelectCurrentPara( rWrtSh ); --- 938 unchanged lines hidden --- | 846 { 847 lcl_CharDialog( rWrtSh, bUseDialog, nSlot, pArgs, &rReq ); 848 } 849 break; 850 case SID_CHAR_DLG_FOR_PARAGRAPH: 851 { 852 rWrtSh.Push(); //save current cursor 853 SwLangHelper::SelectCurrentPara( rWrtSh ); --- 938 unchanged lines hidden --- |