[ooo-build-commit] 2 commits - patches/dev300 patches/vba

[Petr Mladek]

 patches/dev300/apply                           |    5 ++
 patches/dev300/autodoc-two-template-types.diff |   53 +++++++++++++++++++++++++
 patches/vba/vba-word-support-part2.diff        |   14 +++---
 3 files changed, 65 insertions(+), 7 deletions(-)

New commits:
commit 35418e77adfb041ef559522cf99e89efc8a89a13
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Jun 11 18:48:59 2009 +0200

    Avoid warning about missing return
    
    * patches/vba/vba-word-support-part2.diff: inverted the condition, so that
      return is the last command in the method; it helps to avoid warning
      about missing return

diff --git a/patches/vba/vba-word-support-part2.diff b/patches/vba/vba-word-support-part2.diff
index c0949ea..f0bab04 100644
--- a/patches/vba/vba-word-support-part2.diff
+++ b/patches/vba/vba-word-support-part2.diff
@@ -14214,14 +14214,14 @@ index 39c93b9..283162a 100644
 +    {
 +        aStyleType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParagraphStyles") );
 +    }
-+    if( aStyleType.getLength() )
++    if( aStyleType.getLength() == 0 )
 +    {
-+	    uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( mxTextDocument, uno::UNO_QUERY_THROW);
-+	    uno::Reference< container::XNameAccess > xStylesAccess( xStyleSupplier->getStyleFamilies()->getByName( aStyleType ), uno::UNO_QUERY_THROW );
-+        uno::Reference< beans::XPropertySet > xStyleProps( xStylesAccess->getByName( aStyleName ), uno::UNO_QUERY_THROW );
-+        return uno::Reference< word::XStyle >( new SwVbaStyle( this, mxContext, xStyleProps ) ); 
-+    }    
-+    DebugHelper::exception( SbERR_INTERNAL_ERROR, rtl::OUString() );
++        DebugHelper::exception( SbERR_INTERNAL_ERROR, rtl::OUString() );
++    }
++    uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( mxTextDocument, uno::UNO_QUERY_THROW);
++    uno::Reference< container::XNameAccess > xStylesAccess( xStyleSupplier->getStyleFamilies()->getByName( aStyleType ), uno::UNO_QUERY_THROW );
++    uno::Reference< beans::XPropertySet > xStyleProps( xStylesAccess->getByName( aStyleName ), uno::UNO_QUERY_THROW );
++    return uno::Reference< word::XStyle >( new SwVbaStyle( this, mxContext, xStyleProps ) ); 
  }
  
 -SwVbaDocRange::~SwVbaDocRange()
commit 9b48ded8de9e27dc4998844bdd5fd06369fd4e62
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Jun 11 17:12:00 2009 +0200

    Fix autodoc to do not freeze with XFastSAXSerializable.idl
    
    * patches/dev300/autodoc-two-template-types.diff, patches/dev300/apply:
      partial support for two template types; it is needed to process the new
      XFastSAXSerializable.idl; the patch fixes the semantic analyze but not
      the output; the output of template types seems to be incomplete anyway

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 53f75ec..fb6ffd0 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3042,6 +3042,11 @@ svx-visibility.diff, fridrich
 
 # the smart art import work
 unoxml-fast-sax-serializable.diff, thorsten
+# partial support for two template types
+# it is needed to process the new XFastSAXSerializable.idl
+# the patch fixes the semantic analyze but not the output
+# the output of template types seems to be incomplete anyway
+autodoc-two-template-types.diff, pmladek
 # this here depends on oox changes in OOXMLExport
 oox-smartart-import.diff, thorsten
 
diff --git a/patches/dev300/autodoc-two-template-types.diff b/patches/dev300/autodoc-two-template-types.diff
new file mode 100644
index 0000000..20e2b53
--- /dev/null
+++ b/patches/dev300/autodoc-two-template-types.diff
@@ -0,0 +1,53 @@
+--- autodoc/source/parser_i/idl/pe_type2.cxx.old	2009-06-10 21:35:32.000000000 +0200
++++ autodoc/source/parser_i/idl/pe_type2.cxx	2009-06-11 16:58:37.000000000 +0200
+@@ -47,7 +47,7 @@
+ /** Implementation Concept for Parsing a Type
+ 
+ Example Type:
+-    sequence < ::abc::TName< TplType > >  AnyName;
++    sequence < ::abc::TName< TplType, TplType > >  AnyName;
+ 
+ Status Changes:
+ 
+@@ -62,6 +62,8 @@ expect_type:
+ 
+         expect_type:
+             TplType         ->expect_quname_separator
++            ,       -> in_template_type (process in nested PE_Type instance)
++            TplType         ->expect_quname_separator
+             >               -> e_none (finish, '>' not handled)
+ 
+     >               -> expect_quname_separator
+@@ -172,9 +174,29 @@ PE_Type::Process_Punctuation( const TokP
+     }
+ 	else if (eState == in_template_type)
+ 	{
+-	    csv_assert( i_rToken.Id() == TokPunctuation::Greater );
+-		eState = expect_quname_separator;
+-		SetResult(done, stay);
++            switch (i_rToken.Id())
++            {
++                case TokPunctuation::Comma:
++                        eState = in_template_type;
++                        // FIXME: We started tyo call MyTemplateType() more times; we might need to create array
++                        //        of nTemplateType, update the output routines, ...
++                        //        Hmm, the template types are not visible in the HTML output even when only one
++                        //        template type is used => there might be missing even more code
++                        // Example of the more types is in XFastSAXSerializable.idl:
++                        //        sequence< beans::Pair<string, long> > registerNamespaces
++                        SetResult( done, push_sure, &MyTemplateType() );
++                        break;
++
++                case TokPunctuation::TokPunctuation::Greater:
++                        eState = expect_quname_separator;
++                        SetResult(done, stay);
++                        break;
++
++                default:
++                       Cerr() << "Syntax error: in template type." << Endl();
++                       SetResult( not_done, pop_failure);
++                       break;
++            }
+ 	}
+ }
+