diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2013-08-17 12:53:07 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-08-19 14:19:34 +0000 |
| commit | edba90dc39fc3141a8a9e441aa97b46baa4c6ca2 (patch) | |
| tree | 6692756ca703bc994a05769ef39c09c1e177cf71 /sw/source/core/frmedt | |
| parent | 83d874ec13f6bf260f3f4093fd1613bea23bf27c (diff) | |
String to OUString + whitespaces, log messages
Change-Id: I76014ecb4dd0f040b6770965cb690cc9839bedb5
Reviewed-on: https://gerrit.libreoffice.org/5474
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/core/frmedt')
| -rw-r--r-- | sw/source/core/frmedt/fefly1.cxx | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx index 4765b7124c64..9f5a55765f88 100644 --- a/sw/source/core/frmedt/fefly1.cxx +++ b/sw/source/core/frmedt/fefly1.cxx @@ -2007,10 +2007,8 @@ void SwFEShell::GetConnectableFrmFmts(SwFrmFmt & rFmt, } // #i73249# -const String SwFEShell::GetObjTitle() const +OUString SwFEShell::GetObjTitle() const { - String aTitle; - if ( Imp()->HasDrawView() ) { const SdrMarkList *pMrkList = &Imp()->GetDrawView()->GetMarkedObjectList(); @@ -2020,19 +2018,16 @@ const String SwFEShell::GetObjTitle() const const SwFrmFmt* pFmt = FindFrmFmt( pObj ); if ( pFmt->Which() == RES_FLYFRMFMT ) { - aTitle = dynamic_cast<const SwFlyFrmFmt*>(pFmt)->GetObjTitle(); - } - else - { - aTitle = pObj->GetTitle(); + return dynamic_cast<const SwFlyFrmFmt*>(pFmt)->GetObjTitle(); } + return pObj->GetTitle(); } } - return aTitle; + return OUString(); } -void SwFEShell::SetObjTitle( const String& rTitle ) +void SwFEShell::SetObjTitle( const OUString& rTitle ) { if ( Imp()->HasDrawView() ) { @@ -2054,10 +2049,8 @@ void SwFEShell::SetObjTitle( const String& rTitle ) } } -const String SwFEShell::GetObjDescription() const +OUString SwFEShell::GetObjDescription() const { - String aDescription; - if ( Imp()->HasDrawView() ) { const SdrMarkList *pMrkList = &Imp()->GetDrawView()->GetMarkedObjectList(); @@ -2067,19 +2060,16 @@ const String SwFEShell::GetObjDescription() const const SwFrmFmt* pFmt = FindFrmFmt( pObj ); if ( pFmt->Which() == RES_FLYFRMFMT ) { - aDescription = dynamic_cast<const SwFlyFrmFmt*>(pFmt)->GetObjDescription(); - } - else - { - aDescription = pObj->GetDescription(); + return dynamic_cast<const SwFlyFrmFmt*>(pFmt)->GetObjDescription(); } + return pObj->GetDescription(); } } - return aDescription; + return OUString(); } -void SwFEShell::SetObjDescription( const String& rDescription ) +void SwFEShell::SetObjDescription( const OUString& rDescription ) { if ( Imp()->HasDrawView() ) { |