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

2014-04-26 Thread Miklos Vajna 
 unusedcode.easy|1 -
 writerfilter/source/dmapper/SdtHelper.cxx  |8 
 writerfilter/source/dmapper/SdtHelper.hxx  |1 -
 writerfilter/source/rtftok/rtfcharsets.cxx |9 ++---
 writerfilter/source/rtftok/rtfcharsets.hxx |   24 +---
 5 files changed, 19 insertions(+), 24 deletions(-)

New commits:
commit 68c2e3d6d6392d409fd28302939309328a9ef0c1
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Sat Apr 26 17:51:36 2014 +0200

writerfilter: fix indentation in rtfcharsets

Change-Id: Id5592e10b93800560e82b4506cddb1dfcbe1043f

diff --git a/writerfilter/source/rtftok/rtfcharsets.cxx 
b/writerfilter/source/rtftok/rtfcharsets.cxx
index 674040b..9e84b1e 100644
--- a/writerfilter/source/rtftok/rtfcharsets.cxx
+++ b/writerfilter/source/rtftok/rtfcharsets.cxx
@@ -10,11 +10,14 @@
 #include rtfcharsets.hxx
 #include sal/macros.h
 
-namespace writerfilter {
-namespace rtftok {
+namespace writerfilter
+{
+namespace rtftok
+{
 
 // See RTF spec v1.9.1, page 19
-RTFEncoding aRTFEncodings[] = {
+RTFEncoding aRTFEncodings[] =
+{
 // charset  codepageWindows / Mac name
 {0, 1252}, // ANSI
 {1, 0}, // Default
diff --git a/writerfilter/source/rtftok/rtfcharsets.hxx 
b/writerfilter/source/rtftok/rtfcharsets.hxx
index c2cca62..99e9d86 100644
--- a/writerfilter/source/rtftok/rtfcharsets.hxx
+++ b/writerfilter/source/rtftok/rtfcharsets.hxx
@@ -10,17 +10,19 @@
 #ifndef INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFCHARSETS_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFCHARSETS_HXX
 
-namespace writerfilter {
-namespace rtftok {
-/// RTF legacy charsets
-typedef struct
-{
-int charset;
-int codepage;
-} RTFEncoding;
-extern RTFEncoding aRTFEncodings[];
-extern int nRTFEncodings;
-} // namespace rtftok
+namespace writerfilter
+{
+namespace rtftok
+{
+/// RTF legacy charsets
+typedef struct
+{
+int charset;
+int codepage;
+} RTFEncoding;
+extern RTFEncoding aRTFEncodings[];
+extern int nRTFEncodings;
+} // namespace rtftok
 } // namespace writerfilter
 
 #endif // INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFCHARSETS_HXX
commit 4d0e97f33d559cf3004ee41735b1dd57b584e95c
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Sat Apr 26 17:48:37 2014 +0200

writerfilter: unused appendToInteropGrabBag() version

Change-Id: Ie00332fcaaf3a78516569b010ac2ff7e2c259b28

diff --git a/unusedcode.easy b/unusedcode.easy
index e3a896f..4ba0403 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -238,4 +238,3 @@ 
std::auto_ptrformula::FormulaTokenArray::auto_ptr(std::auto_ptr_refformula::F
 std::vectorrtl::Referenceoox::xls::(anonymous namespace)::WorkerThread, 
std::allocatorrtl::Referenceoox::xls::(anonymous namespace)::WorkerThread  
::reserve(unsigned long)
 utl::extractTime(com::sun::star::util::DateTime const, 
com::sun::star::util::Time)
 vcl::MapChar(vcl::_TrueTypeFont*, unsigned short, bool)
-writerfilter::dmapper::SdtHelper::appendToInteropGrabBag(rtl::OUString const, 
com::sun::star::uno::Any const)
diff --git a/writerfilter/source/dmapper/SdtHelper.cxx 
b/writerfilter/source/dmapper/SdtHelper.cxx
index ad3c315..a18f84d 100644
--- a/writerfilter/source/dmapper/SdtHelper.cxx
+++ b/writerfilter/source/dmapper/SdtHelper.cxx
@@ -188,14 +188,6 @@ bool SdtHelper::hasElements()
 return m_bHasElements;
 }
 
-void SdtHelper::appendToInteropGrabBag(const OUString rName, const 
css::uno::Any rValue)
-{
-sal_Int32 nLength = m_aGrabBag.getLength();
-m_aGrabBag.realloc(nLength + 1);
-m_aGrabBag[nLength].Name = rName;
-m_aGrabBag[nLength].Value = rValue;
-}
-
 void SdtHelper::appendToInteropGrabBag(com::sun::star::beans::PropertyValue 
rValue)
 {
 sal_Int32 nLength = m_aGrabBag.getLength();
diff --git a/writerfilter/source/dmapper/SdtHelper.hxx 
b/writerfilter/source/dmapper/SdtHelper.hxx
index c68c4d0..9e730b2 100644
--- a/writerfilter/source/dmapper/SdtHelper.hxx
+++ b/writerfilter/source/dmapper/SdtHelper.hxx
@@ -82,7 +82,6 @@ public:
 /// Create date control from w:sdt's w:date.
 void createDateControl(OUString rContentText);
 
-void appendToInteropGrabBag(const OUString rName, const css::uno::Any 
rValue);
 void appendToInteropGrabBag(com::sun::star::beans::PropertyValue rValue);
 com::sun::star::uno::Sequencecom::sun::star::beans::PropertyValue 
getInteropGrabBagAndClear();
 bool isInteropGrabBagEmpty();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-03-08 Thread 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 vmik...@collabora.co.uk
Date:   Sat Mar 8 12:29:12 2014 +0100

copypaste 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::Referencetext::XTextContent 
xTextContent(xFieldInterface, uno::UNO_QUERY_THROW);
 uno::Reference text::XTextAppend   xTextAppend;
 xTextAppend = m_aTextAppendStack.top().xTextAppend;
commit 73eb16923b8b36ecd1e4f434bd248e206b775078
Author: Miklos Vajna vmik...@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_ptrformula::FormulaTokenArray::auto_ptr(std::auto_ptrformula::Formu
 
std::auto_ptrformula::FormulaTokenArray::auto_ptr(std::auto_ptr_refformula::FormulaTokenArray)
 std::vectorrtl::Referenceoox::xls::(anonymous namespace)::WorkerThread, 
std::allocatorrtl::Referenceoox::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();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits