[Libreoffice-commits] core.git: writerfilter/source

[Miklos Vajna]

 writerfilter/source/dmapper/SdtHelper.cxx      |    2 +-
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |    4 ++--
 writerfilter/source/rtftok/rtfdocumentimpl.hxx |   10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit d97380c66904328e9d706a0b03a6800dc048aa7d
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Feb 28 20:33:17 2017 +0100

    writerfilter: avoid repeating the return type from the declaration
    
    Change-Id: I4fb7993482e71c936d820b559aa6b4a212c8175d
    Reviewed-on: https://gerrit.libreoffice.org/34729
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/writerfilter/source/dmapper/SdtHelper.cxx b/writerfilter/source/dmapper/SdtHelper.cxx
index a27c017..b9c3b9f 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 719d82c..7286a83 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 5b09a50..5128264a 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;