ooo-build r15527 - in trunk: . patches/dev300

[cbosdo svn gnome org]

Author: cbosdo
Date: Thu Mar 12 08:50:03 2009
New Revision: 15527
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15527&view=rev

Log:
Added missing files to patch and completed changelog


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/writerfilter-docx-import-redlines.diff

Modified: trunk/patches/dev300/writerfilter-docx-import-redlines.diff
==============================================================================
--- trunk/patches/dev300/writerfilter-docx-import-redlines.diff	(original)
+++ trunk/patches/dev300/writerfilter-docx-import-redlines.diff	Thu Mar 12 08:50:03 2009
@@ -455,6 +455,150 @@
  
  };
  } //namespace dmapper
+diff --git writerfilter/source/dmapper/SettingsTable.cxx writerfilter/source/dmapper/SettingsTable.cxx
+new file mode 100644
+index 0000000..fc1fb34
+--- /dev/null
++++ writerfilter/source/dmapper/SettingsTable.cxx
+@@ -0,0 +1,85 @@
++#include "SettingsTable.hxx"
++
++#include <ooxml/resourceids.hxx>
++
++#include <com/sun/star/beans/XPropertySet.hpp>
++#include <com/sun/star/text/XTextDocument.hpp>
++
++#if DEBUG
++#include <iostream>
++#endif
++
++using namespace com::sun::star;
++using namespace rtl;
++
++namespace writerfilter {
++namespace dmapper {
++
++SettingsTable_Impl::SettingsTable_Impl( ) 
++{
++}
++
++SettingsTable_Impl::~SettingsTable_Impl( ) 
++{
++}
++
++SettingsTable::SettingsTable( ) :
++    m_pImpl( new SettingsTable_Impl )
++{
++}
++
++SettingsTable::~SettingsTable( )
++{
++    delete m_pImpl, m_pImpl = NULL;
++}
++
++void SettingsTable::attribute( Id nName, Value& rVal )
++{
++#if DEBUG
++    clog << "SettingsTable::attribute( )" << endl;
++#endif
++}
++
++void SettingsTable::sprm( Sprm& rSprm )
++{
++    switch ( rSprm.getId( ) )
++    {
++        case NS_ooxml::LN_CT_Settings_trackRevisions:
++            {
++                m_pImpl->m_bRecordChanges = bool(rSprm.getValue( )->getInt( ) );
++            }
++            break;
++        default:
++            {
++#if DEBUG
++                clog << __FILE__ << ":" << __LINE__;
++                clog << ": unknown SPRM: " << rSprm.getName( ) << endl;
++#endif
++            }
++    }
++}
++
++void SettingsTable::entry( int nPos, writerfilter::Reference<Properties>::Pointer_t pRef )
++{
++#if DEBUG
++    clog << "SettingsTable::entry( ), pos: " << nPos << endl;
++#endif
++    pRef->resolve( *this );
++}
++
++void SettingsTable::resolveSprmProps( Sprm& rSprm )
++{
++    writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps();
++    if( pProperties.get())
++        pProperties->resolve(*this);
++}
++    
++void SettingsTable::ApplyProperties( uno::Reference< text::XTextDocument > xDoc )
++{
++    uno::Reference< beans::XPropertySet> xDocProps( xDoc, uno::UNO_QUERY );
++
++    // Record changes value
++    xDocProps->setPropertyValue( OUString::createFromAscii( "RecordChanges" ), uno::makeAny( m_pImpl->m_bRecordChanges ) );
++}
++
++} }
+diff --git writerfilter/source/dmapper/SettingsTable.hxx writerfilter/source/dmapper/SettingsTable.hxx
+new file mode 100644
+index 0000000..6a5e8b9
+--- /dev/null
++++ writerfilter/source/dmapper/SettingsTable.hxx
+@@ -0,0 +1,47 @@
++#ifndef INCLUDED_SETTINGSTABLE_HXX
++#define INCLUDED_SETTINGSTABLE_HXX
++
++#include <WriterFilterDllApi.hxx>
++#include <resourcemodel/WW8ResourceModel.hxx>
++
++#include <com/sun/star/text/XTextDocument.hpp>
++
++namespace writerfilter {
++namespace dmapper
++{
++using namespace std;
++
++struct SettingsTable_Impl
++{
++public:
++    bool m_bRecordChanges;
++
++    SettingsTable_Impl( );
++    ~SettingsTable_Impl( );
++};
++
++class WRITERFILTER_DLLPRIVATE SettingsTable: public Properties, public Table
++{
++public:
++    SettingsTable_Impl* m_pImpl;
++
++    SettingsTable( );
++    ~SettingsTable( );
++    
++    // Properties
++    virtual void attribute(Id Name, Value & val);
++    virtual void sprm(Sprm & sprm);
++
++    // Table
++    virtual void entry(int pos, writerfilter::Reference<Properties>::Pointer_t ref);
++
++    void resolveSprmProps( Sprm& rSprm );
++
++    void ApplyProperties( com::sun::star::uno::Reference< com::sun::star::text::XTextDocument > xDoc );
++};
++typedef boost::shared_ptr< SettingsTable > SettingsTablePtr;
++
++
++} }
++
++#endif
 diff --git writerfilter/source/dmapper/makefile.mk writerfilter/source/dmapper/makefile.mk
 index c1fcc36..e7235cc 100644
 --- writerfilter/source/dmapper/makefile.mk