writerfilter/source/dmapper/CellColorHandler.cxx | 2 -- writerfilter/source/dmapper/ConversionHelper.cxx | 3 +-- writerfilter/source/dmapper/DomainMapper.cxx | 1 - writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2 -- 4 files changed, 1 insertion(+), 7 deletions(-)
New commits: commit be267ff6338ba023a7230a41c92186b844bdd396 Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Mon May 12 10:16:27 2014 +0200 writerfilter: write out table::BorderLineStyle::NONE Change-Id: Ifc9e42f12c8e3d6ae1f98396fddf5bd6adcf3ba1 diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx b/writerfilter/source/dmapper/ConversionHelper.cxx index bff0e82..af6ea70 100644 --- a/writerfilter/source/dmapper/ConversionHelper.cxx +++ b/writerfilter/source/dmapper/ConversionHelper.cxx @@ -31,7 +31,6 @@ #include <functional> using namespace com::sun::star; -using namespace com::sun::star::table::BorderLineStyle; namespace writerfilter { namespace dmapper{ @@ -85,7 +84,7 @@ void MakeBorderLine( sal_Int32 nLineThickness, sal_Int32 nLineType, ::editeng::SvxBorderStyle const nLineStyle( ::editeng::ConvertBorderStyleFromWord(nLineType)); rToFill.LineStyle = nLineStyle; - double const fConverted( (NONE == nLineStyle) ? 0.0 : + double const fConverted( (table::BorderLineStyle::NONE == nLineStyle) ? 0.0 : ::editeng::ConvertBorderWidthFromWord(nLineStyle, nLineThickness, nLineType)); rToFill.LineWidth = convertTwipToMM100(fConverted); commit 9655f94bb4f778e5dede0d8d45e001d1cc24275a Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Mon May 12 10:15:37 2014 +0200 writerfilter: unused 'using' in dmapper Change-Id: Id6a8362872bb4602b840da388189fecc046dd97e diff --git a/writerfilter/source/dmapper/CellColorHandler.cxx b/writerfilter/source/dmapper/CellColorHandler.cxx index c70936d..c069b4b 100644 --- a/writerfilter/source/dmapper/CellColorHandler.cxx +++ b/writerfilter/source/dmapper/CellColorHandler.cxx @@ -30,8 +30,6 @@ namespace writerfilter { namespace dmapper { using namespace ::com::sun::star::drawing; -using namespace ::writerfilter; - CellColorHandler::CellColorHandler() : LoggedProperties(dmapper_logger, "CellColorHandler"), diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index e50ccf4..dd92026 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -70,7 +70,6 @@ #include <GraphicHelpers.hxx> using namespace ::com::sun::star; -using namespace ::rtl; namespace writerfilter { commit 2c95e104e942408948bb1134310884ab66a68a6c Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Mon May 12 10:12:06 2014 +0200 writerfilter: unused 'using' in rtftok Change-Id: Ie28d898d490ff695143e9f09502fa10db092ccc7 diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 38e8653..f62827e 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -59,8 +59,6 @@ #define MM100_TO_EMU(MM100) (MM100 * 360) -using std::make_pair; - namespace writerfilter { namespace rtftok _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits