[Libreoffice-commits] .: binfilter/bf_so3 binfilter/bf_sw binfilter/inc

[Caolán McNamara]

 binfilter/bf_so3/source/persist/svstor.cxx    |  101 --------------------------
 binfilter/bf_sw/source/ui/app/sw_docshini.cxx |    2 
 binfilter/inc/bf_so3/svstor.hxx               |   34 --------
 3 files changed, 1 insertion(+), 136 deletions(-)

New commits:
commit 1c7e7b29af394d773611627f3630f07154a0732b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Feb 10 14:20:34 2012 +0000

    these virtuals just point to baseclass impls

diff --git a/binfilter/bf_so3/source/persist/svstor.cxx b/binfilter/bf_so3/source/persist/svstor.cxx
index 5fb79d4..268781e 100644
--- a/binfilter/bf_so3/source/persist/svstor.cxx
+++ b/binfilter/bf_so3/source/persist/svstor.cxx
@@ -252,107 +252,6 @@ SvStorage::~SvStorage()
 {
 }
 
-BOOL SvStorage::IsStorageFile( const String & rFileName )
-{
-    return SotStorage::IsStorageFile( rFileName );
-}
-
-const ::String & SvStorage::GetName() const
-{
-    return SotStorage::GetName();
-}
-
-void SvStorage::SetClass( const SvGlobalName & rName,
-                          ULONG nOriginalClipFormat,
-                          const String & rUserTypeName )
-{
-    SotStorage::SetClass( rName, nOriginalClipFormat, rUserTypeName );
-}
-
-void SvStorage::SetConvertClass( const SvGlobalName & rName,
-                                 ULONG nOriginalClipFormat,
-                                 const String & rUserTypeName )
-{
-    SotStorage::SetConvertClass( rName, nOriginalClipFormat, rUserTypeName );
-}
-
-SvGlobalName SvStorage::GetClassName()
-{
-    return SotStorage::GetClassName();
-}
-
-ULONG SvStorage::GetFormat()
-{
-    return SotStorage::GetFormat();
-}
-
-::String SvStorage::GetUserName()
-{
-    return SotStorage::GetUserName();
-}
-
-BOOL SvStorage::ShouldConvert()
-{
-    return SotStorage::ShouldConvert();
-}
-
-void SvStorage::FillInfoList( SvStorageInfoList * pFillList ) const
-{
-    SotStorage::FillInfoList( pFillList );
-}
-
-BOOL SvStorage::CopyTo( SotStorage * pDestStg )
-{
-    return SotStorage::CopyTo( pDestStg );
-}
-
-BOOL SvStorage::Commit()
-{
-    return SotStorage::Commit();
-}
-
-BOOL SvStorage::Revert()
-{
-    return SotStorage::Revert();
-}
-
-BOOL SvStorage::IsStorage( const String & rEleName ) const
-{
-    return SotStorage::IsStorage( rEleName );
-}
-
-BOOL SvStorage::IsStream( const String & rEleName ) const
-{
-    return SotStorage::IsStream( rEleName );
-}
-
-BOOL SvStorage::IsContained( const String & rEleName ) const
-{
-    return SotStorage::IsContained( rEleName );
-}
-
-BOOL SvStorage::Remove( const String & rEleName )
-{
-    return SotStorage::Remove( rEleName );
-}
-
-BOOL SvStorage::Rename( const String & rEleName, const String & rNewName )
-{
-    return SotStorage::Rename( rEleName, rNewName );
-}
-
-BOOL SvStorage::CopyTo( const String & rEleName,
-                        SotStorage * pNewSt, const String & rNewName )
-{
-    return SotStorage::CopyTo( rEleName, pNewSt, rNewName );
-}
-
-BOOL SvStorage::MoveTo( const String & rEleName,
-                        SotStorage * pNewSt, const String & rNewName )
-{
-    return SotStorage::MoveTo( rEleName, pNewSt, rNewName );
-}
-
 /*************************************************************************
 |*    SvStorage::OpenStream()
 |*
diff --git a/binfilter/bf_sw/source/ui/app/sw_docshini.cxx b/binfilter/bf_sw/source/ui/app/sw_docshini.cxx
index 6ac7a14..a67d8a6 100644
--- a/binfilter/bf_sw/source/ui/app/sw_docshini.cxx
+++ b/binfilter/bf_sw/source/ui/app/sw_docshini.cxx
@@ -636,7 +636,7 @@ using namespace ::rtl;
 /*?*/       else
 /*?*/       {
 /*?*/           // sollte es sich um eine 2. Vrolage handeln ??
-/*?*/           if( SvStorage::IsStorageFile( rNm ) )
+/*?*/           if( SotStorage::IsStorageFile( rNm ) )
 /*?*/               break;
 /*?*/
 /*?*/           const SfxFilter* pFltr = SwIoSystem::GetFileFilter(rNm);
diff --git a/binfilter/inc/bf_so3/svstor.hxx b/binfilter/inc/bf_so3/svstor.hxx
index a82ba96..8f2cd7a 100644
--- a/binfilter/inc/bf_so3/svstor.hxx
+++ b/binfilter/inc/bf_so3/svstor.hxx
@@ -111,27 +111,6 @@ public:
                         SvStorage();
                         SO2_DECL_STANDARD_CLASS_DLL(SvStorage,SOAPP)
 
-    static BOOL         IsStorageFile( const String & rFileName );
-    virtual const ::String & GetName() const;
-
-                        // eigener Datenbereich
-    void                SetClass( const SvGlobalName & rClass,
-                                  ULONG bOriginalClipFormat,
-                                  const String & rUserTypeName );
-    void                SetConvertClass( const SvGlobalName & rConvertClass,
-                                         ULONG bOriginalClipFormat,
-                                         const String & rUserTypeName );
-    SvGlobalName        GetClassName();// Typ der Daten im Storage
-    ULONG               GetFormat();
-    virtual ::String    GetUserName();
-    BOOL                ShouldConvert();
-
-                        // Liste aller Elemente
-    void                FillInfoList( SvStorageInfoList * ) const;
-    BOOL                CopyTo( SotStorage * pDestStg );
-    BOOL                Commit();
-    BOOL                Revert();
-
                         /* Element Methoden     */
                         // Stream mit Verbindung zu Storage erzeugen,
                         // in etwa eine Parent-Child Beziehung
@@ -155,19 +134,6 @@ public:
     SvStorage *        OpenOLEStorage( const String & rEleName,
                                     StreamMode = STREAM_STD_READWRITE,
                                     StorageMode = STORAGE_TRANSACTED );
-                        // Abfrage auf Storage oder Stream
-    BOOL                IsStream( const String & rEleName ) const;
-    BOOL                IsStorage( const String & rEleName ) const;
-    BOOL                IsContained( const String & rEleName ) const;
-                        // Element loeschen
-    BOOL                Remove( const String & rEleName );
-                        // Elementnamen aendern
-    BOOL                Rename( const String & rEleName,
-                                const String & rNewName );
-    BOOL                CopyTo( const String & rEleName, SotStorage * pDest,
-                                const String & rNewName );
-    BOOL                MoveTo( const String & rEleName, SotStorage * pDest,
-                                const String & rNewName );
 };
 
 #ifndef SO2_DECL_SVSTORAGE_DEFINED