diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-12 09:53:27 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-12 12:24:28 +0200 |
| commit | 5dd762ddc1829a86e7b4e23076143bc01d6073ad (patch) | |
| tree | 90ac69d1bab369bc054ac84ede13ec3c87075642 /filter | |
| parent | 9bd372218dfea3fb70d503d7532ee2b144ada136 (diff) | |
hold MetaAction by rtl::Reference
instead of yet another private implementation of manual reference
counting
Change-Id: Iefb1d2e595e45a2dfdc3be54e1c51b64afeaf9d8
Reviewed-on: https://gerrit.libreoffice.org/52753
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/CppunitTest_filter_pict_test.mk | 1 | ||||
| -rw-r--r-- | filter/Library_flash.mk | 1 | ||||
| -rw-r--r-- | filter/Library_gie.mk | 1 | ||||
| -rw-r--r-- | filter/source/svg/svgexport.cxx | 2 | ||||
| -rw-r--r-- | filter/source/svg/svgwriter.cxx | 1 |
5 files changed, 3 insertions, 3 deletions
diff --git a/filter/CppunitTest_filter_pict_test.mk b/filter/CppunitTest_filter_pict_test.mk index bba3113a4473..431166e6e3cd 100644 --- a/filter/CppunitTest_filter_pict_test.mk +++ b/filter/CppunitTest_filter_pict_test.mk @@ -22,6 +22,7 @@ $(eval $(call gb_CppunitTest_use_libraries,filter_pict_test, \ comphelper \ basegfx \ sal \ + salhelper \ test \ tk \ tl \ diff --git a/filter/Library_flash.mk b/filter/Library_flash.mk index c0fc10a66e45..7abba3682a56 100644 --- a/filter/Library_flash.mk +++ b/filter/Library_flash.mk @@ -34,6 +34,7 @@ $(eval $(call gb_Library_use_libraries,flash,\ cppuhelper \ cppu \ sal \ + salhelper \ )) $(eval $(call gb_Library_use_externals,flash,\ diff --git a/filter/Library_gie.mk b/filter/Library_gie.mk index d1513b25aed6..679114e67f68 100644 --- a/filter/Library_gie.mk +++ b/filter/Library_gie.mk @@ -43,6 +43,7 @@ $(eval $(call gb_Library_use_libraries,gie,\ tk \ cppu \ sal \ + salhelper \ )) $(eval $(call gb_Library_add_exception_objects,gie,\ diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index f4ab91bb6461..b6878dba5ae9 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -2004,12 +2004,10 @@ bool SVGFilter::implCreateObjectsFromShape( const Reference< css::drawing::XDraw if( bIsTextShapeStarted && ( nType == MetaActionType::BMPSCALE || nType == MetaActionType::BMPEXSCALE ) ) { GDIMetaFile aEmbeddedBitmapMtf; - pAction->Duplicate(); aEmbeddedBitmapMtf.AddAction( pAction ); aEmbeddedBitmapMtf.SetPrefSize( aSize ); aEmbeddedBitmapMtf.SetPrefMapMode(MapMode(MapUnit::Map100thMM)); mEmbeddedBitmapActionSet.insert( ObjectRepresentation( rxShape, aEmbeddedBitmapMtf ) ); - pAction->Duplicate(); aMtf.AddAction( pAction ); } } diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index 12b872a0a588..b414cc573f46 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -1871,7 +1871,6 @@ BitmapChecksum SVGActionWriter::GetChecksum( const MetaAction* pAction ) { GDIMetaFile aMtf; MetaAction* pA = const_cast<MetaAction*>(pAction); - pA->Duplicate(); aMtf.AddAction( pA ); return aMtf.GetChecksum(); } |