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

[Miklos Vajna]

 unusedcode.easy                                    |    1 -
 writerfilter/source/dmapper/DomainMapper_Impl.cxx  |    3 +--
 writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx |    5 -----
 writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx |    1 -
 4 files changed, 1 insertion(+), 9 deletions(-)

New commits:
commit 58a06b28d96b746014de0eb07cf90e75c3736d1a
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Sat Mar 8 12:29:12 2014 +0100

    copy&paste from xmloff
    
    Change-Id: I3d700c439fa7112f391f464f744d6e0dcb8e43cf

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 7d63908..516c436 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -3595,9 +3595,8 @@ void DomainMapper_Impl::CloseFieldCommand()
                 /* Unsupported fields will be handled here for docx file.
                  * To handle unsupported fields used fieldmark API.
                  */
-                static const OUString sAPI_unsupportedfield( "com.sun.star.text.Fieldmark");
                 OUString aCode( pContext->GetCommand().trim() );
-                xFieldInterface = m_xTextFactory->createInstance(sAPI_unsupportedfield);
+                xFieldInterface = m_xTextFactory->createInstance("com.sun.star.text.Fieldmark");
                 const uno::Reference<text::XTextContent> xTextContent(xFieldInterface, uno::UNO_QUERY_THROW);
                 uno::Reference< text::XTextAppend >  xTextAppend;
                 xTextAppend = m_aTextAppendStack.top().xTextAppend;
commit 73eb16923b8b36ecd1e4f434bd248e206b775078
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Sat Mar 8 12:28:22 2014 +0100

    unused OOXMLUniversalMeasureValue ctor
    
    Change-Id: I4f956cc9aeab0ad761076f25e920c79cdb75c115

diff --git a/unusedcode.easy b/unusedcode.easy
index e7dbded..2e3550e 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -200,4 +200,3 @@ std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr<formula::Formu
 std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr_ref<formula::FormulaTokenArray>)
 std::vector<rtl::Reference<oox::xls::(anonymous namespace)::WorkerThread>, std::allocator<rtl::Reference<oox::xls::(anonymous namespace)::WorkerThread> > >::reserve(unsigned long)
 vcl::MapChar(vcl::_TrueTypeFont*, unsigned short, bool)
-writerfilter::ooxml::OOXMLUniversalMeasureValue::OOXMLUniversalMeasureValue(unsigned int)
diff --git a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
index 15027b5..5d97521 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx
@@ -660,11 +660,6 @@ string OOXMLHexValue::toString() const
 
 // OOXMLUniversalMeasureValue
 
-OOXMLUniversalMeasureValue::OOXMLUniversalMeasureValue(sal_uInt32 nValue)
-    : mnValue(nValue)
-{
-}
-
 OOXMLUniversalMeasureValue::OOXMLUniversalMeasureValue(const OUString& rValue)
 {
     if (rValue.endsWith("pt"))
diff --git a/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx b/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx
index 58815b6..c3ce87f 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx
@@ -220,7 +220,6 @@ class OOXMLUniversalMeasureValue : public OOXMLValue
 protected:
     sal_uInt32 mnValue;
 public:
-    explicit OOXMLUniversalMeasureValue(sal_uInt32 nValue);
     explicit OOXMLUniversalMeasureValue(const OUString& rValue);
     virtual ~OOXMLUniversalMeasureValue();