commit 2a49c656e7d7643f8e47f1bae43f5540e80c1bf3
author Miklos Vajna <vmiklos@frugalware.org> Mon May 30 13:17:21 2011 +0200
committer Miklos Vajna <vmiklos@frugalware.org> Mon May 30 13:17:21 2011 +0200
tree 588276eacd4a53f8fcf25382c934ed737ecb2c59
parent 46abc374c6b21c5bd9a2a7048dabacae15279947

implement RTF_FPRQ

writerfilter/source/rtftok/rtfdocumentimpl.cxx

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 40962f0..9ed16ab 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -143,12 +143,12 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
    return 0;
}

int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, bool bParam, int nParam)
int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
{
    switch (nKeyword)
    {
        case RTF_F:
            if (bParam && m_aStates.top().nDestinationState == DESTINATION_FONTENTRY)
            if (m_aStates.top().nDestinationState == DESTINATION_FONTENTRY)
            {
                m_aStates.top().nCurrentFontIndex = nParam;
            }
@@ -157,6 +157,9 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, bool bParam, int nParam)
                OSL_TRACE("%s: TODO handle value '\\f' outside font table", OSL_THIS_FUNC);
            }
            break;
        case RTF_FPRQ:
            m_aStates.top().aSprms[NS_rtf::LN_PRQ] = nParam;
            break;
        default:
            OSL_TRACE("%s: TODO handle value '%s'", OSL_THIS_FUNC, m_pCurrentKeyword->getStr());
            break;
@@ -256,7 +259,8 @@ int RTFDocumentImpl::dispatchKeyword(OString& rKeyword, bool bParam, int nParam)
                return ret;
            break;
        case CONTROL_VALUE:
            if ((ret = dispatchValue(aRTFControlWords[i].nIndex, bParam, nParam)))
            // values require a parameter by definition
            if (bParam && (ret = dispatchValue(aRTFControlWords[i].nIndex, nParam)))
                return ret;
            break;
    }

writerfilter/source/rtftok/rtfdocumentimpl.hxx

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 23c1795..ac62755 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -77,7 +77,7 @@ namespace writerfilter {
                int dispatchKeyword(rtl::OString& rKeyword, bool bParam, int nParam);
                int dispatchDestination(RTFKeyword nKeyword, bool bParam, int nParam);
                int dispatchToggle(RTFKeyword nKeyword, bool bParam, int nParam);
                int dispatchValue(RTFKeyword nKeyword, bool bParam, int nParam);
                int dispatchValue(RTFKeyword nKeyword, int nParam);
                int dispatchFlag(RTFKeyword nKeyword);

                int resolveChars(char ch);