linguistic/source/dicimp.cxx | 4 ++-- linguistic/source/lngsvcmgr.cxx | 12 ++++++------ writerfilter/source/dmapper/DomainMapper_Impl.cxx | 1 - writerfilter/source/dmapper/DomainMapper_Impl.hxx | 1 - 4 files changed, 8 insertions(+), 10 deletions(-)
New commits: commit 613d53637eb6d84d48b379efacc469659634d669 Author: Alexander Wilms <f.alexander.wi...@gmail.com> Date: Tue Feb 25 19:17:44 2014 +0100 Remove visual noise from linguistic Change-Id: I9ed8b9cf844d9e5909cc87dac1438ec7a54613b8 Reviewed-on: https://gerrit.libreoffice.org/8280 Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx index 0afa14d..0ce35b5 100644 --- a/linguistic/source/dicimp.cxx +++ b/linguistic/source/dicimp.cxx @@ -456,9 +456,9 @@ sal_uLong DictionaryNeo::saveEntries(const OUString &rURL) sal_uLong nErr = sal::static_int_cast< sal_uLong >(-1); SvStreamPtr pStream = SvStreamPtr( utl::UcbStreamHelper::CreateStream( xStream ) ); - // + // Always write as the latest version, i.e. DIC_VERSION_7 - // + rtl_TextEncoding eEnc = RTL_TEXTENCODING_UTF8; pStream->WriteLine(OString(pVerOOo7)); if (0 != (nErr = pStream->GetError())) diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index 104a4a0..6b15796 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -735,9 +735,9 @@ void LngSvcMgr::UpdateAll() OUString aLastFoundList( OUString::createFromAscii( apLastFoundLists[k] ) ); sal_Int32 i; - // + // remove configured but not available language/services entries - // + Sequence< OUString > aNodeNames( aCfg.GetNodeNames( aActiveList ) ); // list of configured locales sal_Int32 nNodeNames = aNodeNames.getLength(); const OUString *pNodeName = aNodeNames.getConstArray(); @@ -752,11 +752,11 @@ void LngSvcMgr::UpdateAll() aCurSvcs[k][ pNodeName[i] ] = aCfgSvcs; } - // + // add new available language/service entries // and // set last found services to currently available ones - // + Sequence< Locale > aAvailLocales( getAvailableLocales(aService) ); sal_Int32 nAvailLocales = aAvailLocales.getLength(); const Locale *pAvailLocale = aAvailLocales.getConstArray(); @@ -782,9 +782,9 @@ void LngSvcMgr::UpdateAll() } } - // + // write new data back to configuration - // + for (int k = 0; k < nNumServices; ++k) { for (int i = 0; i < 2; ++i) commit cd35fd41df314d0176ae1da4a67e6a7d978f3cf2 Author: Stephan Bergmann <sberg...@redhat.com> Date: Wed Feb 26 16:14:26 2014 +0100 -Werror,-Wunused-private-field Change-Id: Ie64ffd691f3528136414bfc67f89881f3c778f1f diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index f86fbd5..bf6155b9 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -175,7 +175,6 @@ DomainMapper_Impl::DomainMapper_Impl( m_aAnnotationPositions(), m_xInsertTextRange(xInsertTextRange), m_bIsNewDoc(bIsNewDoc), - m_bBibliographyMarkerAdded(false), m_bInTableStyleRunProps(false), m_pSdtHelper(0), m_nTableDepth(0), diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx index b53cd34..d1e9bb4 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx @@ -403,7 +403,6 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > m_xInsertTextRange; private: bool m_bIsNewDoc; - bool m_bBibliographyMarkerAdded; public: DomainMapper_Impl( DomainMapper& rDMapper,
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits