strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#98721# support creating field control from field selection window

Browse source
This commit is contained in:
Niklas Nebel 2002-05-23 16:26:41 +00:00
parent 292e9056c2
commit f4cbc8207e
3 changed files with 46 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sc/sdi/tabvwsh.sdi
View file

@ -3,7 +3,7 @@
// StarCalc
//
// (C) 1994 StarDivision GmbH, Hamburg, Germany
// $Author: dr $ $Date: 2002-05-22 07:07:06 $ $Revision: 1.8 $
// $Author: nn $ $Date: 2002-05-23 17:25:49 $ $Revision: 1.9 $
// $Logfile: T:/sc/sdi/tabvwsh.sdv $ $Workfile: tabvwsh.sdi $
//----------------------------------------------------------------------------
@ -93,6 +93,7 @@ interface BaseSelection : Selection
SID_LINKS [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ]
SID_DRAW_CHART [ ExecMethod = ExecDraw; StateMethod = GetDrawState; ]
SID_OPENDLG_MODCHART [ ExecMethod = Execute; StateMethod = GetDrawInsState; ]
SID_FM_CREATE_FIELDCONTROL [ ExecMethod = ExecDrawIns ; ]
// } Einfuegen von Objekten

43
sc/source/ui/view/tabvwshb.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: tabvwshb.cxx,v $
*
* $Revision: 1.11 $
* $Revision: 1.12 $
*
* last change: $Author: nn $ $Date: 2001-12-21 12:58:39 $
* last change: $Author: nn $ $Date: 2002-05-23 17:26:41 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -73,6 +73,7 @@
// INCLUDE ---------------------------------------------------------------
#include <svx/dataaccessdescriptor.hxx>
#include <svx/pfiledlg.hxx>
#include <svx/svdmark.hxx>
#include <svx/svdograf.hxx>
@ -113,6 +114,7 @@ SO2_DECL_REF(SvStorage)
#include "fuinsert.hxx"
#include "docsh.hxx"
#include "chartarr.hxx"
#include "drawview.hxx"
// STATIC DATA -----------------------------------------------------------
@ -435,6 +437,43 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq)
SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); // Navigator
rReq.Done();
}
break;
// #98721#
case SID_FM_CREATE_FIELDCONTROL:
{
SFX_REQUEST_ARG( rReq, pDescriptorItem, SfxUnoAnyItem, SID_FM_DATACCESS_DESCRIPTOR, sal_False );
DBG_ASSERT( pDescriptorItem, "SID_FM_CREATE_FIELDCONTROL: invalid request args!" );
if(pDescriptorItem)
{
//! merge with ScViewFunc::PasteDataFormat (SOT_FORMATSTR_ID_SBA_FIELDDATAEXCHANGE)?
ScDrawView* pDrView = GetScDrawView();
SdrPageView* pPageView = pDrView ? pDrView->GetPageViewPvNum(0) : NULL;
if(pPageView)
{
::svx::ODataAccessDescriptor aDescriptor(pDescriptorItem->GetValue());
SdrObject* pNewDBField = pDrView->CreateFieldControl(aDescriptor);
if(pNewDBField)
{
Rectangle aVisArea = pWin->PixelToLogic(Rectangle(Point(0,0), pWin->GetOutputSizePixel()));
Point aObjPos(aVisArea.Center());
Size aObjSize(pNewDBField->GetLogicRect().GetSize());
aObjPos.X() -= aObjSize.Width() / 2;
aObjPos.Y() -= aObjSize.Height() / 2;
Rectangle aNewObjectRectangle(aObjPos, aObjSize);
pNewDBField->SetLogicRect(aNewObjectRectangle);
pView->InsertObject(pNewDBField, *pPageView, pView->IsSolidDraggingNow() ? SDRINSERT_NOBROADCAST : 0);
}
}
}
rReq.Done();
}
break;
}
}

6
sc/source/ui/view/viewfun5.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: viewfun5.cxx,v $
*
* $Revision: 1.18 $
* $Revision: 1.19 $
*
* last change: $Author: dr $ $Date: 2001-11-07 12:49:49 $
* last change: $Author: nn $ $Date: 2002-05-23 17:26:41 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -323,7 +323,7 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId,
{
// insert database field control
if ( ::svx::OColumnTransferable::canExtractColumnDescriptor( aDataHelper.GetDataFlavorExVector(), CTF_COLUMN_DESCRIPTOR ) )
if ( ::svx::OColumnTransferable::canExtractColumnDescriptor( aDataHelper.GetDataFlavorExVector(), CTF_COLUMN_DESCRIPTOR | CTF_CONTROL_EXCHANGE ) )
{
MakeDrawLayer();
ScDrawView* pDrawView = GetScDrawView();