[Libreoffice-commits] .: writerfilter/source

[Miklos Vajna]

 writerfilter/source/rtftok/rtfcontrolwords.cxx |   12 ------------
 writerfilter/source/rtftok/rtfcontrolwords.hxx |    2 --
 writerfilter/source/rtftok/rtftokenizer.cxx    |    3 ++-
 3 files changed, 2 insertions(+), 15 deletions(-)

New commits:
commit 9fda7a919f31a192b9bd2938139b6566b7fc2935
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Sat Apr 21 20:00:08 2012 +0200

    rtftok: try to make tinderboxes happy

diff --git a/writerfilter/source/rtftok/rtfcontrolwords.cxx b/writerfilter/source/rtftok/rtfcontrolwords.cxx
index 11c4d3d..516a9b8 100644
--- a/writerfilter/source/rtftok/rtfcontrolwords.cxx
+++ b/writerfilter/source/rtftok/rtfcontrolwords.cxx
@@ -1862,18 +1862,6 @@ bool RTFSymbol::operator<(const RTFSymbol& rOther) const
     return strcmp(sKeyword, rOther.sKeyword) < 0;
 }
 
-RTFSymbol::RTFSymbol(const char* pKeyword)
-    : sKeyword(pKeyword)
-{
-}
-
-RTFSymbol::RTFSymbol(const char *pKeyword, int pControlType, RTFKeyword pIndex)
-    : sKeyword(pKeyword),
-    nControlType(pControlType),
-    nIndex(pIndex)
-{
-}
-
 } // namespace rtftok
 } // namespace writerfilter
 
diff --git a/writerfilter/source/rtftok/rtfcontrolwords.hxx b/writerfilter/source/rtftok/rtfcontrolwords.hxx
index 477ddb5..1088982 100644
--- a/writerfilter/source/rtftok/rtfcontrolwords.hxx
+++ b/writerfilter/source/rtftok/rtfcontrolwords.hxx
@@ -1868,8 +1868,6 @@ struct RTFSymbol
     RTFKeyword nIndex;
 
     bool operator<(const RTFSymbol& rOther) const;
-    RTFSymbol(const char* pKeyword);
-    RTFSymbol(const char *pKeyword, int pControlType, RTFKeyword pIndex);
 };
 
 extern RTFSymbol aRTFControlWords[];
diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx b/writerfilter/source/rtftok/rtftokenizer.cxx
index b40a912..709bb30 100644
--- a/writerfilter/source/rtftok/rtftokenizer.cxx
+++ b/writerfilter/source/rtftok/rtftokenizer.cxx
@@ -268,7 +268,8 @@ int RTFTokenizer::dispatchKeyword(OString& rKeyword, bool bParam, int nParam)
         return 0;
     /*SAL_INFO("writefilter", OSL_THIS_FUNC << ": keyword '\\" << rKeyword.getStr() <<
                "' with param? " << (bParam ? 1 : 0) <<" param val: '" << (bParam ? nParam : 0) << "'");*/
-    RTFSymbol aSymbol(rKeyword.getStr());
+    RTFSymbol aSymbol;
+    aSymbol.sKeyword = rKeyword.getStr();
     std::vector<RTFSymbol>::iterator low = std::lower_bound(m_aRTFControlWords.begin(), m_aRTFControlWords.end(), aSymbol);
     int i = low - m_aRTFControlWords.begin();
     if (low == m_aRTFControlWords.end() || aSymbol < *low)