diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-02-15 10:31:10 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-02-15 10:31:10 +0100 |
| commit | 4a7d3e0c752e3d1a10de8c4a2a1ccd1f00ada3fc (patch) | |
| tree | 814c85d7673480e087b7d5757def9db53fd8a74e /reportdesign/source/core/sdr/RptObject.cxx | |
| parent | 933795c27b41b3f8f66725a6d814d5fc608a8359 (diff) | |
| parent | ac6e971d8a5f715f716b6bdcaf6cb535104df32c (diff) | |
dba34d: pulled and merged CWS dba34c, thus implicitly rebasing to m100
Diffstat (limited to 'reportdesign/source/core/sdr/RptObject.cxx')
| -rw-r--r-- | reportdesign/source/core/sdr/RptObject.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx index 272f0d6f4ecd..bbc970eba479 100644 --- a/reportdesign/source/core/sdr/RptObject.cxx +++ b/reportdesign/source/core/sdr/RptObject.cxx @@ -37,7 +37,7 @@ #include <toolkit/helper/convert.hxx> #include "RptPage.hxx" #include "corestrings.hrc" -#include <dbaccess/singledoccontroller.hxx> +#include <dbaccess/dbsubcomponentcontroller.hxx> #include "ModuleHelper.hxx" #include <RptResId.hrc> @@ -509,12 +509,12 @@ OCustomShape::~OCustomShape() DBG_DTOR( rpt_OCustomShape, NULL); } // ----------------------------------------------------------------------------- -UINT16 OCustomShape::GetObjIdentifier() const +sal_uInt16 OCustomShape::GetObjIdentifier() const { - return UINT16(OBJ_CUSTOMSHAPE); + return sal_uInt16(OBJ_CUSTOMSHAPE); } //---------------------------------------------------------------------------- -UINT32 OCustomShape::GetObjInventor() const +sal_uInt32 OCustomShape::GetObjInventor() const { return ReportInventor; } @@ -692,12 +692,12 @@ void OUnoObject::impl_setReportComponent_nothrow() impl_initializeModel_nothrow(); } // ----------------------------------------------------------------------------- -UINT16 OUnoObject::GetObjIdentifier() const +sal_uInt16 OUnoObject::GetObjIdentifier() const { - return UINT16(m_nObjectType); + return sal_uInt16(m_nObjectType); } //---------------------------------------------------------------------------- -UINT32 OUnoObject::GetObjInventor() const +sal_uInt32 OUnoObject::GetObjInventor() const { return ReportInventor; } @@ -965,7 +965,7 @@ SdrObject* OUnoObject::Clone() const //---------------------------------------------------------------------------- TYPEINIT1(OOle2Obj, SdrOle2Obj); DBG_NAME( rpt_OOle2Obj ); -OOle2Obj::OOle2Obj(const uno::Reference< report::XReportComponent>& _xComponent,UINT16 _nType) +OOle2Obj::OOle2Obj(const uno::Reference< report::XReportComponent>& _xComponent,sal_uInt16 _nType) :SdrOle2Obj() ,OObjectBase(_xComponent) ,m_nType(_nType) @@ -977,7 +977,7 @@ OOle2Obj::OOle2Obj(const uno::Reference< report::XReportComponent>& _xComponent, m_bIsListening = sal_True; } //---------------------------------------------------------------------------- -OOle2Obj::OOle2Obj(const ::rtl::OUString& _sComponentName,UINT16 _nType) +OOle2Obj::OOle2Obj(const ::rtl::OUString& _sComponentName,sal_uInt16 _nType) :SdrOle2Obj() ,OObjectBase(_sComponentName) ,m_nType(_nType) @@ -992,12 +992,12 @@ OOle2Obj::~OOle2Obj() DBG_DTOR( rpt_OOle2Obj, NULL); } // ----------------------------------------------------------------------------- -UINT16 OOle2Obj::GetObjIdentifier() const +sal_uInt16 OOle2Obj::GetObjIdentifier() const { return m_nType; } //---------------------------------------------------------------------------- -UINT32 OOle2Obj::GetObjInventor() const +sal_uInt32 OOle2Obj::GetObjInventor() const { return ReportInventor; } |