ooo-build r15567 - in trunk: . patches/vba

[noelpwer svn gnome org]

Author: noelpwer
Date: Wed Mar 18 16:24:42 2009
New Revision: 15567
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15567&view=rev

Log:
2009-03-18  Noel Power <noel power novell com>

        * patches/vba/read-vba-dir-stream-fix.diff: apply imported image for
        all image sizes ( bad hack )
        * patches/vba/vba-templateobject.diff: fix template name api




Modified:
   trunk/ChangeLog
   trunk/patches/vba/read-vba-dir-stream-fix.diff
   trunk/patches/vba/vba-templateobject.diff

Modified: trunk/patches/vba/read-vba-dir-stream-fix.diff
==============================================================================
--- trunk/patches/vba/read-vba-dir-stream-fix.diff	(original)
+++ trunk/patches/vba/read-vba-dir-stream-fix.diff	Wed Mar 18 16:24:42 2009
@@ -181,7 +181,7 @@
          // 1 seems to work best for MSO images, otherwise they don't get displayed ( I guess the default size
          // in ooo is different )
 -        xImageManager->insertImages( 1,  commands, images );
-+        //xImageManager->insertImages( 1,  commands, images );
++        //xImageManager->insertImages( 1,  commands, images ); // #FIXME and scale images based on default icon size
 +        xImageManager->replaceImages( 1,  commands, images );
 +        xImageManager->replaceImages( 2,  commands, images );
 +        xImageManager->replaceImages( 3,  commands, images );

Modified: trunk/patches/vba/vba-templateobject.diff
==============================================================================
--- trunk/patches/vba/vba-templateobject.diff	(original)
+++ trunk/patches/vba/vba-templateobject.diff	Wed Mar 18 16:24:42 2009
@@ -342,7 +342,7 @@
  
  using namespace ::ooo::vba;
  using namespace ::com::sun::star;
-@@ -161,6 +165,32 @@ SwVbaDocument::getServiceImplName()
+@@ -161,6 +165,25 @@ SwVbaDocument::getServiceImplName()
  	static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaDocument") );
  	return sImplName;
  }
@@ -351,19 +351,12 @@
 +{
 +    SwDocShell* pDocShell = word::getDocShell( getModel() );
 +    uno::Reference< word::XTemplate > xTemplate;
-+    // is this document a template
-+    if ( pDocShell && pDocShell->IsTemplate() )
-+        xTemplate = new SwVbaTemplate( this, mxContext, getModel(), rtl::OUString::createFromAscii("UnKnown") ); // we should be able to find the name
-+    else 
-+    // is this document an ms document opened from a template
-+    {
-+        uno::Reference< document::XDocumentInfoSupplier > xDocInfoSupp( getModel(), uno::UNO_QUERY_THROW );
-+        uno::Reference< document::XDocumentPropertiesSupplier > xDocPropSupp( xDocInfoSupp->getDocumentInfo(), uno::UNO_QUERY_THROW );
-+        uno::Reference< document::XDocumentProperties > xDocProps( xDocPropSupp->getDocumentProperties(), uno::UNO_QUERY_THROW );
-+        rtl::OUString sTemplateName = xDocProps->getTemplateName();
++    uno::Reference< document::XDocumentInfoSupplier > xDocInfoSupp( getModel(), uno::UNO_QUERY_THROW );
++    uno::Reference< document::XDocumentPropertiesSupplier > xDocPropSupp( xDocInfoSupp->getDocumentInfo(), uno::UNO_QUERY_THROW );
++    uno::Reference< document::XDocumentProperties > xDocProps( xDocPropSupp->getDocumentProperties(), uno::UNO_QUERY_THROW );
++    rtl::OUString sTemplateName = xDocProps->getTemplateName();
 +
-+        xTemplate = new SwVbaTemplate( this, mxContext, getModel(), sTemplateName );
-+    }
++    xTemplate = new SwVbaTemplate( this, mxContext, getModel(), sTemplateName );
 +    return uno::makeAny( xTemplate );
 +}
 +