diff options
Diffstat (limited to 'reportdesign/source')
-rw-r--r-- | reportdesign/source/core/sdr/RptObject.cxx | 14 | ||||
-rw-r--r-- | reportdesign/source/ui/report/propbrw.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/ui/report/report.src | 19 |
3 files changed, 8 insertions, 29 deletions
diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx index 92ee82a45587..45b5dc064d30 100644 --- a/reportdesign/source/core/sdr/RptObject.cxx +++ b/reportdesign/source/core/sdr/RptObject.cxx @@ -32,6 +32,7 @@ #include "ModuleHelper.hxx" #include <RptResId.hrc> +#include "strings.hxx" #include <svx/xflclit.hxx> #include <svx/xlnclit.hxx> #include <svx/xlndsit.hxx> @@ -764,32 +765,27 @@ bool OUnoObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) OUString OUnoObject::GetDefaultName(const OUnoObject* _pObj) { - sal_uInt16 nResId = 0; OUString aDefaultName = "HERE WE HAVE TO INSERT OUR NAME!"; if ( _pObj->supportsService( SERVICE_FIXEDTEXT ) ) { - nResId = RID_STR_CLASS_FIXEDTEXT; + aDefaultName = RID_STR_CLASS_FIXEDTEXT; } else if ( _pObj->supportsService( SERVICE_FIXEDLINE ) ) { - nResId = RID_STR_CLASS_FIXEDLINE; + aDefaultName = RID_STR_CLASS_FIXEDLINE; } else if ( _pObj->supportsService( SERVICE_IMAGECONTROL ) ) { - nResId = RID_STR_CLASS_IMAGECONTROL; + aDefaultName = RID_STR_CLASS_IMAGECONTROL; } else if ( _pObj->supportsService( SERVICE_FORMATTEDFIELD ) ) { - nResId = RID_STR_CLASS_FORMATTEDFIELD; + aDefaultName = RID_STR_CLASS_FORMATTEDFIELD; } - if (nResId) - aDefaultName = ModuleRes(nResId); - return aDefaultName; } - void OUnoObject::_propertyChange( const beans::PropertyChangeEvent& evt ) { OObjectBase::_propertyChange(evt); diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx index 8d436f30e291..5e7316b7dcd3 100644 --- a/reportdesign/source/ui/report/propbrw.cxx +++ b/reportdesign/source/ui/report/propbrw.cxx @@ -54,6 +54,7 @@ #include "ViewsWindow.hxx" #include "UITools.hxx" #include <unotools/confignode.hxx> +#include "strings.hxx" namespace rptui { @@ -381,7 +382,8 @@ OUString PropBrw::GetHeadlineName( const uno::Sequence< Reference<uno::XInterfac else { OSL_FAIL("Unknown service name!"); - nResId = RID_STR_CLASS_FORMATTEDFIELD; + aName += RID_STR_CLASS_FORMATTEDFIELD; + return aName; } if (nResId) diff --git a/reportdesign/source/ui/report/report.src b/reportdesign/source/ui/report/report.src index af7f1b0e3876..55472688ab79 100644 --- a/reportdesign/source/ui/report/report.src +++ b/reportdesign/source/ui/report/report.src @@ -21,25 +21,6 @@ #include <svx/svxids.hrc> #include "helpids.hrc" -// Dialog Controls --------------------------------------------------------------- - -String RID_STR_CLASS_FIXEDTEXT -{ - Text = "Label" ; -}; -String RID_STR_CLASS_FIXEDLINE -{ - Text = "Line" ; -}; -String RID_STR_CLASS_IMAGECONTROL -{ - Text = "Graphic" ; -}; -String RID_STR_CLASS_FORMATTEDFIELD -{ - Text = "FormattedField" ; -}; - // Property Browser Headline ---------------------------------------------------------------- String RID_STR_BRWTITLE_PROPERTIES |