summaryrefslogtreecommitdiff
path: root/dtrans
diff options
context:
space:
mode:
Diffstat (limited to 'dtrans')
-rw-r--r--dtrans/source/win32/dnd/source.cxx2
-rw-r--r--dtrans/source/win32/dtobj/FmtFilter.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/dtrans/source/win32/dnd/source.cxx b/dtrans/source/win32/dnd/source.cxx
index 06c8e4977def..5b1bc1d3d1b3 100644
--- a/dtrans/source/win32/dnd/source.cxx
+++ b/dtrans/source/win32/dnd/source.cxx
@@ -211,7 +211,7 @@ HRESULT STDMETHODCALLTYPE DragSource::QueryInterface( REFIID riid, void **ppvOb
ULONG STDMETHODCALLTYPE DragSource::AddRef()
{
acquire();
- return (ULONG) m_refCount;
+ return static_cast<ULONG>(m_refCount);
}
ULONG STDMETHODCALLTYPE DragSource::Release()
diff --git a/dtrans/source/win32/dtobj/FmtFilter.cxx b/dtrans/source/win32/dtobj/FmtFilter.cxx
index 2931521511fb..1dcc089c7b9d 100644
--- a/dtrans/source/win32/dtobj/FmtFilter.cxx
+++ b/dtrans/source/win32/dtobj/FmtFilter.cxx
@@ -423,7 +423,7 @@ Sequence< sal_Int8 > WinBITMAPToOOBMP( HBITMAP aHBMP )
pBmp->biPlanes = 1;
pBmp->biBitCount = 32;
pBmp->biCompression = BI_RGB;
- pBmp->biSizeImage = (DWORD)nDataBytes;
+ pBmp->biSizeImage = static_cast<DWORD>(nDataBytes);
pBmp->biXPelsPerMeter = 1000;
pBmp->biYPelsPerMeter = 1000;
pBmp->biClrUsed = 0;
or URELIBS, depend only on MERGELIBS. Change-Id: I5a93031116c26bbbe375e9c467e7b427487ec18b 2013-04-13update the list of serialized libsPeter Foley Change-Id: I2227de962c3af3f729e3476b3dd1d110ed10afce 2013-04-11create --enable-mergelibs=all optionPeter Foley Support cramming everything into one big merged library as well as only the libraries depended upon by almost everything. Change-Id: I69647037dc62840294ba670d5d6c172a4608bf3f 2013-04-10forgot to add condition on URELIBSMatúš Kukan Change-Id: Ie85e370d16c09271fdb12cbe0f6e629e72dee929 2013-04-10add new urelibs library merging some libraries from ure/lib/Matúš Kukan There is no configure switch for this, URELIBS must be set. This commit changes strategy to link also libraries being merged. We need them for build tools like idlc, cppumaker, .., so the tools can link against them now. This avoids circular dependencies. Change-Id: Ic49e18ecbeaff84d4f5a7fafe8b1fbf45ed18c9b 2013-04-05new module i18nlangtagEike Rathke Moved portions from module i18npool, all of former i18nisolang1 library that now is i18nlangtag. Included are languagetag, isolang and mslangid. This i18nlangtag code is now even used by module comphelper, so disentangling i18npool and making this an own module was needed to not create circular module dependencies. Change-Id: Ib887c3d6dde667403fd22d382310ba5f1a9b0015 2013-03-28add rpt, rptui, and rptxml to Library_mergedPeter Foley Change-Id: I8c20d81043602229a3fd936af6e7cdc337c40951 2013-03-28add calc, dbase, file, and flat to Library_mergedPeter Foley Change-Id: Ib6b03cda815ba0450930cec970bfe7eb4d98ac44 2013-03-26add frm to Library_mergedPeter Foley Change-Id: I72fff5fe1fd26e618ffe89111471d95cd4d30852 2013-03-13Creating a libmwaw module for library parsing various old Mac file-formatsFridrich Štrba Change-Id: I367dfa309a30a5b55de1d59e632d0dbcf5dc6dbb Reviewed-on: https://gerrit.libreoffice.org/2662 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org> 2013-03-10another s/MYSQLC/MARIADBC/ - in RepositoryModule_host.mkRene Engelhard Change-Id: I656281844c625bb9074ac2d5b7384eaf71d84e74 2013-03-06Adding libmariadb module for internal mariadb (work in progress)Fridrich Štrba Change-Id: If2cf9ff21120e29a149903e8eab849d97fa0c2c9 2013-03-05Let's use only one Makefile forwarding to gbuild.Matúš Kukan Well, there is still another one: solenv/gbuild/partial_build.mk This enables you to do in SRCDIR: make gb_Side=build -r -f Makefile.gbuild <target> which was not possible previously. Change-Id: I6f8ce1c6503124526986e192b7d3552b909fc157