[ooo-build-commit] patches/vba
Tor Lillqvist
tml at kemper.freedesktop.org
Tue Aug 11 08:23:01 PDT 2009
patches/vba/vba-word-support.diff | 71 +++++++++++++++++++-------------------
1 file changed, 36 insertions(+), 35 deletions(-)
New commits:
commit fe32e94864dfe20efe85629c4914e3ad9d9f5562
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Aug 11 18:20:01 2009 +0300
Adapt vba-word-support.diff for dev300-m54
* patches/vba/vba-word-support.diff: Adapt for dev300-m54.
diff --git a/patches/vba/vba-word-support.diff b/patches/vba/vba-word-support.diff
index d7cb26a..57d51af 100644
--- a/patches/vba/vba-word-support.diff
+++ b/patches/vba/vba-word-support.diff
@@ -9,12 +9,12 @@
/** determines whether there are password-protected modules whose size exceedes the
legacy module size
@param _out_rModuleNames
---- basic/inc/basic/sbstar.hxx.old 2009-04-06 16:41:59.000000000 +0000
-+++ basic/inc/basic/sbstar.hxx 2009-04-06 16:42:01.000000000 +0000
+--- basic/inc/basic/sbstar.hxx
++++ basic/inc/basic/sbstar.hxx
@@ -75,6 +75,10 @@ class StarBASIC : public SbxObject
BOOL bVBAEnabled;
- BasicLibInfo* pLibInfo; // Infoblock fuer Basic-Manager
- SbLanguageMode eLanguageMode; // LanguageMode des Basic-Objekts
+ BasicLibInfo* pLibInfo; // Info block for basic manager
+ SbLanguageMode eLanguageMode; // LanguageMode of the basic object
+
+ SbxObjectRef pVBAGlobals;
+ SbxObject* getVBAGlobals( );
@@ -84,8 +84,8 @@
Any BasicManager::SetGlobalUNOConstant( const sal_Char* _pAsciiName, const Any& _rValue )
{
---- basic/source/classes/sb.cxx.old 2009-04-06 16:41:59.000000000 +0000
-+++ basic/source/classes/sb.cxx 2009-04-06 16:42:01.000000000 +0000
+--- basic/source/classes/sb.cxx
++++ basic/source/classes/sb.cxx
@@ -70,7 +70,29 @@ SV_IMPL_VARARR(SbTextPortions,SbTextPort
TYPEINIT1(StarBASIC,SbxObject)
@@ -114,8 +114,8 @@
+
+}
- //========================================================================
- // Array zur Umrechnung SFX <-> VB-Fehlercodes anlegen
+ // Create array for conversion SFX <-> VB error code
+ struct SFX_VB_ErrorItem
@@ -609,6 +631,7 @@ StarBASIC::StarBASIC( StarBASIC* p, BOOL
pRtl = new SbiStdObject( String( RTL_CONSTASCII_USTRINGPARAM(RTLNAME) ), this );
// Suche ueber StarBASIC ist immer global
@@ -2394,8 +2394,8 @@
#define SC_SERVICE_INVALID USHRT_MAX
---- sc/prj/build.lst.old 2009-04-06 16:41:58.000000000 +0000
-+++ sc/prj/build.lst 2009-04-06 16:42:01.000000000 +0000
+--- sc/prj/build.lst
++++ sc/prj/build.lst
@@ -1,4 +1,4 @@
-sc sc : oovbaapi svx stoc uui BOOST:boost formula oox NULL
+sc sc : vbahelper oovbaapi svx stoc uui BOOST:boost formula oox NULL
@@ -2558,16 +2558,16 @@
// suppress VBA events when loading the xml
uno::Reference< document::XVbaEventsHelper > xEvt( aDocument.GetVbaEventsHelper() );
if ( xEvt.is() )
---- sc/source/ui/unoobj/docuno.cxx.old 2009-04-06 16:42:00.000000000 +0000
-+++ sc/source/ui/unoobj/docuno.cxx 2009-04-06 16:42:01.000000000 +0000
+--- sc/source/ui/unoobj/docuno.cxx
++++ sc/source/ui/unoobj/docuno.cxx
@@ -107,7 +107,6 @@ using namespace com::sun::star::document
// alles ohne Which-ID, Map nur fuer PropertySetInfo
//! umbenennen, sind nicht mehr nur Options
-#include <com/sun/star/script/ScriptEventDescriptor.hpp>
- const SfxItemPropertyMap* lcl_GetDocOptPropertyMap()
+ const SfxItemPropertyMapEntry* lcl_GetDocOptPropertyMap()
{
- static SfxItemPropertyMap aDocOptPropertyMap_Impl[] =
+ static SfxItemPropertyMapEntry aDocOptPropertyMap_Impl[] =
@@ -315,7 +314,6 @@ uno::Any SAL_CALL ScModelObj::queryInter
SC_QUERYINTERFACE( view::XRenderable )
SC_QUERYINTERFACE( document::XLinkTargetSupplier )
@@ -6519,9 +6519,9 @@
#include <com/sun/star/sheet/ConditionOperator.hpp>
template< typename Ifc1 >
---- sc/source/ui/vba/vbacontrol.cxx.old 2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbacontrol.cxx 1970-01-01 00:00:00.000000000 +0000
-@@ -1,467 +0,0 @@
+--- sc/source/ui/vba/vbacontrol.cxx
++++ sc/source/ui/vba/vbacontrol.cxx
+@@ -1,468 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -6709,14 +6709,15 @@
-
-sal_Bool SAL_CALL ScVbaControl::getVisible() throw (uno::RuntimeException)
-{
-- uno::Reference< awt::XWindow2 > xWindow2( getWindowPeer(), uno::UNO_QUERY_THROW );
-- return xWindow2->isVisible();
+- sal_Bool bVisible = sal_False;
+- m_xProps->getPropertyValue(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EnableVisible" ) ) ) >>= bVisible;
+- return bVisible;
-}
-
-void SAL_CALL ScVbaControl::setVisible( sal_Bool bVisible ) throw (uno::RuntimeException)
-{
-- uno::Reference< awt::XWindow2 > xWindow2( getWindowPeer(), uno::UNO_QUERY_THROW );
-- xWindow2->setVisible( bVisible );
+- m_xProps->setPropertyValue
+- (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EnableVisible" ) ), uno::makeAny( bVisible ) );
-}
-double SAL_CALL ScVbaControl::getHeight() throw (uno::RuntimeException)
-{
@@ -8221,8 +8222,8 @@
+ virtual css::uno::Sequence<rtl::OUString> getServiceNames();
};
#endif //
---- sc/source/ui/vba/vbahelper.cxx.old 2009-04-02 10:45:35.000000000 +0000
-+++ sc/source/ui/vba/vbahelper.cxx 1970-01-01 00:00:00.000000000 +0000
+--- sc/source/ui/vba/vbahelper.cxx
++++ sc/source/ui/vba/vbahelper.cxx
@@ -1,828 +0,0 @@
-/*************************************************************************
- *
@@ -8670,7 +8671,7 @@
-uno::Any
-OORGBToXLRGB( const uno::Any& aCol )
-{
-- sal_Int32 nCol;
+- sal_Int32 nCol=0;
- aCol >>= nCol;
- nCol = OORGBToXLRGB( nCol );
- return uno::makeAny( nCol );
@@ -8678,7 +8679,7 @@
-uno::Any
-XLRGBToOORGB( const uno::Any& aCol )
-{
-- sal_Int32 nCol;
+- sal_Int32 nCol=0;
- aCol >>= nCol;
- nCol = XLRGBToOORGB( nCol );
- return uno::makeAny( nCol );
@@ -15506,11 +15507,11 @@
#define SW_SERVICE_INVALID USHRT_MAX
---- sw/prj/build.lst.old 2009-04-06 16:41:57.000000000 +0000
-+++ sw/prj/build.lst 2009-04-06 16:42:01.000000000 +0000
+--- sw/prj/build.lst
++++ sw/prj/build.lst
@@ -1,4 +1,4 @@
--sw sw : connectivity OOo:writerperfect OOo:lotuswordpro svx stoc uui NULL
-+sw sw : connectivity OOo:writerperfect OOo:lotuswordpro svx stoc uui vbahelper NULL
+-sw sw : l10n connectivity OOo:writerperfect OOo:lotuswordpro svx stoc uui NULL
++sw sw : l10n connectivity OOo:writerperfect OOo:lotuswordpro svx stoc uui vbahelper NULL
sw sw usr1 - all sw_mkout NULL
sw sw\inc nmake - all sw_inc NULL
sw sw\uiconfig\layout nmake - all sw_layout NULL
@@ -15541,10 +15542,10 @@
..\%__SRC%\bin\sw*.res %_DEST%\bin%_EXT%\sw*.res
..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.*
---- sw/source/core/unocore/unocoll.cxx.old 2009-04-02 10:50:23.000000000 +0000
-+++ sw/source/core/unocore/unocoll.cxx 2009-04-06 16:42:01.000000000 +0000
+--- sw/source/core/unocore/unocoll.cxx
++++ sw/source/core/unocore/unocoll.cxx
@@ -73,7 +73,14 @@
- #include <unochart.hxx>
+ #include <iterator>
#include "docsh.hxx"
-
@@ -15680,9 +15681,9 @@
*
******************************************************************************/
@@ -203,6 +323,8 @@ const ProvNamesId_Type __FAR_DATA aProvN
+ { "com.sun.star.chart2.data.DataProvider", SW_SERVICE_CHART2_DATA_PROVIDER },
{ "com.sun.star.text.Fieldmark", SW_SERVICE_TYPE_FIELDMARK },
{ "com.sun.star.text.FormFieldmark", SW_SERVICE_TYPE_FORMFIELDMARK },
- { "com.sun.star.chart2.data.DataProvider", SW_SERVICE_CHART2_DATA_PROVIDER },
+ { "ooo.vba.VBAObjectModuleObjectProvider", SW_SERVICE_VBAOBJECTPROVIDER },
+ { "ooo.vba.VBACodeNameProvider", SW_SERVICE_VBACODENAMEPROVIDER },
@@ -22903,8 +22904,8 @@
+};
+
+#endif //
---- vbahelper/source/msforms/vbacontrol.cxx.old 1970-01-01 00:00:00.000000000 +0000
-+++ vbahelper/source/msforms/vbacontrol.cxx 2009-04-06 16:42:01.000000000 +0000
+--- vbahelper/source/msforms/vbacontrol.cxx
++++ vbahelper/source/msforms/vbacontrol.cxx
@@ -0,0 +1,520 @@
+/*************************************************************************
+ *
More information about the ooo-build-commit
mailing list