Kaydet (Commit) a412f3c7 authored tarafından Vladimir Glazounov's avatar Vladimir Glazounov

INTEGRATION: CWS asyncdialogs (1.49.20); FILE MERGED

2006/09/20 14:48:12 pb 1.49.20.4: RESYNC: (1.51-1.52); FILE MERGED
2006/08/30 12:08:44 pb 1.49.20.3: RESYNC: (1.50-1.51); FILE MERGED
2006/05/31 10:56:55 pb 1.49.20.2: RESYNC: (1.49-1.50); FILE MERGED
2006/03/13 08:32:30 pb 1.49.20.1: fix: #i57125# SID_INSERTDOC calls SwView::ExecuteInsertDoc()
üst eafbd388
......@@ -4,9 +4,9 @@
*
* $RCSfile: textsh1.cxx,v $
*
* $Revision: 1.52 $
* $Revision: 1.53 $
*
* last change: $Author: obo $ $Date: 2006-09-16 23:18:02 $
* last change: $Author: vg $ $Date: 2006-11-22 10:27:53 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
......@@ -366,23 +366,10 @@ void SwTextShell::Execute(SfxRequest &rReq)
break;
}
case SID_INSERTDOC:
if (!pItem)
{
rReq.SetReturnValue(SfxBoolItem(nSlot, GetView().InsertDoc(nSlot, aEmptyStr, aEmptyStr) != -1));
rReq.Ignore();
}
else
{
String aFile = aEmptyStr;
String aFilter = aEmptyStr;
aFile = ((const SfxStringItem *)pItem)->GetValue();
if(SFX_ITEM_SET == pArgs->GetItemState(FN_PARAM_1, TRUE, &pItem ))
aFilter = ((const SfxStringItem *)pItem)->GetValue();
rReq.SetReturnValue(SfxBoolItem(nSlot, GetView().InsertDoc( nSlot, aFile, aFilter ) != -1));
rReq.Done();
}
{
GetView().ExecuteInsertDoc( rReq, pItem );
break;
}
case FN_FORMAT_RESET:
rWrtSh.ResetAttr();
rReq.Done();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment