summaryrefslogtreecommitdiff
path: root/reportdesign/source/ui
diff options
context:
space:
mode:
Diffstat (limited to 'reportdesign/source/ui')
-rw-r--r--reportdesign/source/ui/inc/DesignView.hxx6
-rw-r--r--reportdesign/source/ui/inc/ReportController.hxx2
-rw-r--r--reportdesign/source/ui/inc/ReportWindow.hxx2
-rw-r--r--reportdesign/source/ui/inc/ScrollHelper.hxx2
-rw-r--r--reportdesign/source/ui/inc/ViewsWindow.hxx2
-rw-r--r--reportdesign/source/ui/report/DesignView.cxx2
-rw-r--r--reportdesign/source/ui/report/ReportController.cxx46
-rw-r--r--reportdesign/source/ui/report/ReportWindow.cxx2
-rw-r--r--reportdesign/source/ui/report/ScrollHelper.cxx2
-rw-r--r--reportdesign/source/ui/report/ViewsWindow.cxx2
-rw-r--r--reportdesign/source/ui/report/dlgedfac.cxx22
11 files changed, 45 insertions, 45 deletions
diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx
index 60ee506da7f7..15a7d2ed25b8 100644
--- a/reportdesign/source/ui/inc/DesignView.hxx
+++ b/reportdesign/source/ui/inc/DesignView.hxx
@@ -61,7 +61,7 @@ namespace rptui
std::shared_ptr<ONavigator> m_xReportExplorer;
Idle m_aMarkIdle;
DlgEdMode m_eMode;
- sal_uInt16 m_eActObj;
+ SdrObjKind m_eActObj;
Size m_aGridSizeCoarse;
Size m_aGridSizeFine;
bool m_bDeleted;
@@ -97,8 +97,8 @@ namespace rptui
OReportController& getController() const { return m_rReportController; }
void SetMode( DlgEdMode m_eMode );
- void SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType = OUString());
- sal_uInt16 GetInsertObj() const { return m_eActObj;}
+ void SetInsertObj( SdrObjKind eObj,const OUString& _sShapeType = OUString());
+ SdrObjKind GetInsertObj() const { return m_eActObj;}
OUString const & GetInsertObjString() const;
DlgEdMode GetMode() const { return m_eMode; }
diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx
index 06ee94c3bd49..326c5ff0308c 100644
--- a/reportdesign/source/ui/inc/ReportController.hxx
+++ b/reportdesign/source/ui/inc/ReportController.hxx
@@ -126,7 +126,7 @@ namespace rptui
* \param _xSection the section where to create the formatted field
* \param _sFunction the function which will be set at the data field.
*/
- void createControl(const css::uno::Sequence< css::beans::PropertyValue >& _aArgs,const css::uno::Reference< css::report::XSection>& _xSection,const OUString& _sFunction ,sal_uInt16 _nObjectId = OBJ_DLG_FORMATTEDFIELD);
+ void createControl(const css::uno::Sequence< css::beans::PropertyValue >& _aArgs,const css::uno::Reference< css::report::XSection>& _xSection,const OUString& _sFunction ,SdrObjKind _nObjectId = OBJ_RD_FORMATTEDFIELD);
/** switch the report header/footer sectionon off with undo or without depending on the given id.
*
* \param _nId Can either be SID_REPORTHEADER_WITHOUT_UNDO or SID_REPORTFOOTER_WITHOUT_UNDO or SID_REPORTHEADERFOOTER.
diff --git a/reportdesign/source/ui/inc/ReportWindow.hxx b/reportdesign/source/ui/inc/ReportWindow.hxx
index d794a33f13a4..c634dcf098f4 100644
--- a/reportdesign/source/ui/inc/ReportWindow.hxx
+++ b/reportdesign/source/ui/inc/ReportWindow.hxx
@@ -74,7 +74,7 @@ namespace rptui
OScrollWindowHelper* getScrollWindow() const { return m_pParent; }
void SetMode( DlgEdMode m_eMode );
- void SetInsertObj( sal_uInt16 eObj, const OUString& _sShapeType);
+ void SetInsertObj(SdrObjKind eObj, const OUString& _sShapeType);
OUString const & GetInsertObjString() const;
void setGridSnap(bool bOn);
void setDragStripes(bool bOn);
diff --git a/reportdesign/source/ui/inc/ScrollHelper.hxx b/reportdesign/source/ui/inc/ScrollHelper.hxx
index c166e1f759d5..eab5c7dd3b8b 100644
--- a/reportdesign/source/ui/inc/ScrollHelper.hxx
+++ b/reportdesign/source/ui/inc/ScrollHelper.hxx
@@ -84,7 +84,7 @@ namespace rptui
// forwards
void SetMode( DlgEdMode _eMode );
- void SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType);
+ void SetInsertObj(SdrObjKind eObj, const OUString& _sShapeType);
OUString const & GetInsertObjString() const;
void setGridSnap(bool bOn);
void setDragStripes(bool bOn);
diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx
index e03ff63648df..c270aae409fc 100644
--- a/reportdesign/source/ui/inc/ViewsWindow.hxx
+++ b/reportdesign/source/ui/inc/ViewsWindow.hxx
@@ -148,7 +148,7 @@ namespace rptui
bool empty() const { return m_aSections.empty(); }
void SetMode( DlgEdMode m_eMode );
- void SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType);
+ void SetInsertObj( SdrObjKind eObj,const OUString& _sShapeType);
const OUString& GetInsertObjString() const { return m_sShapeType;}
/** copies the current selection in this section
*/
diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx
index dc85e34acd2d..e4eb5f653659 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -289,7 +289,7 @@ void ODesignView::SetMode( DlgEdMode _eNewMode )
m_aScrollWindow->SetMode(_eNewMode);
}
-void ODesignView::SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType )
+void ODesignView::SetInsertObj( SdrObjKind eObj,const OUString& _sShapeType )
{
m_eActObj = eObj;
m_aScrollWindow->SetInsertObj( eObj,_sShapeType );
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 0c2ba10ea590..cae05f329d5a 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -600,23 +600,23 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const
break;
case SID_FM_FIXEDTEXT:
aReturn.bEnabled = isEditable();
- aReturn.bChecked = getDesignView()->GetInsertObj() == OBJ_DLG_FIXEDTEXT;
+ aReturn.bChecked = getDesignView()->GetInsertObj() == OBJ_RD_FIXEDTEXT;
break;
case SID_INSERT_HFIXEDLINE:
aReturn.bEnabled = isEditable();
- aReturn.bChecked = getDesignView()->GetInsertObj() == OBJ_DLG_HFIXEDLINE;
+ aReturn.bChecked = getDesignView()->GetInsertObj() == OBJ_RD_HFIXEDLINE;
break;
case SID_INSERT_VFIXEDLINE:
aReturn.bEnabled = isEditable();
- aReturn.bChecked = getDesignView()->GetInsertObj() == OBJ_DLG_VFIXEDLINE;
+ aReturn.bChecked = getDesignView()->GetInsertObj() == OBJ_RD_VFIXEDLINE;
break;
case SID_FM_EDIT:
aReturn.bEnabled = isEditable();
- aReturn.bChecked = getDesignView()->GetInsertObj() == OBJ_DLG_FORMATTEDFIELD;
+ aReturn.bChecked = getDesignView()->GetInsertObj() == OBJ_RD_FORMATTEDFIELD;
break;
case SID_FM_IMAGECONTROL:
aReturn.bEnabled = isEditable();
- aReturn.bChecked = getDesignView()->GetInsertObj() == OBJ_DLG_IMAGECONTROL;
+ aReturn.bChecked = getDesignView()->GetInsertObj() == OBJ_RD_IMAGECONTROL;
break;
case SID_DRAWTBX_CS_BASIC:
case SID_DRAWTBX_CS_BASIC1:
@@ -1116,10 +1116,10 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >
InvalidateFeature( SID_OBJECT_SELECT );
break;
case SID_SELECT_ALL_EDITS:
- getDesignView()->SelectAll(OBJ_DLG_FORMATTEDFIELD);
+ getDesignView()->SelectAll(OBJ_RD_FORMATTEDFIELD);
break;
case SID_SELECT_ALL_LABELS:
- getDesignView()->SelectAll(OBJ_DLG_FIXEDTEXT);
+ getDesignView()->SelectAll(OBJ_RD_FIXEDTEXT);
break;
case SID_TERMINATE_INPLACEACTIVATION:
{
@@ -1200,31 +1200,31 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >
break;
case SID_FM_FIXEDTEXT:
getDesignView()->SetMode( DlgEdMode::Insert );
- getDesignView()->SetInsertObj( OBJ_DLG_FIXEDTEXT );
+ getDesignView()->SetInsertObj( OBJ_RD_FIXEDTEXT );
createDefaultControl(aArgs);
InvalidateAll();
break;
case SID_INSERT_HFIXEDLINE:
getDesignView()->SetMode( DlgEdMode::Insert );
- getDesignView()->SetInsertObj( OBJ_DLG_HFIXEDLINE );
+ getDesignView()->SetInsertObj( OBJ_RD_HFIXEDLINE );
createDefaultControl(aArgs);
InvalidateAll();
break;
case SID_INSERT_VFIXEDLINE:
getDesignView()->SetMode( DlgEdMode::Insert );
- getDesignView()->SetInsertObj( OBJ_DLG_VFIXEDLINE );
+ getDesignView()->SetInsertObj( OBJ_RD_VFIXEDLINE );
createDefaultControl(aArgs);
InvalidateAll();
break;
case SID_FM_EDIT:
getDesignView()->SetMode( DlgEdMode::Insert );
- getDesignView()->SetInsertObj( OBJ_DLG_FORMATTEDFIELD );
+ getDesignView()->SetInsertObj( OBJ_RD_FORMATTEDFIELD );
createDefaultControl(aArgs);
InvalidateAll();
break;
case SID_FM_IMAGECONTROL:
getDesignView()->SetMode( DlgEdMode::Insert );
- getDesignView()->SetInsertObj( OBJ_DLG_IMAGECONTROL );
+ getDesignView()->SetInsertObj( OBJ_RD_IMAGECONTROL );
createDefaultControl(aArgs);
InvalidateAll();
break;
@@ -3012,7 +3012,7 @@ void OReportController::insertGraphic()
{ PROPERTY_IMAGEURL, Any(aDialog.GetPath()) },
{ PROPERTY_PRESERVEIRI, Any(bLink) }
}));
- createControl(aArgs,xSection,OUString(),OBJ_DLG_IMAGECONTROL);
+ createControl(aArgs,xSection,OUString(),OBJ_RD_IMAGECONTROL);
}
}
catch(const Exception&)
@@ -3099,7 +3099,7 @@ IMPL_LINK_NOARG( OReportController, OnExecuteReport, void*, void )
executeReport();
}
-void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,const uno::Reference< report::XSection>& _xSection,const OUString& _sFunction,sal_uInt16 _nObjectId)
+void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,const uno::Reference< report::XSection>& _xSection,const OUString& _sFunction,SdrObjKind _nObjectId)
{
SequenceAsHashMap aMap(_aArgs);
getDesignView()->setMarked(_xSection, true);
@@ -3131,7 +3131,7 @@ void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,co
OReportSection::createDefault(sCustomShapeType,pNewControl);
pNewControl->SetLogicRect(tools::Rectangle(3000,500,6000,3500)); // switch height and width
}
- else if ( _nObjectId == OBJ_OLE2 || OBJ_DLG_SUBREPORT == _nObjectId )
+ else if ( _nObjectId == OBJ_OLE2 || OBJ_RD_SUBREPORT == _nObjectId )
{
pNewControl = SdrObjFactory::MakeNewObject(
*m_aReportModel,
@@ -3159,7 +3159,7 @@ void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,co
nullptr,
_nObjectId,
SdrInventor::ReportDesign,
- OBJ_DLG_FIXEDTEXT,
+ OBJ_RD_FIXEDTEXT,
// tdf#118963 Need a SdrModel for SdrObject creation. Dereferencing
// m_aReportModel seems pretty safe, it's done in other places, initialized
@@ -3216,9 +3216,9 @@ void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,co
pObj->CreateMediator(true);
- if ( _nObjectId == OBJ_DLG_FIXEDTEXT ) // special case for fixed text
+ if ( _nObjectId == OBJ_RD_FIXEDTEXT ) // special case for fixed text
xUnoProp->setPropertyValue(PROPERTY_LABEL,uno::makeAny(OUnoObject::GetDefaultName(pObj)));
- else if ( _nObjectId == OBJ_DLG_VFIXEDLINE )
+ else if ( _nObjectId == OBJ_RD_VFIXEDLINE )
{
awt::Size aOlSize = xShapeProp->getSize();
xShapeProp->setSize(awt::Size(aOlSize.Height,aOlSize.Width)); // switch height and width
@@ -3427,7 +3427,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs)
if ( !xField.is() )
continue;
- sal_uInt16 nOBJID = 0;
+ SdrObjKind nOBJID = OBJ_NONE;
sal_Int32 nDataType = sdbc::DataType::BINARY;
xField->getPropertyValue(PROPERTY_TYPE) >>= nDataType;
switch ( nDataType )
@@ -3435,10 +3435,10 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs)
case sdbc::DataType::BINARY:
case sdbc::DataType::VARBINARY:
case sdbc::DataType::LONGVARBINARY:
- nOBJID = OBJ_DLG_IMAGECONTROL;
+ nOBJID = OBJ_RD_IMAGECONTROL;
break;
default:
- nOBJID = OBJ_DLG_FORMATTEDFIELD;
+ nOBJID = OBJ_RD_FORMATTEDFIELD;
break;
}
@@ -3466,7 +3466,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs)
xNumberFormats,
nOBJID,
SdrInventor::ReportDesign,
- OBJ_DLG_FIXEDTEXT,
+ OBJ_RD_FIXEDTEXT,
// tdf#118963 Need a SdrModel for SdrObject creation. Dereferencing
// m_aReportModel seems pretty safe, it's done in other places, initialized
@@ -3537,7 +3537,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs)
xField->getPropertyValue(PROPERTY_LABEL) >>= sLabel;
if (pSectionViews[0] != pSectionViews[1] &&
- nOBJID == OBJ_DLG_FORMATTEDFIELD) // we want this nice feature only at FORMATTEDFIELD
+ nOBJID == OBJ_RD_FORMATTEDFIELD) // we want this nice feature only at FORMATTEDFIELD
{
uno::Reference< report::XReportComponent> xShapePropLabel(pObjs[0]->getUnoShape(),uno::UNO_QUERY_THROW);
uno::Reference< report::XReportComponent> xShapePropTextField(pObjs[1]->getUnoShape(),uno::UNO_QUERY_THROW);
diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx
index 674e72da8e9c..ed6f614b5859 100644
--- a/reportdesign/source/ui/report/ReportWindow.cxx
+++ b/reportdesign/source/ui/report/ReportWindow.cxx
@@ -89,7 +89,7 @@ void OReportWindow::dispose()
vcl::Window::dispose();
}
-void OReportWindow::SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType )
+void OReportWindow::SetInsertObj( SdrObjKind eObj,const OUString& _sShapeType )
{
m_aViewsWindow->SetInsertObj( eObj,_sShapeType);
}
diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx
index a7a8fda02ad3..bb9691e8eabf 100644
--- a/reportdesign/source/ui/report/ScrollHelper.cxx
+++ b/reportdesign/source/ui/report/ScrollHelper.cxx
@@ -218,7 +218,7 @@ sal_uInt16 OScrollWindowHelper::getSectionCount() const
return m_aReportWindow->getSectionCount();
}
-void OScrollWindowHelper::SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType )
+void OScrollWindowHelper::SetInsertObj(SdrObjKind eObj, const OUString& _sShapeType)
{
m_aReportWindow->SetInsertObj(eObj,_sShapeType);
}
diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx
index db2b44b6d731..2274e85ca529 100644
--- a/reportdesign/source/ui/report/ViewsWindow.cxx
+++ b/reportdesign/source/ui/report/ViewsWindow.cxx
@@ -330,7 +330,7 @@ sal_uInt16 OViewsWindow::getSectionCount() const
return static_cast<sal_uInt16>(m_aSections.size());
}
-void OViewsWindow::SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType )
+void OViewsWindow::SetInsertObj( SdrObjKind eObj,const OUString& _sShapeType )
{
for (const auto& rxSection : m_aSections)
rxSection->getReportSection().getSectionView().SetCurrentObj( eObj, SdrInventor::ReportDesign );
diff --git a/reportdesign/source/ui/report/dlgedfac.cxx b/reportdesign/source/ui/report/dlgedfac.cxx
index a0db6c64bc5d..bc68d60b896d 100644
--- a/reportdesign/source/ui/report/dlgedfac.cxx
+++ b/reportdesign/source/ui/report/dlgedfac.cxx
@@ -48,29 +48,29 @@ IMPL_STATIC_LINK(
{
switch( aParams.nObjIdentifier )
{
- case OBJ_DLG_FIXEDTEXT:
+ case OBJ_RD_FIXEDTEXT:
pNewObj = new OUnoObject(aParams.rSdrModel, SERVICE_FIXEDTEXT
,OUString("com.sun.star.form.component.FixedText")
- ,OBJ_DLG_FIXEDTEXT);
+ ,OBJ_RD_FIXEDTEXT);
break;
- case OBJ_DLG_IMAGECONTROL:
+ case OBJ_RD_IMAGECONTROL:
pNewObj = new OUnoObject(aParams.rSdrModel, SERVICE_IMAGECONTROL
,OUString("com.sun.star.form.component.DatabaseImageControl")
- ,OBJ_DLG_IMAGECONTROL);
+ ,OBJ_RD_IMAGECONTROL);
break;
- case OBJ_DLG_FORMATTEDFIELD:
+ case OBJ_RD_FORMATTEDFIELD:
pNewObj = new OUnoObject(aParams.rSdrModel, SERVICE_FORMATTEDFIELD
,OUString("com.sun.star.form.component.FormattedField")
- ,OBJ_DLG_FORMATTEDFIELD);
+ ,OBJ_RD_FORMATTEDFIELD);
break;
- case OBJ_DLG_VFIXEDLINE:
- case OBJ_DLG_HFIXEDLINE:
+ case OBJ_RD_VFIXEDLINE:
+ case OBJ_RD_HFIXEDLINE:
{
OUnoObject* pObj = new OUnoObject(aParams.rSdrModel, SERVICE_FIXEDLINE
,OUString("com.sun.star.awt.UnoControlFixedLineModel")
,aParams.nObjIdentifier);
pNewObj = pObj;
- if ( aParams.nObjIdentifier == OBJ_DLG_HFIXEDLINE )
+ if ( aParams.nObjIdentifier == OBJ_RD_HFIXEDLINE )
{
uno::Reference<beans::XPropertySet> xProp = pObj->getAwtComponent();
xProp->setPropertyValue( PROPERTY_ORIENTATION, uno::makeAny(sal_Int32(0)) );
@@ -80,8 +80,8 @@ IMPL_STATIC_LINK(
case OBJ_CUSTOMSHAPE:
pNewObj = new OCustomShape(aParams.rSdrModel, SERVICE_SHAPE);
break;
- case OBJ_DLG_SUBREPORT:
- pNewObj = new OOle2Obj(aParams.rSdrModel, SERVICE_REPORTDEFINITION, OBJ_DLG_SUBREPORT);
+ case OBJ_RD_SUBREPORT:
+ pNewObj = new OOle2Obj(aParams.rSdrModel, SERVICE_REPORTDEFINITION, OBJ_RD_SUBREPORT);
break;
case OBJ_OLE2:
pNewObj = new OOle2Obj(aParams.rSdrModel, "com.sun.star.chart2.ChartDocument", OBJ_OLE2);
generated by cgit (git 2.34.1) at 2024-07-06 20:18:02 +0000