From a2b77b43685884fb4e9be04152a49294fa50db36 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 15 Sep 2016 15:54:19 +0200 Subject: loplugin:singlevalfields in basic..idl Also fix obvious bug in the initialisation of the connectivity::odbc::OConnection::m_bClosed field. Probably closes some kind of connection leak there. Change-Id: I04579cf91bcd6d6c51c697d83971da4142743a82 Reviewed-on: https://gerrit.libreoffice.org/28932 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- filter/source/t602/t602filter.cxx | 5 ++--- filter/source/t602/t602filter.hxx | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'filter/source/t602') diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx index e1df97f839e5..4b9e7723255f 100644 --- a/filter/source/t602/t602filter.cxx +++ b/filter/source/t602/t602filter.cxx @@ -278,8 +278,8 @@ bool SAL_CALL T602ImportFilter::importImpl( const Sequence< css::beans::Property xImporter->setTargetDocument(mxDoc); char fs[32], fs2[32]; - sprintf(fs, "%ipt", ini.fontsize); - sprintf(fs2,"%ipt", 2*ini.fontsize); + sprintf(fs, "%ipt", inistruct::fontsize); + sprintf(fs2,"%ipt", 2*inistruct::fontsize); mpAttrList = new SvXMLAttributeList; @@ -485,7 +485,6 @@ void T602ImportFilter::Reset602() ini.xcode = KAM; ini.ruscode = false; ini.reformatpars= false; - ini.fontsize = 10; fst.nowfnt = fst.oldfnt = standard; fst.uline = fst.olduline = false; diff --git a/filter/source/t602/t602filter.hxx b/filter/source/t602/t602filter.hxx index f9ccc0526af0..d8dbbdd3439f 100644 --- a/filter/source/t602/t602filter.hxx +++ b/filter/source/t602/t602filter.hxx @@ -75,7 +75,7 @@ struct inistruct tcode xcode; // KAM encoding set - forced bool ruscode; // false Russian tables turned on bool reformatpars; // false Reformat paragraphs (whitespaces and line breaks) - sal_Int16 fontsize; // font size in points + static const sal_Int16 fontsize = 10; // font size in points inistruct() : showcomm( true ) @@ -83,7 +83,6 @@ struct inistruct , xcode ( KAM ) , ruscode ( false ) , reformatpars ( false ) - , fontsize (10) { }; }; -- cgit