[Libreoffice-commits] .: svx/inc svx/source

Caolán McNamara caolan at kemper.freedesktop.org
Wed Sep 28 02:48:18 PDT 2011


 svx/inc/svx/xtable.hxx        |    1 -
 svx/source/xoutdev/xtable.cxx |    4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit a22a722ddb415d8b61a840fff4b39f919242bfe8
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Sep 28 10:42:36 2011 +0100

    nothing initializes pDefaultExt anymore

diff --git a/svx/inc/svx/xtable.hxx b/svx/inc/svx/xtable.hxx
index 3cab495..361520d 100644
--- a/svx/inc/svx/xtable.hxx
+++ b/svx/inc/svx/xtable.hxx
@@ -228,7 +228,6 @@ protected:
     String              aName; // not persistent
     String              aPath;
     XOutdevItemPool*    pXPool;
-    const char *        pDefaultExt;
 
     XPropertyEntryList_impl aList;
     BitmapList_impl*        pBmpList;
diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx
index 7dafb73..79f600d 100644
--- a/svx/source/xoutdev/xtable.cxx
+++ b/svx/source/xoutdev/xtable.cxx
@@ -246,7 +246,7 @@ bool XPropertyList::Load()
         aURL.Append( aName );
 
         if( !aURL.getExtension().getLength() )
-            aURL.setExtension( rtl::OUString::createFromAscii( pDefaultExt ) );
+            aURL.setExtension( GetDefaultExt() );
 
         return SvxXMLXTableImport::load( aURL.GetMainURL( INetURLObject::NO_DECODE ),
                                          uno::Reference < embed::XStorage >(),
@@ -278,7 +278,7 @@ bool XPropertyList::Save()
     aURL.Append( aName );
 
     if( !aURL.getExtension().getLength() )
-        aURL.setExtension( rtl::OUString::createFromAscii( pDefaultExt ) );
+        aURL.setExtension( GetDefaultExt() );
 
     return SvxXMLXTableExportComponent::save( aURL.GetMainURL( INetURLObject::NO_DECODE ),
                                               createInstance(),


More information about the Libreoffice-commits mailing list