[Libreoffice-commits] core.git: include/tools tools/source

[Jan Hubicka]

 include/tools/zcodec.hxx       |    5 ++++-
 tools/source/zcodec/zcodec.cxx |    5 -----
 2 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 3db6d2cb99f9559ba29759990675e469613a8bb0
Author: Jan Hubicka <hubicka at ucw.cz>
Date:   Tue Feb 18 19:17:46 2014 +0100

    GCC 4.9, LTO: libvcl uses GZCodec but it is not linked with the implementation
    
    This is not valid C++ and GCC now resolves the virtual calls and inlines
    destructor that leads to undefined symbols.
    
    Change-Id: I841d25bc6f994f0e73665b174994f9471597131e

diff --git a/include/tools/zcodec.hxx b/include/tools/zcodec.hxx
index 14e2d5b..e5d9592 100644
--- a/include/tools/zcodec.hxx
+++ b/include/tools/zcodec.hxx
@@ -102,7 +102,10 @@ class GZCodec : public ZCodec
 public:
                     GZCodec(){};
                     ~GZCodec(){};
-    virtual void    BeginCompression( sal_uIntPtr nCompressMethod = ZCODEC_DEFAULT );
+    virtual void    BeginCompression( sal_uIntPtr nCompressMethod = ZCODEC_DEFAULT )
+    {
+        ZCodec::BeginCompression( nCompressMethod | ZCODEC_GZ_LIB );
+    };
 };
 
 #endif
diff --git a/tools/source/zcodec/zcodec.cxx b/tools/source/zcodec/zcodec.cxx
index fe2e573..dd993f1 100644
--- a/tools/source/zcodec/zcodec.cxx
+++ b/tools/source/zcodec/zcodec.cxx
@@ -413,9 +413,4 @@ sal_uIntPtr ZCodec::UpdateCRC ( sal_uIntPtr nLatestCRC, sal_uInt8* pSource, long
     return rtl_crc32( nLatestCRC, pSource, nDatSize );
 }
 
-void GZCodec::BeginCompression( sal_uIntPtr nCompressMethod )
-{
-    ZCodec::BeginCompression( nCompressMethod | ZCODEC_GZ_LIB );
-};
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */