diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-02-28 20:33:17 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-03-01 07:17:48 +0000 |
commit | d97380c66904328e9d706a0b03a6800dc048aa7d (patch) | |
tree | 1be4d324ec3123b615948dc615703464386aa366 /writerfilter/source | |
parent | 121525db245624b96a85824cc6ad3013e05e34b0 (diff) |
writerfilter: avoid repeating the return type from the declaration
Change-Id: I4fb7993482e71c936d820b559aa6b4a212c8175d
Reviewed-on: https://gerrit.libreoffice.org/34729
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'writerfilter/source')
-rw-r--r-- | writerfilter/source/dmapper/SdtHelper.cxx | 2 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 4 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.hxx | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/writerfilter/source/dmapper/SdtHelper.cxx b/writerfilter/source/dmapper/SdtHelper.cxx index a27c017226e5..b9c3b9f0ad02 100644 --- a/writerfilter/source/dmapper/SdtHelper.cxx +++ b/writerfilter/source/dmapper/SdtHelper.cxx @@ -59,7 +59,7 @@ awt::Size lcl_getOptimalWidth(const StyleSheetTablePtr& pStyleSheet, OUString& r sal_Int32 nBorder = nHeight / 2; // Width: space for the text + the square having the dropdown arrow. - return awt::Size(nWidth + nBorder + nHeight, nHeight + nBorder); + return {nWidth + nBorder + nHeight, nHeight + nBorder}; } SdtHelper::SdtHelper(DomainMapper_Impl& rDM_Impl) diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 719d82ce35ff..7286a83fc4b5 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -210,8 +210,8 @@ const char* keywordToString(RTFKeyword nKeyword) static util::DateTime lcl_getDateTime(RTFParserState& aState) { - return util::DateTime(0 /*100sec*/, 0 /*sec*/, aState.nMinute, aState.nHour, - aState.nDay, aState.nMonth, aState.nYear, false); + return {0 /*100sec*/, 0 /*sec*/, aState.nMinute, aState.nHour, + aState.nDay, aState.nMonth, aState.nYear, false}; } static void lcl_DestinationToMath(OUStringBuffer* pDestinationText, oox::formulaimport::XmlStreamBuilder& rMathBuffer, bool& rMathNor) diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx index 5b09a5023861..5128264a6684 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx @@ -274,11 +274,11 @@ public: bool isRightToLeft; // Info group. - int nYear; - int nMonth; - int nDay; - int nHour; - int nMinute; + sal_Int16 nYear; + sal_uInt16 nMonth; + sal_uInt16 nDay; + sal_uInt16 nHour; + sal_uInt16 nMinute; /// Text from special destinations. OUStringBuffer aDestinationText; |