diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-03-30 23:40:05 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-04-02 14:53:47 +0100 |
| commit | 1b088c6e496b799ca9ddb0d6f7b98bcb5c132ecc (patch) | |
| tree | 82233934338933862ebcc8135a5733d854acc26b /svx | |
| parent | 2658eeb1203833662aa99c4577d311474a5538a2 (diff) | |
pointer is always non-null
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/form/navigatortree.cxx | 7 | ||||
| -rw-r--r-- | svx/source/svdraw/svdotext.cxx | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 9dd61e9ee169..2c664376abe7 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -1480,12 +1480,11 @@ namespace svxform ////////////////////////////////////////////////////////////////////// // BasisNamen erzeugen - UniString aBaseName; + rtl::OUString aBaseName; if( pEntryData->ISA(FmFormData) ) - aBaseName = SVX_RES( RID_STR_STDFORMNAME ); - + aBaseName = SVX_RESSTR( RID_STR_STDFORMNAME ); else if( pEntryData->ISA(FmControlData) ) - aBaseName = SVX_RES( RID_STR_CONTROL ); + aBaseName = SVX_RESSTR( RID_STR_CONTROL ); ////////////////////////////////////////////////////////////////////// // Neuen Namen erstellen diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 7df368f3acdc..96c9b34545a6 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -870,7 +870,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS { // check whether CharStretching is possible at all GDIMetaFile* pMtf = pOut->GetConnectMetaFile(); - UniString aTestString(sal_Unicode('J')); + rtl::OUString aTestString(static_cast<sal_Unicode>('J')); if(pMtf && (!pMtf->IsRecord() || pMtf->IsPause())) pMtf = NULL; |