diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-01-18 16:36:34 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-01-18 20:47:01 +0000 |
| commit | 6fe8925305dffd2e1d496319f73ef6602363ef7b (patch) | |
| tree | 126b3787ff6538d3ab51555dac681a86bb2a7d58 /desktop | |
| parent | f8779bbcef2a2eeab8d74bce445a0eaceda8bdde (diff) | |
basebmp now only used from vcl/headless code
Change-Id: I068d404431d3565f6ad5741edbd3693225824a4d
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/CppunitTest_desktop_lib.mk | 6 | ||||
| -rw-r--r-- | desktop/Library_sofficeapp.mk | 1 | ||||
| -rw-r--r-- | desktop/qa/desktop_lib/test_desktop_lib.cxx | 5 | ||||
| -rw-r--r-- | desktop/source/lib/init.cxx | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/desktop/CppunitTest_desktop_lib.mk b/desktop/CppunitTest_desktop_lib.mk index 2119e15735fb..c7aee9d1f043 100644 --- a/desktop/CppunitTest_desktop_lib.mk +++ b/desktop/CppunitTest_desktop_lib.mk @@ -16,7 +16,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,desktop_lib, \ )) $(eval $(call gb_CppunitTest_use_libraries,desktop_lib, \ - basebmp \ comphelper \ cppu \ cppuhelper \ @@ -32,7 +31,10 @@ $(eval $(call gb_CppunitTest_use_libraries,desktop_lib, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_use_external,desktop_lib,boost_headers)) +$(eval $(call gb_CppunitTest_use_externals,desktop_lib, \ + boost_headers \ + cairo \ +)) $(eval $(call gb_CppunitTest_use_api,desktop_lib,\ offapi \ diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index ef95ecfbdc19..6062da8ee892 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -41,7 +41,6 @@ $(eval $(call gb_Library_add_defs,sofficeapp,\ $(eval $(call gb_Library_set_precompiled_header,sofficeapp,$(SRCDIR)/desktop/inc/pch/precompiled_sofficeapp)) $(eval $(call gb_Library_use_libraries,sofficeapp,\ - $(if $(filter $(OS),ANDROID),,basebmp) \ comphelper \ cppu \ cppuhelper \ diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx index f06959545722..01657b9a1f81 100644 --- a/desktop/qa/desktop_lib/test_desktop_lib.cxx +++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx @@ -14,7 +14,6 @@ #include <com/sun/star/awt/Key.hpp> #include <com/sun/star/awt/XReschedule.hpp> #include <com/sun/star/awt/Toolkit.hpp> -#include <basebmp/bitmapdevice.hxx> #include <boost/property_tree/json_parser.hpp> #include <comphelper/processfactory.hxx> #include <sfx2/objsh.hxx> @@ -27,6 +26,7 @@ #include <svl/srchitem.hxx> #include <LibreOfficeKit/LibreOfficeKitEnums.h> #include <unotools/tempfile.hxx> +#include <cairo.h> #include "../../inc/lib/init.hxx" @@ -351,8 +351,7 @@ void DesktopLOKTest::testPaintTile() LibLODocument_Impl* pDocument = loadDoc("blank_text.odt"); int nCanvasWidth = 100; int nCanvasHeight = 300; - sal_Int32 nStride = basebmp::getBitmapDeviceStrideForWidth(basebmp::Format::ThirtyTwoBitTcMaskBGRA, - nCanvasWidth); + sal_Int32 nStride = cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32, nCanvasWidth); std::vector<unsigned char> aBuffer(nStride * nCanvasHeight); int nTilePosX = 0; int nTilePosY = 0; diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index f58d8a0e19ef..28a54420eccd 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -103,7 +103,7 @@ typedef struct // We need a shared_array for passing into the BitmapDevice (via // VirtualDevice.SetOutputSizePixelScaleOffsetAndBuffer which goes via the -// SvpVirtualDevice, ending up in the basebmp BitmapDevice. However as we're +// SvpVirtualDevice, ending up in the cairo surface. However as we're // given the array externally we can't delete it, and hence need to override // shared_array's default of deleting its pointer. template<typename T> |