[ooo-build-commit] patches/vba

Noel Power noelp at kemper.freedesktop.org
Fri Dec 18 04:48:56 PST 2009


 patches/vba/vba-dont-load-for-odf.diff |  248 +++++++++++++++++++++++++--------
 1 file changed, 190 insertions(+), 58 deletions(-)

New commits:
commit a12d912a0d77aaf5308ff3ba37aaa3a2b76c01fa
Author: Noel Power <noel.power at novell.com>
Date:   Fri Dec 18 12:47:55 2009 +0000

    move some needed functions to a seperate header file to avoid window build err
    
    * patches/vba/vba-dont-load-for-odf.diff:

diff --git a/patches/vba/vba-dont-load-for-odf.diff b/patches/vba/vba-dont-load-for-odf.diff
index c37da55..544ec0a 100644
--- a/patches/vba/vba-dont-load-for-odf.diff
+++ b/patches/vba/vba-dont-load-for-odf.diff
@@ -14,14 +14,14 @@ index a16b431..670ba03 100644
  					sCodeName = xNameQuery->getCodeNameForObject( xIf );
  					Reference< XPropertySet > xProps( xIf, UNO_QUERY );
 diff --git sc/source/core/data/documen2.cxx sc/source/core/data/documen2.cxx
-index 2a34517..294c86e 100644
+index 2a34517..e1a63f6 100644
 --- sc/source/core/data/documen2.cxx
 +++ sc/source/core/data/documen2.cxx
 @@ -98,6 +98,7 @@
  #include "clipparam.hxx"
  #include "macromgr.hxx"
  #include <com/sun/star/document/XVbaEventsHelper.hpp>
-+#include <vbahelper/vbahelper.hxx>
++#include <vbahelper/vbaaccesshelper.hxx>
  
  // pImpl because including lookupcache.hxx in document.hxx isn't wanted, and
  // dtor plus helpers are convenient.
@@ -30,10 +30,32 @@ index 2a34517..294c86e 100644
  ScDocument::GetVbaEventsHelper()
  {
 -	if( !mxVbaEventsHelper.is() )
-+	if( !mxVbaEventsHelper.is() && pShell && ov::isAlienExcelDoc( *pShell ) )
++	if( !mxVbaEventsHelper.is() && pShell && ooo::vba::isAlienExcelDoc( *pShell ) )
  	{
          try
          {
+diff --git sc/source/core/tool/interpr4.cxx sc/source/core/tool/interpr4.cxx
+index d738dcf..ce6592e 100644
+--- sc/source/core/tool/interpr4.cxx
++++ sc/source/core/tool/interpr4.cxx
+@@ -82,7 +82,7 @@
+ #include <algorithm>
+ #include <functional>
+ #include <memory>
+-#include <vbahelper/vbahelper.hxx>
++#include <vbahelper/vbaaccesshelper.hxx>
+ #include <basic/basmgr.hxx>
+ 
+ using namespace com::sun::star;
+@@ -2702,7 +2702,7 @@ lcl_setVBARange( ScRange& aRange, ScDocument* pDok, SbxVariable* pPar )
+ 		uno::Sequence< uno::Any > aArgs(2);
+ 		aArgs[0] = uno::Any( uno::Reference< uno::XInterface >() ); // dummy parent
+ 		aArgs[1] = uno::Any( xCellRange );
+-		xVBARange = ov::createVBAUnoAPIServiceWithArgs( pDok->GetDocumentShell(), "ooo.vba.excel.Range", aArgs );
++		xVBARange = ooo::vba::createVBAUnoAPIServiceWithArgs( pDok->GetDocumentShell(), "ooo.vba.excel.Range", aArgs );
+ 		if ( xVBARange.is() )
+ 		{
+ 			String sDummy(RTL_CONSTASCII_USTRINGPARAM("A-Range") );
 diff --git sc/source/filter/excel/excimp8.cxx sc/source/filter/excel/excimp8.cxx
 index 4cd1863..f72f975 100644
 --- sc/source/filter/excel/excimp8.cxx
@@ -57,10 +79,10 @@ index 4cd1863..f72f975 100644
              if ( !bAsComment )
              {
 diff --git sc/source/ui/docshell/docsh.cxx sc/source/ui/docshell/docsh.cxx
-index 2cd4321..54e0b4f 100644
+index cc4c5bf..a72c9e2 100644
 --- sc/source/ui/docshell/docsh.cxx
 +++ sc/source/ui/docshell/docsh.cxx
-@@ -372,6 +372,7 @@ void ScDocShell::AfterXMLLoading(sal_Bool bRet)
+@@ -380,6 +380,7 @@ void ScDocShell::AfterXMLLoading(sal_Bool bRet)
      }
      else
          aDocument.SetInsertingFromOtherDoc( FALSE );
@@ -68,7 +90,7 @@ index 2cd4321..54e0b4f 100644
  	// add vba globals ( if they are availabl )
  	uno::Any aGlobs;
          uno::Sequence< uno::Any > aArgs(1);
-@@ -398,6 +399,7 @@ void ScDocShell::AfterXMLLoading(sal_Bool bRet)
+@@ -406,6 +407,7 @@ void ScDocShell::AfterXMLLoading(sal_Bool bRet)
          if ( xEvt.is() )
              xEvt->setIgnoreEvents( sal_False );
  #endif
@@ -97,15 +119,42 @@ index eb7a320..653408b 100644
      return bRet;
  }
 diff --git sc/source/ui/unoobj/servuno.cxx sc/source/ui/unoobj/servuno.cxx
-index 3eb6c9d..502a0bd 100644
+index 3eb6c9d..e2698ec 100644
 --- sc/source/ui/unoobj/servuno.cxx
 +++ sc/source/ui/unoobj/servuno.cxx
+@@ -69,7 +69,7 @@
+ #include <com/sun/star/script/ScriptEventDescriptor.hpp>
+ #include <comphelper/componentcontext.hxx>
+ #include <cppuhelper/component_context.hxx>
+-#include <vbahelper/vbahelper.hxx>
++#include <vbahelper/vbaaccesshelper.hxx>
+ using namespace ::com::sun::star;
+ 
+ class ScVbaObjectForCodeNameProvider : public ::cppu::WeakImplHelper1< container::XNameAccess >
+@@ -87,7 +87,7 @@ public:
+         uno::Sequence< uno::Any > aArgs(2);
+         aArgs[0] = uno::Any( uno::Reference< uno::XInterface >() );
+         aArgs[1] = uno::Any( mpDocShell->GetModel() );
+-        maWorkbook <<= ov::createVBAUnoAPIServiceWithArgs( mpDocShell, "ooo.vba.excel.Workbook", aArgs );
++        maWorkbook <<= ooo::vba::createVBAUnoAPIServiceWithArgs( mpDocShell, "ooo.vba.excel.Workbook", aArgs );
+     }
+ 
+     virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException )
+@@ -120,7 +120,7 @@ public:
+                         aArgs[0] = maWorkbook;
+                         aArgs[1] = uno::Any( xModel );
+                         aArgs[2] = uno::Any( rtl::OUString( sSheetName ) );
+-                        maCachedObject <<= ov::createVBAUnoAPIServiceWithArgs( mpDocShell, "ooo.vba.excel.Worksheet", aArgs );
++                        maCachedObject <<= ooo::vba::createVBAUnoAPIServiceWithArgs( mpDocShell, "ooo.vba.excel.Worksheet", aArgs );
+                         break;
+                     }
+                 }
 @@ -536,10 +536,18 @@ uno::Reference<uno::XInterface> ScServiceProvider::MakeInstance(
              }
              break;
          case SC_SERVICE_VBAOBJECTPROVIDER:
 -            xRet.set(static_cast<container::XNameAccess*>(new ScVbaObjectForCodeNameProvider( pDocShell )));
-+            if ( pDocShell && ov::isAlienExcelDoc( *pDocShell ) )
++            if ( pDocShell && ooo::vba::isAlienExcelDoc( *pDocShell ) )
 +            {
 +                OSL_TRACE("**** creating VBA Object mapper");
 +                xRet.set(static_cast<container::XNameAccess*>(new ScVbaObjectForCodeNameProvider( pDocShell )));
@@ -113,7 +162,7 @@ index 3eb6c9d..502a0bd 100644
              break;
          case SC_SERVICE_VBACODENAMEPROVIDER:
 -            xRet.set(static_cast<document::XCodeNameQuery*>(new ScVbaCodeNameProvider( pDocShell )));
-+            if ( pDocShell && ov::isAlienExcelDoc( *pDocShell ) )
++            if ( pDocShell && ooo::vba::isAlienExcelDoc( *pDocShell ) )
 +            {
 +                OSL_TRACE("**** creating VBA Object provider");
 +                xRet.set(static_cast<document::XCodeNameQuery*>(new ScVbaCodeNameProvider( pDocShell )));
@@ -199,14 +248,14 @@ index c438b74..9c91b48 100644
  		if ( xProps.is() )
  		{
 diff --git sw/source/core/doc/doc.cxx sw/source/core/doc/doc.cxx
-index 914a843..aba6e2f 100644
+index 914a843..8aa72ad 100644
 --- sw/source/core/doc/doc.cxx
 +++ sw/source/core/doc/doc.cxx
 @@ -110,6 +110,7 @@
  
  #include <osl/diagnose.h>
  #include <osl/interlck.h>
-+#include <vbahelper/vbahelper.hxx>
++#include <vbahelper/vbaaccesshelper.hxx>
  
  /* @@@MAINTAINABILITY-HORROR@@@
     Probably unwanted dependency on SwDocShell
@@ -215,21 +264,42 @@ index 914a843..aba6e2f 100644
  SwDoc::GetVbaEventsHelper()
  {
 -	if( !mxVbaEventsHelper.is() )
-+	if( !mxVbaEventsHelper.is() && GetDocShell() && ov::isAlienWordDoc( *GetDocShell() ) )
++	if( !mxVbaEventsHelper.is() && GetDocShell() && ooo::vba::isAlienWordDoc( *GetDocShell() ) )
  	{
          try
          {
 diff --git sw/source/core/unocore/unocoll.cxx sw/source/core/unocore/unocoll.cxx
-index 7c1631a..747c1e6 100644
+index 7c1631a..fdc36fa 100644
 --- sw/source/core/unocore/unocoll.cxx
 +++ sw/source/core/unocore/unocoll.cxx
-@@ -587,14 +587,17 @@ uno::Reference< uno::XInterface >   SwXServiceProvider::MakeInstance(sal_uInt16
+@@ -84,10 +84,9 @@
+ #include <com/sun/star/script/ModuleInfo.hpp>
+ #include <com/sun/star/script/ModuleType.hpp>
+ #include <com/sun/star/script/ScriptEventDescriptor.hpp>
+-#include <vbahelper/vbahelper.hxx>
++#include <vbahelper/vbaaccesshelper.hxx>
+ #include <basic/basmgr.hxx>
+ 
+-
+ using ::rtl::OUString;
+ using namespace ::com::sun::star;
+ using namespace ::com::sun::star::document;
+@@ -259,7 +258,7 @@ public:
+ 	uno::Sequence< uno::Any > aArgs( 2 );
+         aArgs[0] = uno::Any( uno::Reference< uno::XInterface >() );
+         aArgs[1] = uno::Any( mpDocShell->GetModel() );
+-        uno::Reference< uno::XInterface > xDocObj = ov::createVBAUnoAPIServiceWithArgs( mpDocShell, "ooo.vba.word.Document" , aArgs );
++        uno::Reference< uno::XInterface > xDocObj = ooo::vba::createVBAUnoAPIServiceWithArgs( mpDocShell, "ooo.vba.word.Document" , aArgs );
+         OSL_TRACE("Creating Object ( ooo.vba.word.Document ) 0x%x", xDocObj.get() );
+         return  uno::makeAny( xDocObj );
+     }
+@@ -587,14 +586,17 @@ uno::Reference< uno::XInterface >   SwXServiceProvider::MakeInstance(sal_uInt16
  		break;
  		case  SW_SERVICE_VBACODENAMEPROVIDER :
  		{
 -			SwVbaCodeNameProvider* pObjProv = new SwVbaCodeNameProvider( pDoc->GetDocShell() );
 -			xRet =  (cppu::OWeakObject*)pObjProv;
-+			if ( pDoc->GetDocShell()  && ov::isAlienWordDoc( *pDoc->GetDocShell() ) )
++			if ( pDoc->GetDocShell()  && ooo::vba::isAlienWordDoc( *pDoc->GetDocShell() ) )
 +			{
 +				SwVbaCodeNameProvider* pObjProv = new SwVbaCodeNameProvider( pDoc->GetDocShell() );
 +				xRet =  (cppu::OWeakObject*)pObjProv;
@@ -240,7 +310,7 @@ index 7c1631a..747c1e6 100644
  		{
                          uno::Reference< container::XNameContainer > xProjProv = pDoc->GetVBATemplateToProjectCache();
 -                        if ( !xProjProv.is() )
-+                        if ( !xProjProv.is() && pDoc->GetDocShell()  && ov::isAlienWordDoc( *pDoc->GetDocShell() ) )
++                        if ( !xProjProv.is() && pDoc->GetDocShell()  && ooo::vba::isAlienWordDoc( *pDoc->GetDocShell() ) )
                          {
  			    xProjProv = new SwVbaProjectNameProvider( pDoc->GetDocShell() );
                              pDoc->SetVBATemplateToProjectCache( xProjProv );
@@ -257,10 +327,10 @@ index b726149..c049505 100644
  
  .IF "$(GUI)"=="WNT"
 diff --git vbahelper/inc/vbahelper/vbahelper.hxx vbahelper/inc/vbahelper/vbahelper.hxx
-index 54ab0ad..bd31cb6 100644
+index 54ab0ad..0436dfc 100644
 --- vbahelper/inc/vbahelper/vbahelper.hxx
 +++ vbahelper/inc/vbahelper/vbahelper.hxx
-@@ -38,17 +38,20 @@
+@@ -38,17 +38,19 @@
  #include <com/sun/star/lang/IllegalArgumentException.hpp>
  #include <com/sun/star/awt/XControl.hpp>
  #include <com/sun/star/awt/XDevice.hpp>
@@ -269,62 +339,42 @@ index 54ab0ad..bd31cb6 100644
  #include <cppuhelper/implbase1.hxx>
  #include <com/sun/star/frame/XModel.hpp>
  #include <sfx2/dispatch.hxx>
+-//#include <ooo/vba/msforms/XShape.hpp>
 +#include <sfx2/objsh.hxx>
 +#include <sfx2/docfilt.hxx>
 +#include <sfx2/docfile.hxx>
- //#include <ooo/vba/msforms/XShape.hpp>
  #include <vcl/pointr.hxx>
- #define VBAHELPER_DLLIMPLEMENTATION
- #include <vbahelper/vbadllapi.h>
+-#define VBAHELPER_DLLIMPLEMENTATION
+-#include <vbahelper/vbadllapi.h>
  #include <memory>
- namespace css = ::com::sun::star;
--
+-namespace css = ::com::sun::star;
++#include "vbaaccesshelper.hxx"
+ 
++namespace css = ::com::sun::star;
  namespace ooo 
  {
  	namespace vba 
-@@ -65,7 +68,24 @@ namespace ooo
+@@ -65,7 +67,7 @@ namespace ooo
  		}
          VBAHELPER_DLLPUBLIC SfxObjectShell* getSfxObjShell( const css::uno::Reference< css::frame::XModel >& xModel ) throw ( css::uno::RuntimeException);
          VBAHELPER_DLLPUBLIC css::uno::Reference< css::uno::XInterface > createVBAUnoAPIService( SfxObjectShell* pShell,  const sal_Char* _pAsciiName ) throw (css::uno::RuntimeException);
 -        VBAHELPER_DLLPUBLIC css::uno::Reference< css::uno::XInterface > createVBAUnoAPIServiceWithArgs( SfxObjectShell* pShell,  const sal_Char* _pAsciiName, const css::uno::Sequence< css::uno::Any >& aArgs ) throw (css::uno::RuntimeException);
 +
-+        VBAHELPER_DLLPRIVATE inline css::uno::Reference< css::lang::XMultiServiceFactory > getVBAServiceFactory( SfxObjectShell* pShell )
-+        {
-+            css::uno::Any aUnoVar;
-+            if ( !pShell || ! pShell->GetBasicManager()->GetGlobalUNOConstant( "VBAGlobals", aUnoVar ) )
-+                throw css::lang::IllegalArgumentException();
-+            css::uno::Reference< css::lang::XMultiServiceFactory > xVBAFactory( aUnoVar, css::uno::UNO_QUERY_THROW );
-+            return xVBAFactory;
-+        }
-+
-+        VBAHELPER_DLLPUBLIC inline css::uno::Reference< css::uno::XInterface > createVBAUnoAPIServiceWithArgs( SfxObjectShell* pShell,  const sal_Char* _pAsciiName, const css::uno::Sequence< css::uno::Any >& aArgs ) throw (css::uno::RuntimeException)
-+        {
-+            OSL_PRECOND( pShell, "createVBAUnoAPIService: no shell!" );
-+            ::rtl::OUString sVarName( ::rtl::OUString::createFromAscii( _pAsciiName ) );
-+            css::uno::Reference< css::uno::XInterface > xIf = getVBAServiceFactory( pShell )->createInstanceWithArguments( sVarName, aArgs  );
-+            return xIf;
-+        }
-+
          css::uno::Reference< css::frame::XModel > getCurrentDoc( const rtl::OUString& sKey ) throw (css::uno::RuntimeException);
          VBAHELPER_DLLPUBLIC css::uno::Reference< css::frame::XModel > getCurrentExcelDoc( const css::uno::Reference< css::uno::XComponentContext >& xContext ) throw (css::uno::RuntimeException);
          VBAHELPER_DLLPUBLIC css::uno::Reference< css::frame::XModel > getCurrentWordDoc( const css::uno::Reference< css::uno::XComponentContext >& xContext ) throw (css::uno::RuntimeException);
-@@ -98,6 +118,16 @@ namespace ooo
-         VBAHELPER_DLLPUBLIC css::uno::Any getPropertyValue( const css::uno::Sequence< css::beans::PropertyValue >& aProp, const rtl::OUString& aName );
-         VBAHELPER_DLLPUBLIC sal_Bool setPropertyValue( css::uno::Sequence< css::beans::PropertyValue >& aProp, const rtl::OUString& aName, const css::uno::Any& aValue );
-         VBAHELPER_DLLPUBLIC void setOrAppendPropertyValue( css::uno::Sequence< css::beans::PropertyValue >& aProp, const rtl::OUString& aName, const css::uno::Any& aValue );
-+        VBAHELPER_DLLPRIVATE inline bool isAlienDoc( SfxObjectShell& rDocShell, const char* pMimeType )
-+        {
-+            bool bRes( false );
-+            const SfxFilter *pFilt = rDocShell.GetMedium()->GetFilter();
-+            if ( pFilt && pFilt->IsAlienFormat() )
-+                bRes = ( pFilt->GetMimeType().CompareToAscii( pMimeType ) == 0 );
-+            return bRes;
-+        }
-+        VBAHELPER_DLLPUBLIC inline bool isAlienExcelDoc( SfxObjectShell& rDocShell ) { return isAlienDoc( rDocShell, "application/vnd.ms-excel" ); }
-+        VBAHELPER_DLLPUBLIC inline bool isAlienWordDoc( SfxObjectShell& rDocShell ) { return isAlienDoc( rDocShell, "application/vnd.ms-word" ); }
- 
- class VBAHELPER_DLLPUBLIC Millimeter
- {
+diff --git vbahelper/prj/d.lst vbahelper/prj/d.lst
+index db11559..2d20ab1 100644
+--- vbahelper/prj/d.lst
++++ vbahelper/prj/d.lst
+@@ -8,6 +8,7 @@
+ mkdir: %_DEST%\inc%_EXT%\basic
+ ..\inc\vbahelper\vbacollectionimpl.hxx %_DEST%\inc%_EXT%\vbahelper\vbacollectionimpl.hxx
+ ..\inc\vbahelper\vbahelper.hxx %_DEST%\inc%_EXT%\vbahelper\vbahelper.hxx
++..\inc\vbahelper\vbaaccesshelper.hxx %_DEST%\inc%_EXT%\vbahelper\vbaaccesshelper.hxx
+ ..\inc\vbahelper\helperdecl.hxx %_DEST%\inc%_EXT%\vbahelper\helperdecl.hxx
+ ..\inc\vbahelper\vbahelperinterface.hxx %_DEST%\inc%_EXT%\vbahelper\vbahelperinterface.hxx
+ ..\inc\vbahelper\vbaapplicationbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbaapplicationbase.hxx
 diff --git vbahelper/source/vbahelper/vbahelper.cxx vbahelper/source/vbahelper/vbahelper.cxx
 index 1290b25..5c64f99 100644
 --- vbahelper/source/vbahelper/vbahelper.cxx
@@ -359,3 +409,85 @@ index 1290b25..5c64f99 100644
  // helper method to determine if the view ( calc ) is in print-preview mode
  bool isInPrintPreview( SfxViewFrame* pView )
  {
+--- /dev/null	2009-04-14 11:16:40.000000000 +0100
++++ vbahelper/inc/vbahelper/vbaaccesshelper.hxx	2009-12-18 10:27:31.000000000 +0000
+@@ -0,0 +1,79 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: vbahelper.hxx,v $
++ * $Revision: 1.5.32.1 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef OOVBAAPI_VBA_ACCESS_HELPER_HXX
++#define OOVBAAPI_VBA_ACCESS_HELPER_HXX
++
++#include <com/sun/star/beans/XPropertySet.hpp>
++#include <basic/basmgr.hxx>
++#include <sfx2/objsh.hxx>
++#include <sfx2/docfilt.hxx>
++#include <sfx2/docfile.hxx>
++#define VBAHELPER_DLLIMPLEMENTATION
++#include <vbahelper/vbadllapi.h>
++#include <memory>
++namespace css = ::com::sun::star;
++namespace ooo 
++{
++	namespace vba 
++	{
++
++        VBAHELPER_DLLPRIVATE inline css::uno::Reference< css::lang::XMultiServiceFactory > getVBAServiceFactory( SfxObjectShell* pShell )
++        {
++            css::uno::Any aUnoVar;
++            if ( !pShell || ! pShell->GetBasicManager()->GetGlobalUNOConstant( "VBAGlobals", aUnoVar ) )
++                throw css::lang::IllegalArgumentException();
++            css::uno::Reference< css::lang::XMultiServiceFactory > xVBAFactory( aUnoVar, css::uno::UNO_QUERY_THROW );
++            return xVBAFactory;
++        }
++
++        VBAHELPER_DLLPUBLIC inline css::uno::Reference< css::uno::XInterface > createVBAUnoAPIServiceWithArgs( SfxObjectShell* pShell,  const sal_Char* _pAsciiName, const css::uno::Sequence< css::uno::Any >& aArgs ) throw (css::uno::RuntimeException)
++        {
++            OSL_PRECOND( pShell, "createVBAUnoAPIService: no shell!" );
++            ::rtl::OUString sVarName( ::rtl::OUString::createFromAscii( _pAsciiName ) );
++            css::uno::Reference< css::uno::XInterface > xIf = getVBAServiceFactory( pShell )->createInstanceWithArguments( sVarName, aArgs  );
++            return xIf;
++        }
++
++
++        VBAHELPER_DLLPRIVATE inline bool isAlienDoc( SfxObjectShell& rDocShell, const char* pMimeType )
++        {
++            bool bRes( false );
++            const SfxFilter *pFilt = rDocShell.GetMedium()->GetFilter();
++            if ( pFilt && pFilt->IsAlienFormat() )
++                bRes = ( pFilt->GetMimeType().CompareToAscii( pMimeType ) == 0 );
++            return bRes;
++        }
++        VBAHELPER_DLLPUBLIC inline bool isAlienExcelDoc( SfxObjectShell& rDocShell ) { return isAlienDoc( rDocShell, "application/vnd.ms-excel" ); }
++        VBAHELPER_DLLPUBLIC inline bool isAlienWordDoc( SfxObjectShell& rDocShell ) { return isAlienDoc( rDocShell, "application/vnd.ms-word" ); }
++
++	} // openoffice
++} // org
++
++#endif


More information about the ooo-build-commit mailing list