From d91d98a53612a972de368186415aa48698e074d9 Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Fri, 6 Apr 2012 15:08:02 +0200 Subject: fix gcc-4.0.1 and/or 32bit build for string literals Plain 0 is ambiguous to convert to either long or const char*, and just adding an overload next to sal_Int32 would be a dupe if they actually are the same type, so just go with plain int, which is the sensible thing to do anyway. --- sal/inc/rtl/strbuf.hxx | 2 +- sal/inc/rtl/ustrbuf.hxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'sal/inc') diff --git a/sal/inc/rtl/strbuf.hxx b/sal/inc/rtl/strbuf.hxx index 4500cf0f8de8..77113086c4a6 100644 --- a/sal/inc/rtl/strbuf.hxx +++ b/sal/inc/rtl/strbuf.hxx @@ -130,7 +130,7 @@ public: @param length the initial capacity. */ - explicit OStringBuffer(sal_Int32 length) + explicit OStringBuffer(int length) : pData(NULL) , nCapacity( length ) { diff --git a/sal/inc/rtl/ustrbuf.hxx b/sal/inc/rtl/ustrbuf.hxx index 17deadd5de9e..a88710723435 100644 --- a/sal/inc/rtl/ustrbuf.hxx +++ b/sal/inc/rtl/ustrbuf.hxx @@ -125,7 +125,7 @@ public: @param length the initial capacity. */ - explicit OUStringBuffer(sal_Int32 length) + explicit OUStringBuffer(int length) : pData(NULL) , nCapacity( length ) { @@ -155,7 +155,7 @@ public: : pData(NULL) , nCapacity( N - 1 + 16 ) { - rtl_uStringbuffer_newFromStr_WithLength( &pData, literal, N - 1 ); + rtl_uString_newFromLiteral( &pData, literal, N - 1, 16 ); #ifdef RTL_STRING_UNITTEST rtl_string_unittest_const_literal = true; #endif -- cgit -6-0 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/svx/source/svdraw/svdoole2.cxx
AgeCommit message (Expand)Author
2014-04-15svx: sal_Bool->boolNoel Grandin
2014-03-27Second batch of adding SAL_OVERRIDE to overriding function declarationsStephan Bergmann
2014-03-15coverity#1019336 Dereference after null checkCaolán McNamara
2014-03-11svx: sal_Bool->boolNoel Grandin
2014-03-03SVX : Remove usage of DBG_CTOR and DBG_DTOR.Arnaud Versini
2014-02-26cppuhelper: retrofit std::exception into overriding exception specsStephan Bergmann
2014-02-26Remove visual noise from svxAlexander Wilms
2014-02-23Remove unneccessary commentsAlexander Wilms
2014-02-17comphelper: sal_Bool -> boolStephan Bergmann
2014-02-11sal_Bool->boolNoel Grandin
2014-01-28bool improvementsStephan Bergmann
2013-11-27Integrate branch of IAccessible2Steve Yin
2013-11-19remove unnecessary use of OUString constructor when assigningNoel Grandin
2013-10-22Bin comments that claim to say why some header is includedTor Lillqvist