diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2013-08-18 01:53:27 +0200 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2013-08-18 01:53:27 +0200 |
| commit | bc42d992439de77b0e60a8435b2a134d886f0f76 (patch) | |
| tree | ce959150c9841e08d78889b371706cae5584c021 /sw | |
| parent | 70ef99c447fcdb73ecadb8b3afd251ef8021a6cc (diff) | |
String to OUString, optimize order of checks
Change-Id: I54deff88232d54f268a03dd61646b0ad59b3d8d1
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/rubylist.hxx | 20 | ||||
| -rw-r--r-- | sw/source/core/doc/docruby.cxx | 8 |
2 files changed, 14 insertions, 14 deletions
diff --git a/sw/inc/rubylist.hxx b/sw/inc/rubylist.hxx index c79df00c6214..ec834f9f4a70 100644 --- a/sw/inc/rubylist.hxx +++ b/sw/inc/rubylist.hxx @@ -16,8 +16,8 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _RUBYLIST_HXX -#define _RUBYLIST_HXX +#ifndef RUBYLIST_HXX +#define RUBYLIST_HXX #include <swtypes.hxx> #include <fmtruby.hxx> @@ -25,18 +25,18 @@ class SwRubyListEntry { - String sText; - SwFmtRuby aRubyAttr; + OUString m_sText; + SwFmtRuby m_aRubyAttr; public: - SwRubyListEntry() : aRubyAttr( aEmptyStr ) {} + SwRubyListEntry() : m_aRubyAttr( OUString() ) {} ~SwRubyListEntry(); - const String& GetText() const { return sText; } - void SetText( const String& rStr ) { sText = rStr; } + OUString GetText() const { return m_sText; } + void SetText( const OUString& rStr ) { m_sText = rStr; } - const SwFmtRuby& GetRubyAttr() const { return aRubyAttr; } - SwFmtRuby& GetRubyAttr() { return aRubyAttr; } - void SetRubyAttr( const SwFmtRuby& rAttr ) { aRubyAttr = rAttr; } + const SwFmtRuby& GetRubyAttr() const { return m_aRubyAttr; } + SwFmtRuby& GetRubyAttr() { return m_aRubyAttr; } + void SetRubyAttr( const SwFmtRuby& rAttr ) { m_aRubyAttr = rAttr; } }; class SwRubyList : public boost::ptr_vector<SwRubyListEntry> {}; diff --git a/sw/source/core/doc/docruby.cxx b/sw/source/core/doc/docruby.cxx index 1760bf5e41e2..2e2bab72e041 100644 --- a/sw/source/core/doc/docruby.cxx +++ b/sw/source/core/doc/docruby.cxx @@ -134,8 +134,8 @@ sal_uInt16 SwDoc::SetRubyList( const SwPaM& rPam, const SwRubyList& rList, } } - if( aCheckEntry.GetText() != pEntry->GetText() && - pEntry->GetText().Len() ) + if( !pEntry->GetText().isEmpty() && + aCheckEntry.GetText() != pEntry->GetText() ) { // text is changed, so replace the original ReplaceRange( aPam, pEntry->GetText(), false ); @@ -156,11 +156,11 @@ sal_uInt16 SwDoc::SetRubyList( const SwPaM& rPam, const SwRubyList& rList, // set/reset the attribut if( !pEntry->GetRubyAttr().GetText().isEmpty() && - pEntry->GetText().Len() ) + !pEntry->GetText().isEmpty() ) { InsertString( aPam, pEntry->GetText() ); aPam.SetMark(); - aPam.GetMark()->nContent -= pEntry->GetText().Len(); + aPam.GetMark()->nContent -= pEntry->GetText().getLength(); InsertPoolItem( aPam, pEntry->GetRubyAttr(), nsSetAttrMode::SETATTR_DONTEXPAND ); } |