[Libreoffice-commits] core.git: 2 commits - filter/source idl/source sd/source

[Caolán McNamara]

 filter/source/graphicfilter/itiff/itiff.cxx |    6 +--
 idl/source/objects/types.cxx                |    2 -
 sd/source/core/typemap.cxx                  |   46 ----------------------------
 3 files changed, 4 insertions(+), 50 deletions(-)

New commits:
commit cc2b6dbb262db76afe006847a7dddbd0827a8380
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Apr 1 14:22:13 2017 +0100

    ofz: make scanline copy faster
    
    Change-Id: I69225a7b0d0d09d6bc5faf5711552322a7a2ab01

diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx
index 6fd5448e55a6..b5c63d2c2adb 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -629,9 +629,9 @@ bool TIFFReader::ReadMap()
                 //if the buffer for this line didn't change, then just copy the
                 //previous scanline instead of painfully decoding and setting
                 //each pixel one by one again
-                pAcc->CopyScanline(ny, pAcc->GetScanline(ny-1),
-                                       pAcc->GetScanlineFormat(),
-                                       pAcc->GetScanlineSize());
+                Scanline pScanline = pAcc->GetScanline(ny);
+                Scanline pPrevline = pAcc->GetScanline(ny-1);
+                memcpy(pScanline, pPrevline, pAcc->GetScanlineSize());
             }
             else
             {
commit da1d5307c3066dea1fbb5ba2483ba88302efe773
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Apr 1 14:12:12 2017 +0100

    use weak attribute for Linux too
    
    Change-Id: If6bad5be57c984930061629077b07eee287202f0

diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 30b945c9abcb..ed58c172f39c 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -252,7 +252,7 @@ void SvMetaType::WriteSfxItem(
 
     // write the implementation part
     rOutStm.WriteCharPtr( "#ifdef SFX_TYPEMAP" ) << endl;
-    rOutStm.WriteCharPtr( "#if !defined(_WIN32) && ((defined(DISABLE_DYNLOADING) && (defined(ANDROID) || defined(IOS))) || STATIC_LINKING)" ) << endl;
+    rOutStm.WriteCharPtr( "#if !defined(_WIN32) && ((defined(DISABLE_DYNLOADING) && (defined(ANDROID) || defined(IOS) || defined(LINUX))) || STATIC_LINKING)" ) << endl;
     rOutStm.WriteCharPtr( "__attribute__((__weak__))" ) << endl;
     rOutStm.WriteCharPtr( "#endif" ) << endl;
     rOutStm.WriteOString( aTypeName ).WriteOString( aVarName )
diff --git a/sd/source/core/typemap.cxx b/sd/source/core/typemap.cxx
index 9d4a7782146e..6a91ddd3c31d 100644
--- a/sd/source/core/typemap.cxx
+++ b/sd/source/core/typemap.cxx
@@ -103,54 +103,8 @@
 #include <svx/AffineMatrixItem.hxx>
 #include <svx/galleryitem.hxx>
 
-#ifdef DISABLE_DYNLOADING
-/* Avoid clash with the ones from svx/source/form/typemap.cxx */
-#define aSfxInt16Item_Impl sd_source_core_typemap_aSfxInt16Item_Impl
-#define aSfxInt32Item_Impl sd_source_core_typemap_aSfxInt32Item_Impl
-#define aSfxUnoFrameItem_Impl sd_source_core_typemap_aSfxUnoFrameItem_Impl
-#define aSvxClipboardFormatItem_Impl sd_source_core_typemap_aSvxClipboardFormatItem_Impl
-#define aSvxColorItem_Impl sd_source_core_typemap_aSvxColorItem_Impl
-#define aSvxContourItem_Impl sd_source_core_typemap_aSvxContourItem_Impl
-#define aSvxCrossedOutItem_Impl sd_source_core_typemap_aSvxCrossedOutItem_Impl
-#define aSvxFontHeightItem_Impl sd_source_core_typemap_aSvxFontHeightItem_Impl
-#define aSvxFontItem_Impl sd_source_core_typemap_aSvxFontItem_Impl
-#define aSvxKerningItem_Impl sd_source_core_typemap_aSvxKerningItem_Impl
-#define aSvxLRSpaceItem_Impl sd_source_core_typemap_aSvxLRSpaceItem_Impl
-#define aSvxLanguageItem_Impl sd_source_core_typemap_aSvxLanguageItem_Impl
-#define aSvxLineSpacingItem_Impl sd_source_core_typemap_aSvxLineSpacingItem_Impl
-#define aSvxPostureItem_Impl sd_source_core_typemap_aSvxPostureItem_Impl
-#define aSvxShadowedItem_Impl sd_source_core_typemap_aSvxShadowedItem_Impl
-#define aSvxTextLineItem_Impl sd_source_core_typemap_aSvxTextLineItem_Impl
-#define aSvxULSpaceItem_Impl sd_source_core_typemap_aSvxULSpaceItem_Impl
-#define aSvxWeightItem_Impl sd_source_core_typemap_aSvxWeightItem_Impl
-#define aSvxSearchItem_Impl sd_source_core_typemap_aSvxSearchItem_Impl
-#define aSvxSizeItem_Impl sd_source_core_typemap_aSvxSizeItem_Impl
-#endif
-
 #define SFX_TYPEMAP
 #include "sdslots.hxx"
 
-#ifdef DISABLE_DYNLOADING
-#undef aSfxInt16Item_Impl
-#undef aSfxInt32Item_Impl
-#undef aSfxUnoFrameItem_Impl
-#undef aSvxClipboardFormatItem_Impl
-#undef aSvxColorItem_Impl
-#undef aSvxContourItem_Impl
-#undef aSvxCrossedOutItem_Impl
-#undef aSvxFontHeightItem_Impl
-#undef aSvxFontItem_Impl
-#undef aSvxKerningItem_Impl
-#undef aSvxLRSpaceItem_Impl
-#undef aSvxLanguageItem_Impl
-#undef aSvxLineSpacingItem_Impl
-#undef aSvxPostureItem_Impl
-#undef aSvxShadowedItem_Impl
-#undef aSvxTextLineItem_Impl
-#undef aSvxULSpaceItem_Impl
-#undef aSvxWeightItem_Impl
-#undef aSvxSearchItem_Impl
-#undef aSvxSizeItem_Impl
-#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */