drtxtob1.cxx (da72173f) drtxtob1.cxx (d9a8b508)
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

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

48#include "viewdata.hxx"
49//CHINA001 #include "textdlgs.hxx"
50#include "scresid.hxx"
51
52#include "scabstdlg.hxx" //CHINA00
53//------------------------------------------------------------------------
54
55sal_Bool ScDrawTextObjectBar::ExecuteCharDlg( const SfxItemSet& rArgs,
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

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

48#include "viewdata.hxx"
49//CHINA001 #include "textdlgs.hxx"
50#include "scresid.hxx"
51
52#include "scabstdlg.hxx" //CHINA00
53//------------------------------------------------------------------------
54
55sal_Bool ScDrawTextObjectBar::ExecuteCharDlg( const SfxItemSet& rArgs,
56 SfxItemSet& rOutSet )
56 SfxItemSet& rOutSet , sal_uInt16 nSlot)
57{
58//CHINA001 ScCharDlg* pDlg = new ScCharDlg( pViewData->GetDialogParent(),
59//CHINA001 &rArgs,
60//CHINA001 pViewData->GetSfxDocShell() );
61//CHINA001
62 ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
63 DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
64
65 SfxAbstractTabDialog* pDlg = pFact->CreateScCharDlg( pViewData->GetDialogParent(), &rArgs,
66 pViewData->GetSfxDocShell(),RID_SCDLG_CHAR );
67 DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
57{
58//CHINA001 ScCharDlg* pDlg = new ScCharDlg( pViewData->GetDialogParent(),
59//CHINA001 &rArgs,
60//CHINA001 pViewData->GetSfxDocShell() );
61//CHINA001
62 ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
63 DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
64
65 SfxAbstractTabDialog* pDlg = pFact->CreateScCharDlg( pViewData->GetDialogParent(), &rArgs,
66 pViewData->GetSfxDocShell(),RID_SCDLG_CHAR );
67 DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
68 if (nSlot == SID_CHAR_DLG_EFFECT)
69 {
70 pDlg->SetCurPageId(RID_SVXPAGE_CHAR_EFFECTS);
71 }
68 sal_Bool bRet = ( pDlg->Execute() == RET_OK );
69
70 if ( bRet )
71 {
72 const SfxItemSet* pNewAttrs = pDlg->GetOutputItemSet();
73 if ( pNewAttrs )
74 rOutSet.Put( *pNewAttrs );
75 }

--- 77 unchanged lines hidden --- 		72 sal_Bool bRet = ( pDlg->Execute() == RET_OK );
73
74 if ( bRet )
75 {
76 const SfxItemSet* pNewAttrs = pDlg->GetOutputItemSet();
77 if ( pNewAttrs )
78 rOutSet.Put( *pNewAttrs );
79 }

--- 77 unchanged lines hidden ---