diff options
| author | Peter Rabi <prabi@caesar.elte.hu> | 2011-08-01 09:55:46 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2011-08-01 10:30:30 +0200 |
| commit | 055997e42aeacc48f45e5482a69bd3e91bf3e914 (patch) | |
| tree | f5777fb1f90b4ebd555f184d69f332e0135f437d | |
| parent | 71493605969a6ae603001b105261fada2784edbe (diff) | |
Clean-up of bugfix fdo#32895 for the master branch
Contributed under license LGPLv3+/MPL.
| -rw-r--r-- | sfx2/source/doc/doctempl.cxx | 16 | ||||
| -rw-r--r-- | sfx2/source/doc/templatelocnames.src | 2 |
2 files changed, 1 insertions, 17 deletions
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx index 55df091e35..640c645a91 100644 --- a/sfx2/source/doc/doctempl.cxx +++ b/sfx2/source/doc/doctempl.cxx @@ -152,8 +152,6 @@ class DocTempl_EntryData_Impl private: RegionData_Impl* GetParent() const { return mpParent; } - OUString ConvertResourceString( - int nSourceResIds, int nDestResIds, int nCount, const OUString& rString ); public: DocTempl_EntryData_Impl( RegionData_Impl* pParent, @@ -1796,20 +1794,6 @@ DocTempl_EntryData_Impl::DocTempl_EntryData_Impl( RegionData_Impl* pParent, } // ----------------------------------------------------------------------- -OUString DocTempl_EntryData_Impl::ConvertResourceString ( - int nSourceResIds, int nDestResIds, int nCount, const OUString& rString ) -{ - for( int i = 0; i < nCount; ++i ) - { - if( rString == ResId::toString( (const ResId)SfxResId( (sal_uInt16)(nSourceResIds + i) ) ) ) - { - return ResId::toString( (const ResId)SfxResId( (sal_uInt16)(nDestResIds + i) ) ); - } - } - return rString; -} - -// ----------------------------------------------------------------------- int DocTempl_EntryData_Impl::Compare( const OUString& rTitle ) const { return maTitle.compareTo( rTitle ); diff --git a/sfx2/source/doc/templatelocnames.src b/sfx2/source/doc/templatelocnames.src index 9b977554a4..03c3caf661 100644 --- a/sfx2/source/doc/templatelocnames.src +++ b/sfx2/source/doc/templatelocnames.src @@ -50,7 +50,7 @@ String STR_TEMPLATE_NAME4_DEF String STR_TEMPLATE_NAME5_DEF { - Text = "Blue with Bottom Title" ; + Text = "Blue with Bottom Title " ; }; String STR_TEMPLATE_NAME6_DEF |