summaryrefslogtreecommitdiff
path: root/reportdesign/source/core/sdr/RptObject.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-04-30 17:01:32 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-05-02 13:18:57 +0200
commit34f7e618ddd3399d9e7f3998e25545256255d02d (patch)
treefd946f8f2ab8386db89f531d49fae1718a21e943 /reportdesign/source/core/sdr/RptObject.cxx
parentc881756fcfdc1fa63ff534bf4538d551b2139515 (diff)
untranslated strings are just strings
removes starmaths InsertCommand in favour of InsertCommandText Change-Id: I5659adcaa28e5b5861d1a1cc5d2afa84009490f6 Reviewed-on: https://gerrit.libreoffice.org/37113 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'reportdesign/source/core/sdr/RptObject.cxx')
-rw-r--r--reportdesign/source/core/sdr/RptObject.cxx14
1 files changed, 5 insertions, 9 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);