[ooo-build-commit] .: 5 commits - patches/dev300 patches/vba
Noel Power
noelp at kemper.freedesktop.org
Sat Aug 21 13:59:09 PDT 2010
patches/dev300/apply | 16 -
patches/vba/cws-vbasupportdev300.diff | 238 ++++++++-----------
patches/vba/oox-projectname-oobuild-specifix-m2.diff | 110 ++++++++
patches/vba/oox-projectname-oobuild-specifix.diff | 18 -
patches/vba/vba-container-controls.diff | 57 ++--
patches/vba/vba-oox-autocodename.diff | 7
patches/vba/vba-oox-olenameoverride.diff | 44 +--
patches/vba/vba-use-ooxfilter-forcontrols.diff | 6
8 files changed, 293 insertions(+), 203 deletions(-)
New commits:
commit 7d26832fbfd27148d396782a7621114dd7c05079
Author: Noel Power <noel.power at novell.com>
Date: Sat Aug 21 21:58:52 2010 +0100
more build fixes
* patches/dev300/apply:
* patches/vba/oox-projectname-oobuild-specifix-m2.diff:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 7d068a1..3b6b542 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1578,25 +1578,29 @@ cws-vbasupportdev300_m83-fix.diff, cbosdo
vba-enable-fieldrelatedbits.diff
[ VBAObjects < ooo330-m4 ]
vba-container-controls-m2.diff
+# need to adapt ooo-build wrt the changes intorduced into container_controls
+oox-projectname-oobuild-specifix-m2.diff
[ VBAObjects >= ooo330-m4 ]
vba-container-controls.diff
# need to adapt ooo-build wrt the changes intorduced into container_controls
oox-projectname-oobuild-specifix.diff
+[ VBAObjects ]
# fix problem with inserting imported modules with oox
oox-insert-module-bug.diff
# tweak oox filter to handle any passed generated code names
# there is a strange scenario with one cust doc where a code module is missing
[ VBAObjects < ooo330-m4 ]
vba-oox-autocodename-m2.diff, n#507768
-[ VBAObjects >= ooo330-m4 ]
-vba-oox-autocodename.diff, n#507768
# tweak oox filter to handle strange scenario where there might be some
# missing codenmames in excel
-[ VBAObjects < ooo330-m4 ]
vba-oox-olenameoverride-m2.diff, n#359933, n#403974
[ VBAObjects >= ooo330-m4 ]
+vba-oox-autocodename.diff, n#507768
+# tweak oox filter to handle strange scenario where there might be some
+# missing codenmames in excel
vba-oox-olenameoverride.diff, n#359933, n#403974
# fix strange ranges seperator regression problem
+[ VBAObjects ]
fix-name-range-separator.diff, n#597351
# remove dependency of vbahelper on oox ( added by container_controls.diff )
vbahelper-no-oox.diff
@@ -3159,7 +3163,8 @@ emf+-driver-string.diff, n#519715, rodo
[ Fixes ]
# FIXME dev300-m77 sd-print-fix-pageoffset.diff, n#537931, rodo # the code has moved to sd/source/ui/view/DocumentRenderer.cxx
svx-ppt-import-fix-bullet-size.diff, n#515972, rodo
-
+[ Fixes < ooo330-m4 ]
+# #FIXME ooo3330-m4: doesn't apply in m4
# correctly import connector style attribute.
svx-msdff-import-connector-style-fix.diff, n#631804, kohei
@@ -3489,7 +3494,10 @@ calc-perf-outlining-with-notes.diff, kohei
calc-formula-r1c1-parser-fix.diff, n#604903, kohei
# Fix poor performance on saving document with hidden rows.
+# #FIXME ooo330-m4: doesn't apply in m4
+[ CalcFixes < ooo330-m4 ]
calc-perf-ods-export-hidden-rows.diff, deb#582785, kohei
+[ CalcFixes ]
# Opening an xml file with xls extension
sc-xml-with-xls-ext.diff, n#527738, muthusuba
diff --git a/patches/vba/oox-projectname-oobuild-specifix-m2.diff b/patches/vba/oox-projectname-oobuild-specifix-m2.diff
new file mode 100644
index 0000000..fe64670
--- /dev/null
+++ b/patches/vba/oox-projectname-oobuild-specifix-m2.diff
@@ -0,0 +1,110 @@
+diff --git sc/source/core/tool/interpr4.cxx sc/source/core/tool/interpr4.cxx
+index 35177aa..ca045f0 100644
+--- sc/source/core/tool/interpr4.cxx
++++ sc/source/core/tool/interpr4.cxx
+@@ -50,6 +50,7 @@
+
+ #include <com/sun/star/table/XCellRange.hpp>
+ #include <com/sun/star/sheet/XSheetCellRange.hpp>
++#include <com/sun/star/script/XVBACompat.hpp>
+ #include <comphelper/processfactory.hxx>
+
+ #include "interpre.hxx"
+@@ -2706,8 +2707,14 @@ uno::Any lcl_getSheetModule( const uno::Reference<table::XCellRange>& xCellRange
+ if ( pBasMgr && pBasMgr->GetName().Len() )
+ {
+ String sProj = String( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
+- if ( pDok->GetDocumentShell()->GetBasicManager()->GetName().Len() )
+- sProj = pDok->GetDocumentShell()->GetBasicManager()->GetName();
++ try
++ {
++ uno::Reference< beans::XPropertySet > xProps( pDok->GetDocumentShell()->GetModel(), uno::UNO_QUERY_THROW );
++ uno::Reference< script::XVBACompat > xVBAMode( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BasicLibraries") ) ), uno::UNO_QUERY_THROW );
++ sProj = xVBAMode->getProjectName();
++ }
++ catch( uno::Exception& ){}
++
+ StarBASIC* pBasic = pDok->GetDocumentShell()->GetBasicManager()->GetLib( sProj );
+ if ( pBasic )
+ {
+diff --git sc/source/ui/docshell/macromgr.cxx sc/source/ui/docshell/macromgr.cxx
+index 97623f3..5eb823a 100644
+--- sc/source/ui/docshell/macromgr.cxx
++++ sc/source/ui/docshell/macromgr.cxx
+@@ -41,6 +41,7 @@
+ #include "sfx2/objsh.hxx"
+ #include "cell.hxx"
+ #include <com/sun/star/container/XContainer.hpp>
++#include <com/sun/star/script/XVBACompat.hpp>
+
+ #include <list>
+
+@@ -154,8 +155,16 @@ void ScMacroManager::InitUserFuncData()
+
+ Reference< container::XContainer > xModuleContainer;
+ SfxObjectShell* pShell = mpDoc->GetDocumentShell();
+- if ( pShell && pShell->GetBasicManager()->GetName().Len() > 0 )
+- sProjectName = pShell->GetBasicManager()->GetName();
++ if ( pShell )
++ {
++ try
++ {
++ uno::Reference< beans::XPropertySet > xProps( pShell->GetModel(), uno::UNO_QUERY_THROW );
++ uno::Reference< script::XVBACompat > xVBAMode( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BasicLibraries") ) ), uno::UNO_QUERY_THROW );
++ sProjectName = xVBAMode->getProjectName();
++ }
++ catch( uno::Exception& ) {}
++ }
+ try
+ {
+ Reference< script::XLibraryContainer > xLibraries( pShell->GetBasicContainer(), uno::UNO_QUERY_THROW );
+diff --git sw/source/core/unocore/unocoll.cxx sw/source/core/unocore/unocoll.cxx
+index 07cb0f6..ae19ad0 100644
+--- sw/source/core/unocore/unocoll.cxx
++++ sw/source/core/unocore/unocoll.cxx
+@@ -86,6 +86,7 @@
+ #include <com/sun/star/script/ModuleType.hpp>
+ #include <com/sun/star/script/ScriptEventDescriptor.hpp>
+ #include <com/sun/star/script/XVBAModuleInfo.hpp>
++#include <com/sun/star/script/XVBACompat.hpp>
+ #include <vbahelper/vbaaccesshelper.hxx>
+ #include <basic/basmgr.hxx>
+ #include <comphelper/processfactory.hxx>
+@@ -115,8 +116,9 @@ public:
+ uno::Reference< beans::XPropertySet > xProps( mpDocShell->GetModel(), uno::UNO_QUERY_THROW );
+ uno::Reference< container::XNameAccess > xLibContainer( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BasicLibraries") ) ), uno::UNO_QUERY_THROW );
+ rtl::OUString sProjectName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Standard") ) );
+- if ( mpDocShell->GetBasicManager()->GetName().Len() )
+- sProjectName = mpDocShell->GetBasicManager()->GetName();
++ uno::Reference< script::XVBACompat > xVBAMode( xLibContainer, uno::UNO_QUERY );
++ if ( xVBAMode.is() )
++ sProjectName = xVBAMode->getProjectName();
+
+ uno::Reference< container::XNameAccess > xLib( xLibContainer->getByName( sProjectName ), uno::UNO_QUERY_THROW );
+ uno::Sequence< rtl::OUString > sModuleNames = xLib->getElementNames();
+diff --git vbahelper/source/vbahelper/vbahelper.cxx vbahelper/source/vbahelper/vbahelper.cxx
+index c02569d..e9c6f23 100644
+--- vbahelper/source/vbahelper/vbahelper.cxx
++++ vbahelper/source/vbahelper/vbahelper.cxx
+@@ -33,6 +33,7 @@
+ #include <com/sun/star/frame/XModel2.hpp>
+ #include <com/sun/star/frame/XNotifyingDispatch.hpp>
+ #include <com/sun/star/script/XDefaultProperty.hpp>
++#include <com/sun/star/script/XVBACompat.hpp>
+ #include <com/sun/star/uno/XComponentContext.hpp>
+ #include <com/sun/star/lang/XMultiComponentFactory.hpp>
+ #include <com/sun/star/lang/XUnoTunnel.hpp>
+@@ -1271,6 +1272,13 @@ UserFormGeometryHelper::UserFormGeometryHelper( const uno::Reference< uno::XComp
+ if ( pShell )
+ {
+ rtl::OUString sProj( RTL_CONSTASCII_USTRINGPARAM("Standard") );
++ try
++ {
++ uno::Reference< beans::XPropertySet > xProps( pShell->GetModel(), uno::UNO_QUERY_THROW );
++ uno::Reference< script::XVBACompat > xVBAMode( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BasicLibraries") ) ), uno::UNO_QUERY_THROW );
++ sProj = xVBAMode->getProjectName();
++ }
++ catch( uno::Exception& ){}
+ BasicManager* pBasMgr = pShell->GetBasicManager();
+ if ( pBasMgr && pBasMgr->GetName().Len() )
+ sProj = pShell->GetBasicManager()->GetName();
commit 9fd7b1038f0fcf13747bc51d412f20f25c748643
Author: Noel Power <noel.power at novell.com>
Date: Sat Aug 21 20:20:07 2010 +0100
even more build fixes
* patches/vba/cws-vbasupportdev300.diff:
* patches/vba/vba-use-ooxfilter-forcontrols.diff:
diff --git a/patches/vba/cws-vbasupportdev300.diff b/patches/vba/cws-vbasupportdev300.diff
index 0db51c2..4fb9e62 100644
--- a/patches/vba/cws-vbasupportdev300.diff
+++ b/patches/vba/cws-vbasupportdev300.diff
@@ -24861,43 +24861,6 @@ index 3908596..f4ba3d5 100644
case SID_SUBTOTALS:
{
const SfxItemSet* pArgs = rReq.GetArgs();
-diff --git sc/source/ui/view/gridwin.cxx sc/source/ui/view/gridwin.cxx
-index 9e53b3c..120878e 100644
---- sc/source/ui/view/gridwin.cxx
-+++ sc/source/ui/view/gridwin.cxx
-@@ -400,6 +400,32 @@ sal_Bool lcl_GetHyperlinkCell(ScDocument* pDoc, SCCOL& rPosX, SCROW& rPosY, SCTA
- return bFound;
- }
-
-+sal_Bool lcl_GetHyperlinkCell(ScDocument* pDoc, SCCOL& rPosX, SCROW& rPosY, SCTAB nTab, ScBaseCell*& rpCell )
-+{
-+ BOOL bFound = FALSE;
-+ do
-+ {
-+ pDoc->GetCell( rPosX, rPosY, nTab, rpCell );
-+ if ( !rpCell || rpCell->GetCellType() == CELLTYPE_NOTE )
-+ {
-+ if ( rPosX <= 0 )
-+ return FALSE; // alles leer bis links
-+ else
-+ --rPosX; // weitersuchen
-+ }
-+ else if ( rpCell->GetCellType() == CELLTYPE_EDIT)
-+ bFound = TRUE;
-+ else if (rpCell->GetCellType() == CELLTYPE_FORMULA &&
-+ static_cast<ScFormulaCell*>(rpCell)->IsHyperLinkCell())
-+ bFound = TRUE;
-+ else
-+ return FALSE; // andere Zelle
-+ }
-+ while ( !bFound );
-+
-+ return bFound;
-+}
-+
- // ---------------------------------------------------------------------------
- // WB_DIALOGCONTROL noetig fuer UNO-Controls
- ScGridWindow::ScGridWindow( Window* pParent, ScViewData* pData, ScSplitPos eWhichPos )
diff --git sc/source/ui/view/gridwin5.cxx sc/source/ui/view/gridwin5.cxx
index 821d5da..d9e10ef 100644
--- sc/source/ui/view/gridwin5.cxx
@@ -27459,23 +27422,26 @@ index d6dc1bd..276df21 100644
#include <hash_map>
#include <stringhash.hxx>
-@@ -408,9 +406,7 @@ class SW_DLLPUBLIC SwDoc :
+@@ -408,9 +406,8 @@ class SW_DLLPUBLIC SwDoc :
// table of forbidden characters of this document
vos::ORef<SvxForbiddenCharactersTable> xForbiddenCharsTable;
-#ifdef FUTURE_VBA
com::sun::star::uno::Reference< com::sun::star::script::vba::XVBAEventProcessor > mxVbaEvents;
-#endif
++ com::sun::star::uno::Reference<com::sun::star::container::XNameContainer> m_xTemplateToProjectCache;
// --> OD 2007-10-26 #i83479#
public:
struct lessThanNodeNum
-@@ -2146,9 +2142,7 @@ public:
+@@ -2146,9 +2142,9 @@ public:
{
return n32DummyCompatabilityOptions2;
}
-#ifdef FUTURE_VBA
com::sun::star::uno::Reference< com::sun::star::script::vba::XVBAEventProcessor > GetVbaEventProcessor();
-#endif
++ void SetVBATemplateToProjectCache( com::sun::star::uno::Reference< com::sun::star::container::XNameContainer >& xCache ) { m_xTemplateToProjectCache = xCache; };
++ com::sun::star::uno::Reference< com::sun::star::container::XNameContainer > GetVBATemplateToProjectCache() { return m_xTemplateToProjectCache; };
::sfx2::IXmlIdRegistry& GetXmlIdRegistry();
::sw::MetaFieldManager & GetMetaFieldManager();
SfxObjectShell* CreateCopy(bool bCallInitNew) const;
diff --git a/patches/vba/vba-use-ooxfilter-forcontrols.diff b/patches/vba/vba-use-ooxfilter-forcontrols.diff
index fcd8831..1318629 100644
--- a/patches/vba/vba-use-ooxfilter-forcontrols.diff
+++ b/patches/vba/vba-use-ooxfilter-forcontrols.diff
@@ -413,7 +413,7 @@ index c71f885..d033355 100644
#include "WW8FibData.hxx"
+#include <comphelper/processfactory.hxx>
+#include <com/sun/star/document/XFilter.hpp>
-+#include <com/sun/star/vba/script/XVBACompatibility.hpp>
++#include <com/sun/star/script/vba/XVBACompatibility.hpp>
+#include <com/sun/star/document/XImporter.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <comphelper/mediadescriptor.hxx>
commit 022f91c3daf1ddbfb3b5d303c858f635147fe55e
Author: Noel Power <noel.power at novell.com>
Date: Sat Aug 21 18:32:06 2010 +0100
even more build fixes
* patches/vba/cws-vbasupportdev300.diff:
* patches/vba/oox-projectname-oobuild-specifix.diff:
diff --git a/patches/vba/cws-vbasupportdev300.diff b/patches/vba/cws-vbasupportdev300.diff
index 23cc8b2..0db51c2 100644
--- a/patches/vba/cws-vbasupportdev300.diff
+++ b/patches/vba/cws-vbasupportdev300.diff
@@ -18973,13 +18973,10 @@ index e6ebe28..a25455d 100644
virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getThisWorkbook() throw (css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL Workbooks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL Worksheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
-@@ -101,6 +103,20 @@ public:
+@@ -101,6 +103,17 @@ public:
virtual void SAL_CALL setStatusBar( const css::uno::Any& _statusbar ) throw (css::uno::RuntimeException);
virtual ::sal_Int32 SAL_CALL getCursor() throw (css::uno::RuntimeException);
virtual void SAL_CALL setCursor( ::sal_Int32 _cursor ) throw (css::uno::RuntimeException);
-+
-+ virtual sal_Bool SAL_CALL getEnableEvents() throw (css::uno::RuntimeException);
-+ virtual void SAL_CALL setEnableEvents( sal_Bool bEnable ) throw (css::uno::RuntimeException);
+
+ virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
+ virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw (css::uno::RuntimeException);
@@ -23595,7 +23592,7 @@ index 8fcfcd5..dd93063 100755
- uno::Reference< table::XCellRange > xRange( new ScCellRangeObj( getDocShellFromRange( mxRange ) , aRange ) );
- uno::Reference< excel::XRange > xVbaRange( new ScVbaRange( mxParent, mxContext, xRange, mbIsRows, mbIsColumns ) );
+ uno::Reference< table::XCellRange > xRange( new ScCellRangeObj( excel::GetDocShellFromRange( mxRange ) , aRange ) );
-++ uno::Reference< excel::XRange > xVbaRange( new ScVbaRange( mxParent, mxContext, xRange, mbIsRows, mbIsColumns ) );
++ uno::Reference< excel::XRange > xVbaRange( new ScVbaRange( mxParent, mxContext, xRange, mbIsRows, mbIsColumns ) );
xVbaRange->PasteSpecial( uno::Any(), uno::Any(), uno::Any(), uno::Any() );
}
}
@@ -27450,6 +27447,38 @@ index d6dc1bd..276df21 100644
CDEFS+=-DENABLE_VBA
.ENDIF
+--- sw/inc/doc.hxx 2010-08-21 18:03:57.000000000 +0100
++++ sw/inc/doc.hxx 2010-08-21 18:13:06.000000000 +0100
+@@ -79,9 +79,7 @@ class SwList;
+ #include "comphelper/implementationreference.hxx"
+ #include <com/sun/star/chart2/data/XDataProvider.hpp>
+ #include <com/sun/star/linguistic2/XProofreadingIterator.hpp>
+-#ifdef FUTURE_VBA
+ #include <com/sun/star/script/vba/XVBAEventProcessor.hpp>
+-#endif
+
+ #include <hash_map>
+ #include <stringhash.hxx>
+@@ -408,9 +406,7 @@ class SW_DLLPUBLIC SwDoc :
+
+ // table of forbidden characters of this document
+ vos::ORef<SvxForbiddenCharactersTable> xForbiddenCharsTable;
+-#ifdef FUTURE_VBA
+ com::sun::star::uno::Reference< com::sun::star::script::vba::XVBAEventProcessor > mxVbaEvents;
+-#endif
+ // --> OD 2007-10-26 #i83479#
+ public:
+ struct lessThanNodeNum
+@@ -2146,9 +2142,7 @@ public:
+ {
+ return n32DummyCompatabilityOptions2;
+ }
+-#ifdef FUTURE_VBA
+ com::sun::star::uno::Reference< com::sun::star::script::vba::XVBAEventProcessor > GetVbaEventProcessor();
+-#endif
+ ::sfx2::IXmlIdRegistry& GetXmlIdRegistry();
+ ::sw::MetaFieldManager & GetMetaFieldManager();
+ SfxObjectShell* CreateCopy(bool bCallInitNew) const;
diff --git sw/inc/docsh.hxx sw/inc/docsh.hxx
index 3840d59..6c2fd87 100644
--- sw/inc/docsh.hxx
@@ -27564,7 +27593,7 @@ index 03df3e1..9e71620 100644
+#include <com/sun/star/script/ModuleInfo.hpp>
+#include <com/sun/star/script/ModuleType.hpp>
+#include <com/sun/star/script/ScriptEventDescriptor.hpp>
-+#include <com/sun/star/script/XVBAModuleInfo.hpp>
++#include <com/sun/star/script/vba/XVBAModuleInfo.hpp>
+#include <vbahelper/vbaaccesshelper.hxx>
+#include <basic/basmgr.hxx>
+#include <comphelper/processfactory.hxx>
@@ -27597,7 +27626,7 @@ index 03df3e1..9e71620 100644
+
+ uno::Reference< container::XNameAccess > xLib( xLibContainer->getByName( sProjectName ), uno::UNO_QUERY_THROW );
+ uno::Sequence< rtl::OUString > sModuleNames = xLib->getElementNames();
-+ uno::Reference< script::XVBAModuleInfo > xVBAModuleInfo( xLib, uno::UNO_QUERY );
++ uno::Reference< script::vba::XVBAModuleInfo > xVBAModuleInfo( xLib, uno::UNO_QUERY );
+
+ for ( sal_Int32 i=0; i < sModuleNames.getLength(); ++i )
+ {
@@ -29994,10 +30023,12 @@ index b0ae693..fa9765e 100644
return nRet;
}
-@@ -1531,6 +1523,31 @@ void SwDocShell::Execute(SfxRequest& rReq)
+@@ -1531,6 +1523,34 @@ void SwDocShell::Execute(SfxRequest& rReq)
}
}
++ // #FIXME - align with NEW event stuff ( if possible )
++#if 0
+void lcl_processCompatibleSfxHint( const uno::Reference< document::XVbaEventsHelper >& xVbaEventsHelper, const SfxHint& rHint )
+{
+ if ( rHint.ISA( SfxEventHint ) )
@@ -30023,16 +30054,20 @@ index b0ae693..fa9765e 100644
+ }
+ }
+}
++#endif
/*--------------------------------------------------------------------
Beschreibung:
-@@ -1587,6 +1604,9 @@ void SwDocShell::FillClass( SvGlobalName * pClassName,
+@@ -1587,6 +1604,12 @@ void SwDocShell::FillClass( SvGlobalName * pClassName,
*pClipFormat = bTemplate ? SOT_FORMATSTR_ID_STARWRITER_8_TEMPLATE : SOT_FORMATSTR_ID_STARWRITER_8;
*pLongUserName = SW_RESSTR(STR_WRITER_DOCUMENT_FULLTYPE);
}
++// #FIXME check with new Event handling
++#if 0
+ uno::Reference< document::XVbaEventsHelper > xVbaEventsHelper = pDoc->GetVbaEventsHelper();
+ if( xVbaEventsHelper.is() )
+ lcl_processCompatibleSfxHint( xVbaEventsHelper, rHint );
++#endif
*pUserName = SW_RESSTR(STR_HUMAN_SWDOC_NAME);
}
diff --git a/patches/vba/oox-projectname-oobuild-specifix.diff b/patches/vba/oox-projectname-oobuild-specifix.diff
index fe64670..bf852f6 100644
--- a/patches/vba/oox-projectname-oobuild-specifix.diff
+++ b/patches/vba/oox-projectname-oobuild-specifix.diff
@@ -6,7 +6,7 @@ index 35177aa..ca045f0 100644
#include <com/sun/star/table/XCellRange.hpp>
#include <com/sun/star/sheet/XSheetCellRange.hpp>
-+#include <com/sun/star/script/XVBACompat.hpp>
++#include <com/sun/star/script/vba/XVBACompatibility.hpp>
#include <comphelper/processfactory.hxx>
#include "interpre.hxx"
@@ -19,7 +19,7 @@ index 35177aa..ca045f0 100644
+ try
+ {
+ uno::Reference< beans::XPropertySet > xProps( pDok->GetDocumentShell()->GetModel(), uno::UNO_QUERY_THROW );
-+ uno::Reference< script::XVBACompat > xVBAMode( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BasicLibraries") ) ), uno::UNO_QUERY_THROW );
++ uno::Reference< script::vba::XVBACompatibility > xVBAMode( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BasicLibraries") ) ), uno::UNO_QUERY_THROW );
+ sProj = xVBAMode->getProjectName();
+ }
+ catch( uno::Exception& ){}
@@ -35,7 +35,7 @@ index 97623f3..5eb823a 100644
#include "sfx2/objsh.hxx"
#include "cell.hxx"
#include <com/sun/star/container/XContainer.hpp>
-+#include <com/sun/star/script/XVBACompat.hpp>
++#include <com/sun/star/script/vba/XVBACompatibility.hpp>
#include <list>
@@ -50,7 +50,7 @@ index 97623f3..5eb823a 100644
+ try
+ {
+ uno::Reference< beans::XPropertySet > xProps( pShell->GetModel(), uno::UNO_QUERY_THROW );
-+ uno::Reference< script::XVBACompat > xVBAMode( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BasicLibraries") ) ), uno::UNO_QUERY_THROW );
++ uno::Reference< script::vba::XVBACompatibility > xVBAMode( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BasicLibraries") ) ), uno::UNO_QUERY_THROW );
+ sProjectName = xVBAMode->getProjectName();
+ }
+ catch( uno::Exception& ) {}
@@ -65,8 +65,8 @@ index 07cb0f6..ae19ad0 100644
@@ -86,6 +86,7 @@
#include <com/sun/star/script/ModuleType.hpp>
#include <com/sun/star/script/ScriptEventDescriptor.hpp>
- #include <com/sun/star/script/XVBAModuleInfo.hpp>
-+#include <com/sun/star/script/XVBACompat.hpp>
+ #include <com/sun/star/script/vba/XVBAModuleInfo.hpp>
++#include <com/sun/star/script/vba/XVBACompatibility.hpp>
#include <vbahelper/vbaaccesshelper.hxx>
#include <basic/basmgr.hxx>
#include <comphelper/processfactory.hxx>
@@ -76,7 +76,7 @@ index 07cb0f6..ae19ad0 100644
rtl::OUString sProjectName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Standard") ) );
- if ( mpDocShell->GetBasicManager()->GetName().Len() )
- sProjectName = mpDocShell->GetBasicManager()->GetName();
-+ uno::Reference< script::XVBACompat > xVBAMode( xLibContainer, uno::UNO_QUERY );
++ uno::Reference< script::vba::XVBACompatibility > xVBAMode( xLibContainer, uno::UNO_QUERY );
+ if ( xVBAMode.is() )
+ sProjectName = xVBAMode->getProjectName();
@@ -90,7 +90,7 @@ index c02569d..e9c6f23 100644
#include <com/sun/star/frame/XModel2.hpp>
#include <com/sun/star/frame/XNotifyingDispatch.hpp>
#include <com/sun/star/script/XDefaultProperty.hpp>
-+#include <com/sun/star/script/XVBACompat.hpp>
++#include <com/sun/star/script/vba/XVBACompatibility.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/lang/XMultiComponentFactory.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
@@ -101,7 +101,7 @@ index c02569d..e9c6f23 100644
+ try
+ {
+ uno::Reference< beans::XPropertySet > xProps( pShell->GetModel(), uno::UNO_QUERY_THROW );
-+ uno::Reference< script::XVBACompat > xVBAMode( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BasicLibraries") ) ), uno::UNO_QUERY_THROW );
++ uno::Reference< script::vba::XVBACompatibility > xVBAMode( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BasicLibraries") ) ), uno::UNO_QUERY_THROW );
+ sProj = xVBAMode->getProjectName();
+ }
+ catch( uno::Exception& ){}
commit c7c3ff8d2560cd893b47e2f37438394b7555e611
Author: Noel Power <noel.power at novell.com>
Date: Sat Aug 21 16:49:35 2010 +0100
more build fixes
* patches/vba/vba-container-controls.diff:
* patches/vba/vba-oox-autocodename.diff:
* patches/vba/vba-oox-olenameoverride.diff:
* patches/vba/vba-use-ooxfilter-forcontrols.diff:
diff --git a/patches/vba/vba-container-controls.diff b/patches/vba/vba-container-controls.diff
index 358bc4d..e35b070 100644
--- a/patches/vba/vba-container-controls.diff
+++ b/patches/vba/vba-container-controls.diff
@@ -460,7 +460,7 @@ index 1409740..72ed636 100644
#include "oox/core/xmlfilterbase.hxx"
#include "oox/core/binaryfilterbase.hxx"
-+#include "oox/xls/excelvbaproject.hxx"
++#include "oox/ole/vbaproject.hxx"
+#include "oox/ole/simplevbaprojectfilter.hxx"
namespace oox {
@@ -1258,7 +1258,7 @@ diff --git oox/source/xls/excelfilter.cxx oox/source/xls/excelfilter.cxx
index 52d6b69..6f3263f 100644
--- oox/source/xls/excelfilter.cxx
+++ oox/source/xls/excelfilter.cxx
-@@ -240,5 +240,63 @@ OUString ExcelBiffFilter::implGetImplementationName() const
+@@ -240,5 +240,64 @@ OUString ExcelBiffFilter::implGetImplementationName() const
// ============================================================================
@@ -1300,7 +1300,8 @@ index 52d6b69..6f3263f 100644
+ StorageRef xVbaPrjStrg = openSubStorage( CREATE_OUSTRING( "_VBA_PROJECT_CUR" ), false ) ;
+ if( xVbaPrjStrg.get() && xVbaPrjStrg->isStorage() )
+ {
-+ VbaProject aVbaProject( getGlobalFactory(), aHelper.getDocument() );
++ //VbaProject aVbaProject( getGlobalFactory(), aHelper.getDocument() );
++ ole::VbaProject aVbaProject( getGlobalFactory(), Reference< com::sun::star::frame::XModel >( aHelper.getDocument(), UNO_QUERY ), CREATE_OUSTRING( "Calc" ) );
+ aVbaProject.importVbaProject( *xVbaPrjStrg, getGraphicHelper() );
+ bRet = true;
+ }
diff --git a/patches/vba/vba-oox-autocodename.diff b/patches/vba/vba-oox-autocodename.diff
index 3fe05a9..a901123 100644
--- a/patches/vba/vba-oox-autocodename.diff
+++ b/patches/vba/vba-oox-autocodename.diff
@@ -171,7 +171,7 @@ diff --git oox/source/xls/excelfilter.cxx oox/source/xls/excelfilter.cxx
index 6f3263f..3947221 100644
--- oox/source/xls/excelfilter.cxx
+++ oox/source/xls/excelfilter.cxx
-@@ -274,12 +274,14 @@ bool SimpleExcelVBAProjFilter::importDocument() throw()
+@@ -274,13 +274,15 @@ bool SimpleExcelVBAProjFilter::importDocument() throw()
OSL_ENSURE( eBiff != BIFF_UNKNOWN, "ExcelBiffFilter::ExcelBiffFilter - invalid file format" );
if( eBiff != BIFF_UNKNOWN )
{
@@ -181,7 +181,8 @@ index 6f3263f..3947221 100644
StorageRef xVbaPrjStrg = openSubStorage( CREATE_OUSTRING( "_VBA_PROJECT_CUR" ), false ) ;
if( xVbaPrjStrg.get() && xVbaPrjStrg->isStorage() )
{
- VbaProject aVbaProject( getGlobalFactory(), aHelper.getDocument() );
+ //VbaProject aVbaProject( getGlobalFactory(), aHelper.getDocument() );
+ ole::VbaProject aVbaProject( getGlobalFactory(), Reference< com::sun::star::frame::XModel >( aHelper.getDocument(), UNO_QUERY ), CREATE_OUSTRING( "Calc" ) );
- aVbaProject.importVbaProject( *xVbaPrjStrg, getGraphicHelper() );
+ aVbaProject.importVbaProject( *xVbaPrjStrg, getGraphicHelper(), sGeneratedCNames );
bRet = true;
diff --git a/patches/vba/vba-oox-olenameoverride.diff b/patches/vba/vba-oox-olenameoverride.diff
index 66ef547..2f2b254 100644
--- a/patches/vba/vba-oox-olenameoverride.diff
+++ b/patches/vba/vba-oox-olenameoverride.diff
@@ -252,7 +252,7 @@ index 3947221..548245e 100644
using ::com::sun::star::lang::XMultiServiceFactory;
using ::com::sun::star::xml::sax::XFastDocumentHandler;
using ::oox::core::BinaryFilterBase;
-@@ -276,11 +278,14 @@ bool SimpleExcelVBAProjFilter::importDocument() throw()
+@@ -276,12 +278,15 @@ bool SimpleExcelVBAProjFilter::importDocument() throw()
{
Sequence< rtl::OUString > sGeneratedCNames;
getArgument( CREATE_OUSTRING( "GeneratedCodeNames" ) ) >>= sGeneratedCNames;
@@ -262,7 +262,8 @@ index 3947221..548245e 100644
StorageRef xVbaPrjStrg = openSubStorage( CREATE_OUSTRING( "_VBA_PROJECT_CUR" ), false ) ;
if( xVbaPrjStrg.get() && xVbaPrjStrg->isStorage() )
{
- VbaProject aVbaProject( getGlobalFactory(), aHelper.getDocument() );
+ //VbaProject aVbaProject( getGlobalFactory(), aHelper.getDocument() );
+ ole::VbaProject aVbaProject( getGlobalFactory(), Reference< com::sun::star::frame::XModel >( aHelper.getDocument(), UNO_QUERY ), CREATE_OUSTRING( "Calc" ) );
+ aVbaProject.setOleOverridesSink( xOleNameOverrideSink );
aVbaProject.importVbaProject( *xVbaPrjStrg, getGraphicHelper(), sGeneratedCNames );
bRet = true;
diff --git a/patches/vba/vba-use-ooxfilter-forcontrols.diff b/patches/vba/vba-use-ooxfilter-forcontrols.diff
index fca66fb..fcd8831 100644
--- a/patches/vba/vba-use-ooxfilter-forcontrols.diff
+++ b/patches/vba/vba-use-ooxfilter-forcontrols.diff
@@ -16,7 +16,7 @@ index 72ed636..27956d5 100644
+++ oox/inc/oox/xls/excelfilter.hxx
@@ -32,6 +32,7 @@
#include "oox/core/binaryfilterbase.hxx"
- #include "oox/xls/excelvbaproject.hxx"
+ #include "oox/ole/vbaproject.hxx"
#include "oox/ole/simplevbaprojectfilter.hxx"
+#include <com/sun/star/form/XFormComponent.hpp>
commit 4bf17e83cbb58d8caa456dfc5c56cd86910bae65
Author: Noel Power <noel.power at novell.com>
Date: Sat Aug 21 15:13:10 2010 +0100
fix many build errors
* patches/vba/cws-vbasupportdev300.diff:
* patches/vba/vba-container-controls.diff:
* patches/vba/vba-oox-autocodename.diff:
* patches/vba/vba-oox-olenameoverride.diff:
* patches/vba/vba-use-ooxfilter-forcontrols.diff:
diff --git a/patches/vba/cws-vbasupportdev300.diff b/patches/vba/cws-vbasupportdev300.diff
index 81f8b61..23cc8b2 100644
--- a/patches/vba/cws-vbasupportdev300.diff
+++ b/patches/vba/cws-vbasupportdev300.diff
@@ -21,7 +21,7 @@ index e307720..fbd83c8 100644
#include <com/sun/star/resource/XStringResourceResolver.hpp>
#include <com/sun/star/resource/StringResourceWithLocation.hpp>
#include <com/sun/star/task/XInteractionHandler.hpp>
-+#include <com/sun/star/script/XVBACompat.hpp>
++#include <com/sun/star/script/vba/XVBACompatibility.hpp>
using namespace comphelper;
using namespace ::com::sun::star;
@@ -35,10 +35,10 @@ index e307720..fbd83c8 100644
+ // set vba mode on DialogModel ( allows it to work in 100thmm instead of MAP_APPFONT )
+ if ( rDocument.isDocument() && rDocument.getDocument().is() )
+ {
-+ uno::Reference< script::XVBACompat > xDocVBAMode( rDocument.getLibraryContainer( E_SCRIPTS ), uno::UNO_QUERY );
-+ uno::Reference< script::XVBACompat > xDialogModelVBAMode( xDialogModel, uno::UNO_QUERY );
++ uno::Reference< script::vba::XVBACompatibility > xDocVBAMode( rDocument.getLibraryContainer( E_SCRIPTS ), uno::UNO_QUERY );
++ uno::Reference< script::vba::XVBACompatibility > xDialogModelVBAMode( xDialogModel, uno::UNO_QUERY );
+ if ( xDocVBAMode.is() && xDialogModelVBAMode.is() )
-+ xDialogModelVBAMode->setVBACompatModeOn( xDocVBAMode->getVBACompatModeOn() );
++ xDialogModelVBAMode->setVBACompatibilityMode( xDocVBAMode->getVBACompatibilityMode() );
+ }
pEditor->SetDialog( xDialogModel );
@@ -930,6 +930,14 @@ diff --git basic/source/classes/sbxmod.cxx basic/source/classes/sbxmod.cxx
index 834d731..0b9b351 100644
--- basic/source/classes/sbxmod.cxx
+++ basic/source/classes/sbxmod.cxx
+@@ -58,6 +58,7 @@
+ #include <com/sun/star/lang/XServiceInfo.hpp>
+ #include <com/sun/star/script/ModuleType.hpp>
+ #include <com/sun/star/script/vba/XVBACompatibility.hpp>
++#include <com/sun/star/document/XVbaMethodParameter.hpp>
+ #include <com/sun/star/beans/XPropertySet.hpp>
+
+ using namespace com::sun::star;
@@ -500,7 +500,6 @@ IMPL_LINK( AsyncQuitHandler, OnAsyncQuit, void*, /*pNull*/ )
return 0L;
}
@@ -947,14 +955,13 @@ index 834d731..0b9b351 100644
/////////////////////////////////////////////////////////////////////////////
// Ein BASIC-Modul hat EXTSEARCH gesetzt, damit die im Modul enthaltenen
-@@ -795,6 +794,83 @@ void SbModule::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
+@@ -795,6 +794,82 @@ void SbModule::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
SbxVariable* pVar = pHint->GetVar();
SbProperty* pProp = PTR_CAST(SbProperty,pVar);
SbMethod* pMeth = PTR_CAST(SbMethod,pVar);
+ SbProcedureProperty* pProcProperty = PTR_CAST( SbProcedureProperty, pVar );
+ if( pProcProperty )
+ {
-+ bDone = true;
+
+ if( pHint->GetId() == SBX_HINT_DATAWANTED )
+ {
@@ -962,8 +969,8 @@ index 834d731..0b9b351 100644
+ aProcName.AppendAscii( "Property Get " );
+ aProcName += pProcProperty->GetName();
+
-+ SbxVariable* pMeth = Find( aProcName, SbxCLASS_METHOD );
-+ if( pMeth )
++ SbxVariable* pMethVar = Find( aProcName, SbxCLASS_METHOD );
++ if( pMethVar )
+ {
+ SbxValues aVals;
+ aVals.eType = SbxVARIANT;
@@ -973,20 +980,20 @@ index 834d731..0b9b351 100644
+ if( nVarParCount > 1 )
+ {
+ SbxArrayRef xMethParameters = new SbxArray;
-+ xMethParameters->Put( pMeth, 0 ); // Method as parameter 0
++ xMethParameters->Put( pMethVar, 0 ); // Method as parameter 0
+ for( USHORT i = 1 ; i < nVarParCount ; ++i )
+ {
+ SbxVariable* pPar = pArg->Get( i );
+ xMethParameters->Put( pPar, i );
+ }
+
-+ pMeth->SetParameters( xMethParameters );
-+ pMeth->Get( aVals );
-+ pMeth->SetParameters( NULL );
++ pMethVar->SetParameters( xMethParameters );
++ pMethVar->Get( aVals );
++ pMethVar->SetParameters( NULL );
+ }
+ else
+ {
-+ pMeth->Get( aVals );
++ pMethVar->Get( aVals );
+ }
+
+ pVar->Put( aVals );
@@ -994,7 +1001,7 @@ index 834d731..0b9b351 100644
+ }
+ else if( pHint->GetId() == SBX_HINT_DATACHANGED )
+ {
-+ SbxVariable* pMeth = NULL;
++ SbxVariable* pMethVar = NULL;
+
+ bool bSet = pProcProperty->isSet();
+ if( bSet )
@@ -1004,27 +1011,27 @@ index 834d731..0b9b351 100644
+ String aProcName;
+ aProcName.AppendAscii( "Property Set " );
+ aProcName += pProcProperty->GetName();
-+ pMeth = Find( aProcName, SbxCLASS_METHOD );
++ pMethVar = Find( aProcName, SbxCLASS_METHOD );
+ }
-+ if( !pMeth ) // Let
++ if( !pMethVar ) // Let
+ {
+ String aProcName;
+ aProcName.AppendAscii( "Property Let " );
+ aProcName += pProcProperty->GetName();
-+ pMeth = Find( aProcName, SbxCLASS_METHOD );
++ pMethVar = Find( aProcName, SbxCLASS_METHOD );
+ }
+
-+ if( pMeth )
++ if( pMethVar )
+ {
+ // Setup parameters
+ SbxArrayRef xArray = new SbxArray;
-+ xArray->Put( pMeth, 0 ); // Method as parameter 0
++ xArray->Put( pMethVar, 0 ); // Method as parameter 0
+ xArray->Put( pVar, 1 );
-+ pMeth->SetParameters( xArray );
++ pMethVar->SetParameters( xArray );
+
+ SbxValues aVals;
-+ pMeth->Get( aVals );
-+ pMeth->SetParameters( NULL );
++ pMethVar->Get( aVals );
++ pMethVar->SetParameters( NULL );
+ }
+ }
+ }
@@ -1612,11 +1619,10 @@ index cafa0ee..a8e7d84 100644
#if defined (WIN) || defined (WNT) || defined (OS2)
#include <direct.h> // _getdcwd get current work directory, _chdrive
#endif
-@@ -121,6 +127,10 @@ using namespace com::sun::star::io;
+@@ -121,6 +127,9 @@ using namespace com::sun::star::io;
#include <io.h>
#endif
-+using namespace rtl;
+
+#include <basic/sbobjmod.hxx>
+
@@ -17493,16 +17499,16 @@ index a9a83b7..32106fa 100644
+#include <comphelper/componentcontext.hxx>
+#include <cppuhelper/component_context.hxx>
+#include <vbahelper/vbaaccesshelper.hxx>
-+#include <com/sun/star/script/XVBACompat.hpp>
++#include <com/sun/star/script/vba/XVBACompatibility.hpp>
+
using namespace ::com::sun::star;
+bool isInVBAMode( ScDocShell& rDocSh )
+{
+ uno::Reference<script::XLibraryContainer> xLibContainer = rDocSh.GetBasicContainer();
-+ uno::Reference<script::XVBACompat> xVBACompat( xLibContainer, uno::UNO_QUERY );
++ uno::Reference<script::vba::XVBACompatibility> xVBACompat( xLibContainer, uno::UNO_QUERY );
+ if ( xVBACompat.is() )
-+ return xVBACompat->getVBACompatModeOn();
++ return xVBACompat->getVBACompatibilityMode();
+ return false;
+}
+
@@ -26282,14 +26288,6 @@ diff --git sfx2/inc/sfx2/objsh.hxx sfx2/inc/sfx2/objsh.hxx
index 8e4dde2..9fd0a60 100644
--- sfx2/inc/sfx2/objsh.hxx
+++ sfx2/inc/sfx2/objsh.hxx
-@@ -297,6 +297,7 @@ public:
- //<!--Added by PengYunQuan for Validity Cell Range Picker
- virtual sal_Bool AcceptStateUpdate() const;
- //-->Added by PengYunQuan for Validity Cell Range Picker
-+ sal_Bool IsInPrepareClose() const;
- sal_Bool HasModalViews() const;
- sal_Bool IsHelpDocument() const;
-
@@ -404,8 +405,8 @@ public:
::com::sun::star::uno::Any& aRet,
::com::sun::star::uno::Sequence< sal_Int16 >& aOutParamIndex,
@@ -26626,7 +26624,7 @@ index 613d90c..a8695d3 100644
#include <com/sun/star/task/InteractionClassification.hpp>
#include <com/sun/star/security/XDocumentDigitalSignatures.hpp>
+#include <com/sun/star/script/XLibraryQueryExecutable.hpp>
-+#include <com/sun/star/script/XVBACompat.hpp>
++#include <com/sun/star/script/vba/XVBACompatibility.hpp>
/** === end UNO includes === **/
#include <comphelper/componentcontext.hxx>
@@ -26635,7 +26633,7 @@ index 613d90c..a8695d3 100644
using ::com::sun::star::uno::UNO_SET_THROW;
using ::com::sun::star::script::XLibraryContainer;
+ using ::com::sun::star::script::XLibraryQueryExecutable;
-+ using ::com::sun::star::script::XVBACompat;
++ using ::com::sun::star::script::vba::XVBACompatibility;
using ::com::sun::star::container::XNameAccess;
using ::com::sun::star::uno::UNO_QUERY_THROW;
+ using ::com::sun::star::uno::UNO_QUERY;
@@ -26646,8 +26644,8 @@ index 613d90c..a8695d3 100644
if ( xScripts.is() )
xContainer.set( xScripts->getBasicLibraries(), UNO_QUERY_THROW );
-+ Reference< XVBACompat > xDocVBAMode( xContainer, UNO_QUERY );
-+ sal_Bool bIsVBAMode = ( xDocVBAMode.is() && xDocVBAMode->getVBACompatModeOn() );
++ Reference< XVBACompatibility > xDocVBAMode( xContainer, UNO_QUERY );
++ sal_Bool bIsVBAMode = ( xDocVBAMode.is() && xDocVBAMode->getVBACompatibilityMode() );
if ( xContainer.is() )
{
// a library container exists; check if it's empty
@@ -26879,20 +26877,6 @@ index a9a7583..c535d40 100644
// remove ThisComponent reference from AppBasic
SfxObjectShell::SetCurrentComponent( Reference< XInterface >() );
}
-@@ -533,6 +568,13 @@ sal_Bool SfxObjectShell::IsInPrepareClose() const
- return pImp->bInPrepareClose;
- }
-
-+//-------------------------------------------------------------------------
-+
-+sal_Bool SfxObjectShell::IsInPrepareClose() const
-+{
-+ return pImp->bInPrepareClose;
-+}
-+
- //------------------------------------------------------------------------
-
- struct BoolEnv_Impl
@@ -919,7 +961,10 @@ void SfxObjectShell::SetCurrentComponent( const Reference< XInterface >& _rxComp
BasicManager* pAppMgr = SFX_APP()->GetBasicManager();
s_xCurrentComponent = _rxComponent;
@@ -27025,14 +27009,17 @@ index 43c9c8b..5cc2ce8 100644
bool bDetectHidden = ( !bSilent && pDoc );
if ( bDetectHidden && pDoc->QueryHiddenInformation( WhenPrinting, NULL ) != RET_YES )
break;
-@@ -769,6 +773,16 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
+@@ -769,6 +773,19 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
case SID_SETUPPRINTER :
case SID_PRINTER_NAME : // only for recorded macros
{
++ // #TODO FIXME is this necessary at all ?
++ // #Not sure of the impact of the new Oracle code
+ if( nId == SID_PRINTDOC )
+ {
++ SfxObjectShell* pDoc = GetObjectShell();
+ // derived class may decide to abort this
-+ if( !QuerySlotExecutable( nId ) )
++ if( !pDoc->QuerySlotExecutable( nId ) )
+ {
+ rReq.SetReturnValue( SfxBoolItem( 0, FALSE ) );
+ return;
@@ -43588,7 +43575,7 @@ index 86d8e47..b3c904e 100644
// ====UserFormGeomentryHelper====
//---------------------------------------------
UserFormGeometryHelper::UserFormGeometryHelper( const uno::Reference< uno::XComponentContext >& /*xContext*/, const uno::Reference< awt::XControl >& xControl )
-@@ -1424,6 +1447,48 @@ void UserFormGeometryHelper::setHeight( double nHeight )
+@@ -1424,6 +1447,28 @@ void UserFormGeometryHelper::setHeight( double nHeight )
return xIf;
}
@@ -43614,26 +43601,6 @@ index 86d8e47..b3c904e 100644
+ {
+ }
+
-+ uno::Reference< uno::XInterface > getUnoDocModule( const String& aModName, SfxObjectShell* pShell )
-+ {
-+ uno::Reference< uno::XInterface > xIf;
-+ if ( pShell )
-+ {
-+ rtl::OUString sProj( RTL_CONSTASCII_USTRINGPARAM("Standard") );
-+ BasicManager* pBasMgr = pShell->GetBasicManager();
-+ if ( pBasMgr && pBasMgr->GetName().Len() )
-+ sProj = pShell->GetBasicManager()->GetName();
-+ StarBASIC* pBasic = pShell->GetBasicManager()->GetLib( sProj );
-+ if ( pBasic )
-+ {
-+ SbModule* pMod = pBasic->FindModule( aModName );
-+ if ( pMod )
-+ xIf = pMod->GetUnoModule();
-+ }
-+ }
-+ return xIf;
-+ }
-+
SfxObjectShell* getSfxObjShell( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
{
SfxObjectShell* pFoundShell = NULL;
@@ -45373,7 +45340,7 @@ index 1c43cc8..37a561f 100644
#include <com/sun/star/beans/XPropertyState.hpp>
+#include <com/sun/star/document/XStorageBasedDocument.hpp>
+#include <com/sun/star/document/XGraphicObjectResolver.hpp>
-+#include <com/sun/star/script/XVBACompat.hpp>
++#include <com/sun/star/script/vba/XVBACompatibility.hpp>
-
+#include <comphelper/componentcontext.hxx>
@@ -45543,13 +45510,13 @@ index 1c43cc8..37a561f 100644
+ }
+}
+
-+sal_Bool isVBACompatModeOn( DialogImport* _pImport )
++sal_Bool isVBACompatibilityMode( DialogImport* _pImport )
+{
+ sal_Bool bVBAMode = sal_False;
-+ Reference< script::XVBACompat > xVBACompat( _pImport->getScriptLibraryContainer(), UNO_QUERY );
++ Reference< script::vba::XVBACompatibility > xVBACompat( _pImport->getScriptLibraryContainer(), UNO_QUERY );
+ if( xVBACompat.is() )
+ {
-+ bVBAMode = xVBACompat->getVBACompatModeOn();
++ bVBAMode = xVBACompat->getVBACompatibilityMode();
+ }
+ return bVBAMode;
+}
@@ -45562,7 +45529,7 @@ index 1c43cc8..37a561f 100644
{
+ OUString sService( OUSTR("com.sun.star.awt.UnoControlScrollBarModel") );
+ // we should probably limit this to vba mode also ( leave for now )
-+ if ( isVBACompatModeOn( _pImport ) )
++ if ( isVBACompatibilityMode( _pImport ) )
+ sService = OUSTR("com.sun.star.form.component.ScrollBar");
+
+ OUString sLinkedCell;
@@ -45728,7 +45695,7 @@ index 1c43cc8..37a561f 100644
+ {
+ sLinkedCell = xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, OUSTR( "linked-cell" ) );
+ // we should probably limit this to vba mode also ( leave for now )
-+ if ( isVBACompatModeOn( _pImport ) )
++ if ( isVBACompatibilityMode( _pImport ) )
+ sService = OUSTR("com.sun.star.form.component.RadioButton");
+ }
+ catch( Exception& /*e*/ )
@@ -45773,7 +45740,7 @@ index 1c43cc8..37a561f 100644
+ {
+ sLinkedCell = xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, OUSTR( "linked-cell" ) );
+ // we should probably limit this to vba mode also ( leave for now )
-+ if ( isVBACompatModeOn( _pImport ) )
++ if ( isVBACompatibilityMode( _pImport ) )
+ sService = OUSTR("com.sun.star.form.component.RadioButton");
+ }
+ catch( Exception& /*e*/ )
@@ -45814,7 +45781,7 @@ index 1c43cc8..37a561f 100644
+ OUString sListBoxService( OUSTR("com.sun.star.awt.UnoControlListBoxModel") );
+
+ // we should probably limit this to vba mode also ( leave for now )
-+ if ( isVBACompatModeOn( _pImport ) )
++ if ( isVBACompatibilityMode( _pImport ) )
+ sListBoxService = OUSTR("com.sun.star.form.component.ListBox");
+
+ try
@@ -45860,7 +45827,7 @@ index 1c43cc8..37a561f 100644
+ OUString sService( OUSTR("com.sun.star.awt.UnoControlComboBoxModel") );
+
+ // we should probably limit this to vba mode also ( leave for now )
-+ if ( isVBACompatModeOn( _pImport ) )
++ if ( isVBACompatibilityMode( _pImport ) )
+ sService = OUSTR("com.sun.star.form.component.ComboBox");
+
+ OUString sLinkedCell;
@@ -45898,7 +45865,7 @@ index 1c43cc8..37a561f 100644
return new ScrollBarElement( rLocalName, xAttributes, this, _pImport );
}
+ // spinbutton
-+ else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("spinbutton") ) && isVBACompatModeOn( _pImport ) )
++ else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("spinbutton") ) && isVBACompatibilityMode( _pImport ) )
+ {
+ return new SpinButtonElement( rLocalName, xAttributes, this, _pImport );
+ }
@@ -45923,7 +45890,7 @@ index f3c0e55..0f03070 100644
#include <com/sun/star/view/SelectionType.hpp>
+#include <com/sun/star/document/XStorageBasedDocument.hpp>
+#include <com/sun/star/script/DocumentScriptLibraryContainer.hpp>
-+#include <com/sun/star/script/XVBACompat.hpp>
++#include <com/sun/star/script/vba/XVBACompatibility.hpp>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -45965,10 +45932,10 @@ index f3c0e55..0f03070 100644
SAL_THROW( (Exception) )
{
+ DialogImport* pImport = new DialogImport( xContext, xDialogModel, xDocument );
-+ uno::Reference< script::XVBACompat > xVBAModeSource( pImport->getScriptLibraryContainer(), uno::UNO_QUERY );
++ uno::Reference< script::vba::XVBACompatibility > xVBAModeSource( pImport->getScriptLibraryContainer(), uno::UNO_QUERY );
+
+ uno::Reference< beans::XPropertySet > xDlgProps( xDialogModel, uno::UNO_QUERY );
-+ if ( xVBAModeSource.is() && xDlgProps.is() && xVBAModeSource->getVBACompatModeOn() )
++ if ( xVBAModeSource.is() && xDlgProps.is() && xVBAModeSource->getVBACompatibilityMode() )
+ xDlgProps->setPropertyValue( OUSTR("VBAForm"), uno::makeAny( sal_True ) );
return ::xmlscript::createDocumentHandler(
- static_cast< xml::input::XRoot * >(
diff --git a/patches/vba/vba-container-controls.diff b/patches/vba/vba-container-controls.diff
index af0e446..358bc4d 100644
--- a/patches/vba/vba-container-controls.diff
+++ b/patches/vba/vba-container-controls.diff
@@ -6,7 +6,7 @@ index fbd83c8..8d6c3d8 100644
#include <com/sun/star/resource/XStringResourceResolver.hpp>
#include <com/sun/star/resource/StringResourceWithLocation.hpp>
#include <com/sun/star/task/XInteractionHandler.hpp>
--#include <com/sun/star/script/XVBACompat.hpp>
+-#include <com/sun/star/script/vba/XVBACompatibility.hpp>
using namespace comphelper;
using namespace ::com::sun::star;
@@ -17,10 +17,10 @@ index fbd83c8..8d6c3d8 100644
- // set vba mode on DialogModel ( allows it to work in 100thmm instead of MAP_APPFONT )
- if ( rDocument.isDocument() && rDocument.getDocument().is() )
- {
-- uno::Reference< script::XVBACompat > xDocVBAMode( rDocument.getLibraryContainer( E_SCRIPTS ), uno::UNO_QUERY );
-- uno::Reference< script::XVBACompat > xDialogModelVBAMode( xDialogModel, uno::UNO_QUERY );
+- uno::Reference< script::vba::XVBACompatibility > xDocVBAMode( rDocument.getLibraryContainer( E_SCRIPTS ), uno::UNO_QUERY );
+- uno::Reference< script::vba::XVBACompatibility > xDialogModelVBAMode( xDialogModel, uno::UNO_QUERY );
- if ( xDocVBAMode.is() && xDialogModelVBAMode.is() )
-- xDialogModelVBAMode->setVBACompatModeOn( xDocVBAMode->getVBACompatModeOn() );
+- xDialogModelVBAMode->setVBACompatibilityMode( xDocVBAMode->getVBACompatibilityMode() );
- }
pEditor->SetDialog( xDialogModel );
@@ -39,7 +39,7 @@ index 0b9b351..9e36b67 100644
+ try
+ {
+ Reference< beans::XPropertySet > xProps( m_xModel, UNO_QUERY_THROW );
-+ uno::Reference< script::XVBACompat > xVBAMode( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BasicLibraries") ) ), uno::UNO_QUERY_THROW );
++ uno::Reference< script::vba::XVBACompatibility > xVBAMode( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BasicLibraries") ) ), uno::UNO_QUERY_THROW );
+ sProjectName = xVBAMode->getProjectName();
+ }
+ catch( Exception& /*e*/) {}
@@ -227,7 +227,7 @@ index d71999e..372fc9f 100644
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
#include <com/sun/star/document/XDocumentProperties.hpp>
#include <com/sun/star/document/XDocumentInfoSupplier.hpp>
-+#include <com/sun/star/script/XVBACompat.hpp>
++#include <com/sun/star/script/vba/XVBACompatibility.hpp>
#include <tools/urlobj.hxx>
#include <osl/file.hxx>
#include <unotools/pathoptions.hxx>
@@ -246,7 +246,7 @@ index d71999e..372fc9f 100644
- else // cater for the case where VBA is not enabled
- sThisProject = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Standard") );
+ uno::Reference< beans::XPropertySet > xProps( pShell->GetModel(), uno::UNO_QUERY_THROW );
-+ uno::Reference< script::XVBACompat > xVBAMode( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BasicLibraries") ) ), uno::UNO_QUERY_THROW );
++ uno::Reference< script::vba::XVBACompatibility > xVBAMode( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BasicLibraries") ) ), uno::UNO_QUERY_THROW );
+ sThisProject = xVBAMode->getProjectName();
}
+ catch( uno::Exception& /*e*/) {}
@@ -1414,7 +1414,7 @@ index 82e797e..54c116e 100644
#include <svl/smplhint.hxx>
#include <com/sun/star/sdbc/XResultSet.hpp>
-+#include <com/sun/star/script/XVBACompat.hpp>
++#include <com/sun/star/script/vba/XVBACompatibility.hpp>
// INCLUDE ---------------------------------------------------------------
@@ -1423,7 +1423,7 @@ index 82e797e..54c116e 100644
void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, String& sModuleName, String& sModuleSource );
+using com::sun::star::script::XLibraryContainer;
-+using com::sun::star::script::XVBACompat;
++using com::sun::star::script::vba::XVBACompatibility;
+using com::sun::star::container::XNameContainer;
+using com::sun::star::uno::Reference;
+using com::sun::star::uno::UNO_QUERY;
@@ -1437,7 +1437,7 @@ index 82e797e..54c116e 100644
String aLibName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
- if ( GetBasicManager()->GetName().Len() > 0 )
+ Reference< XLibraryContainer > xLibContainer = GetBasicContainer();
-+ Reference< XVBACompat > xVBACompat( xLibContainer, UNO_QUERY );
++ Reference< XVBACompatibility > xVBACompat( xLibContainer, UNO_QUERY );
+
+ if ( xVBACompat.is() )
{
@@ -1613,7 +1613,7 @@ index 703357d..8411b09 100644
#include <com/sun/star/script/XLibraryContainer.hpp>
#include <com/sun/star/script/ScriptEventDescriptor.hpp>
#include <com/sun/star/script/provider/XScriptProviderSupplier.hpp>
-+#include <com/sun/star/script/XVBACompat.hpp>
++#include <com/sun/star/script/vba/XVBACompatibility.hpp>
#include <com/sun/star/container/XNamed.hpp>
@@ -1643,7 +1643,7 @@ index 703357d..8411b09 100644
+ try
+ {
+ Reference< beans::XPropertySet > xProps( m_xModel, UNO_QUERY_THROW );
-+ uno::Reference< script::XVBACompat > xVBAMode( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BasicLibraries") ) ), uno::UNO_QUERY_THROW );
++ uno::Reference< script::vba::XVBACompatibility > xVBAMode( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BasicLibraries") ) ), uno::UNO_QUERY_THROW );
+ msProject = xVBAMode->getProjectName();
+ }
+ catch ( uno::Exception& ) {}
@@ -6887,7 +6887,7 @@ index 37a561f..a5aee90 100644
#include <com/sun/star/beans/XPropertyState.hpp>
#include <com/sun/star/document/XStorageBasedDocument.hpp>
-#include <com/sun/star/document/XGraphicObjectResolver.hpp>
--#include <com/sun/star/script/XVBACompat.hpp>
+-#include <com/sun/star/script/vba/XVBACompatibility.hpp>
-
-#include <comphelper/componentcontext.hxx>
-#include <comphelper/processfactory.hxx>
@@ -7143,12 +7143,12 @@ index 37a561f..a5aee90 100644
}
+//__________________________________________________________________________________________________
--sal_Bool isVBACompatModeOn( DialogImport* _pImport )
+-sal_Bool isVBACompatibilityMode( DialogImport* _pImport )
+void Page::endElement()
+ throw (xml::sax::SAXException, RuntimeException)
{
- sal_Bool bVBAMode = sal_False;
-- Reference< script::XVBACompat > xVBACompat( _pImport->getScriptLibraryContainer(), UNO_QUERY );
+- Reference< script::vba::XVBACompatibility > xVBACompat( _pImport->getScriptLibraryContainer(), UNO_QUERY );
- if( xVBACompat.is() )
+ Reference< beans::XPropertySet > xProps( m_xContainer, UNO_QUERY_THROW );
+
@@ -7159,7 +7159,7 @@ index 37a561f..a5aee90 100644
+ Reference< xml::input::XElement > xStyle( getStyle( _xAttributes ) );
+ if (xStyle.is())
{
-- bVBAMode = xVBACompat->getVBACompatModeOn();
+- bVBAMode = xVBACompat->getVBACompatibilityMode();
+ StyleElement * pStyle = static_cast< StyleElement * >( xStyle.get () );
+ pStyle->importTextColorStyle( xControlModel );
+ pStyle->importTextLineColorStyle( xControlModel );
@@ -7183,7 +7183,7 @@ index 37a561f..a5aee90 100644
{
- OUString sService( OUSTR("com.sun.star.awt.UnoControlScrollBarModel") );
- // we should probably limit this to vba mode also ( leave for now )
-- if ( isVBACompatModeOn( _pImport ) )
+- if ( isVBACompatibilityMode( _pImport ) )
- sService = OUSTR("com.sun.star.form.component.ScrollBar");
-
- OUString sLinkedCell;
@@ -7304,7 +7304,7 @@ index 37a561f..a5aee90 100644
- {
- sLinkedCell = xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, OUSTR( "linked-cell" ) );
- // we should probably limit this to vba mode also ( leave for now )
-- if ( isVBACompatModeOn( _pImport ) )
+- if ( isVBACompatibilityMode( _pImport ) )
- sService = OUSTR("com.sun.star.form.component.RadioButton");
- }
- catch( Exception& /*e*/ )
@@ -7362,7 +7362,7 @@ index 37a561f..a5aee90 100644
- {
- sLinkedCell = xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, OUSTR( "linked-cell" ) );
- // we should probably limit this to vba mode also ( leave for now )
-- if ( isVBACompatModeOn( _pImport ) )
+- if ( isVBACompatibilityMode( _pImport ) )
- sService = OUSTR("com.sun.star.form.component.RadioButton");
- }
- catch( Exception& /*e*/ )
@@ -7415,7 +7415,7 @@ index 37a561f..a5aee90 100644
- OUString sListBoxService( OUSTR("com.sun.star.awt.UnoControlListBoxModel") );
-
- // we should probably limit this to vba mode also ( leave for now )
-- if ( isVBACompatModeOn( _pImport ) )
+- if ( isVBACompatibilityMode( _pImport ) )
- sListBoxService = OUSTR("com.sun.star.form.component.ListBox");
-
- try
@@ -7464,7 +7464,7 @@ index 37a561f..a5aee90 100644
- OUString sService( OUSTR("com.sun.star.awt.UnoControlComboBoxModel") );
-
- // we should probably limit this to vba mode also ( leave for now )
-- if ( isVBACompatModeOn( _pImport ) )
+- if ( isVBACompatibilityMode( _pImport ) )
- sService = OUSTR("com.sun.star.form.component.ComboBox");
-
- OUString sLinkedCell;
@@ -7526,7 +7526,7 @@ index 37a561f..a5aee90 100644
return new ScrollBarElement( rLocalName, xAttributes, this, _pImport );
}
- // spinbutton
-- else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("spinbutton") ) && isVBACompatModeOn( _pImport ) )
+- else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("spinbutton") ) && isVBACompatibilityMode( _pImport ) )
+ else if (rLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("spinbutton") ))
{
return new SpinButtonElement( rLocalName, xAttributes, this, _pImport );
@@ -7580,7 +7580,7 @@ index 0f03070..a66c4a0 100644
+#include <com/sun/star/document/XGraphicObjectResolver.hpp>
#include <com/sun/star/document/XStorageBasedDocument.hpp>
-#include <com/sun/star/script/DocumentScriptLibraryContainer.hpp>
--#include <com/sun/star/script/XVBACompat.hpp>
+-#include <com/sun/star/script/vba/XVBACompatibility.hpp>
+
+#include <comphelper/componentcontext.hxx>
@@ -7769,10 +7769,10 @@ index 0f03070..a66c4a0 100644
SAL_THROW( (Exception) )
{
- DialogImport* pImport = new DialogImport( xContext, xDialogModel, xDocument );
-- uno::Reference< script::XVBACompat > xVBAModeSource( pImport->getScriptLibraryContainer(), uno::UNO_QUERY );
+- uno::Reference< script::vba::XVBACompatibility > xVBAModeSource( pImport->getScriptLibraryContainer(), uno::UNO_QUERY );
-
- uno::Reference< beans::XPropertySet > xDlgProps( xDialogModel, uno::UNO_QUERY );
-- if ( xVBAModeSource.is() && xDlgProps.is() && xVBAModeSource->getVBACompatModeOn() )
+- if ( xVBAModeSource.is() && xDlgProps.is() && xVBAModeSource->getVBACompatibilityMode() )
- xDlgProps->setPropertyValue( OUSTR("VBAForm"), uno::makeAny( sal_True ) );
+ // single set of styles and stylenames apply to all containees
+ :: boost::shared_ptr< ::std::vector< ::rtl::OUString > > pStyleNames( new ::std::vector< ::rtl::OUString > );
diff --git a/patches/vba/vba-oox-autocodename.diff b/patches/vba/vba-oox-autocodename.diff
index 30aa55f..3fe05a9 100644
--- a/patches/vba/vba-oox-autocodename.diff
+++ b/patches/vba/vba-oox-autocodename.diff
@@ -142,7 +142,7 @@ index 11ae11d..af90e41 100755
+ {
+ VbaModuleMap::mapped_type& rxModule = aGeneratedModules[ *pGenModName ];
+ rxModule.reset( new VbaModule( mxDocModel, *pGenModName, eTextEnc, bExecutable ) );
-+ rxModule->setType( ApiModuleType::DOCUMENT );
++ rxModule->setType( ModuleType::DOCUMENT );
+ }
+
/* Now it is time to load the source code. All modules will be inserted
diff --git a/patches/vba/vba-oox-olenameoverride.diff b/patches/vba/vba-oox-olenameoverride.diff
index a811b8b..66ef547 100644
--- a/patches/vba/vba-oox-olenameoverride.diff
+++ b/patches/vba/vba-oox-olenameoverride.diff
@@ -92,12 +92,13 @@ index 635991a..e60f6f6 100755
#include <com/sun/star/script/ModuleInfo.hpp>
#include <com/sun/star/script/ModuleType.hpp>
#include <com/sun/star/script/vba/XVBAModuleInfo.hpp>
-@@ -35,6 +36,8 @@
+@@ -35,6 +36,9 @@
#include "oox/helper/textinputstream.hxx"
#include "oox/ole/vbahelper.hxx"
#include "oox/ole/vbainputstream.hxx"
+#include <hash_map>
+#include <cppuhelper/implbase1.hxx>
++using namespace ::com::sun::star::lang;
using ::rtl::OUString;
using ::rtl::OUStringBuffer;
@@ -105,7 +106,7 @@ index 635991a..e60f6f6 100755
namespace ole {
// ============================================================================
-+typedef ::cppu::WeakImplHelper1< container::XIndexContainer > OleIdToNameContainer_BASE;
++typedef ::cppu::WeakImplHelper1< XIndexContainer > OleIdToNameContainer_BASE;
+typedef std::hash_map< sal_Int32, rtl::OUString > ObjIdToName;
+class OleIdToNameContainer : public OleIdToNameContainer_BASE
+{
@@ -119,51 +120,51 @@ index 635991a..e60f6f6 100755
+public:
+ OleIdToNameContainer() {}
+ // XIndexContainer Methods
-+ virtual void SAL_CALL insertByIndex( ::sal_Int32 Index, const Any& Element ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
++ virtual void SAL_CALL insertByIndex( ::sal_Int32 Index, const Any& Element ) throw (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException)
+ {
+ ::osl::MutexGuard aGuard( m_aMutex );
+ rtl::OUString sOleName;
+ if ( !( Element >>= sOleName ) )
-+ throw lange::IllegalArgumentException();
++ throw IllegalArgumentException();
+ ObjIdToNameHash[ Index ] = sOleName;
+ }
-+ virtual void SAL_CALL removeByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
++ virtual void SAL_CALL removeByIndex( ::sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException)
+ {
+ ::osl::MutexGuard aGuard( m_aMutex );
+ if ( !hasByIndex( Index ) )
-+ throw lang::IndexOutOfBoundsException();
++ throw IndexOutOfBoundsException();
+ ObjIdToNameHash.erase( ObjIdToNameHash.find( Index ) );
+ }
+ // XIndexReplace Methods
-+ virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const uno::Any& Element ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
++ virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const Any& Element ) throw (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException)
+ {
+ ::osl::MutexGuard aGuard( m_aMutex );
+ if ( !hasByIndex( Index ) )
-+ throw lang::IndexOutOfBoundsException();
++ throw IndexOutOfBoundsException();
+ rtl::OUString sOleName;
+ if ( !( Element >>= sOleName ) )
-+ throw lang::IllegalArgumentException();
++ throw IllegalArgumentException();
+ ObjIdToNameHash[ Index ] = sOleName;
+ }
+ // XIndexAccess Methods
-+ virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException)
++ virtual ::sal_Int32 SAL_CALL getCount( ) throw (RuntimeException)
+ {
+ ::osl::MutexGuard aGuard( m_aMutex );
+ return ObjIdToNameHash.size();
+ }
-+ virtual Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
++ virtual Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException)
+ {
+ ::osl::MutexGuard aGuard( m_aMutex );
+ if ( !hasByIndex( Index ) )
-+ throw lang::IndexOutOfBoundsException();
-+ return uno::makeAny( ObjIdToNameHash[ Index ] );
++ throw IndexOutOfBoundsException();
++ return makeAny( ObjIdToNameHash[ Index ] );
+ }
+ // XElementAccess Methods
-+ virtual Type SAL_CALL getElementType( ) throw (uno::RuntimeException)
++ virtual Type SAL_CALL getElementType( ) throw (RuntimeException)
+ {
+ return ::getCppuType((const ::rtl::OUString*)(NULL) );
+ }
-+ virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException)
++ virtual ::sal_Bool SAL_CALL hasElements( ) throw (RuntimeException)
+ {
+ ::osl::MutexGuard aGuard( m_aMutex );
+ return ( getCount() > 0 );
@@ -177,7 +178,7 @@ index 635991a..e60f6f6 100755
}
+void VbaModule::extractOleOverrideFromAttr( const String& rAttributeLine,
-+ const uno::Reference< container::XNameContainer >& rxOleNameOverrides ) const
++ const Reference< XNameContainer >& rxOleNameOverrides ) const
+{
+ String rAttribute = rAttributeLine;
+ // format of the attribute we are interested in is
@@ -196,10 +197,10 @@ index 635991a..e60f6f6 100755
+ rtl::OUStringToOString( maName, RTL_TEXTENCODING_UTF8 ).getStr(), nCntrlId,
+ rtl::OUStringToOString( sCntrlName, RTL_TEXTENCODING_UTF8 ).getStr() );
+ if ( !rxOleNameOverrides->hasByName( maName ) )
-+ rxOleNameOverrides->insertByName( maName, makeAny( uno::Reference< container::XIndexContainer> ( new OleIdToNameContainer() ) ) );
-+ uno::Reference< container::XIndexContainer > xIdToOleName;
++ rxOleNameOverrides->insertByName( maName, makeAny( Reference< XIndexContainer> ( new OleIdToNameContainer() ) ) );
++ Reference< XIndexContainer > xIdToOleName;
+ if ( rxOleNameOverrides->getByName( maName ) >>= xIdToOleName )
-+ xIdToOleName->insertByIndex( nCntrlId, uno::makeAny( rtl::OUString( sCntrlName ) ) );
++ xIdToOleName->insertByIndex( nCntrlId, makeAny( rtl::OUString( sCntrlName ) ) );
+ }
+}
+
diff --git a/patches/vba/vba-use-ooxfilter-forcontrols.diff b/patches/vba/vba-use-ooxfilter-forcontrols.diff
index 0630022..fca66fb 100644
--- a/patches/vba/vba-use-ooxfilter-forcontrols.diff
+++ b/patches/vba/vba-use-ooxfilter-forcontrols.diff
@@ -413,7 +413,7 @@ index c71f885..d033355 100644
#include "WW8FibData.hxx"
+#include <comphelper/processfactory.hxx>
+#include <com/sun/star/document/XFilter.hpp>
-+#include <com/sun/star/script/XVBACompat.hpp>
++#include <com/sun/star/vba/script/XVBACompatibility.hpp>
+#include <com/sun/star/document/XImporter.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <comphelper/mediadescriptor.hxx>
@@ -492,7 +492,7 @@ index c71f885..d033355 100644
+ {
+ try
+ {
-+ uno::Reference< script::XVBACompat > xVBA( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BasicLibraries" ) ) ), uno::UNO_QUERY_THROW );
++ uno::Reference< script::vba::XVBACompatibility > xVBA( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BasicLibraries" ) ) ), uno::UNO_QUERY_THROW );
+ sProjName = xVBA->getProjectName();
+
+ }
More information about the ooo-build-commit
mailing list