[Libreoffice-commits] .: sfx2/source

[Andras Timar]

 sfx2/source/doc/doctempl.cxx         |   16 ----------------
 sfx2/source/doc/templatelocnames.src |    2 +-
 2 files changed, 1 insertion(+), 17 deletions(-)

New commits:
commit 055997e42aeacc48f45e5482a69bd3e91bf3e914
Author: Peter Rabi <prabi at caesar.elte.hu>
Date:   Mon Aug 1 09:55:46 2011 +0200

    Clean-up of bugfix fdo#32895 for the master branch
    
    Contributed under license LGPLv3+/MPL.

diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index 55df091..640c645 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 9b97755..03c3caf 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