ooo-build r11324 - in trunk: . patches/src680 scratch/offapi-vba scratch/sc-vba
- From: noelpwer svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r11324 - in trunk: . patches/src680 scratch/offapi-vba scratch/sc-vba
- Date: Fri, 18 Jan 2008 17:17:44 +0000 (GMT)
Author: noelpwer
Date: Fri Jan 18 17:17:43 2008
New Revision: 11324
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11324&view=rev
Log:
2008-01-18 Noel Power <noel power novell com>
* patches/src680/apply: backported cws-npower11.diff ( removal of
scratch/*-vba
* patches/src680/cws-npower11.diff:
* scratch/sc-vba/*: lots of files deleted ( moved to npower11 )
* scratch/offapi-vb/*: ditto
Added:
trunk/patches/src680/cws-npower11.diff
Removed:
trunk/scratch/offapi-vba/oovbaapi-org-openoffice-excel-xapplication-idl.diff
trunk/scratch/offapi-vba/oovbaapi-org-openoffice-excel-xname-idl.diff
trunk/scratch/offapi-vba/oovbaapi-org-openoffice-excel-xwindow-idl.diff
trunk/scratch/offapi-vba/oovbaapi-org-openoffice-excel-xworkbook-idl.diff
trunk/scratch/offapi-vba/oovbaapi-org-openoffice-excel-xworksheet-idl.diff
trunk/scratch/offapi-vba/oovbaapi-org-openoffice-vba-xassistant-idl.diff
trunk/scratch/offapi-vba/oovbaapi-org-openoffice-vba-xglobals-idl.diff
trunk/scratch/sc-vba/sc-source-ui-vba-makefile-mk.diff
trunk/scratch/sc-vba/sc-source-ui-vba-vbaapplication-cxx.diff
trunk/scratch/sc-vba/sc-source-ui-vba-vbaapplication-hxx.diff
trunk/scratch/sc-vba/sc-source-ui-vba-vbaassistant-cxx.diff
trunk/scratch/sc-vba/sc-source-ui-vba-vbaassistant-hxx.diff
trunk/scratch/sc-vba/sc-source-ui-vba-vbaglobals-cxx.diff
trunk/scratch/sc-vba/sc-source-ui-vba-vbaglobals-hxx.diff
trunk/scratch/sc-vba/sc-source-ui-vba-vbahelper-cxx.diff
trunk/scratch/sc-vba/sc-source-ui-vba-vbahelper-hxx.diff
trunk/scratch/sc-vba/sc-source-ui-vba-vbaname-cxx.diff
trunk/scratch/sc-vba/sc-source-ui-vba-vbanames-cxx.diff
trunk/scratch/sc-vba/sc-source-ui-vba-vbawindow-cxx.diff
trunk/scratch/sc-vba/sc-source-ui-vba-vbawindow-hxx.diff
trunk/scratch/sc-vba/sc-source-ui-vba-vbaworkbook-cxx.diff
trunk/scratch/sc-vba/sc-source-ui-vba-vbaworkbook-hxx.diff
trunk/scratch/sc-vba/sc-source-ui-vba-vbaworksheet-cxx.diff
trunk/scratch/sc-vba/sc-source-ui-vba-vbaworksheet-hxx.diff
Modified:
trunk/ChangeLog
trunk/patches/src680/apply
Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply (original)
+++ trunk/patches/src680/apply Fri Jan 18 17:17:43 2008
@@ -290,8 +290,12 @@
cws-newportstl.diff
[ CWSBackports ]
+#dialog refactor
cws-npower9.diff
+#basic runtime fixes
cws-npower10.diff
+#api changes
+cws-npower11.diff
[ CWSBackports < ooh680-m2 ]
buildfix-stl-anachronism.diff, i#83519
Added: trunk/patches/src680/cws-npower11.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/cws-npower11.diff Fri Jan 18 17:17:43 2008
@@ -0,0 +1,887 @@
+Index: sc/source/ui/vba/makefile.mk
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/vba/makefile.mk,v
+retrieving revision 1.5
+retrieving revision 1.5.42.1
+diff -u -p -u -p -b -w -B -r1.5 -r1.5.42.1
+--- sc/source/ui/vba/makefile.mk 7 Dec 2007 10:42:39 -0000 1.5
++++ sc/source/ui/vba/makefile.mk 18 Jan 2008 16:51:37 -0000 1.5.42.1
+@@ -115,6 +115,7 @@ SLOFILES= \
+ $(SLO)$/vbaformatconditions.obj \
+ $(SLO)$/vbastyle.obj \
+ $(SLO)$/vbastyles.obj \
++ $(SLO)$/vbaassistant.obj \
+ $(SLO)$/service.obj \
+
+
+Index: sc/source/ui/vba/vbaapplication.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/vba/vbaapplication.cxx,v
+retrieving revision 1.5
+retrieving revision 1.5.42.1
+diff -u -p -u -p -b -w -B -r1.5 -r1.5.42.1
+--- sc/source/ui/vba/vbaapplication.cxx 7 Dec 2007 10:43:04 -0000 1.5
++++ sc/source/ui/vba/vbaapplication.cxx 18 Jan 2008 16:51:37 -0000 1.5.42.1
+@@ -62,6 +62,7 @@
+ #include "gridwin.hxx"
+ #include "vbanames.hxx"
+ #include "vbashape.hxx"
++#include "vbaassistant.hxx"
+ #include "sc.hrc"
+
+ #include <osl/file.hxx>
+@@ -127,6 +128,12 @@ ScVbaApplication::getThisWorkbook() thro
+ return getActiveWorkbook();
+ }
+
++uno::Reference< vba::XAssistant > SAL_CALL
++ScVbaApplication::getAssistant() throw (css::uno::RuntimeException)
++{
++ return uno::Reference< vba::XAssistant >( new ScVbaAssistant( this, mxContext ) );
++}
++
+ uno::Any SAL_CALL
+ ScVbaApplication::getSelection() throw (uno::RuntimeException)
+ {
+@@ -431,12 +438,17 @@ ScVbaApplication::Range( const uno::Any&
+ }
+
+ uno::Any SAL_CALL
+-ScVbaApplication::Names( ) throw ( uno::RuntimeException )
++ScVbaApplication::Names( const css::uno::Any& aIndex ) throw ( uno::RuntimeException )
+ {
+ uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
+- uno::Reference< sheet::XNamedRanges > xNamedRanges( getActiveSheet() , uno::UNO_QUERY_THROW );
++ uno::Reference< beans::XPropertySet > xPropertySet( xModel, uno::UNO_QUERY_THROW );
++ uno::Reference< sheet::XNamedRanges > xNamedRanges( xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("NamedRanges")) , uno::UNO_QUERY_THROW );
+ css::uno::Reference< excel::XNames > xNames ( new ScVbaNames( this , mxContext , xNamedRanges , xModel ) );
+- return uno::makeAny( xNames );
++ if ( aIndex.getValueTypeClass() == uno::TypeClass_VOID )
++ {
++ return uno::Any( xNames );
++ }
++ return uno::Any( xNames->Item( aIndex, uno::Any() ) );
+ }
+
+
+Index: sc/source/ui/vba/vbaapplication.hxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/vba/vbaapplication.hxx,v
+retrieving revision 1.3
+retrieving revision 1.3.42.1
+diff -u -p -u -p -b -w -B -r1.3 -r1.3.42.1
+--- sc/source/ui/vba/vbaapplication.hxx 7 Dec 2007 10:43:17 -0000 1.3
++++ sc/source/ui/vba/vbaapplication.hxx 18 Jan 2008 16:51:37 -0000 1.3.42.1
+@@ -80,6 +80,7 @@ public:
+ virtual ::sal_Bool SAL_CALL getDisplayFormulaBar() throw ( css::uno::RuntimeException );
+ virtual void SAL_CALL setDisplayFormulaBar( ::sal_Bool _displayformulabar ) throw ( css::uno::RuntimeException );
+
++ virtual css::uno::Reference< oo::vba::XAssistant > SAL_CALL getAssistant() throw (css::uno::RuntimeException);
+ virtual css::uno::Reference< oo::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);
+@@ -99,7 +100,7 @@ public:
+ virtual css::uno::Any SAL_CALL Windows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
+ virtual void SAL_CALL wait( double time ) throw (css::uno::RuntimeException);
+ virtual css::uno::Any SAL_CALL Range( const css::uno::Any& Cell1, const css::uno::Any& Cell2 ) throw (css::uno::RuntimeException);
+- virtual css::uno::Any SAL_CALL Names( ) throw ( css::uno::RuntimeException );
++ virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) throw ( css::uno::RuntimeException );
+ virtual void SAL_CALL GoTo( const css::uno::Any& Reference, const css::uno::Any& Scroll ) throw (css::uno::RuntimeException);
+ virtual void SAL_CALL Calculate() throw (css::script::BasicErrorException, css::uno::RuntimeException);
+ virtual css::uno::Reference< oo::excel::XRange > SAL_CALL Intersect( const css::uno::Reference< oo::excel::XRange >& Arg1, const css::uno::Reference< oo::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorEx
ception, css::uno::RuntimeException);
+Index: sc/source/ui/vba/vbaglobals.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/vba/vbaglobals.cxx,v
+retrieving revision 1.3
+retrieving revision 1.3.42.1
+diff -u -p -u -p -b -w -B -r1.3 -r1.3.42.1
+--- sc/source/ui/vba/vbaglobals.cxx 7 Dec 2007 10:53:12 -0000 1.3
++++ sc/source/ui/vba/vbaglobals.cxx 18 Jan 2008 16:51:37 -0000 1.3.42.1
+@@ -158,9 +158,9 @@ ScVbaGlobals::Range( const uno::Any& Cel
+ }
+
+ uno::Any SAL_CALL
+-ScVbaGlobals::Names( ) throw ( uno::RuntimeException )
++ScVbaGlobals::Names( const css::uno::Any& aIndex ) throw ( uno::RuntimeException )
+ {
+- return getApplication()->Names();
++ return getApplication()->Names( aIndex );
+ }
+
+ namespace globals
+Index: sc/source/ui/vba/vbaglobals.hxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/vba/vbaglobals.hxx,v
+retrieving revision 1.3
+retrieving revision 1.3.42.1
+diff -u -p -u -p -b -w -B -r1.3 -r1.3.42.1
+--- sc/source/ui/vba/vbaglobals.hxx 7 Dec 2007 10:53:25 -0000 1.3
++++ sc/source/ui/vba/vbaglobals.hxx 18 Jan 2008 16:51:37 -0000 1.3.42.1
+@@ -75,6 +75,6 @@
+ virtual css::uno::Any SAL_CALL Sheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
+ virtual css::uno::Sequence< css::uno::Any > SAL_CALL getGlobals( ) throw (css::uno::RuntimeException);
+ virtual css::uno::Any SAL_CALL Range( const css::uno::Any& Cell1, const css::uno::Any& Cell2 ) throw (css::uno::RuntimeException);
+- virtual css::uno::Any SAL_CALL Names( ) throw ( css::uno::RuntimeException );
++ virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) throw ( css::uno::RuntimeException );
+ };
+ #endif //
+Index: sc/source/ui/vba/vbahelper.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/vba/vbahelper.cxx,v
+retrieving revision 1.3
+retrieving revision 1.3.42.1
+diff -u -p -u -p -b -w -B -r1.3 -r1.3.42.1
+--- sc/source/ui/vba/vbahelper.cxx 7 Dec 2007 10:53:38 -0000 1.3
++++ sc/source/ui/vba/vbahelper.cxx 18 Jan 2008 16:51:38 -0000 1.3.42.1
+@@ -219,6 +219,22 @@ dispatchRequests (uno::Reference< frame:
+ }
+
+
++void dispatchExecute(css::uno::Reference< css::frame::XModel>& xModel, USHORT nSlot, SfxCallMode nCall)
++{
++ ScTabViewShell* pViewShell = getBestViewShell( xModel );
++ SfxViewFrame* pViewFrame = NULL;
++ if ( pViewShell )
++ pViewFrame = pViewShell->GetViewFrame();
++ if ( pViewFrame )
++ {
++ SfxDispatcher* pDispatcher = pViewFrame->GetDispatcher();
++ if( pDispatcher )
++ {
++ pDispatcher->Execute( nSlot , nCall );
++ }
++ }
++}
++
+ void
+ implnPaste()
+ {
+@@ -535,6 +551,11 @@ void PrintOutHelper( const uno::Any& Fro
+ // of this method
+ }
+
++ void PrintPreviewHelper( const css::uno::Any& /*EnableChanges*/, css::uno::Reference< css::frame::XModel >& xModel )
++{
++ dispatchExecute( xModel, SID_VIEWSHELL1 );
++}
++
+ rtl::OUString getAnyAsString( const uno::Any& pvargItem ) throw ( uno::RuntimeException )
+ {
+ uno::Type aType = pvargItem.getValueType();
+Index: sc/source/ui/vba/vbahelper.hxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/vba/vbahelper.hxx,v
+retrieving revision 1.4
+retrieving revision 1.4.42.1
+diff -u -p -u -p -b -w -B -r1.4 -r1.4.42.1
+--- sc/source/ui/vba/vbahelper.hxx 7 Dec 2007 10:53:50 -0000 1.4
++++ sc/source/ui/vba/vbahelper.hxx 18 Jan 2008 16:51:38 -0000 1.4.42.1
+@@ -44,6 +44,7 @@
+ #include <cppuhelper/implbase1.hxx>
+ #include <com/sun/star/frame/XModel.hpp>
+ #include <docsh.hxx>
++#include <sfx2/dispatch.hxx>
+
+ namespace css = ::com::sun::star;
+
+@@ -65,6 +66,7 @@ namespace org
+
+ void dispatchRequests (css::uno::Reference< css::frame::XModel>& xModel,rtl::OUString & aUrl) ;
+ void dispatchRequests (css::uno::Reference< css::frame::XModel>& xModel,rtl::OUString & aUrl, css::uno::Sequence< css::beans::PropertyValue >& sProps ) ;
++ void dispatchExecute(css::uno::Reference< css::frame::XModel>& xModel, USHORT nSlot, SfxCallMode nCall = SFX_CALLMODE_SYNCHRON );
+ void implnCopy();
+ void implnPaste();
+ void implnCut();
+@@ -85,6 +87,7 @@ namespace org
+ // contains an empty object reference
+ const css::uno::Any& aNULL();
+ void PrintOutHelper( const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName, css::uno::Reference< css::frame::XModel >& xModel, sal_Bool bSelection );
++ void PrintPreviewHelper( const css::uno::Any& EnableChanges, css::uno::Reference< css::frame::XModel >& xModel );
+
+ rtl::OUString getAnyAsString( const css::uno::Any& pvargItem ) throw ( css::uno::RuntimeException );
+ rtl::OUString VBAToRegexp(const rtl::OUString &rIn, bool bForLike = false); // needs to be in an uno service ( already this code is duplicated in basic )
+Index: sc/source/ui/vba/vbaname.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/vba/vbaname.cxx,v
+retrieving revision 1.2
+retrieving revision 1.2.42.1
+diff -u -p -u -p -b -w -B -r1.2 -r1.2.42.1
+--- sc/source/ui/vba/vbaname.cxx 7 Dec 2007 10:55:43 -0000 1.2
++++ sc/source/ui/vba/vbaname.cxx 18 Jan 2008 16:51:38 -0000 1.2.42.1
+@@ -36,6 +36,7 @@
+
+ #include <com/sun/star/table/XCellRange.hpp>
+ #include <com/sun/star/sheet/XCellRangeAddressable.hpp>
++#include <com/sun/star/sheet/XCellRangeReferrer.hpp>
+
+ #include "vbaname.hxx"
+ #include "vbarange.hxx"
+@@ -115,17 +116,37 @@ ScVbaName::getValue() throw (css::uno::R
+ {
+ ::rtl::OUString sValue = mxNamedRange->getContent();
+ ::rtl::OUString sSheetName = getWorkSheet()->getName();
+- if ( sValue.toChar() == '$' )
++ ::rtl::OUString sSegmentation = ::rtl::OUString::createFromAscii( ";" );
++ ::rtl::OUString sNewSegmentation = ::rtl::OUString::createFromAscii( "," );
++ ::rtl::OUString sResult;
++ sal_Int32 nFrom = 0;
++ sal_Int32 nTo = 0;
++ nTo = sValue.indexOf( sSegmentation, nFrom );
++ while ( nTo != -1 )
+ {
+- ::rtl::OUString sTmp = sValue.copy(1);
+- sValue = sTmp;
++ ::rtl::OUString sTmpValue = sValue.copy( nFrom, nTo - nFrom );
++ if ( sTmpValue.toChar() == '$' )
++ {
++ ::rtl::OUString sTmp = sTmpValue.copy( 1 );
++ sTmp = sTmp.replaceAt(0, (sSheetName + ::rtl::OUString::createFromAscii(".")).getLength(), sSheetName + ::rtl::OUString::createFromAscii("!"));
++ sResult += sTmp;
++ sResult += sNewSegmentation;
++ }
++ nFrom = nTo + 1;
++ nTo = sValue.indexOf( sSegmentation, nFrom );
++ }
++ ::rtl::OUString sTmpValue = sValue.copy( nFrom );
++ if ( sTmpValue.toChar() == '$' )
++ {
++ ::rtl::OUString sTmp = sTmpValue.copy(1);
++ sTmp = sTmp.replaceAt(0, (sSheetName + ::rtl::OUString::createFromAscii(".")).getLength(), sSheetName + ::rtl::OUString::createFromAscii("!"));
++ sResult += sTmp;
+ }
+- sValue = sValue.replaceAt(0, (sSheetName + ::rtl::OUString::createFromAscii(".")).getLength(), sSheetName + ::rtl::OUString::createFromAscii("!"));
+- if (sValue.indexOf('=') != 0)
++ if (sResult.indexOf('=') != 0)
+ {
+- sValue = ::rtl::OUString::createFromAscii("=") + sValue;
++ sResult = ::rtl::OUString::createFromAscii("=") + sResult;
+ }
+- return sValue;
++ return sResult;
+ }
+
+ void
+@@ -133,17 +154,38 @@ ScVbaName::setValue( const ::rtl::OUStri
+ {
+ ::rtl::OUString sSheetName = getWorkSheet()->getName();
+ ::rtl::OUString sValue = rValue;
++ ::rtl::OUString sSegmentation = ::rtl::OUString::createFromAscii( "," );
++ ::rtl::OUString sNewSegmentation = ::rtl::OUString::createFromAscii( ";" );
++ ::rtl::OUString sResult;
++ sal_Int32 nFrom = 0;
++ sal_Int32 nTo = 0;
+ if (sValue.indexOf('=') == 0)
+ {
+ ::rtl::OUString sTmp = sValue.copy(1);
+ sValue = sTmp;
+ }
+- if (sValue.copy(0, sSheetName.getLength()).equals(sSheetName))
++ nTo = sValue.indexOf( sSegmentation, nFrom );
++ while ( nTo != -1 )
++ {
++ ::rtl::OUString sTmpValue = sValue.copy( nFrom, nTo - nFrom );
++ sTmpValue = sTmpValue.replaceAt(0, (sSheetName + ::rtl::OUString::createFromAscii("!")).getLength(), sSheetName + ::rtl::OUString::createFromAscii("."));
++ if (sTmpValue.copy(0, sSheetName.getLength()).equals(sSheetName))
++ {
++ sTmpValue = ::rtl::OUString::createFromAscii("$") + sTmpValue;
++ }
++ sTmpValue += sNewSegmentation;
++ sResult += sTmpValue;
++ nFrom = nTo + 1;
++ nTo = sValue.indexOf( sSegmentation, nFrom );
++ }
++ ::rtl::OUString sTmpValue = sValue.copy( nFrom );
++ sTmpValue = sTmpValue.replaceAt(0, (sSheetName + ::rtl::OUString::createFromAscii("!")).getLength(), sSheetName + ::rtl::OUString::createFromAscii("."));
++ if (sTmpValue.copy(0, sSheetName.getLength()).equals(sSheetName))
+ {
+- sValue = ::rtl::OUString::createFromAscii("$") + sSheetName;
++ sTmpValue = ::rtl::OUString::createFromAscii("$") + sTmpValue;
+ }
+- sValue = sValue.replaceAt(0, (sSheetName + ::rtl::OUString::createFromAscii("!")).getLength(), sSheetName + ::rtl::OUString::createFromAscii("."));
+- mxNamedRange->setContent(sValue);
++ sResult += sTmpValue;
++ mxNamedRange->setContent(sResult);
+ }
+
+ ::rtl::OUString
+@@ -197,7 +239,7 @@ ScVbaName::setRefersToR1C1Local( const :
+ css::uno::Reference< oo::excel::XRange >
+ ScVbaName::getRefersToRange() throw (css::uno::RuntimeException)
+ {
+- css::uno::Reference< oo::excel::XRange > xRange;
++ uno::Reference< oo::excel::XRange > xRange = ScVbaRange::getRangeObjectForName( mxContext, mxNamedRange->getName(), getDocShell( mxModel ), ScAddress::CONV_XL_R1C1 );
+ return xRange;
+ }
+
+Index: sc/source/ui/vba/vbanames.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/vba/vbanames.cxx,v
+retrieving revision 1.2
+retrieving revision 1.2.42.1
+diff -u -p -u -p -b -w -B -r1.2 -r1.2.42.1
+--- sc/source/ui/vba/vbanames.cxx 7 Dec 2007 10:56:06 -0000 1.2
++++ sc/source/ui/vba/vbanames.cxx 18 Jan 2008 16:51:38 -0000 1.2.42.1
+@@ -75,6 +75,7 @@ ScVbaNames::ScVbaNames(const css::uno::R
+ mxModel( xModel ),
+ mxNames( xNames )
+ {
++ m_xNameAccess.set( xNames, uno::UNO_QUERY_THROW );
+ }
+
+ ScVbaNames::~ScVbaNames()
+Index: sc/source/ui/vba/vbawindow.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/vba/vbawindow.cxx,v
+retrieving revision 1.3
+retrieving revision 1.3.42.1
+diff -u -p -u -p -b -w -B -r1.3 -r1.3.42.1
+--- sc/source/ui/vba/vbawindow.cxx 7 Dec 2007 11:05:13 -0000 1.3
++++ sc/source/ui/vba/vbawindow.cxx 18 Jan 2008 16:51:38 -0000 1.3.42.1
+@@ -42,7 +42,11 @@
+ #include <com/sun/star/view/DocumentZoomType.hpp>
+ #include <com/sun/star/table/CellRangeAddress.hpp>
+ #include <org/openoffice/excel/XlWindowState.hpp>
++#include <org/openoffice/excel/XlWindowView.hpp>
+ #include <org/openoffice/excel/Constants.hpp>
++#include <com/sun/star/awt/XWindow.hpp>
++#include <com/sun/star/awt/XWindow2.hpp>
++#include <com/sun/star/awt/PosSize.hpp>
+
+ #include <docsh.hxx>
+ #include <tabvwsh.hxx>
+@@ -443,8 +447,8 @@ ScVbaWindow::Close( const uno::Any& Save
+ workbook.Close(SaveChanges, FileName, RouteWorkBook );
+ }
+
+-uno::Reference< excel::XPane >
+-ScVbaWindow::ActivePane()
++uno::Reference< excel::XPane > SAL_CALL
++ScVbaWindow::ActivePane() throw (script::BasicErrorException, uno::RuntimeException)
+ {
+ return new ScVbaPane( mxContext, m_xViewPane );
+ }
+@@ -631,7 +635,8 @@ ScVbaWindow::setSplitColumn( sal_Int32 _
+ if( getSplitColumn() != _splitcolumn )
+ {
+ sal_Bool bFrozen = getFreezePanes();
+- m_xViewFreezable->freezeAtPosition( _splitcolumn, 0 );
++ sal_Int32 nRow = getSplitRow();
++ m_xViewFreezable->freezeAtPosition( _splitcolumn, nRow );
+ SplitAtDefinedPosition( !bFrozen );
+ }
+ }
+@@ -663,7 +668,8 @@ ScVbaWindow::setSplitRow( sal_Int32 _spl
+ if( getSplitRow() != _splitrow )
+ {
+ sal_Bool bFrozen = getFreezePanes();
+- m_xViewFreezable->freezeAtPosition( 0, _splitrow );
++ sal_Int32 nColumn = getSplitColumn();
++ m_xViewFreezable->freezeAtPosition( nColumn , _splitrow );
+ SplitAtDefinedPosition( !bFrozen );
+ }
+ }
+@@ -738,6 +744,184 @@ ScVbaWindow::setZoom( const uno::Any& _z
+ }
+ }
+
++uno::Reference< excel::XWorksheet > SAL_CALL
++ScVbaWindow::ActiveSheet( ) throw (script::BasicErrorException, uno::RuntimeException)
++{
++ return ScVbaGlobals::getGlobalsImpl(mxContext)->getApplication()->getActiveSheet();
++}
++
++uno::Any SAL_CALL
++ScVbaWindow::getView() throw (uno::RuntimeException)
++{
++ // not supported now
++ sal_Int32 nWindowView = excel::XlWindowView::xlNormalView;
++ return uno::makeAny( nWindowView );
++}
++
++void SAL_CALL
++ScVbaWindow::setView( const uno::Any& _view) throw (uno::RuntimeException)
++{
++ sal_Int32 nWindowView = excel::XlWindowView::xlNormalView;
++ _view >>= nWindowView;
++ USHORT nSlot = FID_NORMALVIEWMODE;
++ switch ( nWindowView )
++ {
++ case excel::XlWindowView::xlNormalView:
++ nSlot = FID_NORMALVIEWMODE;
++ break;
++ case excel::XlWindowView::xlPageBreakPreview:
++ nSlot = FID_PAGEBREAKMODE;
++ break;
++ default:
++ DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() );
++ }
++ dispatchExecute( m_xModel, nSlot );
++}
++
++sal_Bool SAL_CALL
++ScVbaWindow::getVisible() throw (uno::RuntimeException)
++{
++ sal_Bool bVisible = sal_True;
++ uno::Reference< frame::XController > xController( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
++ uno::Reference< css::awt::XWindow > xWindow (xController->getFrame()->getContainerWindow(), uno::UNO_QUERY_THROW );
++ uno::Reference< css::awt::XWindow2 > xWindow2 (xWindow, uno::UNO_QUERY_THROW );
++ if( xWindow2.is() )
++ {
++ bVisible = xWindow2->isVisible();
++ }
++ return bVisible;
++}
++
++void SAL_CALL
++ScVbaWindow::setVisible(sal_Bool _visible) throw (uno::RuntimeException)
++{
++ uno::Reference< frame::XController > xController( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
++ uno::Reference< css::awt::XWindow > xWindow (xController->getFrame()->getContainerWindow(), uno::UNO_QUERY_THROW );
++ if( xWindow.is() )
++ {
++ xWindow->setVisible( _visible );
++ }
++}
++
++css::awt::Rectangle getPosSize( const uno::Reference< frame::XModel >& xModel )
++{
++ css::awt::Rectangle aRect;
++ uno::Reference< frame::XController > xController( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
++ uno::Reference< css::awt::XWindow > xWindow (xController->getFrame()->getContainerWindow(), uno::UNO_QUERY_THROW );
++ if( xWindow.is() )
++ {
++ aRect = xWindow->getPosSize();
++ }
++ return aRect;
++}
++
++void setPosSize( const uno::Reference< frame::XModel >& xModel, sal_Int32 nValue, USHORT nFlag )
++{
++ uno::Reference< frame::XController > xController( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
++ uno::Reference< css::awt::XWindow > xWindow (xController->getFrame()->getContainerWindow(), uno::UNO_QUERY_THROW );
++ if( xWindow.is() )
++ {
++ css::awt::Rectangle aRect = xWindow->getPosSize();
++ switch( nFlag )
++ {
++ case css::awt::PosSize::X:
++ xWindow->setPosSize( nValue, aRect.Y, 0, 0, css::awt::PosSize::X );
++ break;
++ case css::awt::PosSize::Y:
++ xWindow->setPosSize( aRect.X, nValue, 0, 0, css::awt::PosSize::Y );
++ break;
++ case css::awt::PosSize::WIDTH:
++ xWindow->setPosSize( 0, 0, nValue, aRect.Height, css::awt::PosSize::WIDTH );
++ break;
++ case css::awt::PosSize::HEIGHT:
++ xWindow->setPosSize( 0, 0, aRect.Width, nValue, css::awt::PosSize::HEIGHT );
++ break;
++ default:
++ break;
++ }
++ }
++}
++
++sal_Int32 SAL_CALL
++ScVbaWindow::getHeight() throw (uno::RuntimeException)
++{
++ css::awt::Rectangle aRect = getPosSize(m_xModel);
++ return aRect.Height;
++}
++
++void SAL_CALL
++ScVbaWindow::setHeight( sal_Int32 _height ) throw (uno::RuntimeException)
++{
++ setPosSize(m_xModel, _height, css::awt::PosSize::HEIGHT);
++}
++
++sal_Int32 SAL_CALL
++ScVbaWindow::getLeft() throw (uno::RuntimeException)
++{
++ css::awt::Rectangle aRect = getPosSize(m_xModel);
++ return aRect.X;
++}
++
++void SAL_CALL
++ScVbaWindow::setLeft( sal_Int32 _left ) throw (uno::RuntimeException)
++{
++ setPosSize(m_xModel, _left, css::awt::PosSize::X);
++}
++sal_Int32 SAL_CALL
++ScVbaWindow::getTop() throw (uno::RuntimeException)
++{
++ css::awt::Rectangle aRect = getPosSize(m_xModel);
++ return aRect.Y;
++}
++
++void SAL_CALL
++ScVbaWindow::setTop( sal_Int32 _top ) throw (uno::RuntimeException)
++{
++ setPosSize(m_xModel, _top, css::awt::PosSize::Y);
++}
++sal_Int32 SAL_CALL
++ScVbaWindow::getWidth() throw (uno::RuntimeException)
++{
++ css::awt::Rectangle aRect = getPosSize(m_xModel);
++ return aRect.Width;
++}
++
++void SAL_CALL
++ScVbaWindow::setWidth( sal_Int32 _width ) throw (uno::RuntimeException)
++{
++ setPosSize(m_xModel, _width, css::awt::PosSize::WIDTH);
++}
++
++sal_Int32 SAL_CALL
++ScVbaWindow::PointsToScreenPixelsX(sal_Int32 _points) throw (css::script::BasicErrorException, css::uno::RuntimeException)
++{
++ sal_Int32 nHundredthsofOneMillimeters = Millimeter::getInHundredthsOfOneMillimeter( _points );
++ double fConvertFactor = (m_xDevice->getInfo().PixelPerMeterX/100000);
++ return static_cast<sal_Int32>(fConvertFactor * nHundredthsofOneMillimeters );
++}
++
++sal_Int32 SAL_CALL
++ScVbaWindow::PointsToScreenPixelsY(sal_Int32 _points) throw (css::script::BasicErrorException, css::uno::RuntimeException)
++{
++ sal_Int32 nHundredthsofOneMillimeters = Millimeter::getInHundredthsOfOneMillimeter( _points );
++ double fConvertFactor = (m_xDevice->getInfo().PixelPerMeterY/100000);
++ return static_cast<sal_Int32>(fConvertFactor * nHundredthsofOneMillimeters );
++}
++
++void SAL_CALL
++ScVbaWindow::PrintOut( const css::uno::Any& From, const css::uno::Any&To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
++{
++ // need test, print current active sheet
++ PrintOutHelper( From, To, Copies, Preview, ActivePrinter, PrintToFile, Collate, PrToFileName, m_xModel, sal_True );
++}
++
++void SAL_CALL
++ScVbaWindow::PrintPreview( const css::uno::Any& EnableChanges ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
++{
++ // need test, print preview current active sheet
++ PrintPreviewHelper( EnableChanges, m_xModel );
++}
++
+ rtl::OUString&
+ ScVbaWindow::getServiceImplName()
+ {
+Index: sc/source/ui/vba/vbawindow.hxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/vba/vbawindow.hxx,v
+retrieving revision 1.3
+retrieving revision 1.3.42.1
+diff -u -p -u -p -b -w -B -r1.3 -r1.3.42.1
+--- sc/source/ui/vba/vbawindow.hxx 7 Dec 2007 11:05:26 -0000 1.3
++++ sc/source/ui/vba/vbawindow.hxx 18 Jan 2008 16:51:38 -0000 1.3.42.1
+@@ -64,8 +64,11 @@ public:
+ void Scroll( const css::uno::Any& Down, const css::uno::Any& Up, const css::uno::Any& ToRight, const css::uno::Any& ToLeft, bool bLargeScroll = false ) throw (css::uno::RuntimeException);
+ public:
+ ScVbaWindow( const css::uno::Reference< oo::vba::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::frame::XModel >& xModel );
+- css::uno::Reference< oo::excel::XPane > ActivePane();
++
+ // XWindow
++ virtual css::uno::Reference< oo::excel::XRange > SAL_CALL ActiveCell( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
++ virtual css::uno::Reference< oo::excel::XPane > SAL_CALL ActivePane() throw (css::script::BasicErrorException, css::uno::RuntimeException);
++ virtual css::uno::Reference< oo::excel::XWorksheet > SAL_CALL ActiveSheet( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+ virtual void SAL_CALL setCaption( const css::uno::Any& _caption ) throw (css::uno::RuntimeException);
+ virtual css::uno::Any SAL_CALL getCaption() throw (css::uno::RuntimeException);
+ virtual ::sal_Bool SAL_CALL getDisplayGridlines() throw (css::uno::RuntimeException);
+@@ -82,6 +85,10 @@ public:
+ virtual void SAL_CALL setDisplayWorkbookTabs( ::sal_Bool _bDisplayWorkbookTabs ) throw (css::uno::RuntimeException);
+ virtual ::sal_Bool SAL_CALL getFreezePanes() throw (css::uno::RuntimeException);
+ virtual void SAL_CALL setFreezePanes( ::sal_Bool _bFreezePanes ) throw (css::uno::RuntimeException);
++ virtual sal_Int32 SAL_CALL getHeight() throw (css::uno::RuntimeException) ;
++ virtual void SAL_CALL setHeight( sal_Int32 _height ) throw (css::uno::RuntimeException) ;
++ virtual sal_Int32 SAL_CALL getLeft() throw (css::uno::RuntimeException) ;
++ virtual void SAL_CALL setLeft( sal_Int32 _left ) throw (css::uno::RuntimeException) ;
+ virtual ::sal_Bool SAL_CALL getSplit() throw (css::uno::RuntimeException);
+ virtual void SAL_CALL setSplit( ::sal_Bool _bSplit ) throw (css::uno::RuntimeException);
+ virtual sal_Int32 SAL_CALL getSplitColumn() throw (css::uno::RuntimeException) ;
+@@ -96,6 +103,14 @@ public:
+ virtual void SAL_CALL setScrollRow( const css::uno::Any& _scrollrow ) throw (css::uno::RuntimeException) ;
+ virtual css::uno::Any SAL_CALL getScrollColumn() throw (css::uno::RuntimeException) ;
+ virtual void SAL_CALL setScrollColumn( const css::uno::Any& _scrollcolumn ) throw (css::uno::RuntimeException) ;
++ virtual sal_Int32 SAL_CALL getTop() throw (css::uno::RuntimeException) ;
++ virtual void SAL_CALL setTop( sal_Int32 _top ) throw (css::uno::RuntimeException) ;
++ virtual css::uno::Any SAL_CALL getView() throw (css::uno::RuntimeException);
++ virtual void SAL_CALL setView( const css::uno::Any& _view ) throw (css::uno::RuntimeException);
++ virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
++ virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException);
++ virtual sal_Int32 SAL_CALL getWidth() throw (css::uno::RuntimeException) ;
++ virtual void SAL_CALL setWidth( sal_Int32 _width ) throw (css::uno::RuntimeException) ;
+ virtual css::uno::Any SAL_CALL getWindowState() throw (css::uno::RuntimeException);
+ virtual void SAL_CALL setWindowState( const css::uno::Any& _windowstate ) throw (css::uno::RuntimeException);
+ virtual css::uno::Any SAL_CALL getZoom() throw (css::uno::RuntimeException);
+@@ -108,8 +123,11 @@ public:
+ virtual void SAL_CALL ScrollWorkbookTabs( const css::uno::Any& Sheets, const css::uno::Any& Position ) throw (css::uno::RuntimeException);
+ virtual void SAL_CALL Activate( ) throw (css::uno::RuntimeException);
+ virtual void SAL_CALL Close( const css::uno::Any& SaveChanges, const css::uno::Any& FileName, const css::uno::Any& RouteWorkBook ) throw (css::uno::RuntimeException);
+- virtual css::uno::Reference< oo::excel::XRange > SAL_CALL ActiveCell( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+ virtual css::uno::Any SAL_CALL Selection( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
++ virtual sal_Int32 SAL_CALL PointsToScreenPixelsX(sal_Int32 _points) throw (css::script::BasicErrorException, css::uno::RuntimeException);
++ virtual sal_Int32 SAL_CALL PointsToScreenPixelsY(sal_Int32 _points) throw (css::script::BasicErrorException, css::uno::RuntimeException);
++ virtual void SAL_CALL PrintOut( const css::uno::Any& From, const css::uno::Any&To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
++ virtual void SAL_CALL PrintPreview( const css::uno::Any& EnableChanges ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+ // XHelperInterface
+ virtual rtl::OUString& getServiceImplName();
+ virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+Index: sc/source/ui/vba/vbaworkbook.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/vba/vbaworkbook.cxx,v
+retrieving revision 1.4
+retrieving revision 1.4.42.1
+diff -u -p -u -p -b -w -B -r1.4 -r1.4.42.1
+--- sc/source/ui/vba/vbaworkbook.cxx 10 Dec 2007 09:31:05 -0000 1.4
++++ sc/source/ui/vba/vbaworkbook.cxx 18 Jan 2008 16:51:38 -0000 1.4.42.1
+@@ -433,14 +433,18 @@ ScVbaWorkbook::Styles( const::uno::Any&
+
+ // Amelia Wang
+ uno::Any SAL_CALL
+-ScVbaWorkbook::Names( ) throw (uno::RuntimeException)
++ScVbaWorkbook::Names( const css::uno::Any& aIndex ) throw (uno::RuntimeException)
+ {
+ uno::Reference< frame::XModel > xModel( getModel() );
+ uno::Reference< beans::XPropertySet > xProps( xModel, uno::UNO_QUERY_THROW );
+ uno::Reference< sheet::XNamedRanges > xNamedRanges( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NamedRanges") ) ), uno::UNO_QUERY_THROW );
+ uno::Reference< vba::XCollection > xNames( new ScVbaNames( this , mxContext , xNamedRanges , xModel ));
++ if ( aIndex.getValueTypeClass() == uno::TypeClass_VOID )
++ {
+ return uno::Any( xNames );
+ }
++ return uno::Any( xNames->Item( aIndex, uno::Any() ) );
++}
+
+ rtl::OUString&
+ ScVbaWorkbook::getServiceImplName()
+Index: sc/source/ui/vba/vbaworkbook.hxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/vba/vbaworkbook.hxx,v
+retrieving revision 1.3
+retrieving revision 1.3.42.1
+diff -u -p -u -p -b -w -B -r1.3 -r1.3.42.1
+--- sc/source/ui/vba/vbaworkbook.hxx 7 Dec 2007 11:06:17 -0000 1.3
++++ sc/source/ui/vba/vbaworkbook.hxx 18 Jan 2008 16:51:38 -0000 1.3.42.1
+@@ -80,7 +80,7 @@ public:
+ virtual void SAL_CALL Save() throw (css::uno::RuntimeException);
+ virtual void SAL_CALL Activate() throw (css::uno::RuntimeException);
+ // Amelia Wang
+- virtual css::uno::Any SAL_CALL Names( ) throw (css::uno::RuntimeException);
++ virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
+
+ virtual css::uno::Any SAL_CALL Styles( const css::uno::Any& Item ) throw (css::uno::RuntimeException);
+ virtual void SAL_CALL ResetColors( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+Index: sc/source/ui/vba/vbaworksheet.cxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/vba/vbaworksheet.cxx,v
+retrieving revision 1.3
+retrieving revision 1.3.42.1
+diff -u -p -u -p -b -w -B -r1.3 -r1.3.42.1
+--- sc/source/ui/vba/vbaworksheet.cxx 7 Dec 2007 11:06:55 -0000 1.3
++++ sc/source/ui/vba/vbaworksheet.cxx 18 Jan 2008 16:51:38 -0000 1.3.42.1
+@@ -860,6 +860,29 @@ ScVbaWorksheet::getSheetID() throw (uno:
+ return xAddressable->getRangeAddress().Sheet;
+ }
+
++void SAL_CALL
++ScVbaWorksheet::PrintOut( const uno::Any& From, const uno::Any& To, const uno::Any& Copies, const uno::Any& Preview, const uno::Any& ActivePrinter, const uno::Any& PrintToFile, const uno::Any& Collate, const uno::Any& PrToFileName, const uno::Any& IgnorePrintAreas ) throw (uno::RuntimeException)
++{
++ sal_Int32 nTo = 0;
++ sal_Int32 nFrom = 0;
++ sal_Int16 nCopies = 1;
++ sal_Bool bCollate = sal_False;
++ sal_Bool bSelection = sal_False;
++ sal_Bool bIgnorePrintAreas = sal_False;
++ From >>= nFrom;
++ To >>= nTo;
++ Copies >>= nCopies;
++ IgnorePrintAreas >>= bIgnorePrintAreas;
++ if ( nCopies > 1 ) // Collate only useful when more that 1 copy
++ Collate >>= bCollate;
++
++ if ( !( nFrom || nTo ) )
++ bSelection = sal_True;
++
++ uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW );
++ PrintOutHelper( From, To, Copies, Preview, ActivePrinter, PrintToFile, Collate, PrToFileName, xModel, bSelection );
++}
++
+
+ namespace worksheet
+ {
+Index: sc/source/ui/vba/vbaworksheet.hxx
+===================================================================
+RCS file: /cvs/sc/sc/source/ui/vba/vbaworksheet.hxx,v
+retrieving revision 1.3
+retrieving revision 1.3.42.1
+diff -u -p -u -p -b -w -B -r1.3 -r1.3.42.1
+--- sc/source/ui/vba/vbaworksheet.hxx 7 Dec 2007 11:07:07 -0000 1.3
++++ sc/source/ui/vba/vbaworksheet.hxx 18 Jan 2008 16:51:38 -0000 1.3.42.1
+@@ -136,6 +136,7 @@ public:
+ virtual void SAL_CALL setCodeName( const rtl::OUString& sCodeName ) throw (css::uno::RuntimeException);
+ sal_Int16 getSheetID() throw (css::uno::RuntimeException);
+
++ virtual void SAL_CALL PrintOut( const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName, const css::uno::Any& IgnorePrintAreas ) throw (css::uno::RuntimeException);
+ // XHelperInterface
+ virtual rtl::OUString& getServiceImplName();
+ virtual css::uno::Sequence<rtl::OUString> getServiceNames();
+Index: oovbaapi/org/openoffice/excel/XApplication.idl
+===================================================================
+RCS file: /cvs/api/oovbaapi/org/openoffice/excel/XApplication.idl,v
+retrieving revision 1.3
+retrieving revision 1.3.4.1
+diff -u -p -u -p -b -w -B -r1.3 -r1.3.4.1
+--- oovbaapi/org/openoffice/excel/XApplication.idl 7 Dec 2007 11:21:12 -0000 1.3
++++ oovbaapi/org/openoffice/excel/XApplication.idl 18 Jan 2008 16:51:20 -0000 1.3.4.1
+@@ -43,6 +43,10 @@
+ #include <org/openoffice/vba/XHelperInterface.idl>
+ #endif
+
++#ifndef __org_openoffice_vba_XAssistant_idl__
++#include <org/openoffice/vba/XAssistant.idl>
++#endif
++
+ module org { module openoffice { module excel {
+
+ interface XRange;
+@@ -63,6 +67,7 @@ interface XApplication
+ [attribute, readonly] XRange ActiveCell;
+ [attribute, readonly] XWindow ActiveWindow;
+ [attribute, readonly] XWorksheet ActiveSheet;
++ [attribute, readonly] org::openoffice::vba::XAssistant Assistant;
+ [attribute] long Calculation;
+ //#TODO #FIXME this is more of a placeholder, will return
+ // the value of activeworkbook, in xl 'ThisWorkbook' should return the
+@@ -93,7 +98,7 @@ interface XApplication
+ any Evaluate( [in] string Name );
+ any Dialogs( [in] any DialogIndex );
+ any Range( [in] any Cell1, [in] any Cell2 );
+- any Names();
++ any Names( [in] any Index );
+ void GoTo( [in] any Reference, [in] any Scroll );
+ // #FIXME #TODO up to 30 args needed
+ double CountA( [in] any arg1 );
+Index: oovbaapi/org/openoffice/excel/XWindow.idl
+===================================================================
+RCS file: /cvs/api/oovbaapi/org/openoffice/excel/XWindow.idl,v
+retrieving revision 1.3
+retrieving revision 1.3.4.1
+diff -u -p -u -p -b -w -B -r1.3 -r1.3.4.1
+--- oovbaapi/org/openoffice/excel/XWindow.idl 7 Dec 2007 11:29:02 -0000 1.3
++++ oovbaapi/org/openoffice/excel/XWindow.idl 18 Jan 2008 16:51:20 -0000 1.3.4.1
+@@ -49,6 +49,8 @@ module org { module openoffice { modul
+
+ //=============================================================================
+ interface XRange;
++interface XWorksheet;
++interface XPane;
+ interface XWindow
+ {
+ interface ::org::openoffice::vba::XHelperInterface;
+@@ -61,6 +63,8 @@ interface XWindow
+ [attribute] boolean DisplayVerticalScrollBar;
+ [attribute] boolean DisplayWorkbookTabs;
+ [attribute] boolean FreezePanes;
++ [attribute] long Height;
++ [attribute] long Left;
+ [attribute] boolean Split;
+ [attribute] long SplitColumn;
+ [attribute] double SplitHorizontal;
+@@ -68,6 +72,10 @@ interface XWindow
+ [attribute] double SplitVertical;
+ [attribute] any ScrollColumn;
+ [attribute] any ScrollRow;
++ [attribute] long Top;
++ [attribute] any View;
++ [attribute] boolean Visible;
++ [attribute] long Width;
+ [attribute] any WindowState;
+ [attribute] any Zoom;
+ any SelectedSheets( [in] any aIndex );
+@@ -78,7 +86,21 @@ interface XWindow
+ void Close([in] any SaveChanges, [in] any FileName, [in] any RouteWorkBook);
+ XRange ActiveCell() raises(com::sun::star::script::BasicErrorException);
+ any Selection() raises(com::sun::star::script::BasicErrorException);
++ long PointsToScreenPixelsX([in] long Points) raises(com::sun::star::script::BasicErrorException);
++ long PointsToScreenPixelsY([in] long Points) raises(com::sun::star::script::BasicErrorException);
++ void PrintOut([in] /*optional short*/ any From,
++ [in] /*optional short*/ any To,
++ [in] /*optional short*/ any Copies,
++ [in] /*optional boolean*/ any Preview,
++ [in] /*optional string*/ any ActivePrinter,
++ [in] /*optional boolean*/ any PrintToFile,
++ [in] /*optional boolean*/ any Collate,
++ [in] /*optional string*/ any PrToFileName
++ ) raises(com::sun::star::script::BasicErrorException);
++ void PrintPreview( [in] /*Optional*/ any EnableChanges ) raises ( com::sun::star::script::BasicErrorException );
+
++ XWorksheet ActiveSheet() raises(com::sun::star::script::BasicErrorException);
++ XPane ActivePane() raises(com::sun::star::script::BasicErrorException);
+ };
+
+ //=============================================================================
+Index: oovbaapi/org/openoffice/excel/XWorkbook.idl
+===================================================================
+RCS file: /cvs/api/oovbaapi/org/openoffice/excel/XWorkbook.idl,v
+retrieving revision 1.3
+retrieving revision 1.3.4.1
+diff -u -p -u -p -b -w -B -r1.3 -r1.3.4.1
+--- oovbaapi/org/openoffice/excel/XWorkbook.idl 7 Dec 2007 11:29:28 -0000 1.3
++++ oovbaapi/org/openoffice/excel/XWorkbook.idl 18 Jan 2008 16:51:20 -0000 1.3.4.1
+@@ -76,7 +76,7 @@ interface XWorkbook
+ void Activate();
+ void ResetColors() raises (com::sun::star::script::BasicErrorException);
+
+- any Names();
++ any Names( [in] any Index );
+
+ any Colors([in] any Index) raises (com::sun::star::script::BasicErrorException);
+ long FileFormat() raises (com::sun::star::script::BasicErrorException);
+Index: oovbaapi/org/openoffice/excel/XWorksheet.idl
+===================================================================
+RCS file: /cvs/api/oovbaapi/org/openoffice/excel/XWorksheet.idl,v
+retrieving revision 1.3
+retrieving revision 1.3.4.1
+diff -u -p -u -p -b -w -B -r1.3 -r1.3.4.1
+--- oovbaapi/org/openoffice/excel/XWorksheet.idl 7 Dec 2007 11:29:52 -0000 1.3
++++ oovbaapi/org/openoffice/excel/XWorksheet.idl 18 Jan 2008 16:51:20 -0000 1.3.4.1
+@@ -103,6 +103,7 @@ interface XWorksheet
+
+ void setEnableCalculation([in] boolean EnableCalculation) raises(com::sun::star::script::BasicErrorException);
+ boolean getEnableCalculation() raises(com::sun::star::script::BasicErrorException);
++ void PrintOut( [in] any From, [in] any To, [in] any Copies, [in] any Preview, [in] any ActivePrinter, [in] any PrintToFile, [in] any Collate, [in] any PrToFileName, [in] any IgnorePrintAreas );
+
+
+ };
+Index: oovbaapi/org/openoffice/vba/XGlobals.idl
+===================================================================
+RCS file: /cvs/api/oovbaapi/org/openoffice/vba/XGlobals.idl,v
+retrieving revision 1.3
+retrieving revision 1.3.4.1
+diff -u -p -u -p -b -w -B -r1.3 -r1.3.4.1
+--- oovbaapi/org/openoffice/vba/XGlobals.idl 7 Dec 2007 12:17:49 -0000 1.3
++++ oovbaapi/org/openoffice/vba/XGlobals.idl 18 Jan 2008 16:51:21 -0000 1.3.4.1
+@@ -62,7 +62,7 @@ interface XGlobals: com::sun::star::uno:
+ any WorkBooks( [in] any aIndex );
+ any Sheets( [in] any aIndex );
+ any Range( [in] any Cell1, [in] any Cell2 );
+- any Names( );
++ any Names( [in] any Index );
+ };
+
+ }; }; };
+Index: oovbaapi/org/openoffice/vba/makefile.mk
+===================================================================
+RCS file: /cvs/api/oovbaapi/org/openoffice/vba/makefile.mk,v
+retrieving revision 1.3
+retrieving revision 1.3.4.1
+diff -u -p -u -p -b -w -B -r1.3 -r1.3.4.1
+--- oovbaapi/org/openoffice/vba/makefile.mk 7 Dec 2007 12:18:21 -0000 1.3
++++ oovbaapi/org/openoffice/vba/makefile.mk 18 Jan 2008 16:51:21 -0000 1.3.4.1
+@@ -56,6 +56,7 @@ IDLFILES=\
+ XVBAToOOEventDescGen.idl\
+ XPropValue.idl\
+ XHelperInterface.idl\
++ XAssistant.idl\
+ Globals.idl\
+
+ # ------------------------------------------------------------------
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
