diff options
author | Oliver Bolte <obo@openoffice.org> | 2007-06-12 04:37:26 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2007-06-12 04:37:26 +0000 |
commit | 90b9d35e53644a084f1ce1bb8168743352750a9a (patch) | |
tree | 5fe7df3cf38747a42fbb763b3e29ef4967c7ae67 /extensions | |
parent | 8f37b0ee43d4a9f2e07b5c69d8e246e76f82fb65 (diff) |
INTEGRATION: CWS dba23ui (1.14.6); FILE MERGED
2007/05/21 11:07:29 fs 1.14.6.1: proper RTL display of control labels
Issue number: #i69452#
Submitted by: ayaniger@openoffice.org
Reviewed by: frank.schoenheit@sun.com
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/source/propctrlr/browserline.cxx | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx index 45f3ca64ac58..24922062e3b8 100644 --- a/extensions/source/propctrlr/browserline.cxx +++ b/extensions/source/propctrlr/browserline.cxx @@ -4,9 +4,9 @@ * * $RCSfile: browserline.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: kz $ $Date: 2007-05-10 10:46:12 $ + * last change: $Author: obo $ $Date: 2007-06-12 05:37:26 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -335,8 +335,17 @@ namespace pcr if( m_pTheParent ) { String aText = m_aFtTitle.GetText(); + while( m_pTheParent->GetTextWidth( aText ) < m_nNameWidth ) - aText.AppendAscii("..........."); + aText.AppendAscii("..........."); + + // for Issue 69452 + if (Application::GetSettings().GetLayoutRTL()) + { + sal_Unicode cRTL_mark = 0x200F; + aText.Append(cRTL_mark); + } + m_aFtTitle.SetText(aText); } } @@ -345,7 +354,16 @@ namespace pcr XubString OBrowserLine::GetTitle() const { String sDisplayName = m_aFtTitle.GetText(); + + // for Issue 69452 + if (Application::GetSettings().GetLayoutRTL()) + { + sal_Unicode cRTL_mark = 0x200F; + sDisplayName.EraseTrailingChars(cRTL_mark); + } + sDisplayName.EraseTrailingChars( '.' ); + return sDisplayName; } |