| blob | d7cb26a4398127b7cf281a241a8ff34718d9b109 |
1 --- basic/inc/basic/basmgr.hxx.old 2009-04-06 16:41:59.000000000 +0000
2 +++ basic/inc/basic/basmgr.hxx 2009-04-06 16:42:01.000000000 +0000
3 @@ -231,6 +231,8 @@ public:
4 ::com::sun::star::uno::Any
5 SetGlobalUNOConstant( const sal_Char* _pAsciiName, const ::com::sun::star::uno::Any& _rValue );
7 + /** retrieves a global constant in the basic library, referring to some UNO object, returns true if a value is found ( value is in aOut ) false otherwise. */
8 + bool GetGlobalUNOConstant( const sal_Char* _pAsciiName, ::com::sun::star::uno::Any& aOut );
9 /** determines whether there are password-protected modules whose size exceedes the
10 legacy module size
11 @param _out_rModuleNames
12 --- basic/inc/basic/sbstar.hxx.old 2009-04-06 16:41:59.000000000 +0000
13 +++ basic/inc/basic/sbstar.hxx 2009-04-06 16:42:01.000000000 +0000
14 @@ -75,6 +75,10 @@ class StarBASIC : public SbxObject
15 BOOL bVBAEnabled;
16 BasicLibInfo* pLibInfo; // Infoblock fuer Basic-Manager
17 SbLanguageMode eLanguageMode; // LanguageMode des Basic-Objekts
18 +
19 + SbxObjectRef pVBAGlobals;
20 + SbxObject* getVBAGlobals( );
21 +
22 protected:
23 BOOL CError( SbError, const String&, xub_StrLen, xub_StrLen, xub_StrLen );
24 private:
25 @@ -199,6 +203,7 @@ public:
27 SbxObjectRef getRTL( void ) { return pRtl; }
28 BOOL IsDocBasic() { return bDocBasic; }
29 + SbxVariable* VBAFind( const String& rName, SbxClassType t );
30 };
32 #ifndef __SB_SBSTARBASICREF_HXX
33 --- basic/prj/d.lst.old 2009-04-02 10:49:18.000000000 +0000
34 +++ basic/prj/d.lst 2009-04-06 16:42:01.000000000 +0000
35 @@ -7,6 +7,8 @@ mkdir: %COMMON_DEST%\res%_EXT%
36 ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
37 ..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
38 ..\%__SRC%\slb\sb.lib %_DEST%\lib%_EXT%\xsb.lib
39 +..\%__SRC%\lib\vbahelp*.* %_DEST%\lib%_EXT%\vba*.*
40 +
41 ..\%__SRC%\srs\classes.srs %_DEST%\res%_EXT%\basic.srs
42 ..\%COMMON_OUTDIR%\srs\classes_srs.hid %COMMON_DEST%\res%_EXT%\basic_srs.hid
43 ..\%__SRC%\bin\sb?????.dll %_DEST%\bin%_EXT%\sb?????.dll
44 @@ -56,4 +58,8 @@ mkdir: %_DEST%\inc%_EXT%\basic
45 ..\inc\basic\sbxmstrm.hxx %_DEST%\inc%_EXT%\basic\sbxmstrm.hxx
47 ..\inc\basic\basicmanagerrepository.hxx %_DEST%\inc%_EXT%\basic\basicmanagerrepository.hxx
48 +..\inc\basic\vbacollectionimpl.hxx %_DEST%\inc%_EXT%\basic\vbacollectionimpl.hxx
49 +..\inc\basic\vbahelper.hxx %_DEST%\inc%_EXT%\basic\vbahelper.hxx
50 +..\inc\basic\helperdecl.hxx %_DEST%\inc%_EXT%\basic\helperdecl.hxx
51 +..\inc\basic\vbahelperinterface.hxx %_DEST%\inc%_EXT%\basic\vbahelperinterface.hxx
52 ..\inc\modsizeexceeded.hxx %_DEST%\inc%_EXT%\basic\modsizeexceeded.hxx
53 --- basic/source/basmgr/basmgr.cxx.old 2009-04-06 16:41:59.000000000 +0000
54 +++ basic/source/basmgr/basmgr.cxx 2009-04-06 16:42:01.000000000 +0000
55 @@ -48,6 +48,7 @@
57 #include <basic/sbuno.hxx>
58 #include <basic/basmgr.hxx>
59 +#include <sbunoobj.hxx>
60 #include "basrid.hxx"
61 #include "sbintern.hxx"
62 #include <sb.hrc>
63 @@ -1833,6 +1834,23 @@ BasicError* BasicManager::GetNextError()
64 DBG_CHKTHIS( BasicManager, 0 );
65 return pErrorMgr->GetNextError();
66 }
67 +bool BasicManager::GetGlobalUNOConstant( const sal_Char* _pAsciiName, ::com::sun::star::uno::Any& aOut )
68 +{
69 + bool bRes = false;
70 + StarBASIC* pStandardLib = GetStdLib();
71 + OSL_PRECOND( pStandardLib, "BasicManager::SetGlobalUNOConstant: no lib to insert into!" );
72 + if ( pStandardLib )
73 + {
74 + ::rtl::OUString sVarName( ::rtl::OUString::createFromAscii( _pAsciiName ) );
75 + SbUnoObject* pGlobs = dynamic_cast<SbUnoObject*>( pStandardLib->Find( sVarName, SbxCLASS_DONTCARE ) );
76 + if ( pGlobs )
77 + {
78 + aOut = pGlobs->getUnoAny();
79 + bRes = true;
80 + }
81 + }
82 + return bRes;
83 +}
85 Any BasicManager::SetGlobalUNOConstant( const sal_Char* _pAsciiName, const Any& _rValue )
86 {
87 --- basic/source/classes/sb.cxx.old 2009-04-06 16:41:59.000000000 +0000
88 +++ basic/source/classes/sb.cxx 2009-04-06 16:42:01.000000000 +0000
89 @@ -70,7 +70,29 @@ SV_IMPL_VARARR(SbTextPortions,SbTextPort
90 TYPEINIT1(StarBASIC,SbxObject)
92 #define RTLNAME "@SBRTL"
93 +// i#i68894#
95 +const static String aThisComponent( RTL_CONSTASCII_USTRINGPARAM("ThisComponent") );
96 +const static String aVBAHook( RTL_CONSTASCII_USTRINGPARAM( "VBAGlobals" ) );
97 +
98 +SbxObject* StarBASIC::getVBAGlobals( )
99 +{
100 + if ( !pVBAGlobals )
101 + pVBAGlobals = (SbUnoObject*)Find( aVBAHook , SbxCLASS_DONTCARE );
102 + return pVBAGlobals;
103 +}
104 +
105 +// i#i68894#
106 +SbxVariable* StarBASIC::VBAFind( const String& rName, SbxClassType t )
107 +{
108 + if( rName == aThisComponent )
109 + return NULL;
110 + // rename to init globals
111 + if ( getVBAGlobals( ) )
112 + return pVBAGlobals->Find( rName, t );
113 + return NULL;
114 +
115 +}
117 //========================================================================
118 // Array zur Umrechnung SFX <-> VB-Fehlercodes anlegen
119 @@ -609,6 +631,7 @@ StarBASIC::StarBASIC( StarBASIC* p, BOOL
120 pRtl = new SbiStdObject( String( RTL_CONSTASCII_USTRINGPARAM(RTLNAME) ), this );
121 // Suche ueber StarBASIC ist immer global
122 SetFlag( SBX_GBLSEARCH );
123 + pVBAGlobals = NULL;
124 }
126 // #51727 SetModified ueberladen, damit der Modified-
127 --- basic/source/classes/sbxmod.cxx.old 2009-04-06 16:42:00.000000000 +0000
128 +++ basic/source/classes/sbxmod.cxx 2009-04-06 16:42:01.000000000 +0000
129 @@ -1781,13 +1781,20 @@ void SbUserFormModule::InitObject()
130 try
131 {
133 - if ( m_xModel.is() )
134 + String aHook( RTL_CONSTASCII_USTRINGPARAM( "VBAGlobals" ) );
135 + SbUnoObject* pGlobs = (SbUnoObject*)GetParent()->Find( aHook, SbxCLASS_DONTCARE );
136 + if ( m_xModel.is() && pGlobs )
137 {
138 +
139 + uno::Reference< lang::XMultiServiceFactory > xVBAFactory( pGlobs->getUnoAny(), uno::UNO_QUERY_THROW );
140 uno::Reference< lang::XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory();
141 uno::Sequence< uno::Any > aArgs(1);
142 aArgs[ 0 ] <<= m_xModel;
143 rtl::OUString sDialogUrl( RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.script:" ) );
144 - sDialogUrl = sDialogUrl.concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Standard") ) ).concat( rtl::OUString( '.') ).concat( GetName() ).concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("?location=document") ) );
145 + rtl::OUString sProjectName( RTL_CONSTASCII_USTRINGPARAM("Standard") );
146 + if ( this->GetParent()->GetName().Len() )
147 + sProjectName = this->GetParent()->GetName();
148 + sDialogUrl = sDialogUrl.concat( sProjectName ).concat( rtl::OUString( '.') ).concat( GetName() ).concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("?location=document") ) );
150 uno::Reference< awt::XDialogProvider > xProvider( xFactory->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.DialogProvider")), aArgs ), uno::UNO_QUERY_THROW );
151 m_xDialog = xProvider->createDialog( sDialogUrl );
152 @@ -1797,7 +1804,7 @@ void SbUserFormModule::InitObject()
153 aArgs[ 0 ] = uno::Any();
154 aArgs[ 1 ] <<= m_xDialog;
155 aArgs[ 2 ] <<= m_xModel;
156 - pDocObject = new SbUnoObject( GetName(), uno::makeAny( xFactory->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.UserForm")), aArgs ) ) );
157 + pDocObject = new SbUnoObject( GetName(), uno::makeAny( xVBAFactory->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.UserForm")), aArgs ) ) );
158 uno::Reference< lang::XComponent > xComponent( aArgs[ 1 ], uno::UNO_QUERY_THROW );
159 // remove old listener if it exists
160 FormObjEventListenerImpl* pFormListener = dynamic_cast< FormObjEventListenerImpl* >( m_DialogListener.get() );
161 --- basic/source/inc/runtime.hxx.old 2009-04-06 16:42:00.000000000 +0000
162 +++ basic/source/inc/runtime.hxx 2009-04-06 16:42:01.000000000 +0000
163 @@ -206,7 +206,6 @@ class SbiInstance
164 BOOL bCompatibility; // Flag: TRUE = VBA runtime compatibility mode
166 ComponentVector_t ComponentVector;
167 -
168 public:
169 SbiRuntime* pRun; // Call-Stack
170 SbiInstance* pNext; // Instanzen-Chain
171 --- basic/source/runtime/methods.cxx.old 2009-04-06 16:42:00.000000000 +0000
172 +++ basic/source/runtime/methods.cxx 2009-04-06 16:42:01.000000000 +0000
173 @@ -844,6 +844,15 @@ RTLFUNC(SendKeys) // JSM
174 StarBASIC::Error(SbERR_NOT_IMPLEMENTED);
175 }
177 +// Stub, basic already yields by default
178 +RTLFUNC(DoEvents)
179 +{
180 + (void)pBasic;
181 + (void)bWrite;
182 +
183 + rPar.Get(0)->PutInteger( 0 );
184 +}
185 +
186 RTLFUNC(Exp)
187 {
188 (void)pBasic;
189 --- basic/source/runtime/rtlproto.hxx.old 2009-04-06 16:42:00.000000000 +0000
190 +++ basic/source/runtime/rtlproto.hxx 2009-04-06 16:42:01.000000000 +0000
191 @@ -167,6 +167,7 @@ extern RTLFUNC(Kill); // JSM
192 extern RTLFUNC(MkDir); // JSM
193 extern RTLFUNC(RmDir); // JSM
194 extern RTLFUNC(SendKeys); // JSM
195 +extern RTLFUNC(DoEvents);
196 extern RTLFUNC(DimArray);
197 extern RTLFUNC(Dir);
198 extern RTLFUNC(Exp);
199 --- basic/source/runtime/stdobj.cxx.old 2009-04-06 16:42:00.000000000 +0000
200 +++ basic/source/runtime/stdobj.cxx 2009-04-06 16:42:01.000000000 +0000
201 @@ -478,6 +478,7 @@ static Methods aMethods[] = {
202 { "SendKeys", SbxNULL, 2 | _FUNCTION, RTLNAME(SendKeys),0 },
203 { "String", SbxSTRING, 0,NULL,0 },
204 { "Wait", SbxBOOL, _OPT, NULL,0 },
205 +{ "DoEvents", SbxINTEGER, 0 | _FUNCTION, RTLNAME(DoEvents),0 },
206 { "SetAttr", SbxNULL, 2 | _FUNCTION, RTLNAME(SetAttr),0 },
207 { "File" , SbxSTRING, 0,NULL,0 },
208 { "Attributes", SbxINTEGER, 0,NULL,0 },
209 --- basic/source/runtime/step2.cxx.old 2009-04-02 10:49:15.000000000 +0000
210 +++ basic/source/runtime/step2.cxx 2009-04-06 16:42:01.000000000 +0000
211 @@ -56,57 +56,6 @@ using com::sun::star::uno::Reference;
213 SbxVariable* getVBAConstant( const String& rName );
215 -const static String aThisComponent( RTL_CONSTASCII_USTRINGPARAM("ThisComponent") );
216 -const static String aVBAHook( RTL_CONSTASCII_USTRINGPARAM( "VBAGlobals" ) );
217 -// i#i68894#
218 -SbxArray* getVBAGlobals( )
219 -{
220 - static SbxArrayRef pArray;
221 - static bool isInitialised = false;
222 - if ( isInitialised )
223 - return pArray;
224 - Reference < XComponentContext > xCtx;
225 - Reference < XPropertySet > xProps(
226 - ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW );
227 - xCtx.set( xProps->getPropertyValue( rtl::OUString(
228 - RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))),
229 - UNO_QUERY_THROW );
230 - SbUnoObject dGlobs( String( RTL_CONSTASCII_USTRINGPARAM("ExcelGlobals") ), xCtx->getValueByName( ::rtl::OUString::createFromAscii( "/singletons/ooo.vba.theGlobals") ) );
231 -
232 - SbxVariable *vba = dGlobs.Find( String( RTL_CONSTASCII_USTRINGPARAM("getGlobals") ) , SbxCLASS_DONTCARE );
233 -
234 - if ( vba )
235 - {
236 - pArray = static_cast<SbxArray *>(vba->GetObject());
237 - isInitialised = true;
238 - return pArray;
239 - }
240 - return NULL;
241 -}
242 -
243 -// i#i68894#
244 -SbxVariable* VBAFind( const String& rName, SbxClassType t )
245 -{
246 - if( rName == aThisComponent )
247 - return NULL;
248 -
249 - SbxArray *pVBAGlobals = getVBAGlobals( );
250 - for (USHORT i = 0; pVBAGlobals && i < pVBAGlobals->Count(); i++)
251 - {
252 - SbxVariable *pElem = pVBAGlobals->Get( i );
253 - if (!pElem || !pElem->IsObject())
254 - continue;
255 - SbxObject *pVba = static_cast<SbxObject *>(pElem->GetObject());
256 - SbxVariable *pVbaVar = pVba ? pVba->Find( rName, t ) : NULL;
257 - if( pVbaVar )
258 - {
259 - return pVbaVar;
260 - }
261 - }
262 - return NULL;
263 -
264 -}
265 -
266 // Suchen eines Elements
267 // Die Bits im String-ID:
268 // 0x8000 - Argv ist belegt
269 @@ -191,7 +140,7 @@ SbxVariable* SbiRuntime::FindElement
270 if ( bVBAEnabled )
271 {
272 // Try Find in VBA symbols space
273 - pElem = VBAFind( aName, SbxCLASS_DONTCARE );
274 + pElem = rBasic.VBAFind( aName, SbxCLASS_DONTCARE );
275 if ( pElem )
276 bSetName = false; // don't overwrite uno name
277 else
278 --- forms/source/misc/InterfaceContainer.cxx.old 2009-04-06 16:41:59.000000000 +0000
279 +++ forms/source/misc/InterfaceContainer.cxx 2009-04-06 16:42:01.000000000 +0000
280 @@ -132,9 +132,8 @@ OInterfaceContainer::fakeVbaEventsHack(
281 // we'll ignore, we'll get called back here anyway )
282 Reference< XChild > xChild( xForm->getParent(), UNO_QUERY_THROW );
283 Reference< XModel > xDocOwner( xChild->getParent(), UNO_QUERY );
284 - Reference< XCodeNameQuery > xNameQuery( xDocOwner, UNO_QUERY );
285 OSL_TRACE(" Is DOC ????? %s", xDocOwner.is() ? "true" : "false" );
286 - if ( xDocOwner.is() && xNameQuery.is() )
287 + if ( xDocOwner.is() )
288 {
289 bool hasVBABindings = lcl_hasVbaEvents( m_xEventAttacher->getScriptEvents( _nIndex ) );
290 if ( hasVBABindings )
291 @@ -143,12 +142,14 @@ OInterfaceContainer::fakeVbaEventsHack(
292 return;
293 }
294 Reference< XMultiServiceFactory > xFac( comphelper::getProcessServiceFactory(), UNO_QUERY );
295 - if ( xFac.is() )
296 + Reference< XMultiServiceFactory > xDocFac( xDocOwner, UNO_QUERY );
297 + if ( xFac.is() && xDocFac.is() )
298 {
299 try
300 {
301 Reference< ooo::vba::XVBAToOOEventDescGen > xDescSupplier( xFac->createInstance( rtl::OUString::createFromAscii( "ooo.vba.VBAToOOEventDesc" ) ), UNO_QUERY_THROW );
302 Reference< XInterface > xIf( getByIndex( _nIndex ) , UNO_QUERY_THROW );
303 + Reference< XCodeNameQuery > xNameQuery( xDocFac->createInstance( rtl::OUString::createFromAscii( "ooo.vba.VBACodeNameProvider" ) ), UNO_QUERY_THROW );
304 rtl::OUString sCodeName;
305 sCodeName = xNameQuery->getCodeNameForObject( xIf );
306 Reference< XPropertySet > xProps( xIf, UNO_QUERY );
307 --- offapi/com/sun/star/document/XCompatWriterDocProperties.idl.old 1970-01-01 00:00:00.000000000 +0000
308 +++ offapi/com/sun/star/document/XCompatWriterDocProperties.idl 2009-04-06 16:42:01.000000000 +0000
309 @@ -0,0 +1,49 @@
310 +/*************************************************************************
311 + *
312 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
313 + *
314 + * Copyright 2008 by Sun Microsystems, Inc.
315 + *
316 + * OpenOffice.org - a multi-platform office productivity suite
317 + *
318 + * $RCSfile: XDocumentProperties.idl,v $
319 + * $Revision: 1.5 $
320 + *
321 + * This file is part of OpenOffice.org.
322 + *
323 + * OpenOffice.org is free software: you can redistribute it and/or modify
324 + * it under the terms of the GNU Lesser General Public License version 3
325 + * only, as published by the Free Software Foundation.
326 + *
327 + * OpenOffice.org is distributed in the hope that it will be useful,
328 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
329 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
330 + * GNU Lesser General Public License version 3 for more details
331 + * (a copy is included in the LICENSE file that accompanied this code).
332 + *
333 + * You should have received a copy of the GNU Lesser General Public License
334 + * version 3 along with OpenOffice.org. If not, see
335 + * <http://www.openoffice.org/license.html>
336 + * for a copy of the LGPLv3 License.
337 + *
338 + ************************************************************************/
339 +#ifndef __com_sun_star_document_XCompatWriterDocProperties_idl__
340 +#define __com_sun_star_document_XCompatWriterDocProperties_idl__
341 +
342 +#ifndef __com_sun_star_document_XDocumentProperties_idl__
343 +#include <com/sun/star/document/XDocumentProperties.idl>
344 +#endif
345 +//=============================================================================
346 +
347 +module com { module sun { module star { module document {
348 +interface XCompatWriterDocProperties
349 +{
350 +// interface ::com::sun::star::document::XDocumentProperties;
351 + [attribute] string Manager;
352 + [attribute] string Category;
353 + [attribute] string Company;
354 +
355 +
356 +}; }; }; };
357 +};
358 +#endif
359 --- offapi/com/sun/star/document/makefile.mk.old 2009-04-06 16:42:00.000000000 +0000
360 +++ offapi/com/sun/star/document/makefile.mk 2009-04-06 16:42:01.000000000 +0000
361 @@ -118,6 +118,7 @@ IDLFILES=\
362 XDocumentLanguages.idl \
363 XCodeNameQuery.idl \
364 XDocumentEventCompatibleHelper.idl \
365 + XCompatWriterDocProperties.idl \
366 VbaEventId.idl \
367 XVbaEventsHelper.idl \
368 VbaEventsHelper.idl \
369 --- oovbaapi/ooo/vba/ControlProvider.idl.old 1970-01-01 00:00:00.000000000 +0000
370 +++ oovbaapi/ooo/vba/ControlProvider.idl 2009-04-06 16:42:01.000000000 +0000
371 @@ -0,0 +1,54 @@
372 +/*************************************************************************
373 + *
374 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
375 + *
376 + * Copyright 2008 by Sun Microsystems, Inc.
377 + *
378 + * OpenOffice.org - a multi-platform office productivity suite
379 + *
380 + * $RCSfile: XGlobals.idl,v $
381 + * $Revision: 1.4 $
382 + *
383 + * This file is part of OpenOffice.org.
384 + *
385 + * OpenOffice.org is free software: you can redistribute it and/or modify
386 + * it under the terms of the GNU Lesser General Public License version 3
387 + * only, as published by the Free Software Foundation.
388 + *
389 + * OpenOffice.org is distributed in the hope that it will be useful,
390 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
391 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
392 + * GNU Lesser General Public License version 3 for more details
393 + * (a copy is included in the LICENSE file that accompanied this code).
394 + *
395 + * You should have received a copy of the GNU Lesser General Public License
396 + * version 3 along with OpenOffice.org. If not, see
397 + * <http://www.openoffice.org/license.html>
398 + * for a copy of the LGPLv3 License.
399 + *
400 + ************************************************************************/
401 +#ifndef __ooo_vba_ControlProvider_idl__
402 +#define __ooo_vba_ControlProvider_idl__
403 +
404 +#ifndef __com_sun_star_uno_XInterface_idl__
405 +#include <com/sun/star/uno/XInterface.idl>
406 +#endif
407 +
408 +#ifndef __com_sun_star_frame_XModel_idl__
409 +#include <com/sun/star/frame/XModel.idl>
410 +#endif
411 +
412 +
413 +module ooo { module vba {
414 +
415 +interface XControlProvider;
416 +
417 +service ControlProvider
418 +{
419 + interface ::ooo::vba::XControlProvider;
420 +};
421 +
422 +}; };
423 +
424 +#endif
425 +
426 --- oovbaapi/ooo/vba/Globals.idl.old 2009-04-02 10:36:29.000000000 +0000
427 +++ oovbaapi/ooo/vba/Globals.idl 1970-01-01 00:00:00.000000000 +0000
428 @@ -1,48 +0,0 @@
429 -/*************************************************************************
430 - *
431 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
432 - *
433 - * Copyright 2008 by Sun Microsystems, Inc.
434 - *
435 - * OpenOffice.org - a multi-platform office productivity suite
436 - *
437 - * $RCSfile: Globals.idl,v $
438 - * $Revision: 1.3 $
439 - *
440 - * This file is part of OpenOffice.org.
441 - *
442 - * OpenOffice.org is free software: you can redistribute it and/or modify
443 - * it under the terms of the GNU Lesser General Public License version 3
444 - * only, as published by the Free Software Foundation.
445 - *
446 - * OpenOffice.org is distributed in the hope that it will be useful,
447 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
448 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
449 - * GNU Lesser General Public License version 3 for more details
450 - * (a copy is included in the LICENSE file that accompanied this code).
451 - *
452 - * You should have received a copy of the GNU Lesser General Public License
453 - * version 3 along with OpenOffice.org. If not, see
454 - * <http://www.openoffice.org/license.html>
455 - * for a copy of the LGPLv3 License.
456 - *
457 - ************************************************************************/
458 -
459 -#ifndef __ooo_vba_Globals_idl__
460 -#define __ooo_vba_Globals_idl__
461 -
462 -#ifndef __ooo_vba_XGlobals_idl__
463 -#include <ooo/vba/XGlobals.idl>
464 -#endif
465 -
466 -#include <com/sun/star/uno/XComponentContext.idl>
467 -#include <com/sun/star/table/XCellRange.idl>
468 -
469 -module ooo { module vba {
470 -service Globals : XGlobals
471 -{
472 -};
473 -
474 -}; };
475 -
476 -#endif
477 --- oovbaapi/ooo/vba/XApplicationBase.idl.old 1970-01-01 00:00:00.000000000 +0000
478 +++ oovbaapi/ooo/vba/XApplicationBase.idl 2009-04-06 16:42:01.000000000 +0000
479 @@ -0,0 +1,61 @@
480 +/*************************************************************************
481 + *
482 + * OpenOffice.org - a multi-platform office productivity suite
483 + *
484 + * $RCSfile$
485 + *
486 + * $Revision$
487 + *
488 + * last change: $Author$ $Date$
489 + *
490 + * The Contents of this file are made available subject to
491 + * the terms of GNU Lesser General Public License Version 2.1.
492 + *
493 + *
494 + * GNU Lesser General Public License Version 2.1
495 + * =============================================
496 + * Copyright 2005 by Sun Microsystems, Inc.
497 + * 901 San Antonio Road, Palo Alto, CA 94303, USA
498 + *
499 + * This library is free software; you can redistribute it and/or
500 + * modify it under the terms of the GNU Lesser General Public
501 + * License version 2.1, as published by the Free Software Foundation.
502 + *
503 + * This library is distributed in the hope that it will be useful,
504 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
505 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
506 + * Lesser General Public License for more details.
507 + *
508 + * You should have received a copy of the GNU Lesser General Public
509 + * License along with this library; if not, write to the Free Software
510 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
511 + * MA 02111-1307 USA
512 + *
513 + ************************************************************************/
514 +#ifndef __ooo_vba_XApplicationBase_idl__
515 +#define __ooo_vba_XApplicationBase_idl__
516 +
517 +#ifndef __com_sun_star_uno_XInterface_idl__
518 +#include <com/sun/star/uno/XInterface.idl>
519 +#endif
520 +
521 +#ifndef __ooo_vba_XHelperInterface_idl__
522 +#include <ooo/vba/XHelperInterface.idl>
523 +#endif
524 +
525 +module ooo { module vba {
526 +//=============================================================================
527 +
528 +interface XApplicationBase
529 +{
530 + interface ::ooo::vba::XHelperInterface;
531 +
532 + [attribute] boolean ScreenUpdating;
533 + [attribute] boolean DisplayStatusBar;
534 +
535 + any CommandBars( [in] any aIndex );
536 +};
537 +
538 +}; };
539 +
540 +#endif
541 --- oovbaapi/ooo/vba/XControlProvider.idl.old 1970-01-01 00:00:00.000000000 +0000
542 +++ oovbaapi/ooo/vba/XControlProvider.idl 2009-04-06 16:42:01.000000000 +0000
543 @@ -0,0 +1,64 @@
544 +/*************************************************************************
545 + *
546 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
547 + *
548 + * Copyright 2008 by Sun Microsystems, Inc.
549 + *
550 + * OpenOffice.org - a multi-platform office productivity suite
551 + *
552 + * $RCSfile: XGlobals.idl,v $
553 + * $Revision: 1.4 $
554 + *
555 + * This file is part of OpenOffice.org.
556 + *
557 + * OpenOffice.org is free software: you can redistribute it and/or modify
558 + * it under the terms of the GNU Lesser General Public License version 3
559 + * only, as published by the Free Software Foundation.
560 + *
561 + * OpenOffice.org is distributed in the hope that it will be useful,
562 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
563 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
564 + * GNU Lesser General Public License version 3 for more details
565 + * (a copy is included in the LICENSE file that accompanied this code).
566 + *
567 + * You should have received a copy of the GNU Lesser General Public License
568 + * version 3 along with OpenOffice.org. If not, see
569 + * <http://www.openoffice.org/license.html>
570 + * for a copy of the LGPLv3 License.
571 + *
572 + ************************************************************************/
573 +#ifndef __ooo_vba_XControlProvider_idl__
574 +#define __ooo_vba_XControlProvider_idl__
575 +
576 +#ifndef __com_sun_star_uno_XInterface_idl__
577 +#include <com/sun/star/uno/XInterface.idl>
578 +#endif
579 +
580 +#ifndef __com_sun_star_frame_XModel_idl__
581 +#include <com/sun/star/frame/XModel.idl>
582 +#endif
583 +
584 +#ifndef __com_sun_star_awt_XControl_idl__
585 +#include <com/sun/star/awt/XControl.idl>
586 +#endif
587 +
588 +#ifndef __com_sun_star_drawing_XControlShape_idl__
589 +#include <com/sun/star/drawing/XControlShape.idl>
590 +#endif
591 +#ifndef __ooo_vba_msforms_XControl_idl__
592 +#include <ooo/vba/msforms/XControl.idl>
593 +#endif
594 +
595 +module ooo { module vba {
596 +
597 +interface XControlProvider
598 +{
599 + ::ooo::vba::msforms::XControl createControl( [in] ::com::sun::star::drawing::XControlShape xControl, [in] ::com::sun::star::frame::XModel xDocOwner );
600 + ::ooo::vba::msforms::XControl createUserformControl( [in] ::com::sun::star::awt::XControl xControl, [in] ::com::sun::star::awt::XControl xDialog, [in] ::com::sun::star::frame::XModel xDocOwner );
601 +
602 +};
603 +
604 +}; };
605 +
606 +#endif
607 +
608 --- oovbaapi/ooo/vba/XDocumentBase.idl.old 1970-01-01 00:00:00.000000000 +0000
609 +++ oovbaapi/ooo/vba/XDocumentBase.idl 2009-04-06 16:42:01.000000000 +0000
610 @@ -0,0 +1,67 @@
611 +/*************************************************************************
612 + *
613 + * OpenOffice.org - a multi-platform office productivity suite
614 + *
615 + * $RCSfile$
616 + *
617 + * $Revision$
618 + *
619 + * last change: $Author$ $Date$
620 + *
621 + * The Contents of this file are made available subject to
622 + * the terms of GNU Lesser General Public License Version 2.1.
623 + *
624 + *
625 + * GNU Lesser General Public License Version 2.1
626 + * =============================================
627 + * Copyright 2005 by Sun Microsystems, Inc.
628 + * 901 San Antonio Road, Palo Alto, CA 94303, USA
629 + *
630 + * This library is free software; you can redistribute it and/or
631 + * modify it under the terms of the GNU Lesser General Public
632 + * License version 2.1, as published by the Free Software Foundation.
633 + *
634 + * This library is distributed in the hope that it will be useful,
635 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
636 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
637 + * Lesser General Public License for more details.
638 + *
639 + * You should have received a copy of the GNU Lesser General Public
640 + * License along with this library; if not, write to the Free Software
641 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
642 + * MA 02111-1307 USA
643 + *
644 + ************************************************************************/
645 +#ifndef __ooo_vba_XDocumentBase_idl__
646 +#define __ooo_vba_XDocumentBase_idl__
647 +
648 +#ifndef __com_sun_star_uno_XInterface_idl__
649 +#include <com/sun/star/uno/XInterface.idl>
650 +#endif
651 +
652 +#ifndef __ooo_vba_XHelperInterface_idl__
653 +#include <ooo/vba/XHelperInterface.idl>
654 +#endif
655 +
656 +module ooo { module vba {
657 +//=============================================================================
658 +
659 +interface XDocumentBase
660 +{
661 + interface ::ooo::vba::XHelperInterface;
662 +
663 + [attribute, readonly] string Name;
664 + [attribute, readonly] string Path;
665 + [attribute, readonly] string FullName;
666 + [attribute] boolean Saved;
667 +
668 + void Close([in] any SaveChanges, [in] any FileName, [in] any RouteWorkBook);
669 + void Save();
670 + void Activate();
671 + void Protect( [in] any Password );
672 + void Unprotect( [in] any Password );
673 +};
674 +
675 +}; };
676 +
677 +#endif
678 --- oovbaapi/ooo/vba/XDocumentProperties.idl.old 1970-01-01 00:00:00.000000000 +0000
679 +++ oovbaapi/ooo/vba/XDocumentProperties.idl 2009-04-06 16:42:01.000000000 +0000
680 @@ -0,0 +1,71 @@
681 +/*************************************************************************
682 + *
683 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
684 + *
685 + * Copyright 2008 by Sun Microsystems, Inc.
686 + *
687 + * OpenOffice.org - a multi-platform office productivity suite
688 + *
689 + * $RCSfile: XDocument.idl,v $
690 + * $Revision: 1.4 $
691 + *
692 + * This file is part of OpenOffice.org.
693 + *
694 + * OpenOffice.org is free software: you can redistribute it and/or modify
695 + * it under the terms of the GNU Lesser General Public License version 3
696 + * only, as published by the Free Software Foundation.
697 + *
698 + * OpenOffice.org is distributed in the hope that it will be useful,
699 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
700 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
701 + * GNU Lesser General Public License version 3 for more details
702 + * (a copy is included in the LICENSE file that accompanied this code).
703 + *
704 + * You should have received a copy of the GNU Lesser General Public License
705 + * version 3 along with OpenOffice.org. If not, see
706 + * <http://www.openoffice.org/license.html>
707 + * for a copy of the LGPLv3 License.
708 + *
709 + ************************************************************************/
710 +
711 +#ifndef __ooo_vba_XDocumentProperties_idl__
712 +#define __ooo_vba_XDocumentProperties_idl__
713 +
714 +#ifndef __com_sun_star_script_BasicErrorException_idl__
715 +#include <com/sun/star/script/BasicErrorException.idl>
716 +#endif
717 +#ifndef __ooo_vba_XHelperInterface_idl__
718 +#include <ooo/vba/XHelperInterface.idl>
719 +#endif
720 +#ifndef __ooo_vba_XCollection_idl__
721 +#include <ooo/vba/XCollection.idl>
722 +#endif
723 +
724 +module ooo { module vba {
725 +interface XDocumentProperty;
726 +interface XDocumentProperties
727 +{
728 + interface XCollection;
729 + /** Creates a new custom document property.
730 + * You can only add a new document property to the custom DocumentProperties collection. Depending on value of
731 + * boolean LinkSource, either (False) Value or (True) LinkSource must be provided.
732 + * @param Name (Required String. The name of the property.
733 + * @param LinkToContent Specifies whether the property is linked to the contents of the container document. If this argument is True, the LinkSource argument is required; if it's False, the value argument is required.
734 + * @param Type The data type of the property. Can be one of the following MsoDocProperties constants:
735 + * msoPropertyTypeBoolean, msoPropertyTypeDate, msoPropertyTypeFloat, msoPropertyTypeNumber, or msoPropertyTypeString.
736 + * @param Value The value of the property, if it's not linked to the contents of the container document.
737 + * The value is converted to match the data type specified by the type argument, if it can't be converted, an error occurs.
738 + * If LinkToContent is True, the Value argument is ignored and the new document property is assigned a default value
739 + * until the linked property values are updated by the container application (usually when the document is saved).
740 + * @param LinkSource Ignored if LinkToContent is False. The source of the linked property. The container application determines
741 + * what types of source linking you can use.
742 + */
743 + XDocumentProperty Add([in] string Name, [in] boolean LinkToContent, [in] /* MsoDocProperties */ byte Type, [in] any Value,
744 + [in] /*optional*/ any LinkSource)
745 + raises (com::sun::star::script::BasicErrorException);
746 +};
747 +
748 +}; };
749 +
750 +#endif
751 +
752 --- oovbaapi/ooo/vba/XDocumentProperty.idl.old 1970-01-01 00:00:00.000000000 +0000
753 +++ oovbaapi/ooo/vba/XDocumentProperty.idl 2009-04-06 16:42:01.000000000 +0000
754 @@ -0,0 +1,106 @@
755 +/*************************************************************************
756 + *
757 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
758 + *
759 + * Copyright 2008 by Sun Microsystems, Inc.
760 + *
761 + * OpenOffice.org - a multi-platform office productivity suite
762 + *
763 + * $RCSfile: XDocument.idl,v $
764 + * $Revision: 1.4 $
765 + *
766 + * This file is part of OpenOffice.org.
767 + *
768 + * OpenOffice.org is free software: you can redistribute it and/or modify
769 + * it under the terms of the GNU Lesser General Public License version 3
770 + * only, as published by the Free Software Foundation.
771 + *
772 + * OpenOffice.org is distributed in the hope that it will be useful,
773 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
774 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
775 + * GNU Lesser General Public License version 3 for more details
776 + * (a copy is included in the LICENSE file that accompanied this code).
777 + *
778 + * You should have received a copy of the GNU Lesser General Public License
779 + * version 3 along with OpenOffice.org. If not, see
780 + * <http://www.openoffice.org/license.html>
781 + * for a copy of the LGPLv3 License.
782 + *
783 + ************************************************************************/
784 +
785 +#ifndef __ooo_vba_XDocumentProperty_idl__
786 +#define __ooo_vba_XDocumentProperty_idl__
787 +
788 +#ifndef __com_sun_star_script_BasicErrorException_idl__
789 +#include <com/sun/star/script/BasicErrorException.idl>
790 +#endif
791 +#ifndef __com_sun_star_script_XDefaultProperty_idl__
792 +#include <com/sun/star/script/XDefaultProperty.idl>
793 +#endif
794 +#ifndef __ooo_vba_XHelperInterface_idl__
795 +#include <ooo/vba/XHelperInterface.idl>
796 +#endif
797 +
798 +module ooo { module vba {
799 +
800 +/**
801 + * Specific built-in document property. Use CustomDocumentProperties(index),
802 + * where index is the name or index number of the custom document property,
803 + * to return a DocumentProperty object that represents a specific custom document property.
804 + */
805 +interface XDocumentProperty
806 +{
807 +
808 + interface com::sun::star::script::XDefaultProperty;
809 + interface ooo::vba::XHelperInterface;
810 +
811 + void Delete()
812 + raises (com::sun::star::script::BasicErrorException);
813 +
814 + /** Required String. The name of the property.
815 + */
816 + string getName()
817 + raises (com::sun::star::script::BasicErrorException);
818 +
819 + void setName([in] string Name)
820 + raises (com::sun::star::script::BasicErrorException);
821 +
822 + /** The data type of the property.
823 + * Can be one of the following MsoDocProperties constants:
824 + * msoPropertyTypeBoolean, msoPropertyTypeDate, msoPropertyTypeFloat,
825 + * msoPropertyTypeNumber, or msoPropertyTypeString.
826 + */
827 + byte getType()
828 + raises (com::sun::star::script::BasicErrorException);
829 +
830 + void setType([in] byte Type)
831 + raises (com::sun::star::script::BasicErrorException);
832 +
833 + /** If true, then LinkSource has a valid value. */
834 + boolean getLinkToContent()
835 + raises (com::sun::star::script::BasicErrorException);
836 +
837 + void setLinkToContent([in] boolean LinkToContent)
838 + raises (com::sun::star::script::BasicErrorException);
839 +
840 + /** If LinkToContent is false, then this contains the value of the property
841 + * The data type of the value will match the Type property.
842 + */
843 + any getValue()
844 + raises (com::sun::star::script::BasicErrorException);
845 +
846 + void setValue([in] any Value)
847 + raises (com::sun::star::script::BasicErrorException);
848 +
849 + /** If LinkToContent is false, then this contains the value of the property */
850 + string getLinkSource()
851 + raises (com::sun::star::script::BasicErrorException);
852 +
853 + void setLinkSource([in] string LinkSource)
854 + raises (com::sun::star::script::BasicErrorException);
855 +};
856 +
857 +}; };
858 +
859 +#endif
860 +
861 --- oovbaapi/ooo/vba/XGlobals.idl.old 2009-04-02 10:36:29.000000000 +0000
862 +++ oovbaapi/ooo/vba/XGlobals.idl 1970-01-01 00:00:00.000000000 +0000
863 @@ -1,67 +0,0 @@
864 -/*************************************************************************
865 - *
866 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
867 - *
868 - * Copyright 2008 by Sun Microsystems, Inc.
869 - *
870 - * OpenOffice.org - a multi-platform office productivity suite
871 - *
872 - * $RCSfile: XGlobals.idl,v $
873 - * $Revision: 1.4 $
874 - *
875 - * This file is part of OpenOffice.org.
876 - *
877 - * OpenOffice.org is free software: you can redistribute it and/or modify
878 - * it under the terms of the GNU Lesser General Public License version 3
879 - * only, as published by the Free Software Foundation.
880 - *
881 - * OpenOffice.org is distributed in the hope that it will be useful,
882 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
883 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
884 - * GNU Lesser General Public License version 3 for more details
885 - * (a copy is included in the LICENSE file that accompanied this code).
886 - *
887 - * You should have received a copy of the GNU Lesser General Public License
888 - * version 3 along with OpenOffice.org. If not, see
889 - * <http://www.openoffice.org/license.html>
890 - * for a copy of the LGPLv3 License.
891 - *
892 - ************************************************************************/
893 -#ifndef __ooo_vba_XGlobals_idl__
894 -#define __ooo_vba_XGlobals_idl__
895 -
896 -#ifndef __com_sun_star_uno_XInterface_idl__
897 -#include <com/sun/star/uno/XInterface.idl>
898 -#endif
899 -#ifndef __ooo_vba_excel_XApplication_idl__
900 -#include <ooo/vba/excel/XApplication.idl>
901 -#endif
902 -#ifndef __ooo_vba_excel_XWorkbook_idl__
903 -#include <ooo/vba/excel/XWorkbook.idl>
904 -#endif
905 -#ifndef __ooo_vba_excel_XWorksheet_idl__
906 -#include <ooo/vba/excel/XWorksheet.idl>
907 -#endif
908 -
909 -module ooo { module vba {
910 -
911 -interface XGlobals: com::sun::star::uno::XInterface
912 -{
913 - // FIXME, need better way to expose globals
914 - sequence< any > getGlobals();
915 -
916 - [attribute, readonly] ooo::vba::excel::XApplication Application;
917 - [attribute, readonly] ooo::vba::excel::XWorkbook ActiveWorkbook;
918 - [attribute, readonly] ooo::vba::excel::XWorksheet ActiveSheet;
919 - any WorkSheets( [in] any aIndex );
920 - any WorkBooks( [in] any aIndex );
921 - any Sheets( [in] any aIndex );
922 - any Range( [in] any Cell1, [in] any Cell2 );
923 - any Names( [in] any Index );
924 -};
925 -
926 -}; };
927 -
928 -#endif
929 -
930 -
931 --- oovbaapi/ooo/vba/XGlobalsBase.idl.old 1970-01-01 00:00:00.000000000 +0000
932 +++ oovbaapi/ooo/vba/XGlobalsBase.idl 2009-04-06 16:42:01.000000000 +0000
933 @@ -0,0 +1,53 @@
934 +/*************************************************************************
935 + *
936 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
937 + *
938 + * Copyright 2008 by Sun Microsystems, Inc.
939 + *
940 + * OpenOffice.org - a multi-platform office productivity suite
941 + *
942 + * $RCSfile: XGlobals.idl,v $
943 + * $Revision: 1.4 $
944 + *
945 + * This file is part of OpenOffice.org.
946 + *
947 + * OpenOffice.org is free software: you can redistribute it and/or modify
948 + * it under the terms of the GNU Lesser General Public License version 3
949 + * only, as published by the Free Software Foundation.
950 + *
951 + * OpenOffice.org is distributed in the hope that it will be useful,
952 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
953 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
954 + * GNU Lesser General Public License version 3 for more details
955 + * (a copy is included in the LICENSE file that accompanied this code).
956 + *
957 + * You should have received a copy of the GNU Lesser General Public License
958 + * version 3 along with OpenOffice.org. If not, see
959 + * <http://www.openoffice.org/license.html>
960 + * for a copy of the LGPLv3 License.
961 + *
962 + ************************************************************************/
963 +#ifndef __ooo_vba_XGlobalsBase_idl__
964 +#define __ooo_vba_XGlobalsBase_idl__
965 +
966 +#ifndef __com_sun_star_uno_XInterface_idl__
967 +#include <com/sun/star/uno/XInterface.idl>
968 +#endif
969 +#ifndef __ooo_vba_XHelperInterface_idl__
970 +#include <ooo/vba/XHelperInterface.idl>
971 +#endif
972 +#ifndef __com_sun_star_lang_XMultiServiceFactory
973 +#include <com/sun/star/lang/XMultiServiceFactory.idl>
974 +#endif
975 +module ooo { module vba {
976 +interface XGlobalsBase
977 +{
978 + interface ::ooo::vba::XHelperInterface;
979 + interface ::com::sun::star::lang::XMultiServiceFactory;
980 +};
981 +
982 +}; };
983 +
984 +#endif
985 +
986 +
987 --- oovbaapi/ooo/vba/XWindowBase.idl.old 1970-01-01 00:00:00.000000000 +0000
988 +++ oovbaapi/ooo/vba/XWindowBase.idl 2009-04-06 16:42:01.000000000 +0000
989 @@ -0,0 +1,62 @@
990 +/*************************************************************************
991 + *
992 + * OpenOffice.org - a multi-platform office productivity suite
993 + *
994 + * $RCSfile$
995 + *
996 + * $Revision$
997 + *
998 + * last change: $Author$ $Date$
999 + *
1000 + * The Contents of this file are made available subject to
1001 + * the terms of GNU Lesser General Public License Version 2.1.
1002 + *
1003 + *
1004 + * GNU Lesser General Public License Version 2.1
1005 + * =============================================
1006 + * Copyright 2005 by Sun Microsystems, Inc.
1007 + * 901 San Antonio Road, Palo Alto, CA 94303, USA
1008 + *
1009 + * This library is free software; you can redistribute it and/or
1010 + * modify it under the terms of the GNU Lesser General Public
1011 + * License version 2.1, as published by the Free Software Foundation.
1012 + *
1013 + * This library is distributed in the hope that it will be useful,
1014 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
1015 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
1016 + * Lesser General Public License for more details.
1017 + *
1018 + * You should have received a copy of the GNU Lesser General Public
1019 + * License along with this library; if not, write to the Free Software
1020 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
1021 + * MA 02111-1307 USA
1022 + *
1023 + ************************************************************************/
1024 +#ifndef __ooo_vba_XHelperWindow_idl__
1025 +#define __ooo_vba_XHelperWindow_idl__
1026 +
1027 +#ifndef __com_sun_star_uno_XInterface_idl__
1028 +#include <com/sun/star/uno/XInterface.idl>
1029 +#endif
1030 +
1031 +#ifndef __ooo_vba_XHelperInterface_idl__
1032 +#include <ooo/vba/XHelperInterface.idl>
1033 +#endif
1034 +
1035 +module ooo { module vba {
1036 +//=============================================================================
1037 +
1038 +interface XWindowBase
1039 +{
1040 + interface ::ooo::vba::XHelperInterface;
1041 +
1042 + [attribute] long Height;
1043 + [attribute] long Left;
1044 + [attribute] long Top;
1045 + [attribute] boolean Visible;
1046 + [attribute] long Width;
1047 +};
1048 +
1049 +}; };
1050 +
1051 +#endif
1052 --- oovbaapi/ooo/vba/excel/Globals.idl.old 1970-01-01 00:00:00.000000000 +0000
1053 +++ oovbaapi/ooo/vba/excel/Globals.idl 2009-04-06 16:42:01.000000000 +0000
1054 @@ -0,0 +1,48 @@
1055 +/*************************************************************************
1056 + *
1057 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1058 + *
1059 + * Copyright 2008 by Sun Microsystems, Inc.
1060 + *
1061 + * OpenOffice.org - a multi-platform office productivity suite
1062 + *
1063 + * $RCSfile: Globals.idl,v $
1064 + * $Revision: 1.3 $
1065 + *
1066 + * This file is part of OpenOffice.org.
1067 + *
1068 + * OpenOffice.org is free software: you can redistribute it and/or modify
1069 + * it under the terms of the GNU Lesser General Public License version 3
1070 + * only, as published by the Free Software Foundation.
1071 + *
1072 + * OpenOffice.org is distributed in the hope that it will be useful,
1073 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
1074 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1075 + * GNU Lesser General Public License version 3 for more details
1076 + * (a copy is included in the LICENSE file that accompanied this code).
1077 + *
1078 + * You should have received a copy of the GNU Lesser General Public License
1079 + * version 3 along with OpenOffice.org. If not, see
1080 + * <http://www.openoffice.org/license.html>
1081 + * for a copy of the LGPLv3 License.
1082 + *
1083 + ************************************************************************/
1084 +
1085 +#ifndef __ooo_vba_excel_Globals_idl__
1086 +#define __ooo_vba_excel_Globals_idl__
1087 +
1088 +#ifndef __ooo_vba_excel_XGlobals_idl__
1089 +#include <ooo/vba/excel/XGlobals.idl>
1090 +#endif
1091 +
1092 +#include <com/sun/star/uno/XComponentContext.idl>
1093 +#include <com/sun/star/table/XCellRange.idl>
1094 +
1095 +module ooo { module vba { module excel {
1096 +service Globals : XGlobals
1097 +{
1098 +};
1099 +
1100 +}; }; };
1101 +
1102 +#endif
1103 --- oovbaapi/ooo/vba/excel/XApplication.idl.old 2009-04-06 16:41:59.000000000 +0000
1104 +++ oovbaapi/ooo/vba/excel/XApplication.idl 2009-04-06 16:42:01.000000000 +0000
1105 @@ -42,10 +42,6 @@
1106 #include <ooo/vba/XAssistant.idl>
1107 #endif
1109 -#ifndef __ooo_vba_XCommandBars_idl__
1110 -#include <ooo/vba/XCommandBars.idl>
1111 -#endif
1112 -
1113 module ooo { module vba { module excel {
1115 interface XRange;
1116 @@ -56,10 +52,10 @@ interface XWorksheetFunction;
1117 interface XWindow;
1118 interface XWorksheet;
1120 -interface XApplication
1121 +interface XApplication : com::sun::star::uno::XInterface
1122 {
1124 - interface ::ooo::vba::XHelperInterface;
1125 +// interface ::ooo::vba::XHelperInterface;
1127 [attribute, readonly] any Selection;
1128 [attribute, readonly] XWorkbook ActiveWorkbook;
1129 @@ -74,8 +70,6 @@ interface XApplication
1130 // to determine this
1131 [attribute, readonly] XWorkbook ThisWorkbook;
1132 [attribute, readonly] string Name;
1133 - [attribute] boolean ScreenUpdating;
1134 - [attribute] boolean DisplayStatusBar;
1135 [attribute] boolean DisplayAlerts;
1136 [attribute] boolean DisplayFormulaBar;
1137 [attribute] any CutCopyMode;
1138 @@ -90,7 +84,7 @@ interface XApplication
1139 string LibraryPath() raises(com::sun::star::script::BasicErrorException);
1140 string TemplatesPath() raises(com::sun::star::script::BasicErrorException);
1141 string PathSeparator() raises(com::sun::star::script::BasicErrorException);
1142 - any CommandBars( [in] any aIndex );
1143 + //any CommandBars( [in] any aIndex );
1144 any Workbooks( [in] any aIndex );
1145 any Worksheets( [in] any aIndex );
1146 any Windows( [in] any aIndex );
1147 @@ -109,7 +103,6 @@ interface XApplication
1148 XRange Union([in] XRange Arg1, [in] XRange Arg2, [in] /*Optional*/ any Arg3, [in] /*Optional*/ any Arg4, [in] /*Optional*/ any Arg5, [in] /*Optional*/ any Arg6, [in] /*Optional*/ any Arg7, [in] /*Optional*/ any Arg8, [in] /*Optional*/ any Arg9, [in] /*Optional*/ any Arg10, [in] /*Optional*/ any Arg11, [in] /*Optional*/ any Arg12, [in] /*Optional*/ any Arg13, [in] /*Optional*/ any Arg14, [in] /*Optional*/ any Arg15, [in] /*Optional*/ any Arg16, [in] /*Optional*/ any Arg17, [in] /*Optional*/ any Arg18, [in] /*Optional*/ any Arg19, [in] /*Optional*/ any Arg20, [in] /*Optional*/ any Arg21, [in] /*Optional*/ any Arg22, [in] /*Optional*/ any Arg23, [in] /*Optional*/ any Arg24, [in] /*Optional*/ any Arg25, [in] /*Optional*/ any Arg26, [in] /*Optional*/ any Arg27, [in] /*Optional*/ any Arg28, [in] /*Optional*/ any Arg29, [in] /*Optional*/ any Arg30)
1149 raises(com::sun::star::script::BasicErrorException);
1150 void Volatile([in] any Volatile);
1151 - void DoEvents();
1152 any Caller( [in] any aIndex );
1153 };
1155 --- oovbaapi/ooo/vba/excel/XGlobals.idl.old 1970-01-01 00:00:00.000000000 +0000
1156 +++ oovbaapi/ooo/vba/excel/XGlobals.idl 2009-04-06 16:42:01.000000000 +0000
1157 @@ -0,0 +1,86 @@
1158 +/*************************************************************************
1159 + *
1160 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1161 + *
1162 + * Copyright 2008 by Sun Microsystems, Inc.
1163 + *
1164 + * OpenOffice.org - a multi-platform office productivity suite
1165 + *
1166 + * $RCSfile: XGlobals.idl,v $
1167 + * $Revision: 1.4 $
1168 + *
1169 + * This file is part of OpenOffice.org.
1170 + *
1171 + * OpenOffice.org is free software: you can redistribute it and/or modify
1172 + * it under the terms of the GNU Lesser General Public License version 3
1173 + * only, as published by the Free Software Foundation.
1174 + *
1175 + * OpenOffice.org is distributed in the hope that it will be useful,
1176 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
1177 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1178 + * GNU Lesser General Public License version 3 for more details
1179 + * (a copy is included in the LICENSE file that accompanied this code).
1180 + *
1181 + * You should have received a copy of the GNU Lesser General Public License
1182 + * version 3 along with OpenOffice.org. If not, see
1183 + * <http://www.openoffice.org/license.html>
1184 + * for a copy of the LGPLv3 License.
1185 + *
1186 + ************************************************************************/
1187 +#ifndef __ooo_vba_excel_XGlobals_idl__
1188 +#define __ooo_vba_excel_XGlobals_idl__
1189 +
1190 +#ifndef __com_sun_star_uno_XInterface_idl__
1191 +#include <com/sun/star/uno/XInterface.idl>
1192 +#endif
1193 +#ifndef __com_sun_star_script_BasicErrorException_idl__
1194 +#include <com/sun/star/script/BasicErrorException.idl>
1195 +#endif
1196 +#ifndef __ooo_vba_excel_XWorkbook_idl__
1197 +#include <ooo/vba/excel/XWorkbook.idl>
1198 +#endif
1199 +#ifndef __ooo_vba_excel_XWorksheet_idl__
1200 +#include <ooo/vba/excel/XWorksheet.idl>
1201 +#endif
1202 +#ifndef __ooo_vba_XAssistant_idl__
1203 +#include <ooo/vba/XAssistant.idl>
1204 +#endif
1205 +
1206 +module ooo { module vba { module excel {
1207 +interface XRange;
1208 +interface XWindow;
1209 +interface XGlobals: com::sun::star::uno::XInterface
1210 +{
1211 + [attribute, readonly] ooo::vba::excel::XWorkbook ActiveWorkbook;
1212 + [attribute, readonly] ooo::vba::excel::XWorksheet ActiveSheet;
1213 + [attribute, readonly] ooo::vba::excel::XWindow ActiveWindow;
1214 + [attribute, readonly] ooo::vba::excel::XRange ActiveCell;
1215 + [attribute, readonly] ooo::vba::XAssistant Assistant;
1216 + [attribute, readonly] any Selection;
1217 + [attribute, readonly] XWorkbook ThisWorkbook;
1218 +
1219 + void Calculate() raises(com::sun::star::script::BasicErrorException);
1220 + XRange Cells([in] any RowIndex, [in] any ColumnIndex);
1221 + XRange Columns([in] any aIndex);
1222 + any CommandBars( [in] any aIndex );
1223 + any Evaluate( [in] string Name );
1224 +XRange Intersect([in] XRange Arg1, [in] XRange Arg2, [in] /*Optional*/ any Arg3, [in] /*Optional*/ any Arg4, [in] /*Optional*/ any Arg5, [in] /*Optional*/ any Arg6, [in] /*Optional*/ any Arg7, [in] /*Optional*/ any Arg8, [in] /*Optional*/ any Arg9, [in] /*Optional*/ any Arg10, [in] /*Optional*/ any Arg11, [in] /*Optional*/ any Arg12, [in] /*Optional*/ any Arg13, [in] /*Optional*/ any Arg14, [in] /*Optional*/ any Arg15, [in] /*Optional*/ any Arg16, [in] /*Optional*/ any Arg17, [in] /*Optional*/ any Arg18, [in] /*Optional*/ any Arg19, [in] /*Optional*/ any Arg20, [in] /*Optional*/ any Arg21, [in] /*Optional*/ any Arg22, [in] /*Optional*/ any Arg23, [in] /*Optional*/ any Arg24, [in] /*Optional*/ any Arg25, [in] /*Optional*/ any Arg26, [in] /*Optional*/ any Arg27, [in] /*Optional*/ any Arg28, [in] /*Optional*/ any Arg29, [in] /*Optional*/ any Arg30)
1225 + raises(com::sun::star::script::BasicErrorException);
1226 + any WorkSheets( [in] any aIndex );
1227 + any WorkBooks( [in] any aIndex );
1228 + any WorksheetFunction();
1229 + any Windows( [in] any aIndex );
1230 + any Sheets( [in] any aIndex );
1231 + any Range( [in] any Cell1, [in] any Cell2 );
1232 + XRange Rows([in] any aIndex);
1233 + any Names( [in] any Index );
1234 + XRange Union([in] XRange Arg1, [in] XRange Arg2, [in] /*Optional*/ any Arg3, [in] /*Optional*/ any Arg4, [in] /*Optional*/ any Arg5, [in] /*Optional*/ any Arg6, [in] /*Optional*/ any Arg7, [in] /*Optional*/ any Arg8, [in] /*Optional*/ any Arg9, [in] /*Optional*/ any Arg10, [in] /*Optional*/ any Arg11, [in] /*Optional*/ any Arg12, [in] /*Optional*/ any Arg13, [in] /*Optional*/ any Arg14, [in] /*Optional*/ any Arg15, [in] /*Optional*/ any Arg16, [in] /*Optional*/ any Arg17, [in] /*Optional*/ any Arg18, [in] /*Optional*/ any Arg19, [in] /*Optional*/ any Arg20, [in] /*Optional*/ any Arg21, [in] /*Optional*/ any Arg22, [in] /*Optional*/ any Arg23, [in] /*Optional*/ any Arg24, [in] /*Optional*/ any Arg25, [in] /*Optional*/ any Arg26, [in] /*Optional*/ any Arg27, [in] /*Optional*/ any Arg28, [in] /*Optional*/ any Arg29, [in] /*Optional*/ any Arg30)
1235 + raises(com::sun::star::script::BasicErrorException);
1236 +
1237 +};
1238 +
1239 +}; }; };
1240 +
1241 +#endif
1242 +
1243 +
1244 --- oovbaapi/ooo/vba/excel/XWindow.idl.old 2009-04-02 10:36:29.000000000 +0000
1245 +++ oovbaapi/ooo/vba/excel/XWindow.idl 2009-04-06 16:42:01.000000000 +0000
1246 @@ -46,10 +46,8 @@ module ooo { module vba { module excel
1247 interface XRange;
1248 interface XWorksheet;
1249 interface XPane;
1250 -interface XWindow
1251 +interface XWindow : com::sun::star::uno::XInterface
1252 {
1253 - interface ::ooo::vba::XHelperInterface;
1254 -
1255 [attribute] any Caption;
1256 [attribute] boolean DisplayGridlines;
1257 [attribute] boolean DisplayHeadings;
1258 @@ -58,8 +56,6 @@ interface XWindow
1259 [attribute] boolean DisplayVerticalScrollBar;
1260 [attribute] boolean DisplayWorkbookTabs;
1261 [attribute] boolean FreezePanes;
1262 - [attribute] long Height;
1263 - [attribute] long Left;
1264 [attribute] boolean Split;
1265 [attribute] long SplitColumn;
1266 [attribute] double SplitHorizontal;
1267 @@ -67,10 +63,7 @@ interface XWindow
1268 [attribute] double SplitVertical;
1269 [attribute] any ScrollColumn;
1270 [attribute] any ScrollRow;
1271 - [attribute] long Top;
1272 [attribute] any View;
1273 - [attribute] boolean Visible;
1274 - [attribute] long Width;
1275 [attribute] any WindowState;
1276 [attribute] any Zoom;
1277 any SelectedSheets( [in] any aIndex );
1278 --- oovbaapi/ooo/vba/excel/XWorkbook.idl.old 2009-04-02 10:36:29.000000000 +0000
1279 +++ oovbaapi/ooo/vba/excel/XWorkbook.idl 2009-04-06 16:42:01.000000000 +0000
1280 @@ -48,31 +48,19 @@ interface XWorksheet;
1281 interface XWorksheets;
1282 interface XStyles;
1284 -interface XWorkbook
1285 +interface XWorkbook : com::sun::star::uno::XInterface
1286 {
1287 - interface ::ooo::vba::XHelperInterface;
1288 -
1289 - [attribute, readonly] string Name;
1290 - [attribute, readonly] string Path;
1291 - [attribute, readonly] string FullName;
1292 [attribute, readonly] boolean ProtectStructure;
1293 [attribute, readonly] XWorksheet ActiveSheet;
1294 - [attribute] boolean Saved;
1295 [attribute, readonly] string CodeName;
1297 any Worksheets([in] any sheet);
1298 any Styles([in] any Index );
1299 any Sheets([in] any sheet);
1300 any Windows([in] any index );
1301 - void Close([in] any SaveChanges, [in] any FileName, [in] any RouteWorkBook);
1302 - void Protect( [in] any Password );
1303 - void Unprotect( [in] any Password );
1304 - void Save();
1305 - void Activate();
1306 void ResetColors() raises (com::sun::star::script::BasicErrorException);
1307 -
1308 + void Activate();
1309 any Names( [in] any Index );
1310 -
1311 any Colors([in] any Index) raises (com::sun::star::script::BasicErrorException);
1312 long FileFormat() raises (com::sun::star::script::BasicErrorException);
1313 void SaveCopyAs( [in] string Filename );
1314 --- oovbaapi/ooo/vba/excel/makefile.mk.old 2009-04-06 16:41:59.000000000 +0000
1315 +++ oovbaapi/ooo/vba/excel/makefile.mk 2009-04-06 16:42:01.000000000 +0000
1316 @@ -41,7 +41,9 @@ PACKAGE=ooo$/vba$/Excel
1317 # ------------------------------------------------------------------------
1320 -IDLFILES= XApplication.idl\
1321 +IDLFILES= XGlobals.idl\
1322 + Globals.idl\
1323 + XApplication.idl\
1324 XComment.idl\
1325 XComments.idl\
1326 XRange.idl\
1327 --- oovbaapi/ooo/vba/makefile.mk.old 2009-04-06 16:42:00.000000000 +0000
1328 +++ oovbaapi/ooo/vba/makefile.mk 2009-04-06 16:42:01.000000000 +0000
1329 @@ -42,7 +42,6 @@ PACKAGE=ooo$/vba
1331 IDLFILES=\
1332 XErrObject.idl \
1333 - XGlobals.idl \
1334 XCollection.idl\
1335 XVBAToOOEventDescGen.idl\
1336 XPropValue.idl\
1337 @@ -54,7 +53,14 @@ IDLFILES=\
1338 XCommandBars.idl\
1339 XCommandBarPopup.idl\
1340 XCommandBarButton.idl\
1341 - Globals.idl\
1342 + XControlProvider.idl\
1343 + ControlProvider.idl\
1344 + XApplicationBase.idl\
1345 + XWindowBase.idl\
1346 + XDocumentBase.idl\
1347 + XGlobalsBase.idl\
1348 + XDocumentProperty.idl\
1349 + XDocumentProperties.idl\
1351 # ------------------------------------------------------------------
1353 --- oovbaapi/ooo/vba/word/XApplication.idl.old 1970-01-01 00:00:00.000000000 +0000
1354 +++ oovbaapi/ooo/vba/word/XApplication.idl 2009-04-06 16:42:01.000000000 +0000
1355 @@ -0,0 +1,63 @@
1356 +/*************************************************************************
1357 + *
1358 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1359 + *
1360 + * Copyright 2008 by Sun Microsystems, Inc.
1361 + *
1362 + * OpenOffice.org - a multi-platform office productivity suite
1363 + *
1364 + * $RCSfile: XApplication.idl,v $
1365 + * $Revision: 1.4 $
1366 + *
1367 + * This file is part of OpenOffice.org.
1368 + *
1369 + * OpenOffice.org is free software: you can redistribute it and/or modify
1370 + * it under the terms of the GNU Lesser General Public License version 3
1371 + * only, as published by the Free Software Foundation.
1372 + *
1373 + * OpenOffice.org is distributed in the hope that it will be useful,
1374 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
1375 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1376 + * GNU Lesser General Public License version 3 for more details
1377 + * (a copy is included in the LICENSE file that accompanied this code).
1378 + *
1379 + * You should have received a copy of the GNU Lesser General Public License
1380 + * version 3 along with OpenOffice.org. If not, see
1381 + * <http://www.openoffice.org/license.html>
1382 + * for a copy of the LGPLv3 License.
1383 + *
1384 + ************************************************************************/
1385 +#ifndef __ooo_vba_word_XApplication_idl__
1386 +#define __ooo_vba_word_XApplication_idl__
1387 +
1388 +#ifndef __com_sun_star_uno_XInterface_idl__
1389 +#include <com/sun/star/uno/XInterface.idl>
1390 +#endif
1391 +
1392 +#ifndef __ooo_vba_XHelperInterface_idl__
1393 +#include <ooo/vba/XHelperInterface.idl>
1394 +#endif
1395 +
1396 +module ooo { module vba { module word {
1397 +
1398 +interface XDocument;
1399 +interface XWindow;
1400 +interface XSystem;
1401 +interface XOptions;
1402 +interface XSelection;
1403 +interface XApplication : com::sun::star::uno::XInterface
1404 +{
1405 + [attribute, readonly] XDocument ActiveDocument;
1406 + [attribute, readonly] XWindow ActiveWindow;
1407 + [attribute, readonly] string Name;
1408 + [attribute, readonly] ooo::vba::word::XSystem System;
1409 + [attribute, readonly] ooo::vba::word::XOptions Options;
1410 + [attribute, readonly] ooo::vba::word::XSelection Selection;
1411 + any CommandBars( [in] any aIndex );
1412 +};
1413 +
1414 +}; }; };
1415 +
1416 +#endif
1417 +
1418 +
1419 --- oovbaapi/ooo/vba/word/XBookmark.idl.old 1970-01-01 00:00:00.000000000 +0000
1420 +++ oovbaapi/ooo/vba/word/XBookmark.idl 2009-04-06 16:42:01.000000000 +0000
1421 @@ -0,0 +1,61 @@
1422 +/*************************************************************************
1423 + *
1424 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1425 + *
1426 + * Copyright 2008 by Sun Microsystems, Inc.
1427 + *
1428 + * OpenOffice.org - a multi-platform office productivity suite
1429 + *
1430 + * $RCSfile:
1431 + * $Revision:
1432 + *
1433 + * This file is part of OpenOffice.org.
1434 + *
1435 + * OpenOffice.org is free software: you can redistribute it and/or modify
1436 + * it under the terms of the GNU Lesser General Public License version 3
1437 + * only, as published by the Free Software Foundation.
1438 + *
1439 + * OpenOffice.org is distributed in the hope that it will be useful,
1440 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
1441 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1442 + * GNU Lesser General Public License version 3 for more details
1443 + * (a copy is included in the LICENSE file that accompanied this code).
1444 + *
1445 + * You should have received a copy of the GNU Lesser General Public License
1446 + * version 3 along with OpenOffice.org. If not, see
1447 + * <http://www.openoffice.org/license.html>
1448 + * for a copy of the LGPLv3 License.
1449 + *
1450 + ************************************************************************/
1451 +#ifndef __ooo_vba_word_XBookmark_idl__
1452 +#define __ooo_vba_word_XBookmark_idl__
1453 +
1454 +#ifndef __com_sun_star_uno_XInterface_idl__
1455 +#include <com/sun/star/uno/XInterface.idl>
1456 +#endif
1457 +
1458 +#ifndef __ooo_vba_XHelperInterface_idl__
1459 +#include <ooo/vba/XHelperInterface.idl>
1460 +#endif
1461 +
1462 +#ifndef __com_sun_star_container_XNamed_idl__
1463 +#include <com/sun/star/container/XNamed.idl>
1464 +#endif
1465 +
1466 +module ooo { module vba { module word {
1467 +
1468 +interface XBookmark
1469 +{
1470 + interface ooo::vba::XHelperInterface;
1471 + interface ::com::sun::star::container::XNamed;
1472 +
1473 + void Delete();
1474 + void Select();
1475 + any Range();
1476 +};
1477 +
1478 +}; }; };
1479 +
1480 +#endif
1481 +
1482 +
1483 --- oovbaapi/ooo/vba/word/XBookmarks.idl.old 1970-01-01 00:00:00.000000000 +0000
1484 +++ oovbaapi/ooo/vba/word/XBookmarks.idl 2009-04-06 16:42:01.000000000 +0000
1485 @@ -0,0 +1,61 @@
1486 +/*************************************************************************
1487 + *
1488 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1489 + *
1490 + * Copyright 2008 by Sun Microsystems, Inc.
1491 + *
1492 + * OpenOffice.org - a multi-platform office productivity suite
1493 + *
1494 + * $RCSfile:
1495 + * $Revision:
1496 + *
1497 + * This file is part of OpenOffice.org.
1498 + *
1499 + * OpenOffice.org is free software: you can redistribute it and/or modify
1500 + * it under the terms of the GNU Lesser General Public License version 3
1501 + * only, as published by the Free Software Foundation.
1502 + *
1503 + * OpenOffice.org is distributed in the hope that it will be useful,
1504 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
1505 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1506 + * GNU Lesser General Public License version 3 for more details
1507 + * (a copy is included in the LICENSE file that accompanied this code).
1508 + *
1509 + * You should have received a copy of the GNU Lesser General Public License
1510 + * version 3 along with OpenOffice.org. If not, see
1511 + * <http://www.openoffice.org/license.html>
1512 + * for a copy of the LGPLv3 License.
1513 + *
1514 + ************************************************************************/
1515 +#ifndef __ooo_vba_word_XBookmarks_idl__
1516 +#define __ooo_vba_word_XBookmarks_idl__
1517 +
1518 +#ifndef __com_sun_star_uno_XInterface_idl__
1519 +#include <com/sun/star/uno/XInterface.idl>
1520 +#endif
1521 +
1522 +#ifndef __ooo_vba_XCollection_idl__
1523 +#include <ooo/vba/XCollection.idl>
1524 +#endif
1525 +
1526 +
1527 +//=============================================================================
1528 +
1529 +module ooo { module vba { module word {
1530 +
1531 +//=============================================================================
1532 +
1533 +interface XBookmarks
1534 +{
1535 + interface ::ooo::vba::XCollection;
1536 +
1537 + [attribute] long DefaultSorting;
1538 + [attribute] boolean ShowHidden;
1539 +
1540 + any Add( [in] string Name, [in] any Range );
1541 + boolean Exists( [in] string Name );
1542 +};
1543 +
1544 +}; }; };
1545 +
1546 +#endif
1547 --- oovbaapi/ooo/vba/word/XDocument.idl.old 1970-01-01 00:00:00.000000000 +0000
1548 +++ oovbaapi/ooo/vba/word/XDocument.idl 2009-04-06 16:42:01.000000000 +0000
1549 @@ -0,0 +1,62 @@
1550 +/*************************************************************************
1551 + *
1552 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1553 + *
1554 + * Copyright 2008 by Sun Microsystems, Inc.
1555 + *
1556 + * OpenOffice.org - a multi-platform office productivity suite
1557 + *
1558 + * $RCSfile: XDocument.idl,v $
1559 + * $Revision: 1.4 $
1560 + *
1561 + * This file is part of OpenOffice.org.
1562 + *
1563 + * OpenOffice.org is free software: you can redistribute it and/or modify
1564 + * it under the terms of the GNU Lesser General Public License version 3
1565 + * only, as published by the Free Software Foundation.
1566 + *
1567 + * OpenOffice.org is distributed in the hope that it will be useful,
1568 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
1569 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1570 + * GNU Lesser General Public License version 3 for more details
1571 + * (a copy is included in the LICENSE file that accompanied this code).
1572 + *
1573 + * You should have received a copy of the GNU Lesser General Public License
1574 + * version 3 along with OpenOffice.org. If not, see
1575 + * <http://www.openoffice.org/license.html>
1576 + * for a copy of the LGPLv3 License.
1577 + *
1578 + ************************************************************************/
1579 +#ifndef __ooo_vba_word_XDocument_idl__
1580 +#define __ooo_vba_word_XDocument_idl__
1581 +
1582 +#ifndef __com_sun_star_uno_XInterface_idl__
1583 +#include <com/sun/star/uno/XInterface.idl>
1584 +#endif
1585 +
1586 +#ifndef __ooo_vba_XHelperInterface_idl__
1587 +#include <ooo/vba/XHelperInterface.idl>
1588 +#endif
1589 +
1590 +#ifndef __ooo_vba_word_XRange_idl__
1591 +#include <ooo/vba/word/XRange.idl>
1592 +#endif
1593 +
1594 +module ooo { module vba { module word {
1595 +
1596 +interface XDocument : com::sun::star::uno::XInterface
1597 +{
1598 + [attribute, readonly] XRange Content;
1599 +
1600 + XRange Range( [in] any Start, [in] any End );
1601 + any BuiltInDocumentProperties( [in] any index );
1602 + any CustomDocumentProperties( [in] any index );
1603 + any Bookmarks( [in] any aIndex );
1604 + any Variables( [in] any aIndex );
1605 +};
1606 +
1607 +}; }; };
1608 +
1609 +#endif
1610 +
1611 +
1612 --- oovbaapi/ooo/vba/word/XGlobals.idl.old 1970-01-01 00:00:00.000000000 +0000
1613 +++ oovbaapi/ooo/vba/word/XGlobals.idl 2009-04-06 16:42:01.000000000 +0000
1614 @@ -0,0 +1,58 @@
1615 +/*************************************************************************
1616 + *
1617 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1618 + *
1619 + * Copyright 2008 by Sun Microsystems, Inc.
1620 + *
1621 + * OpenOffice.org - a multi-platform office productivity suite
1622 + *
1623 + * $RCSfile: XGlobals.idl,v $
1624 + * $Revision: 1.4 $
1625 + *
1626 + * This file is part of OpenOffice.org.
1627 + *
1628 + * OpenOffice.org is free software: you can redistribute it and/or modify
1629 + * it under the terms of the GNU Lesser General Public License version 3
1630 + * only, as published by the Free Software Foundation.
1631 + *
1632 + * OpenOffice.org is distributed in the hope that it will be useful,
1633 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
1634 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1635 + * GNU Lesser General Public License version 3 for more details
1636 + * (a copy is included in the LICENSE file that accompanied this code).
1637 + *
1638 + * You should have received a copy of the GNU Lesser General Public License
1639 + * version 3 along with OpenOffice.org. If not, see
1640 + * <http://www.openoffice.org/license.html>
1641 + * for a copy of the LGPLv3 License.
1642 + *
1643 + ************************************************************************/
1644 +#ifndef __ooo_vba_word_XGlobals_idl__
1645 +#define __ooo_vba_word_XGlobals_idl__
1646 +
1647 +#ifndef __com_sun_star_uno_XInterface_idl__
1648 +#include <com/sun/star/uno/XInterface.idl>
1649 +#endif
1650 +
1651 +module ooo { module vba { module word {
1652 +interface XDocument;
1653 +interface XWindow;
1654 +interface XSystem;
1655 +interface XOptions;
1656 +interface XSelection;
1657 +interface XGlobals : com::sun::star::uno::XInterface
1658 +{
1659 + [attribute, readonly] XDocument ActiveDocument;
1660 + [attribute, readonly] XWindow ActiveWindow;
1661 + [attribute, readonly] string Name;
1662 + [attribute, readonly] ooo::vba::word::XSystem System;
1663 + [attribute, readonly] ooo::vba::word::XOptions Options;
1664 + [attribute, readonly] ooo::vba::word::XSelection Selection;
1665 + any CommandBars( [in] any aIndex );
1666 +};
1667 +
1668 +}; }; };
1669 +
1670 +#endif
1671 +
1672 +
1673 --- oovbaapi/ooo/vba/word/XOptions.idl.old 1970-01-01 00:00:00.000000000 +0000
1674 +++ oovbaapi/ooo/vba/word/XOptions.idl 2009-04-06 16:42:01.000000000 +0000
1675 @@ -0,0 +1,54 @@
1676 +/*************************************************************************
1677 + *
1678 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1679 + *
1680 + * Copyright 2008 by Sun Microsystems, Inc.
1681 + *
1682 + * OpenOffice.org - a multi-platform office productivity suite
1683 + *
1684 + * $RCSfile:
1685 + * $Revision:
1686 + *
1687 + * This file is part of OpenOffice.org.
1688 + *
1689 + * OpenOffice.org is free software: you can redistribute it and/or modify
1690 + * it under the terms of the GNU Lesser General Public License version 3
1691 + * only, as published by the Free Software Foundation.
1692 + *
1693 + * OpenOffice.org is distributed in the hope that it will be useful,
1694 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
1695 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1696 + * GNU Lesser General Public License version 3 for more details
1697 + * (a copy is included in the LICENSE file that accompanied this code).
1698 + *
1699 + * You should have received a copy of the GNU Lesser General Public License
1700 + * version 3 along with OpenOffice.org. If not, see
1701 + * <http://www.openoffice.org/license.html>
1702 + * for a copy of the LGPLv3 License.
1703 + *
1704 + ************************************************************************/
1705 +#ifndef __ooo_vba_word_XOptions_idl__
1706 +#define __ooo_vba_word_XOptions_idl__
1707 +
1708 +#ifndef __com_sun_star_uno_XInterface_idl__
1709 +#include <com/sun/star/uno/XInterface.idl>
1710 +#endif
1711 +
1712 +#ifndef __ooo_vba_XHelperInterface_idl__
1713 +#include <ooo/vba/XHelperInterface.idl>
1714 +#endif
1715 +
1716 +module ooo { module vba { module word {
1717 +
1718 +interface XOptions
1719 +{
1720 + interface ooo::vba::XHelperInterface;
1721 +
1722 + any DefaultFilePath( [in] long Path );
1723 +};
1724 +
1725 +}; }; };
1726 +
1727 +#endif
1728 +
1729 +
1730 --- oovbaapi/ooo/vba/word/XPane.idl.old 1970-01-01 00:00:00.000000000 +0000
1731 +++ oovbaapi/ooo/vba/word/XPane.idl 2009-04-06 16:42:01.000000000 +0000
1732 @@ -0,0 +1,55 @@
1733 +/*************************************************************************
1734 + *
1735 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1736 + *
1737 + * Copyright 2008 by Sun Microsystems, Inc.
1738 + *
1739 + * OpenOffice.org - a multi-platform office productivity suite
1740 + *
1741 + * $RCSfile:
1742 + * $Revision:
1743 + *
1744 + * This file is part of OpenOffice.org.
1745 + *
1746 + * OpenOffice.org is free software: you can redistribute it and/or modify
1747 + * it under the terms of the GNU Lesser General Public License version 3
1748 + * only, as published by the Free Software Foundation.
1749 + *
1750 + * OpenOffice.org is distributed in the hope that it will be useful,
1751 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
1752 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1753 + * GNU Lesser General Public License version 3 for more details
1754 + * (a copy is included in the LICENSE file that accompanied this code).
1755 + *
1756 + * You should have received a copy of the GNU Lesser General Public License
1757 + * version 3 along with OpenOffice.org. If not, see
1758 + * <http://www.openoffice.org/license.html>
1759 + * for a copy of the LGPLv3 License.
1760 + *
1761 + ************************************************************************/
1762 +#ifndef __ooo_vba_word_XPane_idl__
1763 +#define __ooo_vba_word_XPane_idl__
1764 +
1765 +#ifndef __com_sun_star_uno_XInterface_idl__
1766 +#include <com/sun/star/uno/XInterface.idl>
1767 +#endif
1768 +
1769 +#ifndef __ooo_vba_XHelperInterface_idl__
1770 +#include <ooo/vba/XHelperInterface.idl>
1771 +#endif
1772 +
1773 +module ooo { module vba { module word {
1774 +
1775 +interface XPane
1776 +{
1777 + interface ooo::vba::XHelperInterface;
1778 +
1779 + any View();
1780 + void Close();
1781 +};
1782 +
1783 +}; }; };
1784 +
1785 +#endif
1786 +
1787 +
1788 --- oovbaapi/ooo/vba/word/XPanes.idl.old 1970-01-01 00:00:00.000000000 +0000
1789 +++ oovbaapi/ooo/vba/word/XPanes.idl 2009-04-06 16:42:01.000000000 +0000
1790 @@ -0,0 +1,55 @@
1791 +/*************************************************************************
1792 + *
1793 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1794 + *
1795 + * Copyright 2008 by Sun Microsystems, Inc.
1796 + *
1797 + * OpenOffice.org - a multi-platform office productivity suite
1798 + *
1799 + * $RCSfile:
1800 + * $Revision:
1801 + *
1802 + * This file is part of OpenOffice.org.
1803 + *
1804 + * OpenOffice.org is free software: you can redistribute it and/or modify
1805 + * it under the terms of the GNU Lesser General Public License version 3
1806 + * only, as published by the Free Software Foundation.
1807 + *
1808 + * OpenOffice.org is distributed in the hope that it will be useful,
1809 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
1810 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1811 + * GNU Lesser General Public License version 3 for more details
1812 + * (a copy is included in the LICENSE file that accompanied this code).
1813 + *
1814 + * You should have received a copy of the GNU Lesser General Public License
1815 + * version 3 along with OpenOffice.org. If not, see
1816 + * <http://www.openoffice.org/license.html>
1817 + * for a copy of the LGPLv3 License.
1818 + *
1819 + ************************************************************************/
1820 +#ifndef __ooo_vba_word_XPanes_idl__
1821 +#define __ooo_vba_word_XPanes_idl__
1822 +
1823 +#ifndef __com_sun_star_uno_XInterface_idl__
1824 +#include <com/sun/star/uno/XInterface.idl>
1825 +#endif
1826 +
1827 +#ifndef __ooo_vba_XCollection_idl__
1828 +#include <ooo/vba/XCollection.idl>
1829 +#endif
1830 +
1831 +
1832 +//=============================================================================
1833 +
1834 +module ooo { module vba { module word {
1835 +
1836 +//=============================================================================
1837 +
1838 +interface XPanes
1839 +{
1840 + interface ::ooo::vba::XCollection;
1841 +};
1842 +
1843 +}; }; };
1844 +
1845 +#endif
1846 --- oovbaapi/ooo/vba/word/XRange.idl.old 1970-01-01 00:00:00.000000000 +0000
1847 +++ oovbaapi/ooo/vba/word/XRange.idl 2009-04-06 16:42:01.000000000 +0000
1848 @@ -0,0 +1,57 @@
1849 +/*************************************************************************
1850 + *
1851 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1852 + *
1853 + * Copyright 2008 by Sun Microsystems, Inc.
1854 + *
1855 + * OpenOffice.org - a multi-platform office productivity suite
1856 + *
1857 + * $RCSfile:
1858 + * $Revision:
1859 + *
1860 + * This file is part of OpenOffice.org.
1861 + *
1862 + * OpenOffice.org is free software: you can redistribute it and/or modify
1863 + * it under the terms of the GNU Lesser General Public License version 3
1864 + * only, as published by the Free Software Foundation.
1865 + *
1866 + * OpenOffice.org is distributed in the hope that it will be useful,
1867 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
1868 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1869 + * GNU Lesser General Public License version 3 for more details
1870 + * (a copy is included in the LICENSE file that accompanied this code).
1871 + *
1872 + * You should have received a copy of the GNU Lesser General Public License
1873 + * version 3 along with OpenOffice.org. If not, see
1874 + * <http://www.openoffice.org/license.html>
1875 + * for a copy of the LGPLv3 License.
1876 + *
1877 + ************************************************************************/
1878 +#ifndef __ooo_vba_word_XRange_idl__
1879 +#define __ooo_vba_word_XRange_idl__
1880 +
1881 +#ifndef __com_sun_star_uno_XInterface_idl__
1882 +#include <com/sun/star/uno/XInterface.idl>
1883 +#endif
1884 +
1885 +#ifndef __ooo_vba_XHelperInterface_idl__
1886 +#include <ooo/vba/XHelperInterface.idl>
1887 +#endif
1888 +
1889 +
1890 +module ooo { module vba { module word {
1891 +
1892 +interface XRange
1893 +{
1894 + interface ooo::vba::XHelperInterface;
1895 +
1896 + [attribute] string Text;
1897 +
1898 + void InsertBreak( [in] any Type );
1899 +};
1900 +
1901 +}; }; };
1902 +
1903 +#endif
1904 +
1905 +
1906 --- oovbaapi/ooo/vba/word/XSelection.idl.old 1970-01-01 00:00:00.000000000 +0000
1907 +++ oovbaapi/ooo/vba/word/XSelection.idl 2009-04-06 16:42:01.000000000 +0000
1908 @@ -0,0 +1,55 @@
1909 +/*************************************************************************
1910 + *
1911 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1912 + *
1913 + * Copyright 2008 by Sun Microsystems, Inc.
1914 + *
1915 + * OpenOffice.org - a multi-platform office productivity suite
1916 + *
1917 + * $RCSfile:
1918 + * $Revision:
1919 + *
1920 + * This file is part of OpenOffice.org.
1921 + *
1922 + * OpenOffice.org is free software: you can redistribute it and/or modify
1923 + * it under the terms of the GNU Lesser General Public License version 3
1924 + * only, as published by the Free Software Foundation.
1925 + *
1926 + * OpenOffice.org is distributed in the hope that it will be useful,
1927 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
1928 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1929 + * GNU Lesser General Public License version 3 for more details
1930 + * (a copy is included in the LICENSE file that accompanied this code).
1931 + *
1932 + * You should have received a copy of the GNU Lesser General Public License
1933 + * version 3 along with OpenOffice.org. If not, see
1934 + * <http://www.openoffice.org/license.html>
1935 + * for a copy of the LGPLv3 License.
1936 + *
1937 + ************************************************************************/
1938 +#ifndef __ooo_vba_word_XSelection_idl__
1939 +#define __ooo_vba_word_XSelection_idl__
1940 +
1941 +#ifndef __com_sun_star_uno_XInterface_idl__
1942 +#include <com/sun/star/uno/XInterface.idl>
1943 +#endif
1944 +
1945 +#ifndef __ooo_vba_XHelperInterface_idl__
1946 +#include <ooo/vba/XHelperInterface.idl>
1947 +#endif
1948 +
1949 +
1950 +module ooo { module vba { module word {
1951 +
1952 +interface XSelection
1953 +{
1954 + interface ooo::vba::XHelperInterface;
1955 +
1956 + [attribute] string Text;
1957 +};
1958 +
1959 +}; }; };
1960 +
1961 +#endif
1962 +
1963 +
1964 --- oovbaapi/ooo/vba/word/XSystem.idl.old 1970-01-01 00:00:00.000000000 +0000
1965 +++ oovbaapi/ooo/vba/word/XSystem.idl 2009-04-06 16:42:01.000000000 +0000
1966 @@ -0,0 +1,56 @@
1967 +/*************************************************************************
1968 + *
1969 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1970 + *
1971 + * Copyright 2008 by Sun Microsystems, Inc.
1972 + *
1973 + * OpenOffice.org - a multi-platform office productivity suite
1974 + *
1975 + * $RCSfile:
1976 + * $Revision:
1977 + *
1978 + * This file is part of OpenOffice.org.
1979 + *
1980 + * OpenOffice.org is free software: you can redistribute it and/or modify
1981 + * it under the terms of the GNU Lesser General Public License version 3
1982 + * only, as published by the Free Software Foundation.
1983 + *
1984 + * OpenOffice.org is distributed in the hope that it will be useful,
1985 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
1986 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1987 + * GNU Lesser General Public License version 3 for more details
1988 + * (a copy is included in the LICENSE file that accompanied this code).
1989 + *
1990 + * You should have received a copy of the GNU Lesser General Public License
1991 + * version 3 along with OpenOffice.org. If not, see
1992 + * <http://www.openoffice.org/license.html>
1993 + * for a copy of the LGPLv3 License.
1994 + *
1995 + ************************************************************************/
1996 +#ifndef __ooo_vba_word_XSystem_idl__
1997 +#define __ooo_vba_word_XSystem_idl__
1998 +
1999 +#ifndef __com_sun_star_uno_XInterface_idl__
2000 +#include <com/sun/star/uno/XInterface.idl>
2001 +#endif
2002 +
2003 +#ifndef __ooo_vba_XHelperInterface_idl__
2004 +#include <ooo/vba/XHelperInterface.idl>
2005 +#endif
2006 +
2007 +
2008 +module ooo { module vba { module word {
2009 +
2010 +interface XSystem
2011 +{
2012 + interface ooo::vba::XHelperInterface;
2013 +
2014 + [attribute] long Cursor;
2015 + any PrivateProfileString( [in] string Filename, [in] string Section, [in] string Key );
2016 +};
2017 +
2018 +}; }; };
2019 +
2020 +#endif
2021 +
2022 +
2023 --- oovbaapi/ooo/vba/word/XVariable.idl.old 1970-01-01 00:00:00.000000000 +0000
2024 +++ oovbaapi/ooo/vba/word/XVariable.idl 2009-04-06 16:42:01.000000000 +0000
2025 @@ -0,0 +1,60 @@
2026 +/*************************************************************************
2027 + *
2028 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
2029 + *
2030 + * Copyright 2008 by Sun Microsystems, Inc.
2031 + *
2032 + * OpenOffice.org - a multi-platform office productivity suite
2033 + *
2034 + * $RCSfile:
2035 + * $Revision:
2036 + *
2037 + * This file is part of OpenOffice.org.
2038 + *
2039 + * OpenOffice.org is free software: you can redistribute it and/or modify
2040 + * it under the terms of the GNU Lesser General Public License version 3
2041 + * only, as published by the Free Software Foundation.
2042 + *
2043 + * OpenOffice.org is distributed in the hope that it will be useful,
2044 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
2045 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2046 + * GNU Lesser General Public License version 3 for more details
2047 + * (a copy is included in the LICENSE file that accompanied this code).
2048 + *
2049 + * You should have received a copy of the GNU Lesser General Public License
2050 + * version 3 along with OpenOffice.org. If not, see
2051 + * <http://www.openoffice.org/license.html>
2052 + * for a copy of the LGPLv3 License.
2053 + *
2054 + ************************************************************************/
2055 +#ifndef __ooo_vba_word_XVariable_idl__
2056 +#define __ooo_vba_word_XVariable_idl__
2057 +
2058 +#ifndef __com_sun_star_uno_XInterface_idl__
2059 +#include <com/sun/star/uno/XInterface.idl>
2060 +#endif
2061 +
2062 +#ifndef __ooo_vba_XHelperInterface_idl__
2063 +#include <ooo/vba/XHelperInterface.idl>
2064 +#endif
2065 +
2066 +#ifndef __com_sun_star_container_XNamed_idl__
2067 +#include <com/sun/star/container/XNamed.idl>
2068 +#endif
2069 +
2070 +module ooo { module vba { module word {
2071 +
2072 +interface XVariable
2073 +{
2074 + interface ooo::vba::XHelperInterface;
2075 + interface ::com::sun::star::container::XNamed;
2076 +
2077 + [attribute] any Value;
2078 + [attribute, readonly] long Index;
2079 +};
2080 +
2081 +}; }; };
2082 +
2083 +#endif
2084 +
2085 +
2086 --- oovbaapi/ooo/vba/word/XVariables.idl.old 1970-01-01 00:00:00.000000000 +0000
2087 +++ oovbaapi/ooo/vba/word/XVariables.idl 2009-04-06 16:42:01.000000000 +0000
2088 @@ -0,0 +1,57 @@
2089 +/*************************************************************************
2090 + *
2091 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
2092 + *
2093 + * Copyright 2008 by Sun Microsystems, Inc.
2094 + *
2095 + * OpenOffice.org - a multi-platform office productivity suite
2096 + *
2097 + * $RCSfile:
2098 + * $Revision:
2099 + *
2100 + * This file is part of OpenOffice.org.
2101 + *
2102 + * OpenOffice.org is free software: you can redistribute it and/or modify
2103 + * it under the terms of the GNU Lesser General Public License version 3
2104 + * only, as published by the Free Software Foundation.
2105 + *
2106 + * OpenOffice.org is distributed in the hope that it will be useful,
2107 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
2108 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2109 + * GNU Lesser General Public License version 3 for more details
2110 + * (a copy is included in the LICENSE file that accompanied this code).
2111 + *
2112 + * You should have received a copy of the GNU Lesser General Public License
2113 + * version 3 along with OpenOffice.org. If not, see
2114 + * <http://www.openoffice.org/license.html>
2115 + * for a copy of the LGPLv3 License.
2116 + *
2117 + ************************************************************************/
2118 +#ifndef __ooo_vba_word_XVariables_idl__
2119 +#define __ooo_vba_word_XVariables_idl__
2120 +
2121 +#ifndef __com_sun_star_uno_XInterface_idl__
2122 +#include <com/sun/star/uno/XInterface.idl>
2123 +#endif
2124 +
2125 +#ifndef __ooo_vba_XCollection_idl__
2126 +#include <ooo/vba/XCollection.idl>
2127 +#endif
2128 +
2129 +
2130 +//=============================================================================
2131 +
2132 +module ooo { module vba { module word {
2133 +
2134 +//=============================================================================
2135 +
2136 +interface XVariables
2137 +{
2138 + interface ::ooo::vba::XCollection;
2139 +
2140 + any Add( [in] string Name, [in] any Value );
2141 +};
2142 +
2143 +}; }; };
2144 +
2145 +#endif
2146 --- oovbaapi/ooo/vba/word/XView.idl.old 1970-01-01 00:00:00.000000000 +0000
2147 +++ oovbaapi/ooo/vba/word/XView.idl 2009-04-06 16:42:01.000000000 +0000
2148 @@ -0,0 +1,57 @@
2149 +/*************************************************************************
2150 + *
2151 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
2152 + *
2153 + * Copyright 2008 by Sun Microsystems, Inc.
2154 + *
2155 + * OpenOffice.org - a multi-platform office productivity suite
2156 + *
2157 + * $RCSfile:
2158 + * $Revision:
2159 + *
2160 + * This file is part of OpenOffice.org.
2161 + *
2162 + * OpenOffice.org is free software: you can redistribute it and/or modify
2163 + * it under the terms of the GNU Lesser General Public License version 3
2164 + * only, as published by the Free Software Foundation.
2165 + *
2166 + * OpenOffice.org is distributed in the hope that it will be useful,
2167 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
2168 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2169 + * GNU Lesser General Public License version 3 for more details
2170 + * (a copy is included in the LICENSE file that accompanied this code).
2171 + *
2172 + * You should have received a copy of the GNU Lesser General Public License
2173 + * version 3 along with OpenOffice.org. If not, see
2174 + * <http://www.openoffice.org/license.html>
2175 + * for a copy of the LGPLv3 License.
2176 + *
2177 + ************************************************************************/
2178 +#ifndef __ooo_vba_word_XView_idl__
2179 +#define __ooo_vba_word_XView_idl__
2180 +
2181 +#ifndef __com_sun_star_uno_XInterface_idl__
2182 +#include <com/sun/star/uno/XInterface.idl>
2183 +#endif
2184 +
2185 +#ifndef __ooo_vba_XHelperInterface_idl__
2186 +#include <ooo/vba/XHelperInterface.idl>
2187 +#endif
2188 +
2189 +module ooo { module vba { module word {
2190 +
2191 +interface XView
2192 +{
2193 + interface ooo::vba::XHelperInterface;
2194 +
2195 + [attribute] long SeekView;
2196 + [attribute] long SplitSpecial;
2197 + [attribute] boolean TableGridLines;
2198 + [attribute] long Type;
2199 +};
2200 +
2201 +}; }; };
2202 +
2203 +#endif
2204 +
2205 +
2206 --- oovbaapi/ooo/vba/word/XWindow.idl.old 1970-01-01 00:00:00.000000000 +0000
2207 +++ oovbaapi/ooo/vba/word/XWindow.idl 2009-04-06 16:42:01.000000000 +0000
2208 @@ -0,0 +1,62 @@
2209 +/*************************************************************************
2210 + *
2211 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
2212 + *
2213 + * Copyright 2008 by Sun Microsystems, Inc.
2214 + *
2215 + * OpenOffice.org - a multi-platform office productivity suite
2216 + *
2217 + * $RCSfile: XWindow.idl,v $
2218 + * $Revision: 1.4 $
2219 + *
2220 + * This file is part of OpenOffice.org.
2221 + *
2222 + * OpenOffice.org is free software: you can redistribute it and/or modify
2223 + * it under the terms of the GNU Lesser General Public License version 3
2224 + * only, as published by the Free Software Foundation.
2225 + *
2226 + * OpenOffice.org is distributed in the hope that it will be useful,
2227 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
2228 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2229 + * GNU Lesser General Public License version 3 for more details
2230 + * (a copy is included in the LICENSE file that accompanied this code).
2231 + *
2232 + * You should have received a copy of the GNU Lesser General Public License
2233 + * version 3 along with OpenOffice.org. If not, see
2234 + * <http://www.openoffice.org/license.html>
2235 + * for a copy of the LGPLv3 License.
2236 + *
2237 + ************************************************************************/
2238 +#ifndef __ooo_vba_word_XWindow_idl__
2239 +#define __ooo_vba_word_XWindow_idl__
2240 +
2241 +#ifndef __com_sun_star_uno_XInterface_idl__
2242 +#include <com/sun/star/uno/XInterface.idl>
2243 +#endif
2244 +
2245 +#ifndef __ooo_vba_XHelperInterface_idl__
2246 +#include <ooo/vba/XHelperInterface.idl>
2247 +#endif
2248 +
2249 +//=============================================================================
2250 +
2251 +module ooo { module vba { module word {
2252 +
2253 +//=============================================================================
2254 +//interface XPane;
2255 +interface XWindow : com::sun::star::uno::XInterface
2256 +{
2257 + [attribute] any View;
2258 + void Activate();
2259 + void Close([in] any SaveChanges, [in] any RouteDocument);
2260 + any Panes( [in] any aIndex ); // this is a fake api for it seems not support in Write
2261 + any ActivePane(); // this is a fake api for it seems not support in Write
2262 +};
2263 +
2264 +//=============================================================================
2265 +
2266 +}; }; };
2267 +
2268 +#endif
2269 +
2270 +
2271 --- oovbaapi/ooo/vba/word/makefile.mk.old 1970-01-01 00:00:00.000000000 +0000
2272 +++ oovbaapi/ooo/vba/word/makefile.mk 2009-04-06 16:42:01.000000000 +0000
2273 @@ -0,0 +1,63 @@
2274 +#*************************************************************************
2275 +#
2276 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
2277 +#
2278 +# Copyright 2008 by Sun Microsystems, Inc.
2279 +#
2280 +# OpenOffice.org - a multi-platform office productivity suite
2281 +#
2282 +# $RCSfile: makefile.mk,v $
2283 +#
2284 +# $Revision: 1.4 $
2285 +#
2286 +# This file is part of OpenOffice.org.
2287 +#
2288 +# OpenOffice.org is free software: you can redistribute it and/or modify
2289 +# it under the terms of the GNU Lesser General Public License version 3
2290 +# only, as published by the Free Software Foundation.
2291 +#
2292 +# OpenOffice.org is distributed in the hope that it will be useful,
2293 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
2294 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2295 +# GNU Lesser General Public License version 3 for more details
2296 +# (a copy is included in the LICENSE file that accompanied this code).
2297 +#
2298 +# You should have received a copy of the GNU Lesser General Public License
2299 +# version 3 along with OpenOffice.org. If not, see
2300 +# <http://www.openoffice.org/license.html>
2301 +# for a copy of the LGPLv3 License.
2302 +#
2303 +#*************************************************************************
2304 +PRJ=..$/..$/..
2305 +
2306 +PRJNAME=oovapi
2307 +
2308 +TARGET=word
2309 +PACKAGE=ooo$/vba$/Word
2310 +
2311 +# --- Settings -----------------------------------------------------
2312 +.INCLUDE : $(PRJ)$/util$/makefile.pmk
2313 +
2314 +# ------------------------------------------------------------------------
2315 +
2316 +
2317 +IDLFILES= XGlobals.idl\
2318 + XApplication.idl \
2319 + XDocument.idl \
2320 + XWindow.idl \
2321 + XSystem.idl \
2322 + XRange.idl \
2323 + XBookmark.idl \
2324 + XBookmarks.idl \
2325 + XVariable.idl \
2326 + XVariables.idl \
2327 + XView.idl \
2328 + XPane.idl \
2329 + XPanes.idl \
2330 + XOptions.idl \
2331 + XSelection.idl \
2332 +
2333 +# ------------------------------------------------------------------
2334 +
2335 +.INCLUDE : target.mk
2336 +
2337 --- oovbaapi/prj/build.lst.old 2009-04-02 10:36:28.000000000 +0000
2338 +++ oovbaapi/prj/build.lst 2009-04-06 16:42:01.000000000 +0000
2339 @@ -4,5 +4,6 @@ ovba oovbaapi\genconstidl
2340 ovba oovbaapi\ooo\vba\constants nmake - all ovba_constants ovba_genconstidl NULL
2341 ovba oovbaapi\ooo\vba nmake - all ovba_vba NULL
2342 ovba oovbaapi\ooo\vba\excel nmake - all ovba_excel NULL
2343 +ovba oovbaapi\ooo\vba\word nmake - all ovba_word NULL
2344 ovba oovbaapi\ooo\vba\msforms nmake - all ovba_msforms NULL
2345 -ovba oovbaapi\util nmake - all ovba_util ovba_vba ovba_excel ovba_msforms ovba_constants ovba_genconstidl NULL
2346 +ovba oovbaapi\util nmake - all ovba_util ovba_vba ovba_excel ovba_word ovba_msforms ovba_constants ovba_genconstidl NULL
2347 --- oovbaapi/util/makefile.mk.old 2009-04-06 16:41:59.000000000 +0000
2348 +++ oovbaapi/util/makefile.mk 2009-04-06 16:42:01.000000000 +0000
2349 @@ -44,6 +44,7 @@ TARGET=oovbaapi_db
2350 UNOIDLDBFILES= \
2351 $(UCR)$/vba.db \
2352 $(UCR)$/excel.db \
2353 + $(UCR)$/word.db \
2354 $(UCR)$/msforms.db \
2355 $(UCR)$/constants.db
2357 --- sc/inc/docuno.hxx.old 2009-04-06 16:42:00.000000000 +0000
2358 +++ sc/inc/docuno.hxx 2009-04-06 16:42:01.000000000 +0000
2359 @@ -77,8 +77,6 @@ class SvxFmDrawPage;
2360 class SvxDrawPage;
2361 class ScRangeList;
2363 -#include <com/sun/star/document/XCodeNameQuery.hpp>
2364 -
2365 class SC_DLLPUBLIC ScModelObj : public SfxBaseModel,
2366 public com::sun::star::sheet::XSpreadsheetDocument,
2367 public com::sun::star::document::XActionLockable,
2368 @@ -92,7 +90,6 @@ class SC_DLLPUBLIC ScModelObj : public S
2369 public com::sun::star::view::XRenderable,
2370 public com::sun::star::document::XLinkTargetSupplier,
2371 public com::sun::star::beans::XPropertySet,
2372 - public com::sun::star::document::XCodeNameQuery,
2373 public com::sun::star::document::XDocumentEventCompatibleHelper,
2374 public SvxFmMSFactory, // derived from XMultiServiceFactory
2375 public com::sun::star::lang::XServiceInfo,
2376 @@ -320,8 +317,6 @@ public:
2377 virtual void SAL_CALL removeChangesListener( const ::com::sun::star::uno::Reference<
2378 ::com::sun::star::util::XChangesListener >& aListener )
2379 throw (::com::sun::star::uno::RuntimeException);
2380 - virtual rtl::OUString SAL_CALL getCodeNameForObject( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& aObj )
2381 - throw(::com::sun::star::uno::RuntimeException);
2382 // XVbaEventHelper
2383 virtual sal_Bool SAL_CALL processCompatibleEvent( sal_Int16 nEventId ) throw (::com::sun::star::uno::RuntimeException);
2384 };
2385 --- sc/inc/servuno.hxx.old 2009-04-06 16:41:59.000000000 +0000
2386 +++ sc/inc/servuno.hxx 2009-04-06 16:42:01.000000000 +0000
2387 @@ -94,7 +94,8 @@ class ScDocShell;
2388 #define SC_SERVICE_FORMULAPARS 38
2389 #define SC_SERVICE_OPCODEMAPPER 39
2390 #define SC_SERVICE_VBAOBJECTPROVIDER 40
2391 -#define SC_SERVICE_COUNT 41
2392 +#define SC_SERVICE_VBACODENAMEPROVIDER 41
2393 +#define SC_SERVICE_COUNT 42
2394 #define SC_SERVICE_INVALID USHRT_MAX
2397 --- sc/prj/build.lst.old 2009-04-06 16:41:58.000000000 +0000
2398 +++ sc/prj/build.lst 2009-04-06 16:42:01.000000000 +0000
2399 @@ -1,4 +1,4 @@
2400 -sc sc : oovbaapi svx stoc uui BOOST:boost formula oox NULL
2401 +sc sc : vbahelper oovbaapi svx stoc uui BOOST:boost formula oox NULL
2402 sc sc usr1 - all sc_mkout NULL
2403 sc sc\inc nmake - all sc_inc NULL
2404 sc sc\prj get - all sc_prj NULL
2405 --- sc/source/core/tool/interpr4.cxx.old 2009-04-06 16:41:58.000000000 +0000
2406 +++ sc/source/core/tool/interpr4.cxx 2009-04-06 16:42:01.000000000 +0000
2407 @@ -77,6 +77,7 @@
2408 #include <map>
2409 #include <algorithm>
2410 #include <functional>
2411 +#include <vbahelper/vbahelper.hxx>
2413 using namespace com::sun::star;
2414 using namespace formula;
2415 @@ -2513,18 +2514,11 @@ lcl_setVBARange( ScRange& aRange, ScDocu
2416 try
2417 {
2418 uno::Reference< uno::XInterface > xVBARange;
2419 - uno::Reference< lang::XMultiComponentFactory > xSMgr( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
2420 - uno::Reference< beans::XPropertySet > xProps( xSMgr, uno::UNO_QUERY_THROW );
2421 - uno::Reference< uno::XComponentContext > xCtx( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), uno::UNO_QUERY_THROW );
2422 uno::Reference<table::XCellRange> xCellRange = ScCellRangeObj::CreateRangeFromDoc( pDok, aRange );
2423 - // hmm probably better not to have to include the vba generated headers
2424 - // here, but... if they ever become always available certainly the
2425 - // line below is more coder friendly
2426 - //xRange = ooo::vba::excel::Range::createRangeFromXCellRange( xCtx , uno::Reference< ooo::vba::XHelperInterface >(), xCellRange );
2427 uno::Sequence< uno::Any > aArgs(2);
2428 aArgs[0] = uno::Any( uno::Reference< uno::XInterface >() ); // dummy parent
2429 aArgs[1] = uno::Any( xCellRange );
2430 - xVBARange = xSMgr->createInstanceWithArgumentsAndContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Range") ), aArgs, xCtx );
2431 + xVBARange = ov::createVBAUnoAPIServiceWithArgs( pDok->GetDocumentShell(), "ooo.vba.excel.Range", aArgs );
2432 if ( xVBARange.is() )
2433 {
2434 String sDummy(RTL_CONSTASCII_USTRINGPARAM("A-Range") );
2435 --- sc/source/filter/excel/excimp8.cxx.old 2009-04-06 16:41:59.000000000 +0000
2436 +++ sc/source/filter/excel/excimp8.cxx 2009-04-06 16:42:01.000000000 +0000
2437 @@ -103,8 +103,11 @@
2438 #include <com/sun/star/document/XDocumentProperties.hpp>
2439 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
2440 #include <com/sun/star/script/ModuleInfo.hpp>
2441 +#include <basic/basmgr.hxx>
2442 +#include <cppuhelper/component_context.hxx>
2444 -
2445 +#include <com/sun/star/container/XNameContainer.hpp>
2446 +
2447 using namespace com::sun::star;
2450 @@ -255,16 +258,6 @@ void ImportExcel8::SheetProtection( void
2451 GetSheetProtectBuffer().ReadOptions( aIn, GetCurrScTab() );
2452 }
2454 -bool lcl_hasVBAEnabled()
2455 -{
2456 - uno::Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY);
2457 - // test if vba service is present
2458 - uno::Reference< uno::XComponentContext > xCtx( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), uno::UNO_QUERY );
2459 - uno::Reference< uno::XInterface > xGlobals( xCtx->getValueByName( ::rtl::OUString::createFromAscii( "/singletons/ooo.vba.theGlobals") ), uno::UNO_QUERY );
2460 -
2461 - return xGlobals.is();
2462 -}
2463 -
2464 void ImportExcel8::ReadBasic( void )
2465 {
2466 //bHasBasic = TRUE;
2467 @@ -280,8 +273,11 @@ void ImportExcel8::ReadBasic( void )
2468 bool bLoadStrg = pFilterOpt->IsLoadExcelBasicStorage();
2469 if( bLoadCode || bLoadStrg )
2470 {
2471 + uno::Any aGlobs;
2472 + aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstance( ::rtl::OUString::createFromAscii( "ooo.vba.excel.Globals") );
2473 + pShell->GetBasicManager()->SetGlobalUNOConstant( "VBAGlobals", aGlobs );
2474 SvxImportMSVBasic aBasicImport( *pShell, *xRootStrg, bLoadCode, bLoadStrg );
2475 - bool bAsComment = !bLoadExecutable || !lcl_hasVBAEnabled();
2476 + bool bAsComment = !bLoadExecutable || !aGlobs.hasValue();
2477 aBasicImport.Import( EXC_STORAGE_VBA_PROJECT, EXC_STORAGE_VBA, bAsComment );
2478 GetObjectManager().SetOleNameOverrideInfo( aBasicImport.ControlNameForObjectId() );
2479 }
2480 --- sc/source/filter/excel/xlescher.cxx.old 2009-04-06 16:41:59.000000000 +0000
2481 +++ sc/source/filter/excel/xlescher.cxx 2009-04-06 16:42:01.000000000 +0000
2482 @@ -44,6 +44,7 @@
2483 #include <basic/sbstar.hxx>
2484 #include <basic/sbmod.hxx>
2485 #include <basic/sbmeth.hxx>
2486 +#include <basic/basmgr.hxx>
2488 using ::rtl::OUString;
2489 using ::com::sun::star::uno::Reference;
2490 @@ -305,6 +306,7 @@ Reference< XControlModel > XclControlHel
2491 }
2493 #define EXC_MACRONAME_PRE "vnd.sun.star.script:Standard."
2494 +#define EXC_MACRO_SCHEME "vnd.sun.star.script:"
2495 #define EXC_MACRONAME_SUF "?language=Basic&location=document"
2497 OUString XclControlHelper::GetScMacroName( const String& rXclMacroName, SfxObjectShell* pDocShell )
2498 @@ -312,9 +314,14 @@ OUString XclControlHelper::GetScMacroNam
2499 String sTmp( rXclMacroName );
2500 if( rXclMacroName.Len() > 0 )
2501 {
2502 + String sProjectName( RTL_CONSTASCII_USTRINGPARAM("Standard") );
2503 +
2504 + if ( pDocShell && pDocShell->GetBasicManager()->GetName().Len() > 0 )
2505 + sProjectName = pDocShell->GetBasicManager()->GetName();
2506 +
2507 if ( ( sTmp.Search( '.' ) == STRING_NOTFOUND) && pDocShell )
2508 {
2509 - if( StarBASIC* pBasic = pDocShell->GetBasic() )
2510 + if( StarBASIC* pBasic = pDocShell->GetBasicManager()->GetLib( sProjectName ) )
2511 {
2512 if( SbMethod* pMethod = dynamic_cast< SbMethod* >( pBasic->Find( sTmp, SbxCLASS_METHOD ) ) )
2513 {
2514 @@ -325,7 +332,9 @@ OUString XclControlHelper::GetScMacroNam
2515 }
2516 }
2517 }
2518 - return CREATE_OUSTRING( EXC_MACRONAME_PRE ) + sTmp + CREATE_OUSTRING( EXC_MACRONAME_SUF );
2519 + sProjectName.Append( '.' );
2520 + sTmp.Insert( sProjectName, 0 );
2521 + return CREATE_OUSTRING( EXC_MACRO_SCHEME ) + sTmp + CREATE_OUSTRING( EXC_MACRONAME_SUF );
2522 }
2523 return OUString();
2524 }
2525 --- sc/source/ui/docshell/docsh.cxx.old 2009-04-06 16:42:00.000000000 +0000
2526 +++ sc/source/ui/docshell/docsh.cxx 2009-04-06 16:42:01.000000000 +0000
2527 @@ -131,7 +131,8 @@
2528 #include "cellsuno.hxx"
2529 #include <com/sun/star/document/XVbaEventsHelper.hpp>
2530 #include <com/sun/star/document/VbaEventId.hpp>
2531 -
2532 +#include <basic/sbstar.hxx>
2533 +#include <basic/basmgr.hxx>
2534 using namespace com::sun::star;
2535 using namespace com::sun::star::document::VbaEventId;
2537 @@ -284,6 +285,7 @@ void ScDocShell::BeforeXMLLoading()
2538 if ( xEvt.is() )
2539 xEvt->setIgnoreEvents( sal_True );
2541 +// if VBA enabled then we need to
2542 // prevent unnecessary broadcasts and updates
2543 DBG_ASSERT(pModificator == NULL, "The Modificator should not exist");
2544 pModificator = new ScDocShellModificator( *this );
2545 @@ -367,7 +369,14 @@ void ScDocShell::AfterXMLLoading(sal_Boo
2546 }
2547 else
2548 aDocument.SetInsertingFromOtherDoc( FALSE );
2549 -
2550 + // add vba globals ( if they are availabl )
2551 + SfxObjectShell* pShell = aDocument.GetDocumentShell();
2552 + if ( pShell )
2553 + {
2554 + uno::Any aGlobs;
2555 + aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.excel.Globals" ) ) );
2556 + pShell->GetBasicManager()->SetGlobalUNOConstant( "VBAGlobals", aGlobs );
2557 + }
2558 // suppress VBA events when loading the xml
2559 uno::Reference< document::XVbaEventsHelper > xEvt( aDocument.GetVbaEventsHelper() );
2560 if ( xEvt.is() )
2561 --- sc/source/ui/unoobj/docuno.cxx.old 2009-04-06 16:42:00.000000000 +0000
2562 +++ sc/source/ui/unoobj/docuno.cxx 2009-04-06 16:42:01.000000000 +0000
2563 @@ -107,7 +107,6 @@ using namespace com::sun::star::document
2564 // alles ohne Which-ID, Map nur fuer PropertySetInfo
2566 //! umbenennen, sind nicht mehr nur Options
2567 -#include <com/sun/star/script/ScriptEventDescriptor.hpp>
2568 const SfxItemPropertyMap* lcl_GetDocOptPropertyMap()
2569 {
2570 static SfxItemPropertyMap aDocOptPropertyMap_Impl[] =
2571 @@ -315,7 +314,6 @@ uno::Any SAL_CALL ScModelObj::queryInter
2572 SC_QUERYINTERFACE( view::XRenderable )
2573 SC_QUERYINTERFACE( document::XLinkTargetSupplier )
2574 SC_QUERYINTERFACE( beans::XPropertySet )
2575 - SC_QUERYINTERFACE( document::XCodeNameQuery )
2576 SC_QUERYINTERFACE( document::XDocumentEventCompatibleHelper)
2577 SC_QUERYINTERFACE( lang::XMultiServiceFactory )
2578 SC_QUERYINTERFACE( lang::XServiceInfo )
2579 @@ -1723,49 +1721,7 @@ uno::Sequence<rtl::OUString> SAL_CALL Sc
2581 return concatServiceNames( aMyServices, aDrawServices );
2582 }
2583 -// XCodeNameQuery
2584 -rtl::OUString SAL_CALL
2585 -ScModelObj::getCodeNameForObject( const uno::Reference< uno::XInterface >& xIf ) throw( uno::RuntimeException )
2586 -{
2587 - rtl::OUString sCodeName;
2588 - if ( pDocShell )
2589 - {
2590 - OSL_TRACE( "*** In ScModelObj::getCodeNameForObject");
2591 - // need to find the page ( and index ) for this control
2592 - uno::Reference< drawing::XDrawPagesSupplier > xSupplier( pDocShell->GetModel(), uno::UNO_QUERY_THROW );
2593 - uno::Reference< container::XIndexAccess > xIndex( xSupplier->getDrawPages(), uno::UNO_QUERY_THROW );
2594 - sal_Int32 nLen = xIndex->getCount();
2595 - bool bMatched = false;
2596 - uno::Sequence< script::ScriptEventDescriptor > aFakeEvents;
2597 - for ( sal_Int32 index = 0; index < nLen; ++index )
2598 - {
2599 - try
2600 - {
2601 - uno::Reference< form::XFormsSupplier > xFormSupplier( xIndex->getByIndex( index ), uno::UNO_QUERY_THROW );
2602 - uno::Reference< container::XIndexAccess > xFormIndex( xFormSupplier->getForms(), uno::UNO_QUERY_THROW );
2603 - // get the www-standard container
2604 - uno::Reference< container::XIndexAccess > xFormControls( xFormIndex->getByIndex(0), uno::UNO_QUERY_THROW );
2605 - sal_Int32 nCntrls = xFormControls->getCount();
2606 - for( sal_Int32 cIndex = 0; cIndex < nCntrls; ++cIndex )
2607 - {
2608 - uno::Reference< uno::XInterface > xControl( xFormControls->getByIndex( cIndex ), uno::UNO_QUERY_THROW );
2609 - bMatched = ( xControl == xIf );
2610 - if ( bMatched )
2611 - {
2612 - String sName;
2613 - pDocShell->GetDocument()->GetCodeName( index, sName );
2614 - sCodeName = sName;
2615 - }
2616 - }
2617 - }
2618 - catch( uno::Exception& ) {}
2619 - if ( bMatched )
2620 - break;
2621 - }
2622 - }
2623 - // Probably should throw here ( if !bMatched )
2624 - return sCodeName;
2625 -}
2626 +
2627 // XVbaEventHelper
2628 // For Vba Event
2629 sal_Bool SAL_CALL
2630 --- sc/source/ui/unoobj/servuno.cxx.old 2009-04-06 16:41:59.000000000 +0000
2631 +++ sc/source/ui/unoobj/servuno.cxx 2009-04-06 16:42:01.000000000 +0000
2632 @@ -63,31 +63,31 @@
2633 #include <svx/xmlgrhlp.hxx>
2635 #include <comphelper/processfactory.hxx>
2636 -
2637 +#include <com/sun/star/document/XCodeNameQuery.hpp>
2638 +#include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
2639 +#include <com/sun/star/form/XFormsSupplier.hpp>
2640 +#include <com/sun/star/script/ScriptEventDescriptor.hpp>
2641 +#include <comphelper/componentcontext.hxx>
2642 +#include <cppuhelper/component_context.hxx>
2643 +#include <vbahelper/vbahelper.hxx>
2644 using namespace ::com::sun::star;
2646 class ScVbaObjectForCodeNameProvider : public ::cppu::WeakImplHelper1< container::XNameAccess >
2647 {
2648 uno::Any maWorkbook;
2649 uno::Any maCachedObject;
2650 - uno::Reference<lang::XMultiServiceFactory> mxSF;
2651 ScDocShell* mpDocShell;
2652 public:
2653 ScVbaObjectForCodeNameProvider( ScDocShell* pDocShell ) : mpDocShell( pDocShell )
2654 {
2655 - mxSF.set(comphelper::getProcessServiceFactory());
2656 - uno::Reference<beans::XPropertySet> xProps(mxSF, uno::UNO_QUERY);
2657 - if( xProps.is() )
2658 - {
2659 - ScDocument* pDoc = mpDocShell->GetDocument();
2660 - if ( !pDoc )
2661 - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("")), uno::Reference< uno::XInterface >() );
2662 -
2663 - uno::Sequence< uno::Any > aArgs(2);
2664 - aArgs[0] = uno::Any( uno::Reference< uno::XInterface >() );
2665 - aArgs[1] = uno::Any( mpDocShell->GetModel() );
2666 - maWorkbook <<= mxSF->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Workbook") ), aArgs );
2667 - }
2668 + ScDocument* pDoc = mpDocShell->GetDocument();
2669 + if ( !pDoc )
2670 + throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("")), uno::Reference< uno::XInterface >() );
2671 +
2672 + uno::Sequence< uno::Any > aArgs(2);
2673 + aArgs[0] = uno::Any( uno::Reference< uno::XInterface >() );
2674 + aArgs[1] = uno::Any( mpDocShell->GetModel() );
2675 + maWorkbook <<= ov::createVBAUnoAPIServiceWithArgs( mpDocShell, "ooo.vba.excel.Workbook", aArgs );
2676 }
2678 virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException )
2679 @@ -120,7 +120,7 @@ public:
2680 aArgs[0] = maWorkbook;
2681 aArgs[1] = uno::Any( xModel );
2682 aArgs[2] = uno::Any( rtl::OUString( sSheetName ) );
2683 - maCachedObject <<= mxSF->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Worksheet") ), aArgs );
2684 + maCachedObject <<= ov::createVBAUnoAPIServiceWithArgs( mpDocShell, "ooo.vba.excel.Worksheet", aArgs );
2685 break;
2686 }
2687 }
2688 @@ -160,6 +160,56 @@ public:
2690 };
2692 +class ScVbaCodeNameProvider : public ::cppu::WeakImplHelper1< document::XCodeNameQuery >
2693 +{
2694 +ScDocShell* mpDocShell;
2695 +public:
2696 + ScVbaCodeNameProvider( ScDocShell* pDocShell ) : mpDocShell( pDocShell ) {}
2697 + // XCodeNameQuery
2698 + rtl::OUString SAL_CALL getCodeNameForObject( const uno::Reference< uno::XInterface >& xIf ) throw( uno::RuntimeException )
2699 + {
2700 + rtl::OUString sCodeName;
2701 + if ( mpDocShell )
2702 + {
2703 + OSL_TRACE( "*** In ScVbaCodeNameProvider::getCodeNameForObject");
2704 + // need to find the page ( and index ) for this control
2705 + uno::Reference< drawing::XDrawPagesSupplier > xSupplier( mpDocShell->GetModel(), uno::UNO_QUERY_THROW );
2706 + uno::Reference< container::XIndexAccess > xIndex( xSupplier->getDrawPages(), uno::UNO_QUERY_THROW );
2707 + sal_Int32 nLen = xIndex->getCount();
2708 + bool bMatched = false;
2709 + uno::Sequence< script::ScriptEventDescriptor > aFakeEvents;
2710 + for ( sal_Int32 index = 0; index < nLen; ++index )
2711 + {
2712 + try
2713 + {
2714 + uno::Reference< form::XFormsSupplier > xFormSupplier( xIndex->getByIndex( index ), uno::UNO_QUERY_THROW );
2715 + uno::Reference< container::XIndexAccess > xFormIndex( xFormSupplier->getForms(), uno::UNO_QUERY_THROW );
2716 + // get the www-standard container
2717 + uno::Reference< container::XIndexAccess > xFormControls( xFormIndex->getByIndex(0), uno::UNO_QUERY_THROW );
2718 + sal_Int32 nCntrls = xFormControls->getCount();
2719 + for( sal_Int32 cIndex = 0; cIndex < nCntrls; ++cIndex )
2720 + {
2721 + uno::Reference< uno::XInterface > xControl( xFormControls->getByIndex( cIndex ), uno::UNO_QUERY_THROW );
2722 + bMatched = ( xControl == xIf );
2723 + if ( bMatched )
2724 + {
2725 + String sName;
2726 + mpDocShell->GetDocument()->GetCodeName( index, sName );
2727 + sCodeName = sName;
2728 + }
2729 + }
2730 + }
2731 + catch( uno::Exception& ) {}
2732 + if ( bMatched )
2733 + break;
2734 + }
2735 + }
2736 + // Probably should throw here ( if !bMatched )
2737 + return sCodeName;
2738 + }
2739 +
2740 +};
2741 +
2742 //------------------------------------------------------------------------
2744 static const sal_Char* __FAR_DATA aProvNames[SC_SERVICE_COUNT] =
2745 @@ -210,6 +260,7 @@ static const sal_Char* __FAR_DATA aProvN
2746 SC_SERVICENAME_FORMULAPARS, // SC_SERVICE_FORMULAPARS
2747 SC_SERVICENAME_OPCODEMAPPER, // SC_SERVICE_OPCODEMAPPER
2748 "ooo.vba.VBAObjectModuleObjectProvider",// SC_SERVICE_VBAOBJECTPROVIDER
2749 +"ooo.vba.VBACodeNameProvider",// SC_SERVICE_VBACODENAMEPROVIDER
2750 };
2752 //
2753 @@ -263,6 +314,7 @@ static const sal_Char* __FAR_DATA aOldNa
2754 "", // SC_SERVICE_FORMULAPARS
2755 "", // SC_SERVICE_OPCODEMAPPER
2756 "", // SC_SERVICE_VBAOBJECTPROVIDER
2757 + "", // SC_SERVICE_VBACODENAMEPROVIDER
2758 };
2761 @@ -464,6 +516,9 @@ uno::Reference<uno::XInterface> ScServic
2762 case SC_SERVICE_VBAOBJECTPROVIDER:
2763 xRet.set(static_cast<container::XNameAccess*>(new ScVbaObjectForCodeNameProvider( pDocShell )));
2764 break;
2765 + case SC_SERVICE_VBACODENAMEPROVIDER:
2766 + xRet.set(static_cast<document::XCodeNameQuery*>(new ScVbaCodeNameProvider( pDocShell )));
2767 + break;
2768 }
2769 return xRet;
2770 }
2771 --- sc/source/ui/vba/excelvbahelper.cxx.old 1970-01-01 00:00:00.000000000 +0000
2772 +++ sc/source/ui/vba/excelvbahelper.cxx 2009-04-06 16:42:01.000000000 +0000
2773 @@ -0,0 +1,218 @@
2774 +/*************************************************************************
2775 + *
2776 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
2777 + *
2778 + * Copyright 2008 by Sun Microsystems, Inc.
2779 + *
2780 + * OpenOffice.org - a multi-platform office productivity suite
2781 + *
2782 + * $RCSfile: vbahelper.cxx,v $
2783 + * $Revision: 1.5.32.1 $
2784 + *
2785 + * This file is part of OpenOffice.org.
2786 + *
2787 + * OpenOffice.org is free software: you can redistribute it and/or modify
2788 + * it under the terms of the GNU Lesser General Public License version 3
2789 + * only, as published by the Free Software Foundation.
2790 + *
2791 + * OpenOffice.org is distributed in the hope that it will be useful,
2792 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
2793 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2794 + * GNU Lesser General Public License version 3 for more details
2795 + * (a copy is included in the LICENSE file that accompanied this code).
2796 + *
2797 + * You should have received a copy of the GNU Lesser General Public License
2798 + * version 3 along with OpenOffice.org. If not, see
2799 + * <http://www.openoffice.org/license.html>
2800 + * for a copy of the LGPLv3 License.
2801 + *
2802 + ************************************************************************/
2803 +#include <docuno.hxx>
2804 +#include "excelvbahelper.hxx"
2805 +#include "tabvwsh.hxx"
2806 +#include "transobj.hxx"
2807 +#include "scmod.hxx"
2808 +#include "cellsuno.hxx"
2809 +#include <comphelper/processfactory.hxx>
2810 +
2811 +using namespace ::com::sun::star;
2812 +using namespace ::ooo::vba;
2813 +
2814 +namespace ooo
2815 +{
2816 +namespace vba
2817 +{
2818 +namespace excel
2819 +{
2820 +bool isInPrintPreview( SfxViewFrame* pView )
2821 +{
2822 + sal_uInt16 nViewNo = SID_VIEWSHELL1 - SID_VIEWSHELL0;
2823 + if ( pView->GetObjectShell()->GetFactory().GetViewFactoryCount() >
2824 +nViewNo && !pView->GetObjectShell()->IsInPlaceActive() )
2825 + {
2826 + SfxViewFactory &rViewFactory =
2827 + pView->GetObjectShell()->GetFactory().GetViewFactory(nViewNo);
2828 + if ( pView->GetCurViewId() == rViewFactory.GetOrdinal() )
2829 + return true;
2830 + }
2831 + return false;
2832 +}
2833 +
2834 +const ::rtl::OUString REPLACE_CELLS_WARNING( RTL_CONSTASCII_USTRINGPARAM( "ReplaceCellsWarning"));
2835 +
2836 +class PasteCellsWarningReseter
2837 +{
2838 +private:
2839 + bool bInitialWarningState;
2840 + static uno::Reference< beans::XPropertySet > getGlobalSheetSettings() throw ( uno::RuntimeException )
2841 + {
2842 + static uno::Reference< beans::XPropertySet > xTmpProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
2843 + static uno::Reference<uno::XComponentContext > xContext( xTmpProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), uno::UNO_QUERY_THROW );
2844 + static uno::Reference<lang::XMultiComponentFactory > xServiceManager(
2845 + xContext->getServiceManager(), uno::UNO_QUERY_THROW );
2846 + static uno::Reference< beans::XPropertySet > xProps( xServiceManager->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.GlobalSheetSettings" ) ) ,xContext ), uno::UNO_QUERY_THROW );
2847 + return xProps;
2848 + }
2849 +
2850 + bool getReplaceCellsWarning() throw ( uno::RuntimeException )
2851 + {
2852 + sal_Bool res = sal_False;
2853 + getGlobalSheetSettings()->getPropertyValue( REPLACE_CELLS_WARNING ) >>= res;
2854 + return ( res == sal_True );
2855 + }
2856 +
2857 + void setReplaceCellsWarning( bool bState ) throw ( uno::RuntimeException )
2858 + {
2859 + getGlobalSheetSettings()->setPropertyValue( REPLACE_CELLS_WARNING, uno::makeAny( bState ) );
2860 + }
2861 +public:
2862 + PasteCellsWarningReseter() throw ( uno::RuntimeException )
2863 + {
2864 + bInitialWarningState = getReplaceCellsWarning();
2865 + if ( bInitialWarningState )
2866 + setReplaceCellsWarning( false );
2867 + }
2868 + ~PasteCellsWarningReseter()
2869 + {
2870 + if ( bInitialWarningState )
2871 + {
2872 + // don't allow dtor to throw
2873 + try
2874 + {
2875 + setReplaceCellsWarning( true );
2876 + }
2877 + catch ( uno::Exception& /*e*/ ){}
2878 + }
2879 + }
2880 +};
2881 +
2882 +void
2883 +implnPaste()
2884 +{
2885 + PasteCellsWarningReseter resetWarningBox;
2886 + ScTabViewShell* pViewShell = getCurrentBestViewShell();
2887 + if ( pViewShell )
2888 + {
2889 + pViewShell->PasteFromSystem();
2890 + pViewShell->CellContentChanged();
2891 + }
2892 +}
2893 +
2894 +
2895 +void
2896 +implnCopy()
2897 +{
2898 + ScTabViewShell* pViewShell = getCurrentBestViewShell();
2899 + if ( pViewShell )
2900 + pViewShell->CopyToClip(NULL,false,false,true);
2901 +}
2902 +
2903 +void
2904 +implnCut()
2905 +{
2906 + ScTabViewShell* pViewShell = getCurrentBestViewShell();
2907 + if ( pViewShell )
2908 + pViewShell->CutToClip( NULL, TRUE );
2909 +}
2910 +
2911 +void implnPasteSpecial(USHORT nFlags,USHORT nFunction,sal_Bool bSkipEmpty, sal_Bool bTranspose)
2912 +{
2913 + PasteCellsWarningReseter resetWarningBox;
2914 + sal_Bool bAsLink(sal_False), bOtherDoc(sal_False);
2915 + InsCellCmd eMoveMode = INS_NONE;
2916 +
2917 + ScTabViewShell* pTabViewShell = ScTabViewShell::GetActiveViewShell();
2918 + if ( !pTabViewShell )
2919 + // none active, try next best
2920 + pTabViewShell = getCurrentBestViewShell();
2921 + if ( pTabViewShell )
2922 + {
2923 + ScViewData* pView = pTabViewShell->GetViewData();
2924 + Window* pWin = ( pView != NULL ) ? pView->GetActiveWin() : NULL;
2925 + if ( pView && pWin )
2926 + {
2927 + if ( bAsLink && bOtherDoc )
2928 + pTabViewShell->PasteFromSystem(0);//SOT_FORMATSTR_ID_LINK
2929 + else
2930 + {
2931 + ScTransferObj* pOwnClip = ScTransferObj::GetOwnClipboard( pWin );
2932 + ScDocument* pDoc = NULL;
2933 + if ( pOwnClip )
2934 + pDoc = pOwnClip->GetDocument();
2935 + pTabViewShell->PasteFromClip( nFlags, pDoc,
2936 + nFunction, bSkipEmpty, bTranspose, bAsLink,
2937 + eMoveMode, IDF_NONE, TRUE );
2938 + pTabViewShell->CellContentChanged();
2939 + }
2940 + }
2941 + }
2942 +
2943 +}
2944 +
2945 +ScDocShell*
2946 +getDocShell( css::uno::Reference< css::frame::XModel>& xModel )
2947 +{
2948 + uno::Reference< uno::XInterface > xIf( xModel, uno::UNO_QUERY_THROW );
2949 + ScModelObj* pModel = dynamic_cast< ScModelObj* >( xIf.get() );
2950 + ScDocShell* pDocShell = NULL;
2951 + if ( pModel )
2952 + pDocShell = (ScDocShell*)pModel->GetEmbeddedObject();
2953 + return pDocShell;
2954 +
2955 +}
2956 +
2957 +ScTabViewShell*
2958 +getBestViewShell( css::uno::Reference< css::frame::XModel>& xModel )
2959 +{
2960 + ScDocShell* pDocShell = getDocShell( xModel );
2961 + if ( pDocShell )
2962 + return pDocShell->GetBestViewShell();
2963 + return NULL;
2964 +}
2965 +
2966 +ScTabViewShell*
2967 +getCurrentBestViewShell()
2968 +{
2969 + uno::Reference< frame::XModel > xModel = getCurrentDocument();
2970 + return getBestViewShell( xModel );
2971 +}
2972 +
2973 +SfxViewFrame*
2974 +getCurrentViewFrame()
2975 +{
2976 + ScTabViewShell* pViewShell = getCurrentBestViewShell();
2977 + if ( pViewShell )
2978 + return pViewShell->GetViewFrame();
2979 + return NULL;
2980 +}
2981 +
2982 +SfxItemSet*
2983 +ScVbaCellRangeAccess::GetDataSet( ScCellRangeObj* pRangeObj )
2984 +{
2985 + SfxItemSet* pDataSet = pRangeObj ? pRangeObj->GetCurrentDataSet( true ) : NULL ;
2986 + return pDataSet;
2987 +
2988 +}
2989 +} //excel
2990 +} //vba
2991 +} //ooo
2992 --- sc/source/ui/vba/excelvbahelper.hxx.old 1970-01-01 00:00:00.000000000 +0000
2993 +++ sc/source/ui/vba/excelvbahelper.hxx 2009-04-06 16:42:01.000000000 +0000
2994 @@ -0,0 +1,60 @@
2995 +/*************************************************************************
2996 + *
2997 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
2998 + *
2999 + * Copyright 2008 by Sun Microsystems, Inc.
3000 + *
3001 + * OpenOffice.org - a multi-platform office productivity suite
3002 + *
3003 + * $RCSfile: vbahelper.hxx,v $
3004 + * $Revision: 1.5.32.1 $
3005 + *
3006 + * This file is part of OpenOffice.org.
3007 + *
3008 + * OpenOffice.org is free software: you can redistribute it and/or modify
3009 + * it under the terms of the GNU Lesser General Public License version 3
3010 + * only, as published by the Free Software Foundation.
3011 + *
3012 + * OpenOffice.org is distributed in the hope that it will be useful,
3013 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
3014 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3015 + * GNU Lesser General Public License version 3 for more details
3016 + * (a copy is included in the LICENSE file that accompanied this code).
3017 + *
3018 + * You should have received a copy of the GNU Lesser General Public License
3019 + * version 3 along with OpenOffice.org. If not, see
3020 + * <http://www.openoffice.org/license.html>
3021 + * for a copy of the LGPLv3 License.
3022 + *
3023 + ************************************************************************/
3024 +#ifndef SC_EXCEL_VBA_HELPER_HXX
3025 +#define SC_EXCEL_VBA_HELPER_HXX
3026 +
3027 +#include<vbahelper/vbahelper.hxx>
3028 +#include <docsh.hxx>
3029 +
3030 +class ScCellRangeObj;
3031 +
3032 +namespace ooo
3033 +{
3034 + namespace vba
3035 + {
3036 + namespace excel
3037 + {
3038 + void implnCopy();
3039 + void implnPaste();
3040 + void implnCut();
3041 + void implnPasteSpecial(sal_uInt16 nFlags,sal_uInt16 nFunction,sal_Bool bSkipEmpty, sal_Bool bTranspose);
3042 + ScTabViewShell* getBestViewShell( css::uno::Reference< css::frame::XModel>& xModel ) ;
3043 + ScDocShell* getDocShell( css::uno::Reference< css::frame::XModel>& xModel ) ;
3044 + ScTabViewShell* getCurrentBestViewShell();
3045 + SfxViewFrame* getCurrentViewFrame();
3046 + class ScVbaCellRangeAccess
3047 + {
3048 + public:
3049 + static SfxItemSet* GetDataSet( ScCellRangeObj* pRangeObj );
3050 + };
3051 +};
3052 +};
3053 +};
3054 +#endif
3055 --- sc/source/ui/vba/makefile.mk.old 2009-04-06 16:42:00.000000000 +0000
3056 +++ sc/source/ui/vba/makefile.mk 2009-04-06 16:42:01.000000000 +0000
3057 @@ -64,7 +64,7 @@ SLOFILES= \
3058 $(SLO)$/vbaworksheet.obj \
3059 $(SLO)$/vbaoutline.obj \
3060 $(SLO)$/vbafont.obj\
3061 - $(SLO)$/vbahelper.obj\
3062 + $(SLO)$/excelvbahelper.obj\
3063 $(SLO)$/vbainterior.obj\
3064 $(SLO)$/vbawsfunction.obj\
3065 $(SLO)$/vbawindow.obj\
3066 @@ -81,20 +81,10 @@ SLOFILES= \
3067 $(SLO)$/vbapalette.obj \
3068 $(SLO)$/vbaborders.obj \
3069 $(SLO)$/vbacharacters.obj \
3070 - $(SLO)$/vbacombobox.obj \
3071 $(SLO)$/vbavalidation.obj \
3072 - $(SLO)$/vbacontrol.obj \
3073 - $(SLO)$/vbacontrols.obj \
3074 $(SLO)$/vbaoleobject.obj \
3075 $(SLO)$/vbaoleobjects.obj \
3076 - $(SLO)$/vbabutton.obj \
3077 - $(SLO)$/vbalabel.obj \
3078 - $(SLO)$/vbatextbox.obj \
3079 $(SLO)$/vbatextboxshape.obj \
3080 - $(SLO)$/vbaradiobutton.obj \
3081 - $(SLO)$/vbalistbox.obj \
3082 - $(SLO)$/vbalistcontrolhelper.obj \
3083 - $(SLO)$/vbapropvalue.obj \
3084 $(SLO)$/vbapane.obj \
3085 $(SLO)$/vbashape.obj \
3086 $(SLO)$/vbacolorformat.obj \
3087 @@ -116,24 +106,10 @@ SLOFILES= \
3088 $(SLO)$/vbastyle.obj \
3089 $(SLO)$/vbastyles.obj \
3090 $(SLO)$/vbaassistant.obj \
3091 - $(SLO)$/vbauserform.obj \
3092 - $(SLO)$/vbacheckbox.obj \
3093 - $(SLO)$/vbatogglebutton.obj \
3094 - $(SLO)$/vbaframe.obj \
3095 - $(SLO)$/vbascrollbar.obj \
3096 - $(SLO)$/vbaprogressbar.obj \
3097 - $(SLO)$/vbamultipage.obj \
3098 - $(SLO)$/vbapages.obj \
3099 - $(SLO)$/vbacommandbarcontrol.obj \
3100 - $(SLO)$/vbacommandbarcontrols.obj \
3101 - $(SLO)$/vbacommandbar.obj \
3102 - $(SLO)$/vbacommandbars.obj \
3103 $(SLO)$/vbahyperlink.obj \
3104 $(SLO)$/vbapagesetup.obj \
3105 $(SLO)$/vbapagebreak.obj \
3106 $(SLO)$/vbapagebreaks.obj \
3107 - $(SLO)$/vbaspinbutton.obj \
3108 - $(SLO)$/vbaimage.obj \
3109 $(SLO)$/service.obj \
3110 $(SLO)$/vbaeventshelper.obj
3112 --- sc/source/ui/vba/service.cxx.old 2009-04-06 16:42:00.000000000 +0000
3113 +++ sc/source/ui/vba/service.cxx 2009-04-06 16:42:01.000000000 +0000
3114 @@ -61,11 +61,11 @@ namespace globals
3115 {
3116 extern sdecl::ServiceDecl const serviceDecl;
3117 }
3118 -namespace userform
3119 +namespace hyperlink
3120 {
3121 extern sdecl::ServiceDecl const serviceDecl;
3122 }
3123 -namespace hyperlink
3124 +namespace application
3125 {
3126 extern sdecl::ServiceDecl const serviceDecl;
3127 }
3128 @@ -87,10 +87,10 @@ extern "C"
3129 lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey )
3130 {
3131 OSL_TRACE("In component_writeInfo");
3132 -
3133 +#if 0
3134 // Component registration
3135 if ( component_writeInfoHelper( pServiceManager, pRegistryKey,
3136 - range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl, userform::serviceDecl, window::serviceDecl, hyperlink::serviceDecl ) && component_writeInfoHelper( pServiceManager, pRegistryKey, vbaeventshelper::serviceDecl ) )
3137 + range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl, window::serviceDecl, hyperlink::serviceDecl, application::serviceDecl ) && component_writeInfoHelper( pServiceManager, pRegistryKey, vbaeventshelper::serviceDecl ) )
3138 {
3139 // Singleton registration
3140 try
3141 @@ -110,6 +110,12 @@ extern "C"
3142 }
3143 }
3144 return sal_False;
3145 +#else
3146 + // Component registration
3147 + return component_writeInfoHelper( pServiceManager, pRegistryKey,
3148 + range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl, window::serviceDecl, hyperlink::serviceDecl, application::serviceDecl ) && component_writeInfoHelper( pServiceManager, pRegistryKey, vbaeventshelper::serviceDecl );
3149 +#endif
3150 +
3151 }
3153 SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
3154 @@ -118,7 +124,7 @@ extern "C"
3155 {
3156 OSL_TRACE("In component_getFactory for %s", pImplName );
3157 void* pRet = component_getFactoryHelper(
3158 - pImplName, pServiceManager, pRegistryKey, range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl, userform::serviceDecl, window::serviceDecl, hyperlink::serviceDecl );
3159 + pImplName, pServiceManager, pRegistryKey, range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl, window::serviceDecl, hyperlink::serviceDecl, application::serviceDecl );
3160 if( !pRet )
3161 pRet = component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, vbaeventshelper::serviceDecl );
3162 OSL_TRACE("Ret is 0x%x", pRet);
3163 --- sc/source/ui/vba/vbaapplication.cxx.old 2009-04-06 16:41:59.000000000 +0000
3164 +++ sc/source/ui/vba/vbaapplication.cxx 2009-04-06 16:42:01.000000000 +0000
3165 @@ -60,7 +60,6 @@
3166 #include "vbashape.hxx"
3167 #include "vbatextboxshape.hxx"
3168 #include "vbaassistant.hxx"
3169 -#include "vbacommandbars.hxx"
3170 #include "sc.hrc"
3172 #include <osl/file.hxx>
3173 @@ -87,6 +86,7 @@
3174 #include "miscuno.hxx"
3175 #include "unonames.hxx"
3176 #include "docsh.hxx"
3177 +#include <vbahelper/helperdecl.hxx>
3179 using namespace ::ooo::vba;
3180 using namespace ::com::sun::star;
3181 @@ -123,7 +123,7 @@ public:
3182 ActiveWorkbook( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext) : ScVbaWorkbook( xParent, xContext ){}
3183 };
3185 -ScVbaApplication::ScVbaApplication( uno::Reference<uno::XComponentContext >& xContext ): ScVbaApplication_BASE( uno::Reference< XHelperInterface >(), xContext ), m_xCalculation( excel::XlCalculation::xlCalculationAutomatic )
3186 +ScVbaApplication::ScVbaApplication( const uno::Reference<uno::XComponentContext >& xContext ): ScVbaApplication_BASE( xContext ), m_xCalculation( excel::XlCalculation::xlCalculationAutomatic )
3187 {
3188 }
3190 @@ -151,15 +151,6 @@ ScVbaApplication::getAssistant() throw (
3191 }
3193 uno::Any SAL_CALL
3194 -ScVbaApplication::CommandBars( const uno::Any& aIndex ) throw (uno::RuntimeException)
3195 -{
3196 - uno::Reference< XCommandBars > xCommandBars( new ScVbaCommandBars( this, mxContext, uno::Reference< container::XIndexAccess >() ) );
3197 - if( aIndex.hasValue() )
3198 - return uno::makeAny( xCommandBars->Item( aIndex, uno::Any() ) );
3199 - return uno::makeAny( xCommandBars );
3200 -}
3201 -
3202 -uno::Any SAL_CALL
3203 ScVbaApplication::getSelection() throw (uno::RuntimeException)
3204 {
3205 OSL_TRACE("** ScVbaApplication::getSelection() ** ");
3206 @@ -227,7 +218,7 @@ ScVbaApplication::getActiveCell() throw
3207 {
3208 uno::Reference< sheet::XSpreadsheetView > xView( getCurrentDocument()->getCurrentController(), uno::UNO_QUERY_THROW );
3209 uno::Reference< table::XCellRange > xRange( xView->getActiveSheet(), ::uno::UNO_QUERY_THROW);
3210 - ScTabViewShell* pViewShell = getCurrentBestViewShell();
3211 + ScTabViewShell* pViewShell = excel::getCurrentBestViewShell();
3212 if ( !pViewShell )
3213 throw uno::RuntimeException( rtl::OUString::createFromAscii("No ViewShell available"), uno::Reference< uno::XInterface >() );
3214 ScViewData* pTabView = pViewShell->GetViewData();
3215 @@ -240,65 +231,6 @@ ScVbaApplication::getActiveCell() throw
3216 return new ScVbaRange( this, mxContext, xRange->getCellRangeByPosition( nCursorX, nCursorY, nCursorX, nCursorY ) );
3217 }
3219 -sal_Bool
3220 -ScVbaApplication::getScreenUpdating() throw (uno::RuntimeException)
3221 -{
3222 - uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
3223 - return !xModel->hasControllersLocked();
3224 -}
3225 -
3226 -void
3227 -ScVbaApplication::setScreenUpdating(sal_Bool bUpdate) throw (uno::RuntimeException)
3228 -{
3229 - uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
3230 - if (bUpdate)
3231 - xModel->unlockControllers();
3232 - else
3233 - xModel->lockControllers();
3234 -}
3235 -
3236 -sal_Bool
3237 -ScVbaApplication::getDisplayStatusBar() throw (uno::RuntimeException)
3238 -{
3239 - uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
3240 - uno::Reference< frame::XFrame > xFrame( xModel->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW );
3241 - uno::Reference< beans::XPropertySet > xProps( xFrame, uno::UNO_QUERY_THROW );
3242 -
3243 - if( xProps.is() ){
3244 - uno::Reference< frame::XLayoutManager > xLayoutManager( xProps->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager")) ), uno::UNO_QUERY_THROW );
3245 - rtl::OUString url(RTL_CONSTASCII_USTRINGPARAM( "private:resource/statusbar/statusbar" ));
3246 - if( xLayoutManager.is() && xLayoutManager->isElementVisible( url ) ){
3247 - return sal_True;
3248 - }
3249 - }
3250 - return sal_False;
3251 -}
3252 -
3253 -void
3254 -ScVbaApplication::setDisplayStatusBar(sal_Bool bDisplayStatusBar) throw (uno::RuntimeException)
3255 -{
3256 - uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
3257 - uno::Reference< frame::XFrame > xFrame( xModel->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW );
3258 - uno::Reference< beans::XPropertySet > xProps( xFrame, uno::UNO_QUERY_THROW );
3259 -
3260 - if( xProps.is() ){
3261 - uno::Reference< frame::XLayoutManager > xLayoutManager( xProps->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager")) ), uno::UNO_QUERY_THROW );
3262 - rtl::OUString url(RTL_CONSTASCII_USTRINGPARAM( "private:resource/statusbar/statusbar" ));
3263 - if( xLayoutManager.is() ){
3264 - if( bDisplayStatusBar && !xLayoutManager->isElementVisible( url ) ){
3265 - if( !xLayoutManager->showElement( url ) )
3266 - xLayoutManager->createElement( url );
3267 - return;
3268 - }
3269 - else if( !bDisplayStatusBar && xLayoutManager->isElementVisible( url ) ){
3270 - xLayoutManager->hideElement( url );
3271 - return;
3272 - }
3273 - }
3274 - }
3275 - return;
3276 -}
3277 -
3278 uno::Any SAL_CALL
3279 ScVbaApplication::Workbooks( const uno::Any& aIndex ) throw (uno::RuntimeException)
3280 {
3281 @@ -347,7 +279,7 @@ ScVbaApplication::Evaluate( const ::rtl:
3282 uno::Any
3283 ScVbaApplication::Dialogs( const uno::Any &aIndex ) throw (uno::RuntimeException)
3284 {
3285 - uno::Reference< excel::XDialogs > xDialogs( new ScVbaDialogs( uno::Reference< XHelperInterface >( ScVbaGlobals::getGlobalsImpl( mxContext )->getApplication(), uno::UNO_QUERY_THROW ), mxContext ) );
3286 + uno::Reference< excel::XDialogs > xDialogs( new ScVbaDialogs( uno::Reference< XHelperInterface >( this ), mxContext ) );
3287 if( !aIndex.hasValue() )
3288 return uno::Any( xDialogs );
3289 return uno::Any( xDialogs->Item( aIndex ) );
3290 @@ -460,7 +392,7 @@ ScVbaApplication::setCalculation( ::sal_
3291 uno::Any SAL_CALL
3292 ScVbaApplication::Windows( const uno::Any& aIndex ) throw (uno::RuntimeException)
3293 {
3294 - uno::Reference< XCollection > xWindows = ScVbaWindows::Windows( mxContext );
3295 + uno::Reference< excel::XWindows > xWindows( new ScVbaWindows( this, mxContext ) );
3296 if ( aIndex.getValueTypeClass() == uno::TypeClass_VOID )
3297 return uno::Any( xWindows );
3298 return uno::Any( xWindows->Item( aIndex, uno::Any() ) );
3299 @@ -571,11 +503,11 @@ ScVbaApplication::GoTo( const uno::Any&
3300 xModel->getCurrentController(), uno::UNO_QUERY_THROW );
3301 uno::Reference< sheet::XSpreadsheet > xDoc = xSpreadsheet->getActiveSheet();
3303 - ScTabViewShell* pShell = getCurrentBestViewShell();
3304 + ScTabViewShell* pShell = excel::getCurrentBestViewShell();
3305 ScGridWindow* gridWindow = (ScGridWindow*)pShell->GetWindow();
3306 try
3307 {
3308 - uno::Reference< excel::XRange > xVbaSheetRange = ScVbaRange::getRangeObjectForName( mxContext, sRangeName, getDocShell( xModel ), formula::FormulaGrammar::CONV_XL_R1C1 );
3309 + uno::Reference< excel::XRange > xVbaSheetRange = ScVbaRange::getRangeObjectForName( mxContext, sRangeName, excel::getDocShell( xModel ), formula::FormulaGrammar::CONV_XL_R1C1 );
3310 ;
3311 if( bScroll )
3312 {
3313 @@ -613,7 +545,7 @@ ScVbaApplication::GoTo( const uno::Any&
3314 if( Reference >>= xRange )
3315 {
3316 uno::Reference< excel::XRange > xVbaRange( Reference, uno::UNO_QUERY );
3317 - ScTabViewShell* pShell = getCurrentBestViewShell();
3318 + ScTabViewShell* pShell = excel::getCurrentBestViewShell();
3319 ScGridWindow* gridWindow = (ScGridWindow*)pShell->GetWindow();
3320 if ( xVbaRange.is() )
3321 {
3322 @@ -643,38 +575,10 @@ ScVbaApplication::GoTo( const uno::Any&
3323 uno::Reference< uno::XInterface >() );
3324 }
3326 -namespace
3327 -{
3328 - static uno::Reference< frame::XController > lcl_getCurrentController()
3329 - {
3330 - const uno::Reference< frame::XModel > xWorkingDoc( SfxObjectShell::GetCurrentComponent(), uno::UNO_QUERY );
3331 - uno::Reference< frame::XController > xController;
3332 - if ( xWorkingDoc.is() )
3333 - xController.set( xWorkingDoc->getCurrentController(), uno::UNO_SET_THROW );
3334 - else
3335 - xController.set( SfxObjectShell::GetCurrentComponent(), uno::UNO_QUERY_THROW );
3336 - return xController;
3337 - }
3338 -}
3339 -
3340 sal_Int32 SAL_CALL
3341 ScVbaApplication::getCursor() throw (uno::RuntimeException)
3342 {
3343 - sal_Int32 nPointerStyle( POINTER_ARROW );
3344 - try
3345 - {
3346 - const uno::Reference< frame::XController > xController( lcl_getCurrentController(), uno::UNO_SET_THROW );
3347 - const uno::Reference< frame::XFrame > xFrame ( xController->getFrame(), uno::UNO_SET_THROW );
3348 - const uno::Reference< awt::XWindow > xWindow ( xFrame->getContainerWindow(), uno::UNO_SET_THROW );
3349 - // why the heck isn't there an XWindowPeer::getPointer, but a setPointer only?
3350 - const Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
3351 - if ( pWindow )
3352 - nPointerStyle = pWindow->GetSystemWindow()->GetPointer().GetStyle();
3353 - }
3354 - catch( const uno::Exception& )
3355 - {
3356 - DBG_UNHANDLED_EXCEPTION();
3357 - }
3358 + sal_Int32 nPointerStyle = getPointerStyle();
3360 switch( nPointerStyle )
3361 {
3362 @@ -696,82 +600,34 @@ ScVbaApplication::setCursor( sal_Int32 _
3363 {
3364 try
3365 {
3366 - ::std::vector< uno::Reference< frame::XController > > aControllers;
3367 -
3368 - const uno::Reference< frame::XModel2 > xModel2( SfxObjectShell::GetCurrentComponent(), uno::UNO_QUERY );
3369 - if ( xModel2.is() )
3370 - {
3371 - const uno::Reference< container::XEnumeration > xEnumControllers( xModel2->getControllers(), uno::UNO_SET_THROW );
3372 - while ( xEnumControllers->hasMoreElements() )
3373 - {
3374 - const uno::Reference< frame::XController > xController( xEnumControllers->nextElement(), uno::UNO_QUERY_THROW );
3375 - aControllers.push_back( xController );
3376 - }
3377 - }
3378 - else
3379 + switch( _cursor )
3380 {
3381 - const uno::Reference< frame::XModel > xModel( SfxObjectShell::GetCurrentComponent(), uno::UNO_QUERY );
3382 - if ( xModel.is() )
3383 + case excel::XlMousePointer::xlNorthwestArrow:
3384 {
3385 - const uno::Reference< frame::XController > xController( xModel->getCurrentController(), uno::UNO_SET_THROW );
3386 - aControllers.push_back( xController );
3387 + const Pointer& rPointer( POINTER_ARROW );
3388 + setCursorHelper( rPointer, sal_False );
3389 + break;
3390 }
3391 - else
3392 + case excel::XlMousePointer::xlWait:
3393 + case excel::XlMousePointer::xlIBeam:
3394 {
3395 - const uno::Reference< frame::XController > xController( SfxObjectShell::GetCurrentComponent(), uno::UNO_QUERY_THROW );
3396 - aControllers.push_back( xController );
3397 + const Pointer& rPointer( static_cast< PointerStyle >( _cursor ) );
3398 + //It will set the edit window, toobar and statusbar's mouse pointer.
3399 + setCursorHelper( rPointer, sal_True );
3400 + break;
3401 }
3402 - }
3403 -
3404 - for ( ::std::vector< uno::Reference< frame::XController > >::const_iterator controller = aControllers.begin();
3405 - controller != aControllers.end();
3406 - ++controller
3407 - )
3408 - {
3409 - const uno::Reference< frame::XFrame > xFrame ( (*controller)->getFrame(), uno::UNO_SET_THROW );
3410 - const uno::Reference< awt::XWindow > xWindow ( xFrame->getContainerWindow(), uno::UNO_SET_THROW );
3411 -
3412 - Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
3413 - OSL_ENSURE( pWindow, "ScVbaApplication::setCursor: no window!" );
3414 - if ( !pWindow )
3415 - continue;
3416 -
3417 - switch( _cursor )
3418 + case excel::XlMousePointer::xlDefault:
3419 {
3420 - case excel::XlMousePointer::xlNorthwestArrow:
3421 - {
3422 - const Pointer& rPointer( POINTER_ARROW );
3423 - pWindow->GetSystemWindow()->SetPointer( rPointer );
3424 - pWindow->GetSystemWindow()->EnableChildPointerOverwrite( sal_False );
3425 - break;
3426 - }
3427 - case excel::XlMousePointer::xlWait:
3428 - case excel::XlMousePointer::xlIBeam:
3429 - {
3430 - const Pointer& rPointer( static_cast< PointerStyle >( _cursor ) );
3431 - //It will set the edit window, toobar and statusbar's mouse pointer.
3432 - pWindow->GetSystemWindow()->SetPointer( rPointer );
3433 - pWindow->GetSystemWindow()->EnableChildPointerOverwrite( sal_True );
3434 - //It only set the edit window's mouse pointer
3435 - //pWindow->.SetPointer( rPointer );
3436 - //pWindow->.EnableChildPointerOverwrite( sal_True );
3437 - //printf("\nset Cursor...%d\n", pWindow->.GetType());
3438 - break;
3439 - }
3440 - case excel::XlMousePointer::xlDefault:
3441 - {
3442 - const Pointer& rPointer( POINTER_NULL );
3443 - pWindow->GetSystemWindow()->SetPointer( rPointer );
3444 - pWindow->GetSystemWindow()->EnableChildPointerOverwrite( sal_False );
3445 - break;
3446 - }
3447 - default:
3448 - throw uno::RuntimeException( rtl::OUString(
3449 - RTL_CONSTASCII_USTRINGPARAM("Unknown value for Cursor pointer")), uno::Reference< uno::XInterface >() );
3450 - // TODO: isn't this a flaw in the API? It should be allowed to throw an
3451 - // IllegalArgumentException, or so
3452 + const Pointer& rPointer( POINTER_NULL );
3453 + setCursorHelper( rPointer, sal_False );
3454 + break;
3455 }
3456 - }
3457 + default:
3458 + throw uno::RuntimeException( rtl::OUString(
3459 + RTL_CONSTASCII_USTRINGPARAM("Unknown value for Cursor pointer")), uno::Reference< uno::XInterface >() );
3460 + // TODO: isn't this a flaw in the API? It should be allowed to throw an
3461 + // IllegalArgumentException, or so
3462 + }
3463 }
3464 catch( const uno::Exception& )
3465 {
3466 @@ -1145,7 +1001,7 @@ ScVbaApplication::Intersect( const uno::
3467 }
3469 uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
3470 - ScDocShell* pDocShell = getDocShell( xModel );
3471 + ScDocShell* pDocShell = excel::getDocShell( xModel );
3472 if ( aCellRanges.Count() == 1 )
3473 {
3474 xRefRange = new ScVbaRange( uno::Reference< XHelperInterface >(), mxContext, new ScCellRangeObj( pDocShell, *aCellRanges.First() ) );
3475 @@ -1234,7 +1090,7 @@ ScVbaApplication::Union( const uno::Refe
3476 aCellRanges.Append( *it );
3478 uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
3479 - ScDocShell* pDocShell = getDocShell( xModel );
3480 + ScDocShell* pDocShell = excel::getDocShell( xModel );
3481 if ( aCellRanges.Count() == 1 )
3482 {
3483 // normal range
3484 @@ -1269,16 +1125,11 @@ ScVbaApplication::Volatile( const uno::A
3485 */
3486 }
3488 -void SAL_CALL
3489 -ScVbaApplication::DoEvents() throw ( uno::RuntimeException )
3490 -{
3491 -}
3492 -
3493 ::sal_Bool SAL_CALL
3494 ScVbaApplication::getDisplayFormulaBar() throw ( css::uno::RuntimeException )
3495 {
3496 sal_Bool bRes = sal_False;
3497 - ScTabViewShell* pViewShell = getCurrentBestViewShell();
3498 + ScTabViewShell* pViewShell = excel::getCurrentBestViewShell();
3499 if ( pViewShell )
3500 {
3501 SfxBoolItem sfxFormBar( FID_TOGGLEINPUTLINE);
3502 @@ -1296,7 +1147,7 @@ ScVbaApplication::getDisplayFormulaBar()
3503 void SAL_CALL
3504 ScVbaApplication::setDisplayFormulaBar( ::sal_Bool _displayformulabar ) throw ( css::uno::RuntimeException )
3505 {
3506 - ScTabViewShell* pViewShell = getCurrentBestViewShell();
3507 + ScTabViewShell* pViewShell = excel::getCurrentBestViewShell();
3508 if ( pViewShell && ( _displayformulabar != getDisplayFormulaBar() ) )
3509 {
3510 SfxBoolItem sfxFormBar( FID_TOGGLEINPUTLINE, _displayformulabar);
3511 @@ -1343,3 +1194,13 @@ ScVbaApplication::getServiceNames()
3512 }
3513 return aServiceNames;
3514 }
3515 +
3516 +namespace application
3517 +{
3518 +namespace sdecl = comphelper::service_decl;
3519 +sdecl::vba_service_class_<ScVbaApplication, sdecl::with_args<false> > serviceImpl;
3520 +extern sdecl::ServiceDecl const serviceDecl(
3521 + serviceImpl,
3522 + "ScVbaApplication",
3523 + "ooo.vba.excel.Application" );
3524 +}
3525 --- sc/source/ui/vba/vbaapplication.hxx.old 2009-04-06 16:41:59.000000000 +0000
3526 +++ sc/source/ui/vba/vbaapplication.hxx 2009-04-06 16:42:01.000000000 +0000
3527 @@ -35,9 +35,12 @@
3528 #include <ooo/vba/excel/XApplication.hpp>
3529 #include <com/sun/star/uno/XComponentContext.hpp>
3531 -#include "vbahelperinterface.hxx"
3532 +#include <vbahelper/vbahelperinterface.hxx>
3533 +#include <vbahelper/vbaapplicationbase.hxx>
3534 +#include <cppuhelper/implbase1.hxx>
3536 -typedef InheritedHelperInterfaceImpl1< ov::excel::XApplication > ScVbaApplication_BASE;
3537 +//typedef InheritedHelperInterfaceImpl1< ov::excel::XApplication > ScVbaApplication_BASE;
3538 +typedef cppu::ImplInheritanceHelper1< VbaApplicationBase, ov::excel::XApplication > ScVbaApplication_BASE;
3540 class ScVbaApplication : public ScVbaApplication_BASE
3541 {
3542 @@ -45,12 +48,9 @@ private:
3543 sal_Int32 m_xCalculation;
3544 rtl::OUString getOfficePath( const rtl::OUString& sPath ) throw ( css::uno::RuntimeException );
3545 public:
3546 - ScVbaApplication( css::uno::Reference< css::uno::XComponentContext >& m_xContext );
3547 + ScVbaApplication( const css::uno::Reference< css::uno::XComponentContext >& m_xContext );
3548 virtual ~ScVbaApplication();
3550 - // XHelperInterface ( parent is itself )
3551 - virtual css::uno::Reference< ov::XHelperInterface > SAL_CALL getParent( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { return this; }
3552 -
3553 // XApplication
3554 virtual ::rtl::OUString SAL_CALL PathSeparator( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
3555 virtual void SAL_CALL setDefaultFilePath( const ::rtl::OUString& DefaultFilePath ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
3556 @@ -68,15 +68,10 @@ public:
3557 virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getActiveCell() throw ( css::uno::RuntimeException);
3558 virtual css::uno::Reference< ov::excel::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException);
3559 virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getActiveSheet() throw (css::uno::RuntimeException);
3560 - virtual sal_Bool SAL_CALL getScreenUpdating() throw (css::uno::RuntimeException);
3561 - virtual void SAL_CALL setScreenUpdating(sal_Bool bUpdate) throw (css::uno::RuntimeException);
3562 - virtual sal_Bool SAL_CALL getDisplayStatusBar() throw (css::uno::RuntimeException);
3563 - virtual void SAL_CALL setDisplayStatusBar(sal_Bool bDisplayStatusBar) throw (css::uno::RuntimeException);
3564 virtual ::sal_Bool SAL_CALL getDisplayFormulaBar() throw ( css::uno::RuntimeException );
3565 virtual void SAL_CALL setDisplayFormulaBar( ::sal_Bool _displayformulabar ) throw ( css::uno::RuntimeException );
3567 virtual css::uno::Reference< ov::XAssistant > SAL_CALL getAssistant() throw (css::uno::RuntimeException);
3568 - virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
3569 virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getThisWorkbook() throw (css::uno::RuntimeException);
3570 virtual css::uno::Any SAL_CALL Workbooks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
3571 virtual css::uno::Any SAL_CALL Worksheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
3572 @@ -102,7 +97,6 @@ public:
3573 virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Intersect( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::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::BasicErrorException, css::uno::RuntimeException);
3574 virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Union( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::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::BasicErrorException, css::uno::RuntimeException);
3575 virtual void SAL_CALL Volatile( const css::uno::Any& Volatile ) throw (css::uno::RuntimeException );
3576 - virtual void SAL_CALL DoEvents() throw (css::uno::RuntimeException);
3577 virtual css::uno::Any SAL_CALL Caller( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
3578 // XHelperInterface
3579 virtual rtl::OUString& getServiceImplName();
3580 --- sc/source/ui/vba/vbaassistant.hxx.old 2009-04-02 10:45:35.000000000 +0000
3581 +++ sc/source/ui/vba/vbaassistant.hxx 2009-04-06 16:42:01.000000000 +0000
3582 @@ -40,8 +40,8 @@
3584 #include <sfx2/sfxhelp.hxx>
3586 -#include "vbahelper.hxx"
3587 -#include "vbahelperinterface.hxx"
3588 +#include "excelvbahelper.hxx"
3589 +#include <vbahelper/vbahelperinterface.hxx>
3591 typedef ::cppu::WeakImplHelper1< ov::XAssistant > Assistant;
3592 typedef InheritedHelperInterfaceImpl< Assistant > ScVbaAssistantImpl_BASE;
3593 --- sc/source/ui/vba/vbaaxes.hxx.old 2009-04-02 10:45:35.000000000 +0000
3594 +++ sc/source/ui/vba/vbaaxes.hxx 2009-04-06 16:42:01.000000000 +0000
3595 @@ -32,7 +32,7 @@
3596 #include <ooo/vba/excel/XAxes.hpp>
3597 #include <ooo/vba/excel/XAxis.hpp>
3598 #include <ooo/vba/excel/XChart.hpp>
3599 -#include "vbacollectionimpl.hxx"
3600 +#include <vbahelper/vbacollectionimpl.hxx>
3602 typedef CollTestImplHelper< ov::excel::XAxes > ScVbaAxes_BASE;
3603 class ScVbaAxes : public ScVbaAxes_BASE
3604 --- sc/source/ui/vba/vbaaxis.hxx.old 2009-04-02 10:45:35.000000000 +0000
3605 +++ sc/source/ui/vba/vbaaxis.hxx 2009-04-06 16:42:01.000000000 +0000
3606 @@ -32,8 +32,8 @@
3607 #include <com/sun/star/beans/XPropertySet.hpp>
3608 #include <ooo/vba/excel/XAxis.hpp>
3609 #include <ooo/vba/excel/XChart.hpp>
3610 -#include "vbahelperinterface.hxx"
3611 -
3612 +#include <vbahelper/vbahelperinterface.hxx>
3613 +#include <memory>
3614 typedef InheritedHelperInterfaceImpl1< ov::excel::XAxis > ScVbaAxis_BASE;
3615 class ScVbaChart;
3616 class ScVbaAxis : public ScVbaAxis_BASE
3617 --- sc/source/ui/vba/vbaborders.hxx.old 2009-04-02 10:45:35.000000000 +0000
3618 +++ sc/source/ui/vba/vbaborders.hxx 2009-04-06 16:42:01.000000000 +0000
3619 @@ -38,7 +38,7 @@
3620 #include <com/sun/star/beans/XPropertySet.hpp>
3623 -#include "vbacollectionimpl.hxx"
3624 +#include <vbahelper/vbacollectionimpl.hxx>
3626 typedef CollTestImplHelper< ov::excel::XBorders > ScVbaBorders_BASE;
3627 class ScVbaPalette;
3628 --- sc/source/ui/vba/vbabutton.cxx.old 2009-04-02 10:45:35.000000000 +0000
3629 +++ sc/source/ui/vba/vbabutton.cxx 1970-01-01 00:00:00.000000000 +0000
3630 @@ -1,74 +0,0 @@
3631 -/*************************************************************************
3632 - *
3633 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
3634 - *
3635 - * Copyright 2008 by Sun Microsystems, Inc.
3636 - *
3637 - * OpenOffice.org - a multi-platform office productivity suite
3638 - *
3639 - * $RCSfile: vbabutton.cxx,v $
3640 - * $Revision: 1.3 $
3641 - *
3642 - * This file is part of OpenOffice.org.
3643 - *
3644 - * OpenOffice.org is free software: you can redistribute it and/or modify
3645 - * it under the terms of the GNU Lesser General Public License version 3
3646 - * only, as published by the Free Software Foundation.
3647 - *
3648 - * OpenOffice.org is distributed in the hope that it will be useful,
3649 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
3650 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3651 - * GNU Lesser General Public License version 3 for more details
3652 - * (a copy is included in the LICENSE file that accompanied this code).
3653 - *
3654 - * You should have received a copy of the GNU Lesser General Public License
3655 - * version 3 along with OpenOffice.org. If not, see
3656 - * <http://www.openoffice.org/license.html>
3657 - * for a copy of the LGPLv3 License.
3658 - *
3659 - ************************************************************************/
3660 -#include "vbabutton.hxx"
3661 -#include <vector>
3662 -
3663 -using namespace com::sun::star;
3664 -using namespace ooo::vba;
3665 -
3666 -
3667 -const static rtl::OUString LABEL( RTL_CONSTASCII_USTRINGPARAM("Label") );
3668 -ScVbaButton::ScVbaButton( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : ButtonImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
3669 -{
3670 -}
3671 -
3672 -// Attributes
3673 -rtl::OUString SAL_CALL
3674 -ScVbaButton::getCaption() throw (css::uno::RuntimeException)
3675 -{
3676 - rtl::OUString Label;
3677 - m_xProps->getPropertyValue( LABEL ) >>= Label;
3678 - return Label;
3679 -}
3680 -
3681 -void SAL_CALL
3682 -ScVbaButton::setCaption( const rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException)
3683 -{
3684 - m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) );
3685 -}
3686 -
3687 -rtl::OUString&
3688 -ScVbaButton::getServiceImplName()
3689 -{
3690 - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaButton") );
3691 - return sImplName;
3692 -}
3693 -
3694 -uno::Sequence< rtl::OUString >
3695 -ScVbaButton::getServiceNames()
3696 -{
3697 - static uno::Sequence< rtl::OUString > aServiceNames;
3698 - if ( aServiceNames.getLength() == 0 )
3699 - {
3700 - aServiceNames.realloc( 1 );
3701 - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.Button" ) );
3702 - }
3703 - return aServiceNames;
3704 -}
3705 --- sc/source/ui/vba/vbabutton.hxx.old 2009-04-02 10:45:35.000000000 +0000
3706 +++ sc/source/ui/vba/vbabutton.hxx 1970-01-01 00:00:00.000000000 +0000
3707 @@ -1,51 +0,0 @@
3708 -/*************************************************************************
3709 - *
3710 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
3711 - *
3712 - * Copyright 2008 by Sun Microsystems, Inc.
3713 - *
3714 - * OpenOffice.org - a multi-platform office productivity suite
3715 - *
3716 - * $RCSfile: vbabutton.hxx,v $
3717 - * $Revision: 1.3 $
3718 - *
3719 - * This file is part of OpenOffice.org.
3720 - *
3721 - * OpenOffice.org is free software: you can redistribute it and/or modify
3722 - * it under the terms of the GNU Lesser General Public License version 3
3723 - * only, as published by the Free Software Foundation.
3724 - *
3725 - * OpenOffice.org is distributed in the hope that it will be useful,
3726 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
3727 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3728 - * GNU Lesser General Public License version 3 for more details
3729 - * (a copy is included in the LICENSE file that accompanied this code).
3730 - *
3731 - * You should have received a copy of the GNU Lesser General Public License
3732 - * version 3 along with OpenOffice.org. If not, see
3733 - * <http://www.openoffice.org/license.html>
3734 - * for a copy of the LGPLv3 License.
3735 - *
3736 - ************************************************************************/
3737 -#ifndef SC_VBA_BUTTON_HXX
3738 -#define SC_VBA_BUTTON_HXX
3739 -#include <cppuhelper/implbase1.hxx>
3740 -#include <ooo/vba/msforms/XButton.hpp>
3741 -
3742 -#include "vbacontrol.hxx"
3743 -#include "vbahelper.hxx"
3744 -
3745 -typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XButton > ButtonImpl_BASE;
3746 -
3747 -class ScVbaButton : public ButtonImpl_BASE
3748 -{
3749 -public:
3750 - ScVbaButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
3751 - // Attributes
3752 - virtual rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
3753 - virtual void SAL_CALL setCaption( const rtl::OUString& _caption ) throw (css::uno::RuntimeException);
3754 - //XHelperInterface
3755 - virtual rtl::OUString& getServiceImplName();
3756 - virtual css::uno::Sequence<rtl::OUString> getServiceNames();
3757 -};
3758 -#endif //SC_VBA_BUTTON_HXX
3759 --- sc/source/ui/vba/vbacharacters.hxx.old 2009-04-02 10:45:35.000000000 +0000
3760 +++ sc/source/ui/vba/vbacharacters.hxx 2009-04-06 16:42:01.000000000 +0000
3761 @@ -36,7 +36,7 @@
3762 #include <com/sun/star/uno/XComponentContext.hpp>
3763 #include <com/sun/star/text/XSimpleText.hpp>
3765 -#include "vbahelperinterface.hxx"
3766 +#include <vbahelper/vbahelperinterface.hxx>
3767 #include "vbapalette.hxx"
3768 typedef InheritedHelperInterfaceImpl1< ov::excel::XCharacters > ScVbaCharacters_BASE;
3770 --- sc/source/ui/vba/vbachart.hxx.old 2009-04-02 10:45:35.000000000 +0000
3771 +++ sc/source/ui/vba/vbachart.hxx 2009-04-06 16:42:01.000000000 +0000
3772 @@ -41,7 +41,7 @@
3773 #include <ooo/vba/excel/XChart.hpp>
3774 #include <ooo/vba/excel/XDataLabels.hpp>
3775 #include <ooo/vba/excel/XSeries.hpp>
3776 -#include "vbahelperinterface.hxx"
3777 +#include <vbahelper/vbahelperinterface.hxx>
3779 typedef InheritedHelperInterfaceImpl1<ov::excel::XChart > ChartImpl_BASE;
3781 --- sc/source/ui/vba/vbachartobject.hxx.old 2009-04-02 10:45:35.000000000 +0000
3782 +++ sc/source/ui/vba/vbachartobject.hxx 2009-04-06 16:42:01.000000000 +0000
3783 @@ -36,7 +36,7 @@
3784 #include <com/sun/star/container/XNamed.hpp>
3785 #include <com/sun/star/document/XEmbeddedObjectSupplier.hpp>
3786 #include <ooo/vba/excel/XChartObject.hpp>
3787 -#include "vbahelperinterface.hxx"
3788 +#include <vbahelper/vbahelperinterface.hxx>
3789 #include <memory>
3791 typedef InheritedHelperInterfaceImpl1<ov::excel::XChartObject > ChartObjectImpl_BASE;
3792 --- sc/source/ui/vba/vbachartobjects.hxx.old 2009-04-02 10:45:35.000000000 +0000
3793 +++ sc/source/ui/vba/vbachartobjects.hxx 2009-04-06 16:42:01.000000000 +0000
3794 @@ -36,8 +36,8 @@
3795 #include <com/sun/star/table/XTableCharts.hpp>
3796 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
3797 #include <com/sun/star/container/XEnumerationAccess.hpp>
3798 -#include"vbacollectionimpl.hxx"
3799 -#include "vbahelper.hxx"
3800 +#include <vbahelper/vbacollectionimpl.hxx>
3801 +#include "excelvbahelper.hxx"
3802 #include <hash_map>
3804 typedef CollTestImplHelper< ov::excel::XChartObjects > ChartObjects_BASE;
3805 --- sc/source/ui/vba/vbacharts.hxx.old 2009-04-02 10:45:35.000000000 +0000
3806 +++ sc/source/ui/vba/vbacharts.hxx 2009-04-06 16:42:01.000000000 +0000
3807 @@ -31,8 +31,8 @@
3808 #define SC_VBA_CHARTS_HXX
3809 #include <ooo/vba/excel/XCharts.hpp>
3810 #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
3811 -#include"vbacollectionimpl.hxx"
3812 -#include "vbahelper.hxx"
3813 +#include <vbahelper/vbacollectionimpl.hxx>
3814 +#include "excelvbahelper.hxx"
3815 #include <hash_map>
3817 typedef CollTestImplHelper< ov::excel::XCharts > Charts_BASE;
3818 --- sc/source/ui/vba/vbacheckbox.cxx.old 2009-04-02 10:45:35.000000000 +0000
3819 +++ sc/source/ui/vba/vbacheckbox.cxx 1970-01-01 00:00:00.000000000 +0000
3820 @@ -1,110 +0,0 @@
3821 -/*************************************************************************
3822 - *
3823 - * OpenOffice.org - a multi-platform office productivity suite
3824 - *
3825 - * $RCSfile$
3826 - *
3827 - * $Revision$
3828 - *
3829 - * last change: $Author$ $Date$
3830 - *
3831 - * The Contents of this file are made available subject to
3832 - * the terms of GNU Lesser General Public License Version 2.1.
3833 - *
3834 - *
3835 - * GNU Lesser General Public License Version 2.1
3836 - * =============================================
3837 - * Copyright 2005 by Sun Microsystems, Inc.
3838 - * 901 San Antonio Road, Palo Alto, CA 94303, USA
3839 - *
3840 - * This library is free software; you can redistribute it and/or
3841 - * modify it under the terms of the GNU Lesser General Public
3842 - * License version 2.1, as published by the Free Software Foundation.
3843 - *
3844 - * This library is distributed in the hope that it will be useful,
3845 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
3846 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3847 - * Lesser General Public License for more details.
3848 - *
3849 - * You should have received a copy of the GNU Lesser General Public
3850 - * License along with this library; if not, write to the Free Software
3851 - * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
3852 - * MA 02111-1307 USA
3853 - *
3854 - ************************************************************************/
3855 -#include "vbacheckbox.hxx"
3856 -#include <vector>
3857 -
3858 -using namespace com::sun::star;
3859 -using namespace ooo::vba;
3860 -
3861 -
3862 -const static rtl::OUString LABEL( RTL_CONSTASCII_USTRINGPARAM("Label") );
3863 -const static rtl::OUString STATE( RTL_CONSTASCII_USTRINGPARAM("State") );
3864 -ScVbaCheckbox::ScVbaCheckbox( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper ) : CheckBoxImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
3865 -{
3866 -}
3867 -
3868 -// Attributes
3869 -rtl::OUString SAL_CALL
3870 -ScVbaCheckbox::getCaption() throw (css::uno::RuntimeException)
3871 -{
3872 - rtl::OUString Label;
3873 - m_xProps->getPropertyValue( LABEL ) >>= Label;
3874 - return Label;
3875 -}
3876 -
3877 -void SAL_CALL
3878 -ScVbaCheckbox::setCaption( const rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException)
3879 -{
3880 - m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) );
3881 -}
3882 -
3883 -uno::Any SAL_CALL
3884 -ScVbaCheckbox::getValue() throw (css::uno::RuntimeException)
3885 -{
3886 - sal_Int16 nValue = -1;
3887 - m_xProps->getPropertyValue( STATE ) >>= nValue;
3888 - if( nValue != 0 )
3889 - nValue = -1;
3890 -// return uno::makeAny( nValue );
3891 -// I must be missing something MSO says value should be -1 if selected, 0 if not
3892 -// selected
3893 - return uno::makeAny( ( nValue == -1 ) ? sal_True : sal_False );
3894 -}
3895 -
3896 -void SAL_CALL
3897 -ScVbaCheckbox::setValue( const uno::Any& _value ) throw (css::uno::RuntimeException)
3898 -{
3899 - sal_Int16 nValue = 0;
3900 - sal_Bool bValue = false;
3901 - if( _value >>= nValue )
3902 - {
3903 - if( nValue == -1)
3904 - nValue = 1;
3905 - }
3906 - else if ( _value >>= bValue )
3907 - {
3908 - if ( bValue )
3909 - nValue = 1;
3910 - }
3911 - m_xProps->setPropertyValue( STATE, uno::makeAny( nValue ) );
3912 -}
3913 -rtl::OUString&
3914 -ScVbaCheckbox::getServiceImplName()
3915 -{
3916 - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCheckbox") );
3917 - return sImplName;
3918 -}
3919 -
3920 -uno::Sequence< rtl::OUString >
3921 -ScVbaCheckbox::getServiceNames()
3922 -{
3923 - static uno::Sequence< rtl::OUString > aServiceNames;
3924 - if ( aServiceNames.getLength() == 0 )
3925 - {
3926 - aServiceNames.realloc( 1 );
3927 - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.CheckBox" ) );
3928 - }
3929 - return aServiceNames;
3930 -}
3931 --- sc/source/ui/vba/vbacheckbox.hxx.old 2009-04-02 10:45:35.000000000 +0000
3932 +++ sc/source/ui/vba/vbacheckbox.hxx 1970-01-01 00:00:00.000000000 +0000
3933 @@ -1,60 +0,0 @@
3934 -/*************************************************************************
3935 - *
3936 - * OpenOffice.org - a multi-platform office productivity suite
3937 - *
3938 - * $RCSfile$
3939 - *
3940 - * $Revision$
3941 - *
3942 - * last change: $Author$ $Date$
3943 - *
3944 - * The Contents of this file are made available subject to
3945 - * the terms of GNU Lesser General Public License Version 2.1.
3946 - *
3947 - *
3948 - * GNU Lesser General Public License Version 2.1
3949 - * =============================================
3950 - * Copyright 2005 by Sun Microsystems, Inc.
3951 - * 901 San Antonio Road, Palo Alto, CA 94303, USA
3952 - *
3953 - * This library is free software; you can redistribute it and/or
3954 - * modify it under the terms of the GNU Lesser General Public
3955 - * License version 2.1, as published by the Free Software Foundation.
3956 - *
3957 - * This library is distributed in the hope that it will be useful,
3958 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
3959 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3960 - * Lesser General Public License for more details.
3961 - *
3962 - * You should have received a copy of the GNU Lesser General Public
3963 - * License along with this library; if not, write to the Free Software
3964 - * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
3965 - * MA 02111-1307 USA
3966 - *
3967 - ************************************************************************/
3968 -#ifndef SC_VBA_CHECKBOX_HXX
3969 -#define SC_VBA_CHECKBOX_HXX
3970 -#include <cppuhelper/implbase2.hxx>
3971 -#include <ooo/vba/msforms/XRadioButton.hpp>
3972 -
3973 -#include "vbacontrol.hxx"
3974 -#include "vbahelper.hxx"
3975 -
3976 -typedef cppu::ImplInheritanceHelper2< ScVbaControl, ov::msforms::XRadioButton, css::script::XDefaultProperty > CheckBoxImpl_BASE;
3977 -
3978 -class ScVbaCheckbox : public CheckBoxImpl_BASE
3979 -{
3980 -public:
3981 - ScVbaCheckbox( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
3982 - // Attributes
3983 - virtual rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
3984 - virtual void SAL_CALL setCaption( const rtl::OUString& _caption ) throw (css::uno::RuntimeException);
3985 - virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
3986 - virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
3987 - // XDefaultProperty
3988 - rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
3989 - //XHelperInterface
3990 - virtual rtl::OUString& getServiceImplName();
3991 - virtual css::uno::Sequence<rtl::OUString> getServiceNames();
3992 -};
3993 -#endif //SC_VBA_CHECKBOX_HXX
3994 --- sc/source/ui/vba/vbacollectionimpl.cxx.old 2009-04-02 10:45:35.000000000 +0000
3995 +++ sc/source/ui/vba/vbacollectionimpl.cxx 1970-01-01 00:00:00.000000000 +0000
3996 @@ -1,136 +0,0 @@
3997 -/*************************************************************************
3998 - *
3999 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4000 - *
4001 - * Copyright 2008 by Sun Microsystems, Inc.
4002 - *
4003 - * OpenOffice.org - a multi-platform office productivity suite
4004 - *
4005 - * $RCSfile: vbacollectionimpl.cxx,v $
4006 - * $Revision: 1.3 $
4007 - *
4008 - * This file is part of OpenOffice.org.
4009 - *
4010 - * OpenOffice.org is free software: you can redistribute it and/or modify
4011 - * it under the terms of the GNU Lesser General Public License version 3
4012 - * only, as published by the Free Software Foundation.
4013 - *
4014 - * OpenOffice.org is distributed in the hope that it will be useful,
4015 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
4016 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4017 - * GNU Lesser General Public License version 3 for more details
4018 - * (a copy is included in the LICENSE file that accompanied this code).
4019 - *
4020 - * You should have received a copy of the GNU Lesser General Public License
4021 - * version 3 along with OpenOffice.org. If not, see
4022 - * <http://www.openoffice.org/license.html>
4023 - * for a copy of the LGPLv3 License.
4024 - *
4025 - ************************************************************************/
4026 -#include <vbacollectionimpl.hxx>
4027 -#include "vbaglobals.hxx"
4028 -using namespace ::com::sun::star;
4029 -using namespace ::ooo::vba;
4030 -
4031 -
4032 -ScVbaCollectionBaseImpl::ScVbaCollectionBaseImpl( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess ) throw (uno::RuntimeException) : m_xContext( xContext ), m_xIndexAccess( xIndexAccess )
4033 -{
4034 - m_xNameAccess.set( xIndexAccess, uno::UNO_QUERY );
4035 -}
4036 -
4037 -uno::Any
4038 -ScVbaCollectionBaseImpl::getItemByStringIndex( const rtl::OUString& sIndex ) throw (::uno::RuntimeException)
4039 -{
4040 - if ( !m_xNameAccess.is() )
4041 - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ScVbaCollectionBaseImpl string index access not supported by this object") ), uno::Reference< uno::XInterface >() );
4042 -
4043 - return createCollectionObject( m_xNameAccess->getByName( sIndex ) );
4044 -}
4045 -
4046 -uno::Any
4047 -ScVbaCollectionBaseImpl::getItemByIntIndex( const sal_Int32 nIndex ) throw (uno::RuntimeException)
4048 -{
4049 - if ( !m_xIndexAccess.is() )
4050 - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ScVbaCollectionBaseImpl numeric index access not supported by this object") ), uno::Reference< uno::XInterface >() );
4051 - if ( nIndex <= 0 )
4052 - {
4053 - throw lang::IndexOutOfBoundsException(
4054 - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
4055 - "index is 0 or negative" ) ),
4056 - uno::Reference< uno::XInterface >() );
4057 - }
4058 - // need to adjust for vba index ( for which first element is 1 )
4059 - return createCollectionObject( m_xIndexAccess->getByIndex( nIndex - 1 ) );
4060 -}
4061 -
4062 -::sal_Int32 SAL_CALL
4063 -ScVbaCollectionBaseImpl::getCount() throw (uno::RuntimeException)
4064 -{
4065 - return m_xIndexAccess->getCount();
4066 -}
4067 -
4068 -uno::Any SAL_CALL
4069 -ScVbaCollectionBaseImpl::getParent() throw (uno::RuntimeException)
4070 -{
4071 - // #TODO #FIXME investigate whether this makes sense
4072 - uno::Reference< excel::XApplication > xApplication =
4073 - ScVbaGlobals::getGlobalsImpl( m_xContext )->getApplication();
4074 - uno::Reference< excel::XWorkbook > xWorkbook;
4075 - if ( xApplication.is() )
4076 - {
4077 - xWorkbook = xApplication->getActiveWorkbook();
4078 - }
4079 - return uno::Any( xWorkbook );
4080 -}
4081 -
4082 -::sal_Int32 SAL_CALL ScVbaCollectionBaseImpl::getCreator() throw (uno::RuntimeException)
4083 -{
4084 - // #TODO #FIXE some sort of implementation
4085 - //SC_VBA_STUB();
4086 - return 0;
4087 -}
4088 -uno::Reference< excel::XApplication > SAL_CALL ScVbaCollectionBaseImpl::getApplication() throw (uno::RuntimeException)
4089 -{
4090 - // #TODO #FIXME investigate whether this makes sense
4091 - uno::Reference< excel::XApplication > xApplication =
4092 - ScVbaGlobals::getGlobalsImpl( m_xContext )->getApplication();
4093 - return xApplication;
4094 -}
4095 -
4096 -uno::Any SAL_CALL ScVbaCollectionBaseImpl::Item( const uno::Any& aIndex ) throw (uno::RuntimeException)
4097 -{
4098 - if ( aIndex.getValueTypeClass() != uno::TypeClass_STRING )
4099 - {
4100 - sal_Int32 nIndex = 0;
4101 -
4102 - if ( ( aIndex >>= nIndex ) != sal_True )
4103 - {
4104 - rtl::OUString message;
4105 - message = rtl::OUString::createFromAscii(
4106 - "Couldn't convert index to Int32");
4107 - throw lang::IndexOutOfBoundsException( message,
4108 - uno::Reference< uno::XInterface >() );
4109 - }
4110 - return getItemByIntIndex( nIndex );
4111 - }
4112 - rtl::OUString aStringSheet;
4113 -
4114 - aIndex >>= aStringSheet;
4115 - return getItemByStringIndex( aStringSheet );
4116 -}
4117 -
4118 -::rtl::OUString SAL_CALL
4119 -ScVbaCollectionBaseImpl::getDefaultMethodName( ) throw (css::uno::RuntimeException)
4120 -{
4121 - const static rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM("Item") );
4122 - return sName;
4123 -}
4124 -
4125 - // XElementAccess
4126 -
4127 -::sal_Bool SAL_CALL ScVbaCollectionBaseImpl::hasElements() throw (uno::RuntimeException)
4128 -{
4129 - return ( m_xIndexAccess->getCount() > 0 );
4130 -}
4131 -
4132 -
4133 --- sc/source/ui/vba/vbacollectionimpl.hxx.old 2009-04-02 10:45:35.000000000 +0000
4134 +++ sc/source/ui/vba/vbacollectionimpl.hxx 1970-01-01 00:00:00.000000000 +0000
4135 @@ -1,259 +0,0 @@
4136 -/*************************************************************************
4137 - *
4138 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4139 - *
4140 - * Copyright 2008 by Sun Microsystems, Inc.
4141 - *
4142 - * OpenOffice.org - a multi-platform office productivity suite
4143 - *
4144 - * $RCSfile: vbacollectionimpl.hxx,v $
4145 - * $Revision: 1.5 $
4146 - *
4147 - * This file is part of OpenOffice.org.
4148 - *
4149 - * OpenOffice.org is free software: you can redistribute it and/or modify
4150 - * it under the terms of the GNU Lesser General Public License version 3
4151 - * only, as published by the Free Software Foundation.
4152 - *
4153 - * OpenOffice.org is distributed in the hope that it will be useful,
4154 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
4155 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4156 - * GNU Lesser General Public License version 3 for more details
4157 - * (a copy is included in the LICENSE file that accompanied this code).
4158 - *
4159 - * You should have received a copy of the GNU Lesser General Public License
4160 - * version 3 along with OpenOffice.org. If not, see
4161 - * <http://www.openoffice.org/license.html>
4162 - * for a copy of the LGPLv3 License.
4163 - *
4164 - ************************************************************************/
4165 -#ifndef SC_VBA_COLLECTION_IMPL_HXX
4166 -#define SC_VBA_COLLECTION_IMPL_HXX
4167 -
4168 -#include <ooo/vba/XCollection.hpp>
4169 -//#include <ooo/vba/XCollectionTest.hpp>
4170 -#include <com/sun/star/container/XEnumerationAccess.hpp>
4171 -#include <com/sun/star/uno/XComponentContext.hpp>
4172 -#include <com/sun/star/script/XDefaultMethod.hpp>
4173 -#include <com/sun/star/container/XIndexAccess.hpp>
4174 -#include <com/sun/star/container/XNameAccess.hpp>
4175 -#include <com/sun/star/container/XNamed.hpp>
4176 -
4177 -#include <cppuhelper/implbase3.hxx>
4178 -#include <cppuhelper/implbase2.hxx>
4179 -#include <cppuhelper/implbase1.hxx>
4180 -
4181 -#include "vbahelper.hxx"
4182 -#include "vbahelperinterface.hxx"
4183 -#include "vbaglobals.hxx"
4184 -
4185 -#include <vector>
4186 -
4187 -typedef ::cppu::WeakImplHelper1< css::container::XEnumeration > EnumerationHelper_BASE;
4188 -
4189 -class EnumerationHelperImpl : public EnumerationHelper_BASE
4190 -{
4191 -protected:
4192 - css::uno::Reference< css::uno::XComponentContext > m_xContext;
4193 - css::uno::Reference< css::container::XEnumeration > m_xEnumeration;
4194 -public:
4195 -
4196 - EnumerationHelperImpl( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XEnumeration >& xEnumeration ) throw ( css::uno::RuntimeException ) : m_xContext( xContext ), m_xEnumeration( xEnumeration ) { }
4197 - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (css::uno::RuntimeException) { return m_xEnumeration->hasMoreElements(); }
4198 -};
4199 -
4200 -// a wrapper class for a providing a XIndexAccess, XNameAccess, XEnumerationAccess impl based on providing a vector of interfaces
4201 -// only requirement is the object needs to implement XName
4202 -
4203 -
4204 -
4205 -typedef ::cppu::WeakImplHelper3< css::container::XNameAccess, css::container::XIndexAccess, css::container::XEnumerationAccess > XNamedCollectionHelper_BASE;
4206 -
4207 -template< typename Ifc1 >
4208 -class XNamedObjectCollectionHelper : public XNamedCollectionHelper_BASE
4209 -{
4210 -public:
4211 -typedef std::vector< css::uno::Reference< Ifc1 > > XNamedVec;
4212 -private:
4213 -
4214 - class XNamedEnumerationHelper : public EnumerationHelper_BASE
4215 - {
4216 - XNamedVec mXNamedVec;
4217 - typename XNamedVec::iterator mIt;
4218 - public:
4219 - XNamedEnumerationHelper( const XNamedVec& sMap ) : mXNamedVec( sMap ), mIt( mXNamedVec.begin() ) {}
4220 -
4221 - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (css::uno::RuntimeException)
4222 - {
4223 - return ( mIt != mXNamedVec.end() );
4224 - }
4225 -
4226 - virtual css::uno::Any SAL_CALL nextElement( ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException)
4227 - {
4228 - if ( hasMoreElements() )
4229 - return css::uno::makeAny( *mIt++ );
4230 - throw css::container::NoSuchElementException();
4231 - }
4232 - };
4233 -
4234 -protected:
4235 - XNamedVec mXNamedVec;
4236 - typename XNamedVec::iterator cachePos;
4237 -public:
4238 - XNamedObjectCollectionHelper( const XNamedVec& sMap ) : mXNamedVec( sMap ), cachePos(mXNamedVec.begin()) {}
4239 - // XElementAccess
4240 - virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException) { return Ifc1::static_type(0); }
4241 - virtual ::sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException) { return ( mXNamedVec.size() > 0 ); }
4242 - // XNameAcess
4243 - virtual css::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException)
4244 - {
4245 - if ( !hasByName(aName) )
4246 - throw css::container::NoSuchElementException();
4247 - return css::uno::makeAny( *cachePos );
4248 - }
4249 - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (css::uno::RuntimeException)
4250 - {
4251 - css::uno::Sequence< rtl::OUString > sNames( mXNamedVec.size() );
4252 - rtl::OUString* pString = sNames.getArray();
4253 - typename XNamedVec::iterator it = mXNamedVec.begin();
4254 - typename XNamedVec::iterator it_end = mXNamedVec.end();
4255 -
4256 - for ( ; it != it_end; ++it, ++pString )
4257 - {
4258 - css::uno::Reference< css::container::XNamed > xName( *it, css::uno::UNO_QUERY_THROW );
4259 - *pString = xName->getName();
4260 - }
4261 - return sNames;
4262 - }
4263 - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException)
4264 - {
4265 - cachePos = mXNamedVec.begin();
4266 - typename XNamedVec::iterator it_end = mXNamedVec.end();
4267 - for ( ; cachePos != it_end; ++cachePos )
4268 - {
4269 - css::uno::Reference< css::container::XNamed > xName( *cachePos, css::uno::UNO_QUERY_THROW );
4270 - if ( aName.equals( xName->getName() ) )
4271 - break;
4272 - }
4273 - return ( cachePos != it_end );
4274 - }
4275 -
4276 - // XElementAccess
4277 - virtual ::sal_Int32 SAL_CALL getCount( ) throw (css::uno::RuntimeException) { return mXNamedVec.size(); }
4278 - virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException )
4279 - {
4280 - if ( Index < 0 || Index >= getCount() )
4281 - throw css::lang::IndexOutOfBoundsException();
4282 -
4283 - return css::uno::makeAny( mXNamedVec[ Index ] );
4284 -
4285 - }
4286 - // XEnumerationAccess
4287 - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration( ) throw (css::uno::RuntimeException)
4288 - {
4289 - return new XNamedEnumerationHelper( mXNamedVec );
4290 - }
4291 -};
4292 -
4293 -// including a HelperInterface implementation
4294 -template< typename Ifc1 >
4295 -class ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 >
4296 -{
4297 -typedef InheritedHelperInterfaceImpl< Ifc1 > BaseColBase;
4298 -protected:
4299 - css::uno::Reference< css::container::XIndexAccess > m_xIndexAccess;
4300 - css::uno::Reference< css::container::XNameAccess > m_xNameAccess;
4301 -
4302 - virtual css::uno::Any getItemByStringIndex( const rtl::OUString& sIndex ) throw (css::uno::RuntimeException)
4303 - {
4304 - if ( !m_xNameAccess.is() )
4305 - throw css::uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ScVbaCollectionBase string index access not supported by this object") ), css::uno::Reference< css::uno::XInterface >() );
4306 -
4307 - return createCollectionObject( m_xNameAccess->getByName( sIndex ) );
4308 - }
4309 -
4310 - virtual css::uno::Any getItemByIntIndex( const sal_Int32 nIndex ) throw (css::uno::RuntimeException)
4311 - {
4312 - if ( !m_xIndexAccess.is() )
4313 - throw css::uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ScVbaCollectionBase numeric index access not supported by this object") ), css::uno::Reference< css::uno::XInterface >() );
4314 - if ( nIndex <= 0 )
4315 - {
4316 - throw css::lang::IndexOutOfBoundsException(
4317 - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
4318 - "index is 0 or negative" ) ),
4319 - css::uno::Reference< css::uno::XInterface >() );
4320 - }
4321 - // need to adjust for vba index ( for which first element is 1 )
4322 - return createCollectionObject( m_xIndexAccess->getByIndex( nIndex - 1 ) );
4323 - }
4324 -public:
4325 - ScVbaCollectionBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess ) : BaseColBase( xParent, xContext ), m_xIndexAccess( xIndexAccess ){ m_xNameAccess.set(m_xIndexAccess, css::uno::UNO_QUERY); }
4326 - //XCollection
4327 - virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException)
4328 - {
4329 - return m_xIndexAccess->getCount();
4330 - }
4331 -
4332 - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw (css::uno::RuntimeException)
4333 - {
4334 - if ( Index1.getValueTypeClass() != css::uno::TypeClass_STRING )
4335 - {
4336 - sal_Int32 nIndex = 0;
4337 -
4338 - if ( ( Index1 >>= nIndex ) != sal_True )
4339 - {
4340 - rtl::OUString message;
4341 - message = rtl::OUString::createFromAscii(
4342 - "Couldn't convert index to Int32");
4343 - throw css::lang::IndexOutOfBoundsException( message,
4344 - css::uno::Reference< css::uno::XInterface >() );
4345 - }
4346 - return getItemByIntIndex( nIndex );
4347 - }
4348 - rtl::OUString aStringSheet;
4349 -
4350 - Index1 >>= aStringSheet;
4351 - return getItemByStringIndex( aStringSheet );
4352 - }
4353 - // XDefaultMethod
4354 - ::rtl::OUString SAL_CALL getDefaultMethodName( ) throw (css::uno::RuntimeException)
4355 - {
4356 - const static rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM("Item") );
4357 - return sName;
4358 - }
4359 - // XEnumerationAccess
4360 - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) = 0;
4361 -
4362 - // XElementAccess
4363 - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) = 0;
4364 - // XElementAccess
4365 - virtual ::sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException)
4366 - {
4367 - return ( m_xIndexAccess->getCount() > 0 );
4368 - }
4369 - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) = 0;
4370 -
4371 -};
4372 -
4373 -typedef ::cppu::WeakImplHelper1<ov::XCollection> XCollection_InterfacesBASE;
4374 -
4375 -typedef ScVbaCollectionBase< XCollection_InterfacesBASE > CollImplBase1;
4376 -// compatible with the old collections ( pre XHelperInterface base class ) ( some internal objects still use this )
4377 -class ScVbaCollectionBaseImpl : public CollImplBase1
4378 -{
4379 -public:
4380 - ScVbaCollectionBaseImpl( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess ) throw( css::uno::RuntimeException ) : CollImplBase1( xParent, xContext, xIndexAccess){}
4381 -
4382 -};
4383 -
4384 -template <typename Ifc> // where Ifc must implement XCollectionTest
4385 -class CollTestImplHelper : public ScVbaCollectionBase< ::cppu::WeakImplHelper1< Ifc > >
4386 -{
4387 -typedef ScVbaCollectionBase< ::cppu::WeakImplHelper1< Ifc > > ImplBase1;
4388 -
4389 -public:
4390 - CollTestImplHelper( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess ) throw( css::uno::RuntimeException ) : ImplBase1( xParent, xContext, xIndexAccess ) {}
4391 -};
4392 -
4393 -
4394 -#endif //SC_VBA_COLLECTION_IMPL_HXX
4395 --- sc/source/ui/vba/vbacolorformat.hxx.old 2009-04-02 10:45:35.000000000 +0000
4396 +++ sc/source/ui/vba/vbacolorformat.hxx 2009-04-06 16:42:01.000000000 +0000
4397 @@ -33,7 +33,7 @@
4398 #include <com/sun/star/drawing/XShape.hpp>
4399 #include <ooo/vba/msforms/XColorFormat.hpp>
4400 #include <ooo/vba/msforms/XFillFormat.hpp>
4401 -#include "vbahelperinterface.hxx"
4402 +#include <vbahelper/vbahelperinterface.hxx>
4403 #include "vbafillformat.hxx"
4405 typedef InheritedHelperInterfaceImpl1< ov::msforms::XColorFormat > ScVbaColorFormat_BASE;
4406 --- sc/source/ui/vba/vbacombobox.cxx.old 2009-04-02 10:45:35.000000000 +0000
4407 +++ sc/source/ui/vba/vbacombobox.cxx 1970-01-01 00:00:00.000000000 +0000
4408 @@ -1,175 +0,0 @@
4409 -/*************************************************************************
4410 - *
4411 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4412 - *
4413 - * Copyright 2008 by Sun Microsystems, Inc.
4414 - *
4415 - * OpenOffice.org - a multi-platform office productivity suite
4416 - *
4417 - * $RCSfile: vbacombobox.cxx,v $
4418 - * $Revision: 1.4 $
4419 - *
4420 - * This file is part of OpenOffice.org.
4421 - *
4422 - * OpenOffice.org is free software: you can redistribute it and/or modify
4423 - * it under the terms of the GNU Lesser General Public License version 3
4424 - * only, as published by the Free Software Foundation.
4425 - *
4426 - * OpenOffice.org is distributed in the hope that it will be useful,
4427 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
4428 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4429 - * GNU Lesser General Public License version 3 for more details
4430 - * (a copy is included in the LICENSE file that accompanied this code).
4431 - *
4432 - * You should have received a copy of the GNU Lesser General Public License
4433 - * version 3 along with OpenOffice.org. If not, see
4434 - * <http://www.openoffice.org/license.html>
4435 - * for a copy of the LGPLv3 License.
4436 - *
4437 - ************************************************************************/
4438 -#include "vbacombobox.hxx"
4439 -#include <vector>
4440 -
4441 -using namespace com::sun::star;
4442 -using namespace ooo::vba;
4443 -
4444 -
4445 -//SelectedItems list of integer indexes
4446 -//StringItemList list of items
4447 -
4448 -const static rtl::OUString TEXT( RTL_CONSTASCII_USTRINGPARAM("Text") );
4449 -const static rtl::OUString SELECTEDITEMS( RTL_CONSTASCII_USTRINGPARAM("SelectedItems") );
4450 -const static rtl::OUString ITEMS( RTL_CONSTASCII_USTRINGPARAM("StringItemList") );
4451 -const static rtl::OUString CONTROLSOURCEPROP( RTL_CONSTASCII_USTRINGPARAM("DataFieldProperty") );
4452 -
4453 -ScVbaComboBox::ScVbaComboBox( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper, bool bDialogType ) : ComboBoxImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper ), mbDialogType( bDialogType )
4454 -{
4455 - mpListHelper.reset( new ListControlHelper( m_xProps ) );
4456 - // grab the default value property name
4457 - m_xProps->getPropertyValue( CONTROLSOURCEPROP ) >>= sSourceName;
4458 -}
4459 -
4460 -// Attributes
4461 -
4462 -
4463 -// Value, [read] e.g. getValue returns the value of ooo Text propery e.g. the value in
4464 -// the drop down
4465 -uno::Any SAL_CALL
4466 -ScVbaComboBox::getValue() throw (uno::RuntimeException)
4467 -{
4468 - return m_xProps->getPropertyValue( sSourceName );
4469 -}
4470 -
4471 -void SAL_CALL
4472 -ScVbaComboBox::setListIndex( const uno::Any& _value ) throw (uno::RuntimeException)
4473 -{
4474 - uno::Sequence< sal_Int16 > sSelection(1);
4475 - _value >>= sSelection[ 0 ];
4476 - m_xProps->setPropertyValue( SELECTEDITEMS, uno::makeAny( sSelection ) );
4477 -}
4478 -
4479 -uno::Any SAL_CALL
4480 -ScVbaComboBox::getListIndex() throw (uno::RuntimeException)
4481 -{
4482 - uno::Sequence< rtl::OUString > sItems;
4483 - m_xProps->getPropertyValue( ITEMS ) >>= sItems;
4484 - // should really return the item that has focus regardless of
4485 - // it been selected
4486 - if ( sItems.getLength() > 0 )
4487 - {
4488 - rtl::OUString sText = getText();
4489 - sal_Int32 nLen = sItems.getLength();
4490 - for ( sal_Int32 index = 0; sText.getLength() && index < nLen; ++index )
4491 - {
4492 - if ( sItems[ index ].equals( sText ) )
4493 - {
4494 - OSL_TRACE("getListIndex returning %d", index );
4495 - return uno::makeAny( index );
4496 - }
4497 -
4498 - }
4499 - }
4500 - OSL_TRACE("getListIndex returning %d", -1 );
4501 - return uno::makeAny( sal_Int32( -1 ) );
4502 -}
4503 -
4504 -// Value, [write]e.g. setValue sets the value in the drop down, and if the value is one
4505 -// of the values in the list then the selection is also set
4506 -void SAL_CALL
4507 -ScVbaComboBox::setValue( const uno::Any& _value ) throw (uno::RuntimeException)
4508 -{
4509 - m_xProps->setPropertyValue( sSourceName, _value );
4510 -}
4511 -
4512 -// see Value
4513 -
4514 -::rtl::OUString SAL_CALL
4515 -ScVbaComboBox::getText() throw (uno::RuntimeException)
4516 -{
4517 - rtl::OUString result;
4518 - getValue() >>= result;
4519 - return result;
4520 -}
4521 -
4522 -void SAL_CALL
4523 -ScVbaComboBox::setText( const ::rtl::OUString& _text ) throw (uno::RuntimeException)
4524 -{
4525 - setValue( uno::makeAny( _text ) ); // seems the same
4526 -}
4527 -
4528 -// Methods
4529 -void SAL_CALL
4530 -ScVbaComboBox::AddItem( const uno::Any& pvargItem, const uno::Any& pvargIndex ) throw (uno::RuntimeException)
4531 -{
4532 - mpListHelper->AddItem( pvargItem, pvargIndex );
4533 -}
4534 -
4535 -void SAL_CALL
4536 -ScVbaComboBox::removeItem( const uno::Any& index ) throw (uno::RuntimeException)
4537 - {
4538 - mpListHelper->removeItem( index );
4539 -}
4540 -
4541 -void SAL_CALL
4542 -ScVbaComboBox::Clear( ) throw (uno::RuntimeException)
4543 - {
4544 - mpListHelper->Clear();
4545 - }
4546 -
4547 -void SAL_CALL
4548 -ScVbaComboBox::setRowSource( const rtl::OUString& _rowsource ) throw (css::uno::RuntimeException)
4549 -{
4550 - ScVbaControl::setRowSource( _rowsource );
4551 - mpListHelper->setRowSource( _rowsource );
4552 - }
4553 -
4554 -sal_Int32 SAL_CALL
4555 -ScVbaComboBox::getListCount() throw (uno::RuntimeException)
4556 -{
4557 - return mpListHelper->getListCount();
4558 -}
4559 -
4560 -uno::Any SAL_CALL
4561 -ScVbaComboBox::List( const ::uno::Any& pvargIndex, const uno::Any& pvarColumn ) throw (uno::RuntimeException)
4562 -{
4563 - return mpListHelper->List( pvargIndex, pvarColumn );
4564 - }
4565 -
4566 -rtl::OUString&
4567 -ScVbaComboBox::getServiceImplName()
4568 -{
4569 - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaComboBox") );
4570 - return sImplName;
4571 -}
4572 -
4573 -uno::Sequence< rtl::OUString >
4574 -ScVbaComboBox::getServiceNames()
4575 -{
4576 - static uno::Sequence< rtl::OUString > aServiceNames;
4577 - if ( aServiceNames.getLength() == 0 )
4578 - {
4579 - aServiceNames.realloc( 1 );
4580 - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.ComboBox" ) );
4581 - }
4582 - return aServiceNames;
4583 -}
4584 --- sc/source/ui/vba/vbacombobox.hxx.old 2009-04-02 10:45:35.000000000 +0000
4585 +++ sc/source/ui/vba/vbacombobox.hxx 1970-01-01 00:00:00.000000000 +0000
4586 @@ -1,80 +0,0 @@
4587 -/*************************************************************************
4588 - *
4589 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4590 - *
4591 - * Copyright 2008 by Sun Microsystems, Inc.
4592 - *
4593 - * OpenOffice.org - a multi-platform office productivity suite
4594 - *
4595 - * $RCSfile: vbacombobox.hxx,v $
4596 - * $Revision: 1.4 $
4597 - *
4598 - * This file is part of OpenOffice.org.
4599 - *
4600 - * OpenOffice.org is free software: you can redistribute it and/or modify
4601 - * it under the terms of the GNU Lesser General Public License version 3
4602 - * only, as published by the Free Software Foundation.
4603 - *
4604 - * OpenOffice.org is distributed in the hope that it will be useful,
4605 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
4606 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4607 - * GNU Lesser General Public License version 3 for more details
4608 - * (a copy is included in the LICENSE file that accompanied this code).
4609 - *
4610 - * You should have received a copy of the GNU Lesser General Public License
4611 - * version 3 along with OpenOffice.org. If not, see
4612 - * <http://www.openoffice.org/license.html>
4613 - * for a copy of the LGPLv3 License.
4614 - *
4615 - ************************************************************************/
4616 -#ifndef SC_VBA_COMBOBOX_HXX
4617 -#define SC_VBA_COMBOBOX_HXX
4618 -#include <cppuhelper/implbase2.hxx>
4619 -#include <com/sun/star/uno/XComponentContext.hpp>
4620 -#include <com/sun/star/beans/XPropertySet.hpp>
4621 -#include <com/sun/star/script/XDefaultProperty.hpp>
4622 -#include <ooo/vba/msforms/XComboBox.hpp>
4623 -#include <comphelper/proparrhlp.hxx>
4624 -#include <comphelper/propertycontainer.hxx>
4625 -#include <com/sun/star/beans/PropertyAttribute.hpp>
4626 -
4627 -#include "vbacontrol.hxx"
4628 -#include "vbalistcontrolhelper.hxx"
4629 -#include "vbahelper.hxx"
4630 -
4631 -typedef cppu::ImplInheritanceHelper2<ScVbaControl, ov::msforms::XComboBox, css::script::XDefaultProperty > ComboBoxImpl_BASE;
4632 -class ScVbaComboBox : public ComboBoxImpl_BASE
4633 -{
4634 - std::auto_ptr< ListControlHelper > mpListHelper;
4635 - rtl::OUString sSourceName;
4636 - rtl::OUString msDftPropName;
4637 - bool mbDialogType;
4638 -
4639 -public:
4640 - ScVbaComboBox( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper, bool bDialogType = false );
4641 -
4642 - // Attributes
4643 - virtual css::uno::Any SAL_CALL getListIndex() throw (css::uno::RuntimeException);
4644 - virtual ::sal_Int32 SAL_CALL getListCount() throw (css::uno::RuntimeException);
4645 - virtual void SAL_CALL setListIndex( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
4646 - virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
4647 - virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
4648 - virtual ::rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException);
4649 - virtual void SAL_CALL setText( const ::rtl::OUString& _text ) throw (css::uno::RuntimeException);
4650 -
4651 - // Methods
4652 - virtual void SAL_CALL AddItem( const css::uno::Any& pvargItem, const css::uno::Any& pvargIndex ) throw (css::uno::RuntimeException);
4653 - virtual void SAL_CALL removeItem( const css::uno::Any& index ) throw (css::uno::RuntimeException);
4654 - virtual void SAL_CALL Clear( ) throw (css::uno::RuntimeException);
4655 - virtual css::uno::Any SAL_CALL List( const css::uno::Any& pvargIndex, const css::uno::Any& pvarColumn ) throw (css::uno::RuntimeException);
4656 - // XControl
4657 - virtual void SAL_CALL setRowSource( const rtl::OUString& _rowsource ) throw (css::uno::RuntimeException);
4658 -
4659 - // XDefaultProperty
4660 - ::rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
4661 - //XHelperInterface
4662 - virtual rtl::OUString& getServiceImplName();
4663 - virtual css::uno::Sequence<rtl::OUString> getServiceNames();
4664 -};
4665 -
4666 -#endif //
4667 --- sc/source/ui/vba/vbacommandbar.cxx.old 2009-04-06 16:42:00.000000000 +0000
4668 +++ sc/source/ui/vba/vbacommandbar.cxx 1970-01-01 00:00:00.000000000 +0000
4669 @@ -1,347 +0,0 @@
4670 -/*************************************************************************
4671 - *
4672 - * OpenOffice.org - a multi-platform office productivity suite
4673 - *
4674 - * $RCSfile$
4675 - *
4676 - * $Revision$
4677 - *
4678 - * last change: $Author$ $Date$
4679 - *
4680 - * The Contents of this file are made available subject to
4681 - * the terms of GNU Lesser General Public License Version 2.1.
4682 - *
4683 - *
4684 - * GNU Lesser General Public License Version 2.1
4685 - * =============================================
4686 - * Copyright 2005 by Sun Microsystems, Inc.
4687 - * 901 San Antonio Road, Palo Alto, CA 94303, USA
4688 - *
4689 - * This library is free software; you can redistribute it and/or
4690 - * modify it under the terms of the GNU Lesser General Public
4691 - * License version 2.1, as published by the Free Software Foundation.
4692 - *
4693 - * This library is distributed in the hope that it will be useful,
4694 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
4695 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
4696 - * Lesser General Public License for more details.
4697 - *
4698 - * You should have received a copy of the GNU Lesser General Public
4699 - * License along with this library; if not, write to the Free Software
4700 - * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
4701 - * MA 02111-1307 USA
4702 - *
4703 - ************************************************************************/
4704 -#include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
4705 -#include <com/sun/star/frame/XFrame.hpp>
4706 -#include <com/sun/star/frame/XDesktop.hpp>
4707 -#include <com/sun/star/frame/XLayoutManager.hpp>
4708 -#include <com/sun/star/beans/XPropertySet.hpp>
4709 -#include <ooo/vba/office/MsoBarType.hpp>
4710 -
4711 -#include "vbacommandbar.hxx"
4712 -#include "vbacommandbarcontrols.hxx"
4713 -#include "vbahelper.hxx"
4714 -
4715 -
4716 -using namespace com::sun::star;
4717 -using namespace ooo::vba;
4718 -
4719 -ScVbaCommandBar::ScVbaCommandBar( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, sal_Int32 nModuleType ) throw (uno::RuntimeException) : CommandBar_BASE( xParent, xContext )
4720 -{
4721 - // it's a menu bar
4722 - // only supporting factory menus ( no custom menus )
4723 - m_xParentHardRef.set( xParent, uno::UNO_QUERY_THROW );
4724 - initCommandBar();
4725 - switch( nModuleType )
4726 - {
4727 - case 0:
4728 - m_sMenuModuleName = rtl::OUString::createFromAscii( "com.sun.star.sheet.SpreadsheetDocument" );
4729 - break;
4730 - case 1:
4731 - m_sMenuModuleName = rtl::OUString::createFromAscii( "com.sun.star.text.TextDocument" );
4732 - break;
4733 - default:
4734 - m_sMenuModuleName = rtl::OUString::createFromAscii( "com.sun.star.text.TextDocument" );
4735 - }
4736 - getMenuSettings();
4737 - m_bIsMenu = sal_True;
4738 - m_bCustom = sal_False;
4739 -}
4740 -ScVbaCommandBar::ScVbaCommandBar( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, rtl::OUString sToolBarName, sal_Bool bTemporary, sal_Bool bCreate ) throw (uno::RuntimeException) : CommandBar_BASE( xParent, xContext )
4741 -{
4742 - // it's a tool bar
4743 - m_xParentHardRef.set( xParent, uno::UNO_QUERY_THROW );
4744 - initCommandBar();
4745 - m_bTemporary = bTemporary;
4746 - m_bCreate = bCreate;
4747 - // get OOo ToolBarName
4748 - CommandBarNameMap::const_iterator iter = mCommandBarNameMap.find( sToolBarName.toAsciiLowerCase() );
4749 - if( iter != mCommandBarNameMap.end() )
4750 - {
4751 - m_sToolBarName = iter->second;
4752 - }
4753 - else
4754 - {
4755 - m_sToolBarName = sToolBarName;
4756 - }
4757 - m_sUIName = m_sToolBarName;
4758 - m_bIsMenu = sal_False;
4759 - getToolBarSettings( m_sToolBarName );
4760 -}
4761 -void
4762 -ScVbaCommandBar::initCommandBar() throw (uno::RuntimeException)
4763 -{
4764 - m_pScVbaCommandBars = dynamic_cast< ScVbaCommandBars* >( m_xParentHardRef.get() );
4765 - if ( !m_pScVbaCommandBars )
4766 - throw uno::RuntimeException( rtl::OUString::createFromAscii( "Parent needs to be a ScVbaCommandBars"), uno::Reference< uno::XInterface >() );
4767 - m_bIsMenu = sal_False;
4768 - m_bCustom = sal_False;
4769 - m_bTemporary = sal_True;
4770 - m_sToolBarName = rtl::OUString::createFromAscii("");
4771 - m_sUIName = rtl::OUString::createFromAscii("");
4772 - m_sMenuModuleName = m_pScVbaCommandBars->GetModuleName();
4773 -}
4774 -void
4775 -ScVbaCommandBar::getToolBarSettings( rtl::OUString sToolBarName ) throw( uno::RuntimeException )
4776 -{
4777 - rtl::OUString sFactoryToolBar = rtl::OUString::createFromAscii("private:resource/toolbar/") + sToolBarName.toAsciiLowerCase();
4778 - rtl::OUString sCustomToolBar = rtl::OUString::createFromAscii("private:resource/toolbar/custom_toolbar_") + sToolBarName;
4779 - uno::Reference< lang::XMultiServiceFactory > xMSF( mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
4780 - uno::Reference< ui::XModuleUIConfigurationManagerSupplier > xUICfgManagerSup( xMSF->createInstance(rtl::OUString::createFromAscii("com.sun.star.ui.ModuleUIConfigurationManagerSupplier") ), uno::UNO_QUERY_THROW );
4781 - m_xUICfgManager.set( xUICfgManagerSup->getUIConfigurationManager( m_pScVbaCommandBars->GetModuleName() ), uno::UNO_QUERY_THROW );
4782 - m_xUICfgPers.set( m_xUICfgManager, uno::UNO_QUERY_THROW );
4783 - if( m_xUICfgManager->hasSettings( sFactoryToolBar ) )
4784 - {
4785 - // exsiting standard ToolBar
4786 - m_xBarSettings.set( m_xUICfgManager->getSettings( sFactoryToolBar, sal_True ), uno::UNO_QUERY_THROW );
4787 - m_sToolBarName = sFactoryToolBar;
4788 - }
4789 - else if( m_xUICfgManager->hasSettings( sCustomToolBar ) )
4790 - {
4791 - // exisiting custom ToolBar
4792 - m_xBarSettings.set( m_xUICfgManager->getSettings( sCustomToolBar, sal_True ), uno::UNO_QUERY_THROW );
4793 - m_sToolBarName = sCustomToolBar;
4794 - m_bCustom = sal_True;
4795 - }
4796 - else if( m_bCreate )
4797 - {
4798 - // new custom ToolBar
4799 - m_xBarSettings.set( m_xUICfgManager->createSettings(), uno::UNO_QUERY_THROW );
4800 - m_sToolBarName = sCustomToolBar;
4801 - m_bCustom = sal_True;
4802 - addCustomBar();
4803 - }
4804 - else
4805 - throw uno::RuntimeException( rtl::OUString::createFromAscii("ToolBar do not exist"), uno::Reference< uno::XInterface >() );
4806 - if( m_pScVbaCommandBars->GetWindows()->hasByName( m_sToolBarName ) )
4807 - {
4808 - uno::Any aToolBar = m_pScVbaCommandBars->GetWindows()->getByName( m_sToolBarName );
4809 - aToolBar >>= m_aToolBar;
4810 - }
4811 -}
4812 -void
4813 -ScVbaCommandBar::addCustomBar()
4814 -{
4815 - uno::Reference< beans::XPropertySet > xPropertySet( m_xBarSettings, uno::UNO_QUERY_THROW );
4816 - xPropertySet->setPropertyValue(rtl::OUString::createFromAscii("UIName"), uno::makeAny( m_sUIName ));
4817 -
4818 - if( m_xUICfgManager->hasSettings(m_sToolBarName) )
4819 - {
4820 - m_xUICfgManager->replaceSettings( m_sToolBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
4821 - }
4822 - else
4823 - {
4824 - m_xUICfgManager->insertSettings( m_sToolBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
4825 - }
4826 - if( !m_bTemporary )
4827 - {
4828 - m_xUICfgPers->store();
4829 - }
4830 -}
4831 -void
4832 -ScVbaCommandBar::getMenuSettings()
4833 -{
4834 - try
4835 - {
4836 - rtl::OUString sMenuBar = rtl::OUString::createFromAscii( "private:resource/menubar/menubar" );
4837 - uno::Reference< lang::XMultiServiceFactory > xMSF( mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
4838 - uno::Reference< ui::XModuleUIConfigurationManagerSupplier > xUICfgManagerSup( xMSF->createInstance(rtl::OUString::createFromAscii("com.sun.star.ui.ModuleUIConfigurationManagerSupplier") ), uno::UNO_QUERY_THROW );
4839 - m_xUICfgManager.set( xUICfgManagerSup->getUIConfigurationManager( m_sMenuModuleName ), uno::UNO_QUERY_THROW );
4840 - m_xUICfgPers.set( m_xUICfgManager, uno::UNO_QUERY_THROW );
4841 - m_xBarSettings.set( m_xUICfgManager->getSettings( sMenuBar, sal_True ), uno::UNO_QUERY_THROW );
4842 - }
4843 - catch ( uno::Exception e)
4844 - {
4845 - OSL_TRACE( "getMenuSetting got a error\n" );
4846 - }
4847 -}
4848 -::rtl::OUString SAL_CALL
4849 -ScVbaCommandBar::getName() throw ( uno::RuntimeException )
4850 -{
4851 - // This will get a "NULL length string" when Name is not set.
4852 - uno::Reference< beans::XPropertySet > xPropertySet( m_xBarSettings, uno::UNO_QUERY_THROW );
4853 - uno::Any aName = xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("UIName") );
4854 - rtl::OUString sName;
4855 - aName >>= sName;
4856 - if( sName.getLength() < 1 && !m_bIsMenu )
4857 - {
4858 - uno::Reference< container::XNameAccess > xNameAccess( m_pScVbaCommandBars->GetWindows(), uno::UNO_QUERY_THROW );
4859 - if( xNameAccess->hasByName( m_sToolBarName ) )
4860 - {
4861 - beans::PropertyValues aToolBar;
4862 - xNameAccess->getByName( m_sToolBarName ) >>= aToolBar;
4863 - sal_Int32 nCount = aToolBar.getLength();
4864 - beans::PropertyValue aPropertyValue;
4865 - for( sal_Int32 i = 0; i < nCount; i++ )
4866 - {
4867 - aPropertyValue = aToolBar[i];
4868 - if( aPropertyValue.Name.equals( rtl::OUString::createFromAscii("UIName") ) )
4869 - {
4870 - aPropertyValue.Value >>= sName;
4871 - return sName;
4872 - }
4873 - }
4874 - }
4875 - }
4876 - return sName;
4877 -}
4878 -void SAL_CALL
4879 -ScVbaCommandBar::setName( const ::rtl::OUString& _name ) throw (uno::RuntimeException)
4880 -{
4881 - uno::Reference< beans::XPropertySet > xPropertySet( m_xBarSettings, uno::UNO_QUERY_THROW );
4882 - xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("UIName"), uno::makeAny( _name ) );
4883 - uno::Reference< container::XIndexAccess > xIndexAccess( m_xBarSettings, uno::UNO_QUERY_THROW );
4884 -
4885 - if( m_xUICfgManager->hasSettings( m_sToolBarName ) )
4886 - {
4887 - m_xUICfgManager->replaceSettings( m_sToolBarName, xIndexAccess );
4888 - }
4889 - else
4890 - {
4891 - // toolbar not found
4892 - }
4893 - if( !m_bTemporary )
4894 - {
4895 - m_xUICfgPers->store();
4896 - }
4897 -}
4898 -::sal_Bool SAL_CALL
4899 -ScVbaCommandBar::getVisible() throw (uno::RuntimeException)
4900 -{
4901 - sal_Bool bVisible = sal_False;
4902 - try
4903 - {
4904 - sal_Int32 i = 0;
4905 - while( !m_aToolBar[i].Name.equals( rtl::OUString::createFromAscii( "Visible" ) ) )
4906 - {
4907 - i++;
4908 - }
4909 - m_aToolBar[i].Value >>= bVisible;
4910 - }
4911 - catch ( uno::Exception e )
4912 - {
4913 - }
4914 - return bVisible;
4915 -}
4916 -void SAL_CALL
4917 -ScVbaCommandBar::setVisible( ::sal_Bool _visible ) throw (uno::RuntimeException)
4918 -{
4919 - try
4920 - {
4921 - uno::Reference< frame::XFrame > xFrame( getCurrentDocument()->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW );
4922 - uno::Reference< beans::XPropertySet > xPropertySet( xFrame, uno::UNO_QUERY_THROW );
4923 - uno::Reference< frame::XLayoutManager > xLayoutManager( xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("LayoutManager") ), uno::UNO_QUERY_THROW );
4924 - if( _visible )
4925 - {
4926 - xLayoutManager->createElement( m_sToolBarName );
4927 - xLayoutManager->showElement( m_sToolBarName );
4928 - }
4929 - else
4930 - {
4931 - xLayoutManager->hideElement( m_sToolBarName );
4932 - xLayoutManager->destroyElement( m_sToolBarName );
4933 - }
4934 - }
4935 - catch( uno::Exception e )
4936 - {
4937 - OSL_TRACE( "SetVisible get an exception\n" );
4938 - }
4939 -}
4940 -void SAL_CALL
4941 -ScVbaCommandBar::Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
4942 -{
4943 - if( m_bCustom )
4944 - {
4945 - if( m_xUICfgManager->hasSettings( m_sToolBarName ) )
4946 - {
4947 - m_xUICfgManager->removeSettings(m_sToolBarName);
4948 - // make it permanent
4949 - if( !m_bTemporary )
4950 - {
4951 - m_xUICfgPers->store();
4952 - }
4953 - }
4954 - else
4955 - {
4956 - // toolbar not found
4957 - // TODO throw Error
4958 - }
4959 - uno::Reference< container::XNameContainer > xNameContainer( m_pScVbaCommandBars->GetWindows(), uno::UNO_QUERY_THROW );
4960 - if( xNameContainer->hasByName( m_sToolBarName ) )
4961 - {
4962 - xNameContainer->removeByName( m_sToolBarName );
4963 - }
4964 - }
4965 -}
4966 -uno::Any SAL_CALL
4967 -ScVbaCommandBar::Controls( const uno::Any& aIndex ) throw (script::BasicErrorException, uno::RuntimeException)
4968 -{
4969 - sal_Int32 nIndex;
4970 - uno::Reference< XCommandBarControls > xCommandBarControls( new ScVbaCommandBarControls( this, mxContext, uno::Reference< container::XIndexAccess >() ) );
4971 - if( aIndex.hasValue() )
4972 - {
4973 - if( aIndex >>= nIndex )
4974 - {
4975 - uno::Reference< XCommandBarControl > xCommandBarControl( xCommandBarControls->Item( aIndex, uno::Any() ), uno::UNO_QUERY_THROW );
4976 - return uno::makeAny( xCommandBarControl );
4977 - }
4978 - else
4979 - throw uno::RuntimeException( rtl::OUString::createFromAscii( "invalid index" ), uno::Reference< uno::XInterface >() );
4980 - }
4981 - return uno::makeAny( xCommandBarControls );
4982 -}
4983 -
4984 -sal_Int32 SAL_CALL
4985 -ScVbaCommandBar::Type() throw (script::BasicErrorException, uno::RuntimeException)
4986 -{
4987 - // #FIXME support msoBarTypePopup
4988 - sal_Int32 nType = office::MsoBarType::msoBarTypePopup;
4989 - nType = m_bIsMenu? office::MsoBarType::msoBarTypeNormal : office::MsoBarType::msoBarTypeMenuBar;
4990 - return nType;
4991 -}
4992 -
4993 -uno::Any SAL_CALL
4994 -ScVbaCommandBar::FindControl( const uno::Any& /*aType*/, const uno::Any& /*aId*/, const uno::Any& /*aTag*/, const uno::Any& /*aVisible*/, const uno::Any& /*aRecursive*/ ) throw (script::BasicErrorException, uno::RuntimeException)
4995 -{
4996 - // alwayse fail to find control
4997 - return uno::makeAny( uno::Reference< XCommandBarControl > () );
4998 -}
4999 -
5000 -rtl::OUString&
5001 -ScVbaCommandBar::getServiceImplName()
5002 -{
5003 - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBar") );
5004 - return sImplName;
5005 -}
5006 -uno::Sequence<rtl::OUString>
5007 -ScVbaCommandBar::getServiceNames()
5008 -{
5009 - static uno::Sequence< rtl::OUString > aServiceNames;
5010 - if ( aServiceNames.getLength() == 0 )
5011 - {
5012 - aServiceNames.realloc( 1 );
5013 - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.CommandBar" ) );
5014 - }
5015 - return aServiceNames;
5016 -}
5017 --- sc/source/ui/vba/vbacommandbar.hxx.old 2009-04-06 16:42:00.000000000 +0000
5018 +++ sc/source/ui/vba/vbacommandbar.hxx 1970-01-01 00:00:00.000000000 +0000
5019 @@ -1,107 +0,0 @@
5020 -/*************************************************************************
5021 - *
5022 - * OpenOffice.org - a multi-platform office productivity suite
5023 - *
5024 - * $RCSfile$
5025 - *
5026 - * $Revision$
5027 - *
5028 - * last change: $Author$ $Date$
5029 - *
5030 - * The Contents of this file are made available subject to
5031 - * the terms of GNU Lesser General Public License Version 2.1.
5032 - *
5033 - *
5034 - * GNU Lesser General Public License Version 2.1
5035 - * =============================================
5036 - * Copyright 2005 by Sun Microsystems, Inc.
5037 - * 901 San Antonio Road, Palo Alto, CA 94303, USA
5038 - *
5039 - * This library is free software; you can redistribute it and/or
5040 - * modify it under the terms of the GNU Lesser General Public
5041 - * License version 2.1, as published by the Free Software Foundation.
5042 - *
5043 - * This library is distributed in the hope that it will be useful,
5044 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
5045 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
5046 - * Lesser General Public License for more details.
5047 - *
5048 - * You should have received a copy of the GNU Lesser General Public
5049 - * License along with this library; if not, write to the Free Software
5050 - * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
5051 - * MA 02111-1307 USA
5052 - *
5053 - ************************************************************************/
5054 -#ifndef SC_VBA_COMMANDBAR_HXX
5055 -#define SC_VBA_COMMANDBAR_HXX
5056 -
5057 -#include <ooo/vba/XCommandBar.hpp>
5058 -#include <com/sun/star/ui/XUIConfigurationManager.hpp>
5059 -#include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
5060 -#include <com/sun/star/container/XIndexContainer.hpp>
5061 -#include <com/sun/star/beans/PropertyValues.hpp>
5062 -
5063 -#include "vbahelperinterface.hxx"
5064 -#include "vbacommandbars.hxx"
5065 -
5066 -#include <map>
5067 -typedef std::map< const rtl::OUString, rtl::OUString > CommandBarNameMap;
5068 -typedef std::pair< const rtl::OUString, rtl::OUString > CommandBarNamePair;
5069 -const CommandBarNamePair namePair[] = {
5070 - CommandBarNamePair( rtl::OUString::createFromAscii("standard"), rtl::OUString::createFromAscii("standardbar") ),
5071 - CommandBarNamePair( rtl::OUString::createFromAscii("formatting"), rtl::OUString::createFromAscii("formatobjectbar") ),
5072 -};
5073 -static const CommandBarNameMap mCommandBarNameMap( namePair, ( namePair + sizeof(namePair) / sizeof(namePair[0]) ) );
5074 -
5075 -
5076 -typedef InheritedHelperInterfaceImpl1< ov::XCommandBar > CommandBar_BASE;
5077 -
5078 -class ScVbaCommandBar : public CommandBar_BASE
5079 -{
5080 -private:
5081 - rtl::OUString m_sToolBarName;
5082 - rtl::OUString m_sMenuModuleName;
5083 - rtl::OUString m_sUIName;
5084 - sal_Bool m_bTemporary;
5085 - sal_Bool m_bIsMenu;
5086 - sal_Bool m_bCustom;
5087 - sal_Bool m_bCreate;
5088 - ScVbaCommandBars* m_pScVbaCommandBars;
5089 - css::beans::PropertyValues m_aToolBar;
5090 - // hard reference for parent
5091 - css::uno::Reference< ov::XHelperInterface > m_xParentHardRef;
5092 - css::uno::Reference< css::ui::XUIConfigurationManager > m_xUICfgManager;
5093 - css::uno::Reference< css::ui::XUIConfigurationPersistence > m_xUICfgPers;
5094 - css::uno::Reference< css::container::XIndexContainer > m_xBarSettings;
5095 - void initCommandBar() throw( css::uno::RuntimeException );
5096 -protected:
5097 - void getToolBarSettings( rtl::OUString sToolBarName ) throw( css::uno::RuntimeException );
5098 - void getMenuSettings();
5099 - void addCustomBar();
5100 -public:
5101 - ScVbaCommandBar( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, sal_Int32 nModuleType ) throw( css::uno::RuntimeException );
5102 - ScVbaCommandBar( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, rtl::OUString sToolBarName, sal_Bool bTemporary, sal_Bool bCreate ) throw( css::uno::RuntimeException );
5103 -
5104 - sal_Bool IsMenu() { return m_bIsMenu; };
5105 - css::uno::Reference< css::ui::XUIConfigurationManager > GetUICfgManager() { return m_xUICfgManager; };
5106 - css::uno::Reference< css::ui::XUIConfigurationPersistence > GetUICfgPers() { return m_xUICfgPers; };
5107 - css::uno::Reference< css::container::XIndexContainer > GetBarSettings() { return m_xBarSettings; };
5108 - rtl::OUString GetToolBarName() { return m_sToolBarName; };
5109 -
5110 - // Attributes
5111 - virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
5112 - virtual void SAL_CALL setName( const ::rtl::OUString& _name ) throw (css::uno::RuntimeException);
5113 - virtual ::sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
5114 - virtual void SAL_CALL setVisible( ::sal_Bool _visible ) throw (css::uno::RuntimeException);
5115 -
5116 - // Methods
5117 - virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
5118 - virtual css::uno::Any SAL_CALL Controls( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
5119 - virtual sal_Int32 SAL_CALL Type( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
5120 - virtual css::uno::Any SAL_CALL FindControl( const css::uno::Any& aType, const css::uno::Any& aId, const css::uno::Any& aTag, const css::uno::Any& aVisible, const css::uno::Any& aRecursive ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
5121 -
5122 - // XHelperInterface
5123 - virtual rtl::OUString& getServiceImplName();
5124 - virtual css::uno::Sequence<rtl::OUString> getServiceNames();
5125 -};
5126 -#endif//SC_VBA_COMMANDBAR_HXX
5127 --- sc/source/ui/vba/vbacommandbarcontrol.cxx.old 2009-04-06 16:42:00.000000000 +0000
5128 +++ sc/source/ui/vba/vbacommandbarcontrol.cxx 1970-01-01 00:00:00.000000000 +0000
5129 @@ -1,443 +0,0 @@
5130 -/*************************************************************************
5131 - *
5132 - * OpenOffice.org - a multi-platform office productivity suite
5133 - *
5134 - * $RCSfile$
5135 - *
5136 - * $Revision$
5137 - *
5138 - * last change: $Author$ $Date$
5139 - *
5140 - * The Contents of this file are made available subject to
5141 - * the terms of GNU Lesser General Public License Version 2.1.
5142 - *
5143 - *
5144 - * GNU Lesser General Public License Version 2.1
5145 - * =============================================
5146 - * Copyright 2005 by Sun Microsystems, Inc.
5147 - * 901 San Antonio Road, Palo Alto, CA 94303, USA
5148 - *
5149 - * This library is free software; you can redistribute it and/or
5150 - * modify it under the terms of the GNU Lesser General Public
5151 - * License version 2.1, as published by the Free Software Foundation.
5152 - *
5153 - * This library is distributed in the hope that it will be useful,
5154 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
5155 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
5156 - * Lesser General Public License for more details.
5157 - *
5158 - * You should have received a copy of the GNU Lesser General Public
5159 - * License along with this library; if not, write to the Free Software
5160 - * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
5161 - * MA 02111-1307 USA
5162 - *
5163 - ************************************************************************/
5164 -#include "vbacommandbarcontrol.hxx"
5165 -#include <basic/sbstar.hxx>
5166 -#include <basic/sbmod.hxx>
5167 -
5168 -using namespace com::sun::star;
5169 -using namespace ooo::vba;
5170 -
5171 -uno::Any lcl_getPropertyValue( beans::PropertyValues aPropertyValues, rtl::OUString sPropertyName )
5172 -{
5173 - sal_Int32 nCount = aPropertyValues.getLength();
5174 - for( sal_Int32 i = 0; i < nCount; i++ )
5175 - {
5176 - if( aPropertyValues[i].Name.equalsIgnoreAsciiCase( sPropertyName ) )
5177 - {
5178 - return aPropertyValues[i].Value;
5179 - }
5180 - }
5181 - return uno::Any();
5182 -}
5183 -
5184 -beans::PropertyValues lcl_repalcePropertyValue( beans::PropertyValues aPropertyValues, rtl::OUString sPropertyName, uno::Any aValue )
5185 -{
5186 - sal_Int32 nCount = aPropertyValues.getLength();
5187 - for( sal_Int32 i = 0; i < nCount; i++ )
5188 - {
5189 - if( aPropertyValues[i].Name.equalsIgnoreAsciiCase( sPropertyName ) )
5190 - {
5191 - aPropertyValues[i].Value = aValue;
5192 - return aPropertyValues;
5193 - }
5194 - }
5195 - return aPropertyValues;
5196 -}
5197 -
5198 -ScVbaCommandBarControl::ScVbaCommandBarControl( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition, sal_Int32 nType ) throw (uno::RuntimeException) : CommandBarControl_BASE( xParent, xContext ), m_sName( sName ), m_nPosition( nPosition ), m_nType( nType )
5199 -{
5200 - // exsiting CommandBarBarControl
5201 - m_xParentHardRef.set( xParent, uno::UNO_QUERY_THROW );
5202 - initObjects();
5203 - if( m_xBarSettings->hasElements() )
5204 - {
5205 - ScVbaCommandBarControl* pParentCommandBarControl = m_pCommandBarControls->GetParentCommandBarControl();
5206 - if( pParentCommandBarControl )
5207 - {
5208 - beans::PropertyValues aPropertyValues;
5209 - pParentCommandBarControl->GetCurrentSettings()->getByIndex( pParentCommandBarControl->GetPosition() ) >>= aPropertyValues;
5210 - pParentCommandBarControl->SetPropertyValues( aPropertyValues );
5211 - m_xCurrentSettings.set( lcl_getPropertyValue( pParentCommandBarControl->GetPropertyValues(), rtl::OUString::createFromAscii( "ItemDescriptorContainer" ) ), uno::UNO_QUERY_THROW );
5212 - }
5213 - if( !m_xCurrentSettings.is() )
5214 - {
5215 - m_xCurrentSettings.set( m_xUICfgManager->getSettings( m_pCommandBarControls->GetParentToolBarName(), sal_True ), uno::UNO_QUERY_THROW );
5216 - }
5217 - }
5218 - if( m_bIsMenu )
5219 - {
5220 - m_sBarName = rtl::OUString::createFromAscii("private:resource/menubar/menubar");
5221 - }
5222 - else
5223 - {
5224 - m_sBarName = m_pCommandBarControls->GetParentToolBarName();
5225 - }
5226 - m_bTemporary = sal_True;
5227 -}
5228 -ScVbaCommandBarControl::ScVbaCommandBarControl( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition, sal_Bool bTemporary, sal_Int32 nType) throw (uno::RuntimeException) : CommandBarControl_BASE( xParent, xContext ), m_nPosition( nPosition ), m_bTemporary( bTemporary ), m_nType( nType )
5229 -{
5230 - m_xParentHardRef.set( xParent, uno::UNO_QUERY_THROW );
5231 - initObjects();
5232 - if( sName.getLength() > 0 )
5233 - {
5234 - m_sName = sName;
5235 - }
5236 - m_sCommand = rtl::OUString::createFromAscii("vnd.openoffice.org:") + sName;
5237 - if( m_bIsMenu )
5238 - {
5239 - m_sBarName = rtl::OUString::createFromAscii("private:resource/menubar/menubar");
5240 - createNewMenuBarControl();
5241 - }
5242 - else
5243 - {
5244 - m_sBarName = m_pCommandBarControls->GetParentToolBarName();
5245 - createNewToolBarControl();
5246 - }
5247 -}
5248 -
5249 -void
5250 -ScVbaCommandBarControl::initObjects() throw (uno::RuntimeException)
5251 -{
5252 - m_pCommandBarControls = dynamic_cast< ScVbaCommandBarControls* >( m_xParentHardRef.get() );
5253 - if( !m_pCommandBarControls )
5254 - throw uno::RuntimeException( rtl::OUString::createFromAscii( "Parent needs to be a ScVbaCommandBarControls"), uno::Reference< uno::XInterface >() );
5255 - m_xUICfgManager.set( m_pCommandBarControls->GetUICfgManager(), uno::UNO_QUERY_THROW );
5256 - m_xUICfgPers.set( m_pCommandBarControls->GetUICfgPers(), uno::UNO_QUERY_THROW );
5257 - m_xBarSettings.set( m_pCommandBarControls->GetBarSettings(), uno::UNO_QUERY_THROW );
5258 - m_bIsMenu = m_pCommandBarControls->IsMenu();
5259 - m_sName = rtl::OUString::createFromAscii( "Custom" );
5260 -}
5261 -
5262 -void
5263 -ScVbaCommandBarControl::createNewMenuBarControl()
5264 -{
5265 - uno::Reference< lang::XSingleComponentFactory > xMenuMSF( m_xBarSettings, uno::UNO_QUERY_THROW );
5266 -
5267 - uno::Sequence< beans::PropertyValue > aPropertys;
5268 - if( m_nType == office::MsoControlType::msoControlPopup )
5269 - aPropertys = uno::Sequence< beans::PropertyValue >( 4 );
5270 - else
5271 - aPropertys = uno::Sequence< beans::PropertyValue >( 3 );
5272 -
5273 - aPropertys[0].Name = rtl::OUString::createFromAscii("CommandURL");
5274 - aPropertys[0].Value <<= m_sCommand;
5275 - aPropertys[1].Name = rtl::OUString::createFromAscii("Label");
5276 - aPropertys[1].Value <<= m_sName;
5277 - aPropertys[2].Name = rtl::OUString::createFromAscii("Type");
5278 - aPropertys[2].Value <<= sal_Int32(0);
5279 -
5280 - if( m_nType == office::MsoControlType::msoControlPopup )
5281 - {
5282 - aPropertys[3].Name = rtl::OUString::createFromAscii("ItemDescriptorContainer");
5283 - aPropertys[3].Value <<= xMenuMSF->createInstanceWithContext( mxContext );
5284 - }
5285 -
5286 - if( m_pCommandBarControls->GetParentCommandBar() != NULL )
5287 - {
5288 - // create a new menu
5289 - m_xBarSettings->insertByIndex( m_nPosition, uno::makeAny( aPropertys ) );
5290 - m_xCurrentSettings.set( m_xBarSettings, uno::UNO_QUERY_THROW );
5291 - }
5292 - else if( m_pCommandBarControls->GetParentCommandBarControl() != NULL )
5293 - {
5294 - // create a new menu entry
5295 - ScVbaCommandBarControl* pPc = m_pCommandBarControls->GetParentCommandBarControl();
5296 - beans::PropertyValues aPropertyValues;
5297 - pPc->GetCurrentSettings()->getByIndex( pPc->GetPosition() ) >>= aPropertyValues;
5298 - pPc->SetPropertyValues( aPropertyValues );
5299 -
5300 - // has the property already been set?
5301 - if( lcl_getPropertyValue( pPc->GetPropertyValues(), rtl::OUString::createFromAscii("ItemDescriptorContainer") ).hasValue() )
5302 - {
5303 - lcl_repalcePropertyValue( pPc->GetPropertyValues(), rtl::OUString::createFromAscii("ItemDescriptorContainer"), uno::makeAny( xMenuMSF->createInstanceWithContext( mxContext ) ) );
5304 - pPc->GetCurrentSettings()->replaceByIndex( pPc->GetPosition(), uno::makeAny( pPc->GetPropertyValues() ) );
5305 - }
5306 - m_xCurrentSettings.set( lcl_getPropertyValue( pPc->GetPropertyValues(), rtl::OUString::createFromAscii("ItemDescriptorContainer") ), uno::UNO_QUERY_THROW );
5307 - m_xCurrentSettings->insertByIndex( m_nPosition, uno::makeAny( aPropertys ) );
5308 - }
5309 - if( m_xUICfgManager->hasSettings( m_sBarName ) )
5310 - {
5311 - m_xUICfgManager->replaceSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
5312 - }
5313 - else
5314 - {
5315 - m_xUICfgManager->insertSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
5316 - }
5317 - if( !m_bTemporary )
5318 - {
5319 - m_xUICfgPers->store();
5320 - }
5321 -}
5322 -
5323 -void
5324 -ScVbaCommandBarControl::createNewToolBarControl()
5325 -{
5326 - uno::Sequence< beans::PropertyValue > aPropertys(4);
5327 - aPropertys[0].Name = rtl::OUString::createFromAscii("CommandURL");
5328 - aPropertys[0].Value <<= m_sCommand;
5329 - aPropertys[1].Name = rtl::OUString::createFromAscii("Label");
5330 - aPropertys[1].Value <<= m_sName;
5331 - aPropertys[2].Name = rtl::OUString::createFromAscii("Type");
5332 - aPropertys[2].Value <<= sal_Int32(0);
5333 - aPropertys[3].Name = rtl::OUString::createFromAscii("IsVisible");
5334 - aPropertys[3].Value <<= sal_True;
5335 -
5336 - m_xBarSettings->insertByIndex( m_nPosition, uno::makeAny( aPropertys ) );
5337 - uno::Reference< beans::XPropertySet > xPropertySet( m_xBarSettings, uno::UNO_QUERY_THROW );
5338 - rtl::OUString sUIName;
5339 - xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("UIName") ) >>= sUIName;
5340 -
5341 - m_xCurrentSettings.set( m_xBarSettings, uno::UNO_QUERY_THROW );
5342 - if( m_xUICfgManager->hasSettings( m_sBarName ) )
5343 - {
5344 - m_xUICfgManager->replaceSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
5345 - }
5346 - else
5347 - {
5348 - m_xUICfgManager->insertSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
5349 - }
5350 - if( !m_bTemporary )
5351 - {
5352 - m_xUICfgPers->store();
5353 - }
5354 -}
5355 -
5356 -::rtl::OUString SAL_CALL
5357 -ScVbaCommandBarControl::getCaption() throw ( uno::RuntimeException )
5358 -{
5359 - // "Label" always empty
5360 - rtl::OUString sCaption;
5361 - beans::PropertyValues aPropertyValues;
5362 - if( m_xCurrentSettings.is() )
5363 - {
5364 - m_xCurrentSettings->getByIndex( m_nPosition ) >>= aPropertyValues;
5365 - lcl_getPropertyValue( aPropertyValues, rtl::OUString::createFromAscii("Label") ) >>= sCaption;
5366 - }
5367 - else if( m_xBarSettings.is() )
5368 - {
5369 - m_xBarSettings->getByIndex( m_nPosition ) >>= aPropertyValues;
5370 - lcl_getPropertyValue( aPropertyValues, rtl::OUString::createFromAscii("Label") ) >>= sCaption;
5371 - }
5372 - return sCaption;
5373 -}
5374 -void SAL_CALL
5375 -ScVbaCommandBarControl::setCaption( const ::rtl::OUString& _caption ) throw (uno::RuntimeException)
5376 -{
5377 - if( m_xCurrentSettings.is() )
5378 - {
5379 - beans::PropertyValues aPropertyValues;
5380 - m_xCurrentSettings->getByIndex( m_nPosition ) >>= aPropertyValues;
5381 - beans::PropertyValues aNewPropertyValues;
5382 - aNewPropertyValues = lcl_repalcePropertyValue( aPropertyValues, rtl::OUString::createFromAscii("Label"), uno::makeAny( _caption ) );
5383 - m_xCurrentSettings->replaceByIndex( m_nPosition, uno::makeAny( aNewPropertyValues ) );
5384 - if( m_xUICfgManager->hasSettings( m_sBarName ) )
5385 - {
5386 - m_xUICfgManager->replaceSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
5387 - }
5388 - else
5389 - {
5390 - m_xUICfgManager->insertSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
5391 - }
5392 - // make it permanent
5393 - if( !m_bTemporary )
5394 - {
5395 - m_xUICfgPers->store();
5396 - }
5397 - }
5398 -}
5399 -::rtl::OUString SAL_CALL
5400 -ScVbaCommandBarControl::getOnAction() throw (uno::RuntimeException)
5401 -{
5402 - if( m_xCurrentSettings.is() )
5403 - {
5404 - beans::PropertyValues aPropertyValues;
5405 - m_xCurrentSettings->getByIndex( m_nPosition ) >>= aPropertyValues;
5406 - rtl::OUString sCommandURL;
5407 - lcl_getPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( "CommandURL" ) ) >>= sCommandURL;
5408 - return sCommandURL;
5409 - }
5410 - return ::rtl::OUString();
5411 -}
5412 -void SAL_CALL
5413 -ScVbaCommandBarControl::setOnAction( const ::rtl::OUString& _onaction ) throw (uno::RuntimeException)
5414 -{
5415 - if( m_xCurrentSettings.is() )
5416 - {
5417 - // convert the comand url into something like vnd.sun.star.script:Standard.testMacro.Macro1?language=Basic&location=document
5418 - rtl::OUString aCommandURL;
5419 - rtl::OUString sUrlPart = rtl::OUString::createFromAscii( "vnd.sun.star.script:Standard.");
5420 - SbModule* pModule = StarBASIC::GetActiveModule();
5421 - if( pModule && ( _onaction.indexOf( sUrlPart ) == -1 ) )
5422 - {
5423 - rtl::OUString sUrlPart1 = rtl::OUString::createFromAscii( "?language=Basic&location=document");
5424 - aCommandURL = sUrlPart.concat( pModule->GetName() ).concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".") ) ).concat( _onaction ).concat( sUrlPart1 );
5425 - }
5426 - else
5427 - {
5428 - aCommandURL = _onaction;
5429 - }
5430 - OSL_TRACE(" ScVbaCommandBarControl::setOnAction: %s", rtl::OUStringToOString( aCommandURL, RTL_TEXTENCODING_UTF8 ).getStr() );
5431 -
5432 - beans::PropertyValues aPropertyValues;
5433 - m_xCurrentSettings->getByIndex( m_nPosition ) >>= aPropertyValues;
5434 - beans::PropertyValues aNewPropertyValues;
5435 - aNewPropertyValues = lcl_repalcePropertyValue( aPropertyValues, rtl::OUString::createFromAscii("CommandURL"), uno::makeAny( aCommandURL ) );
5436 - m_xCurrentSettings->replaceByIndex( m_nPosition, uno::makeAny( aNewPropertyValues ) );
5437 - if( m_xUICfgManager->hasSettings( m_sBarName ) )
5438 - {
5439 - m_xUICfgManager->replaceSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
5440 - }
5441 - else
5442 - {
5443 - m_xUICfgManager->insertSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
5444 - }
5445 - // make it permanent
5446 - if( !m_bTemporary )
5447 - {
5448 - m_xUICfgPers->store();
5449 - }
5450 - }
5451 -}
5452 -::sal_Bool SAL_CALL
5453 -ScVbaCommandBarControl::getVisible() throw (uno::RuntimeException)
5454 -{
5455 - // not possible in UNO?
5456 - return sal_True;
5457 -}
5458 -void SAL_CALL
5459 -ScVbaCommandBarControl::setVisible( ::sal_Bool /*_visible*/ ) throw (uno::RuntimeException)
5460 -{
5461 - // "IsVisilbe"
5462 -}
5463 -void SAL_CALL
5464 -ScVbaCommandBarControl::Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
5465 -{
5466 - if( m_xCurrentSettings.is() )
5467 - {
5468 - m_xCurrentSettings->removeByIndex( m_nPosition );
5469 -
5470 - if( m_xUICfgManager->hasSettings( m_sBarName ) )
5471 - {
5472 - m_xUICfgManager->replaceSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
5473 - }
5474 - else
5475 - {
5476 - m_xUICfgManager->insertSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
5477 - }
5478 - // make it permanent
5479 - if( !m_bTemporary )
5480 - {
5481 - m_xUICfgPers->store();
5482 - }
5483 - }
5484 -}
5485 -uno::Any SAL_CALL
5486 -ScVbaCommandBarControl::Controls( const uno::Any& aIndex ) throw (script::BasicErrorException, uno::RuntimeException)
5487 -{
5488 - sal_Int32 nIndex;
5489 - uno::Reference< XCommandBarControls > xCommandBarControls( new ScVbaCommandBarControls( this, mxContext, uno::Reference< container::XIndexAccess >() ) );
5490 - if( aIndex.hasValue() )
5491 - {
5492 - if( aIndex >>= nIndex )
5493 - {
5494 - uno::Reference< XCommandBarControl > xCommandBarControl( xCommandBarControls->Item( aIndex, uno::Any() ), uno::UNO_QUERY_THROW );
5495 - return uno::makeAny( xCommandBarControl );
5496 - }
5497 - else
5498 - throw uno::RuntimeException( rtl::OUString::createFromAscii( "invalid index" ), uno::Reference< uno::XInterface >() );
5499 - }
5500 - return uno::makeAny( xCommandBarControls );
5501 -}
5502 -rtl::OUString&
5503 -ScVbaCommandBarControl::getServiceImplName()
5504 -{
5505 - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBarControl") );
5506 - return sImplName;
5507 -}
5508 -uno::Sequence<rtl::OUString>
5509 -ScVbaCommandBarControl::getServiceNames()
5510 -{
5511 - static uno::Sequence< rtl::OUString > aServiceNames;
5512 - if ( aServiceNames.getLength() == 0 )
5513 - {
5514 - aServiceNames.realloc( 1 );
5515 - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.CommandBarControl" ) );
5516 - }
5517 - return aServiceNames;
5518 -}
5519 -
5520 -//////////// ScVbaCommandBarPopup //////////////////////////////
5521 -ScVbaCommandBarPopup::ScVbaCommandBarPopup( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition ) throw (uno::RuntimeException) : CommandBarPopup_BASE( xParent, xContext, sName, nPosition, office::MsoControlType::msoControlPopup )
5522 -{
5523 -}
5524 -
5525 -ScVbaCommandBarPopup::ScVbaCommandBarPopup( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition, sal_Bool bTemporary ) throw (uno::RuntimeException) : CommandBarPopup_BASE( xParent, xContext, sName, nPosition, bTemporary, office::MsoControlType::msoControlPopup)
5526 -{
5527 -}
5528 -
5529 -rtl::OUString&
5530 -ScVbaCommandBarPopup::getServiceImplName()
5531 -{
5532 - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBarPopup") );
5533 - return sImplName;
5534 -}
5535 -uno::Sequence<rtl::OUString>
5536 -ScVbaCommandBarPopup::getServiceNames()
5537 -{
5538 - static uno::Sequence< rtl::OUString > aServiceNames;
5539 - if ( aServiceNames.getLength() == 0 )
5540 - {
5541 - aServiceNames.realloc( 1 );
5542 - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.CommandBarPopup" ) );
5543 - }
5544 - return aServiceNames;
5545 -}
5546 -
5547 -//////////// ScVbaCommandBarButton //////////////////////////////
5548 -ScVbaCommandBarButton::ScVbaCommandBarButton( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition ) throw (uno::RuntimeException) : CommandBarButton_BASE( xParent, xContext, sName, nPosition, office::MsoControlType::msoControlButton )
5549 -{
5550 -}
5551 -
5552 -ScVbaCommandBarButton::ScVbaCommandBarButton( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition, sal_Bool bTemporary ) throw (uno::RuntimeException) : CommandBarButton_BASE( xParent, xContext, sName, nPosition, bTemporary, office::MsoControlType::msoControlButton)
5553 -{
5554 -}
5555 -
5556 -rtl::OUString&
5557 -ScVbaCommandBarButton::getServiceImplName()
5558 -{
5559 - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBarButton") );
5560 - return sImplName;
5561 -}
5562 -uno::Sequence<rtl::OUString>
5563 -ScVbaCommandBarButton::getServiceNames()
5564 -{
5565 - static uno::Sequence< rtl::OUString > aServiceNames;
5566 - if ( aServiceNames.getLength() == 0 )
5567 - {
5568 - aServiceNames.realloc( 1 );
5569 - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.CommandBarButton" ) );
5570 - }
5571 - return aServiceNames;
5572 -}
5573 --- sc/source/ui/vba/vbacommandbarcontrol.hxx.old 2009-04-06 16:42:00.000000000 +0000
5574 +++ sc/source/ui/vba/vbacommandbarcontrol.hxx 1970-01-01 00:00:00.000000000 +0000
5575 @@ -1,120 +0,0 @@
5576 -/*************************************************************************
5577 - *
5578 - * OpenOffice.org - a multi-platform office productivity suite
5579 - *
5580 - * $RCSfile$
5581 - *
5582 - * $Revision$
5583 - *
5584 - * last change: $Author$ $Date$
5585 - *
5586 - * The Contents of this file are made available subject to
5587 - * the terms of GNU Lesser General Public License Version 2.1.
5588 - *
5589 - *
5590 - * GNU Lesser General Public License Version 2.1
5591 - * =============================================
5592 - * Copyright 2005 by Sun Microsystems, Inc.
5593 - * 901 San Antonio Road, Palo Alto, CA 94303, USA
5594 - *
5595 - * This library is free software; you can redistribute it and/or
5596 - * modify it under the terms of the GNU Lesser General Public
5597 - * License version 2.1, as published by the Free Software Foundation.
5598 - *
5599 - * This library is distributed in the hope that it will be useful,
5600 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
5601 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
5602 - * Lesser General Public License for more details.
5603 - *
5604 - * You should have received a copy of the GNU Lesser General Public
5605 - * License along with this library; if not, write to the Free Software
5606 - * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
5607 - * MA 02111-1307 USA
5608 - *
5609 - ************************************************************************/
5610 -#ifndef SC_VBA_COMMANDBARCONTROL_HXX
5611 -#define SC_VBA_COMMANDBARCONTROL_HXX
5612 -
5613 -#include <ooo/vba/XCommandBarControl.hpp>
5614 -#include <ooo/vba/XCommandBarPopup.hpp>
5615 -#include <ooo/vba/XCommandBarButton.hpp>
5616 -#include <ooo/vba/office/MsoControlType.hpp>
5617 -
5618 -#include "vbahelperinterface.hxx"
5619 -#include "vbacommandbarcontrols.hxx"
5620 -
5621 -typedef InheritedHelperInterfaceImpl1< ov::XCommandBarControl > CommandBarControl_BASE;
5622 -
5623 -class ScVbaCommandBarControl : public CommandBarControl_BASE
5624 -{
5625 -private:
5626 - rtl::OUString m_sName;
5627 - rtl::OUString m_sBarName;
5628 - rtl::OUString m_sCommand;
5629 - sal_Int32 m_nType;
5630 - sal_Int32 m_nPosition;
5631 - sal_Bool m_bTemporary;
5632 - sal_Bool m_bIsMenu;
5633 - ScVbaCommandBarControls* m_pCommandBarControls;
5634 - css::uno::Reference< ov::XHelperInterface > m_xParentHardRef;
5635 - css::uno::Reference< css::ui::XUIConfigurationManager > m_xUICfgManager;
5636 - css::uno::Reference< css::ui::XUIConfigurationPersistence > m_xUICfgPers;
5637 - css::uno::Reference< css::container::XIndexContainer > m_xBarSettings;
5638 - css::uno::Reference< css::container::XIndexContainer > m_xCurrentSettings;
5639 - css::beans::PropertyValues m_aPropertyValues;
5640 -
5641 - void initObjects() throw (css::uno::RuntimeException);
5642 - void createNewMenuBarControl();
5643 - void createNewToolBarControl();
5644 -public:
5645 - ScVbaCommandBarControl( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition = 0, sal_Int32 nType = ov::office::MsoControlType::msoControlButton ) throw (css::uno::RuntimeException);
5646 - ScVbaCommandBarControl( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition, sal_Bool bTemporary, sal_Int32 nType = ov::office::MsoControlType::msoControlButton ) throw (css::uno::RuntimeException);
5647 - css::uno::Reference< css::ui::XUIConfigurationManager > GetUICfgManager() { return m_xUICfgManager; };
5648 - css::uno::Reference< css::ui::XUIConfigurationPersistence > GetUICfgPers() { return m_xUICfgPers; };
5649 - css::uno::Reference< css::container::XIndexContainer > GetBarSettings() { return m_xBarSettings; };
5650 - sal_Bool IsMenu() { return m_bIsMenu; };
5651 - sal_Int32 GetPosition() { return m_nPosition; };
5652 - css::uno::Reference< css::container::XIndexContainer > GetCurrentSettings() { return m_xCurrentSettings; };
5653 - css::beans::PropertyValues GetPropertyValues() { return m_aPropertyValues; };
5654 - void SetPropertyValues( css::beans::PropertyValues aPropertyValues ) { m_aPropertyValues = aPropertyValues; };
5655 -
5656 - // Attributes
5657 - virtual ::rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
5658 - virtual void SAL_CALL setCaption( const ::rtl::OUString& _caption ) throw (css::uno::RuntimeException);
5659 - virtual ::rtl::OUString SAL_CALL getOnAction() throw (css::uno::RuntimeException);
5660 - virtual void SAL_CALL setOnAction( const ::rtl::OUString& _onaction ) throw (css::uno::RuntimeException);
5661 - virtual ::sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
5662 - virtual void SAL_CALL setVisible( ::sal_Bool _visible ) throw (css::uno::RuntimeException);
5663 -
5664 - // Methods
5665 - virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
5666 - virtual css::uno::Any SAL_CALL Controls( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
5667 -
5668 - // XHelperInterface
5669 - virtual rtl::OUString& getServiceImplName();
5670 - virtual css::uno::Sequence<rtl::OUString> getServiceNames();
5671 -};
5672 -
5673 -typedef cppu::ImplInheritanceHelper1< ScVbaCommandBarControl, ov::XCommandBarPopup > CommandBarPopup_BASE;
5674 -class ScVbaCommandBarPopup : public CommandBarPopup_BASE
5675 -{
5676 -public:
5677 - ScVbaCommandBarPopup( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition = 0 ) throw (css::uno::RuntimeException);
5678 - ScVbaCommandBarPopup( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition, sal_Bool bTemporary ) throw (css::uno::RuntimeException);
5679 - // XHelperInterface
5680 - virtual rtl::OUString& getServiceImplName();
5681 - virtual css::uno::Sequence<rtl::OUString> getServiceNames();
5682 -};
5683 -
5684 -typedef cppu::ImplInheritanceHelper1< ScVbaCommandBarControl, ov::XCommandBarButton > CommandBarButton_BASE;
5685 -class ScVbaCommandBarButton : public CommandBarButton_BASE
5686 -{
5687 -public:
5688 - ScVbaCommandBarButton( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition = 0 ) throw (css::uno::RuntimeException);
5689 - ScVbaCommandBarButton( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition, sal_Bool bTemporary ) throw (css::uno::RuntimeException);
5690 - // XHelperInterface
5691 - virtual rtl::OUString& getServiceImplName();
5692 - virtual css::uno::Sequence<rtl::OUString> getServiceNames();
5693 -};
5694 -
5695 -#endif//SC_VBA_COMMANDBARCONTROL_HXX
5696 --- sc/source/ui/vba/vbacommandbarcontrols.cxx.old 2009-04-06 16:42:00.000000000 +0000
5697 +++ sc/source/ui/vba/vbacommandbarcontrols.cxx 1970-01-01 00:00:00.000000000 +0000
5698 @@ -1,348 +0,0 @@
5699 -/*************************************************************************
5700 - *
5701 - * OpenOffice.org - a multi-platform office productivity suite
5702 - *
5703 - * $RCSfile$
5704 - *
5705 - * $Revision$
5706 - *
5707 - * last change: $Author$ $Date$
5708 - *
5709 - * The Contents of this file are made available subject to
5710 - * the terms of GNU Lesser General Public License Version 2.1.
5711 - *
5712 - *
5713 - * GNU Lesser General Public License Version 2.1
5714 - * =============================================
5715 - * Copyright 2005 by Sun Microsystems, Inc.
5716 - * 901 San Antonio Road, Palo Alto, CA 94303, USA
5717 - *
5718 - * This library is free software; you can redistribute it and/or
5719 - * modify it under the terms of the GNU Lesser General Public
5720 - * License version 2.1, as published by the Free Software Foundation.
5721 - *
5722 - * This library is distributed in the hope that it will be useful,
5723 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
5724 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
5725 - * Lesser General Public License for more details.
5726 - *
5727 - * You should have received a copy of the GNU Lesser General Public
5728 - * License along with this library; if not, write to the Free Software
5729 - * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
5730 - * MA 02111-1307 USA
5731 - *
5732 - ************************************************************************/
5733 -#include "vbacommandbarcontrols.hxx"
5734 -#include "vbacommandbarcontrol.hxx"
5735 -
5736 -using namespace com::sun::star;
5737 -using namespace ooo::vba;
5738 -
5739 -uno::Any lcl_getPropertyValue( beans::PropertyValues aPropertyValues, rtl::OUString sPropertyName );
5740 -
5741 -typedef ::cppu::WeakImplHelper1< container::XEnumeration > CommandBarControlEnumeration_BASE;
5742 -class CommandBarControlEnumeration : public CommandBarControlEnumeration_BASE
5743 -{
5744 - //uno::Reference< uno::XComponentContext > m_xContext;
5745 - ScVbaCommandBarControls* m_pCommandBarControls;
5746 - sal_Int32 m_nCurrentPosition;
5747 -public:
5748 - CommandBarControlEnumeration( ScVbaCommandBarControls* pCommandBarControls ) : m_pCommandBarControls( pCommandBarControls ), m_nCurrentPosition( 0 ) {}
5749 - virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException )
5750 - {
5751 - if( m_nCurrentPosition < m_pCommandBarControls->getCount() )
5752 - return sal_True;
5753 - return sal_False;
5754 - }
5755 - virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException )
5756 - {
5757 - if( hasMoreElements() )
5758 - {
5759 - rtl::OUString sName = m_pCommandBarControls->GetControlNameByIndex( m_nCurrentPosition );
5760 - m_nCurrentPosition = m_nCurrentPosition + 1;
5761 - if( sName.getLength() > 0 )
5762 - return m_pCommandBarControls->createCollectionObject( uno::makeAny( sName ) );
5763 - else
5764 - return nextElement();
5765 - }
5766 - else
5767 - throw container::NoSuchElementException();
5768 - }
5769 -};
5770 -
5771 -ScVbaCommandBarControls::ScVbaCommandBarControls( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, const uno::Reference< container::XIndexAccess> xIndexAccess ) throw (uno::RuntimeException) : CommandBarControls_BASE( xParent, xContext, xIndexAccess )
5772 -{
5773 - m_bIsMenu = sal_False;
5774 - m_bHasElements = sal_False;
5775 - m_xParentHardRef.set( xParent, uno::UNO_QUERY_THROW );
5776 - m_pCommandBar = dynamic_cast< ScVbaCommandBar* >( m_xParentHardRef.get() );
5777 - m_pCommandBarControl = dynamic_cast< ScVbaCommandBarControl* >( m_xParentHardRef.get() );
5778 - if( m_pCommandBar )
5779 - {
5780 - m_xUICfgManager.set( m_pCommandBar->GetUICfgManager(), uno::UNO_QUERY_THROW );
5781 - m_xUICfgPers.set( m_pCommandBar->GetUICfgPers(), uno::UNO_QUERY_THROW );
5782 - m_xBarSettings.set( m_pCommandBar->GetBarSettings(), uno::UNO_QUERY_THROW );
5783 - m_bIsMenu = m_pCommandBar->IsMenu();
5784 - if( m_xBarSettings->hasElements() )
5785 - {
5786 - m_bHasElements = sal_True;
5787 - }
5788 - }
5789 - else if( m_pCommandBarControl )
5790 - {
5791 - m_xUICfgManager.set( m_pCommandBarControl->GetUICfgManager(), uno::UNO_QUERY_THROW );
5792 - m_xUICfgPers.set( m_pCommandBarControl->GetUICfgPers(), uno::UNO_QUERY_THROW );
5793 - beans::PropertyValues aPropertyValues;
5794 - m_pCommandBarControl->GetCurrentSettings()->getByIndex( m_pCommandBarControl->GetPosition() ) >>= aPropertyValues;
5795 - m_pCommandBarControl->SetPropertyValues( aPropertyValues );
5796 - m_xBarSettings.set( m_pCommandBarControl->GetCurrentSettings(), uno::UNO_QUERY_THROW );
5797 -
5798 - uno::Any aValue = lcl_getPropertyValue( m_pCommandBarControl->GetPropertyValues(), rtl::OUString::createFromAscii("ItemDescriptorContainer") );
5799 - if( aValue.hasValue() )
5800 - {
5801 - m_xCurrentSettings = m_pCommandBarControl->GetCurrentSettings();
5802 - m_bHasElements = sal_True;
5803 - }
5804 - else
5805 - {
5806 - m_bHasElements = sal_False;
5807 - }
5808 - m_bIsMenu = m_pCommandBarControl->IsMenu();
5809 - }
5810 - else
5811 - {
5812 - throw uno::RuntimeException( rtl::OUString::createFromAscii("Parent needs to be a ScVbaCommandBar or a ScVbaCommandBarControl"), uno::Reference< uno::XInterface >() );
5813 - }
5814 -}
5815 -rtl::OUString
5816 -ScVbaCommandBarControls::GetControlNameByIndex( const sal_Int32 nIndex ) throw ( uno::RuntimeException )
5817 -{
5818 - sal_Int32 nCount = 0;
5819 - if( m_bHasElements )
5820 - {
5821 - sal_Int32 nBarSettingsCount = m_xBarSettings->getCount();
5822 - for( sal_Int32 i = 0; i < nBarSettingsCount; i++ )
5823 - {
5824 - beans::PropertyValues aMenuValues;
5825 - m_xBarSettings->getByIndex( i ) >>= aMenuValues;
5826 - for( sal_Int32 j = 0; j < aMenuValues.getLength(); j++ )
5827 - {
5828 - if( aMenuValues[j].Name.equalsIgnoreAsciiCase( rtl::OUString::createFromAscii( "CommandURL" ) ) )
5829 - {
5830 - nCount++;
5831 - if( nIndex == nCount )
5832 - {
5833 - rtl::OUString sCommandURL;
5834 - aMenuValues[j].Value >>= sCommandURL;
5835 - sal_Int32 nLastIndex = sCommandURL.lastIndexOf( rtl::OUString::createFromAscii(":") );
5836 - if( ( nLastIndex != -1 ) && ( ( nLastIndex +1 ) < sCommandURL.getLength() ) )
5837 - {
5838 - sCommandURL = sCommandURL.copy( nLastIndex + 1 );
5839 - return sCommandURL;
5840 - }
5841 - }
5842 - }
5843 - }
5844 - }
5845 - }
5846 - else
5847 - throw uno::RuntimeException( rtl::OUString::createFromAscii( "Out of bound" ), uno::Reference< uno::XInterface >() );
5848 - return rtl::OUString();
5849 -}
5850 -
5851 -// Attributes
5852 -sal_Int32 SAL_CALL
5853 -ScVbaCommandBarControls::getCount() throw (uno::RuntimeException)
5854 -{
5855 - sal_Int32 nCount = 0;
5856 - if( m_bHasElements )
5857 - {
5858 - sal_Int32 nBarSettingsCount = m_xBarSettings->getCount();
5859 - for( sal_Int32 i = 0; i < nBarSettingsCount; i++ )
5860 - {
5861 - beans::PropertyValues aMenuValues;
5862 - m_xBarSettings->getByIndex( i ) >>= aMenuValues;
5863 - for( sal_Int32 j = 0; j < aMenuValues.getLength(); j++ )
5864 - {
5865 - if( aMenuValues[j].Name.equalsIgnoreAsciiCase( rtl::OUString::createFromAscii( "CommandURL" ) ) )
5866 - {
5867 - nCount++;
5868 - }
5869 - }
5870 - }
5871 - }
5872 - return nCount;
5873 -}
5874 -// XEnumerationAccess
5875 -uno::Type SAL_CALL
5876 -ScVbaCommandBarControls::getElementType() throw ( uno::RuntimeException )
5877 -{
5878 - return XCommandBarControls::static_type( 0 );
5879 -}
5880 -uno::Reference< container::XEnumeration >
5881 -ScVbaCommandBarControls::createEnumeration() throw ( uno::RuntimeException )
5882 -{
5883 - return uno::Reference< container::XEnumeration >( new CommandBarControlEnumeration( this ) );
5884 -}
5885 -uno::Any
5886 -ScVbaCommandBarControls::createCollectionObject( const uno::Any& aSource )
5887 -{
5888 - // only surport the aSource as a name string, because this class is a API wrapper
5889 - rtl::OUString sName;
5890 - if( aSource >>= sName )
5891 - {
5892 - uno::Reference< container::XIndexContainer > xCurrentSettings;
5893 - beans::PropertyValues aPropertyValues;
5894 - if( m_pCommandBarControl )
5895 - {
5896 - m_pCommandBarControl->GetCurrentSettings()->getByIndex( m_pCommandBarControl->GetPosition() ) >>= aPropertyValues;
5897 - xCurrentSettings.set( lcl_getPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( "ItemDescriptorContainer" ) ), uno::UNO_QUERY );
5898 - if( !xCurrentSettings.is() )
5899 - {
5900 - xCurrentSettings.set( m_xUICfgManager->getSettings( GetParentToolBarName(), sal_True ), uno::UNO_QUERY );
5901 - }
5902 - }
5903 -
5904 - sal_Int32 nPosition = -1;
5905 - for( sal_Int32 i = 0; i < xCurrentSettings->getCount(); i++ )
5906 - {
5907 - xCurrentSettings->getByIndex( i ) >>= aPropertyValues;
5908 - // Label always empty in OOo
5909 - rtl::OUString sLabel;
5910 - lcl_getPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( "Label" ) ) >>= sLabel;
5911 - if( sLabel.equalsIgnoreAsciiCase( sName ) )
5912 - {
5913 - nPosition = i;
5914 - break;
5915 - }
5916 - // using CammandURL to find
5917 - rtl::OUString sCommandURL;
5918 - lcl_getPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( "CommandURL" ) ) >>= sCommandURL;
5919 - sal_Int32 nLastIndex = sCommandURL.lastIndexOf( rtl::OUString::createFromAscii(":") );
5920 - if( ( nLastIndex != -1 ) && ( ( nLastIndex + 1 ) < sCommandURL.getLength() ) )
5921 - {
5922 - sCommandURL = sCommandURL.copy( nLastIndex + 1 );
5923 - }
5924 - if( sCommandURL.equalsIgnoreAsciiCase( sName ) )
5925 - {
5926 - nPosition = i;
5927 - break;
5928 - }
5929 - }
5930 -
5931 - if( nPosition != -1 )
5932 - {
5933 - uno::Reference< container::XIndexContainer > xSubMenu;
5934 - lcl_getPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( "ItemDescriptorContainer" ) ) >>= xSubMenu;
5935 - ScVbaCommandBarControl* pNewCommandBarControl = NULL;
5936 - if( xSubMenu.is() )
5937 - pNewCommandBarControl = new ScVbaCommandBarPopup( this, mxContext, sName, nPosition );
5938 - else
5939 - pNewCommandBarControl = new ScVbaCommandBarButton( this, mxContext, sName, nPosition );
5940 -
5941 - return uno::makeAny( uno::Reference< XCommandBarControl > ( pNewCommandBarControl ) );
5942 - }
5943 - else
5944 - throw uno::RuntimeException( rtl::OUString::createFromAscii("The CommandBarControl do not exist"), uno::Reference< uno::XInterface >() );
5945 -
5946 - }
5947 - return uno::Any();
5948 -}
5949 -
5950 -// Methods
5951 -uno::Any SAL_CALL
5952 -ScVbaCommandBarControls::Item( const uno::Any& aIndex, const uno::Any& /*aIndex*/ ) throw (uno::RuntimeException)
5953 -{
5954 - if( aIndex.getValueTypeClass() == uno::TypeClass_STRING )
5955 - {
5956 - return createCollectionObject( aIndex );
5957 - }
5958 - sal_Int32 nIndex = 0;
5959 - if( aIndex >>= nIndex )
5960 - {
5961 - return createCollectionObject( uno::makeAny( GetControlNameByIndex( nIndex ) ) );
5962 - }
5963 -
5964 - return uno::Any();
5965 -}
5966 -uno::Reference< XCommandBarControl > SAL_CALL
5967 -ScVbaCommandBarControls::Add( const uno::Any& Type, const uno::Any& Id, const uno::Any& /*Parameter*/, const uno::Any& Before, const uno::Any& Temporary ) throw (script::BasicErrorException, uno::RuntimeException)
5968 -{
5969 - // Parameter is not supported
5970 - // the following name needs to be individually created;
5971 - rtl::OUString sCaption( rtl::OUString::createFromAscii("custom Control") );
5972 - rtl::OUString sCommand( rtl::OUString::createFromAscii("macro:///Standard.Module1.Test()") );
5973 - sal_Int32 nType =0;
5974 - sal_Int32 nPosition = 0;
5975 - sal_Int32 nId;
5976 - sal_Bool bTemporary = sal_True;
5977 -
5978 - if( Type.hasValue() )
5979 - if( Type >>= nType )
5980 - {
5981 - // evalute the type of the new control
5982 - }
5983 - if( Id.hasValue() )
5984 - if( Id >>= nId )
5985 - {
5986 - // evalute the action of the new control
5987 - }
5988 - if( Before.hasValue() )
5989 - Before >>= nPosition;
5990 - else
5991 - {
5992 - // if Before is ignore, the new control should be placed at the end of the commandbars;
5993 - if( m_pCommandBar )
5994 - nPosition = getCount();
5995 - else if ( m_pCommandBarControl )
5996 - {
5997 - css::uno::Reference< css::container::XIndexContainer > xCurrentSettings;
5998 - xCurrentSettings.set( lcl_getPropertyValue( m_pCommandBarControl->GetPropertyValues(), rtl::OUString::createFromAscii("ItemDescriptorContainer") ), uno::UNO_QUERY );
5999 - if( xCurrentSettings.is() )
6000 - {
6001 - nPosition = xCurrentSettings->getCount();
6002 - }
6003 - }
6004 - }
6005 - if( Temporary.hasValue() )
6006 - if( Temporary >>= bTemporary )
6007 - {
6008 - // evalute the temporary of the new Control
6009 - }
6010 -
6011 - ScVbaCommandBarControl* pNewCommandBarControl = NULL;
6012 - if( nType == office::MsoControlType::msoControlButton )
6013 - {
6014 - pNewCommandBarControl = new ScVbaCommandBarButton( this, mxContext, sCaption, nPosition, bTemporary );
6015 - }
6016 - else if ( nType == office::MsoControlType::msoControlPopup )
6017 - {
6018 - pNewCommandBarControl = new ScVbaCommandBarPopup( this, mxContext, sCaption, nPosition, bTemporary );
6019 - }
6020 - else
6021 - {
6022 - pNewCommandBarControl = new ScVbaCommandBarControl( this, mxContext, sCaption, nPosition, bTemporary );
6023 - }
6024 -
6025 - return uno::Reference< XCommandBarControl >( pNewCommandBarControl );
6026 -}
6027 -
6028 -// XHelperInterface
6029 -rtl::OUString&
6030 -ScVbaCommandBarControls::getServiceImplName()
6031 -{
6032 - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBarControls") );
6033 - return sImplName;
6034 -}
6035 -uno::Sequence<rtl::OUString>
6036 -ScVbaCommandBarControls::getServiceNames()
6037 -{
6038 - static uno::Sequence< rtl::OUString > aServiceNames;
6039 - if ( aServiceNames.getLength() == 0 )
6040 - {
6041 - aServiceNames.realloc( 1 );
6042 - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.CommandBarControls" ) );
6043 - }
6044 - return aServiceNames;
6045 -}
6046 -
6047 --- sc/source/ui/vba/vbacommandbarcontrols.hxx.old 2009-04-06 16:42:00.000000000 +0000
6048 +++ sc/source/ui/vba/vbacommandbarcontrols.hxx 1970-01-01 00:00:00.000000000 +0000
6049 @@ -1,91 +0,0 @@
6050 -/*************************************************************************
6051 - *
6052 - * OpenOffice.org - a multi-platform office productivity suite
6053 - *
6054 - * $RCSfile$
6055 - *
6056 - * $Revision$
6057 - *
6058 - * last change: $Author$ $Date$
6059 - *
6060 - * The Contents of this file are made available subject to
6061 - * the terms of GNU Lesser General Public License Version 2.1.
6062 - *
6063 - *
6064 - * GNU Lesser General Public License Version 2.1
6065 - * =============================================
6066 - * Copyright 2005 by Sun Microsystems, Inc.
6067 - * 901 San Antonio Road, Palo Alto, CA 94303, USA
6068 - *
6069 - * This library is free software; you can redistribute it and/or
6070 - * modify it under the terms of the GNU Lesser General Public
6071 - * License version 2.1, as published by the Free Software Foundation.
6072 - *
6073 - * This library is distributed in the hope that it will be useful,
6074 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
6075 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
6076 - * Lesser General Public License for more details.
6077 - *
6078 - * You should have received a copy of the GNU Lesser General Public
6079 - * License along with this library; if not, write to the Free Software
6080 - * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
6081 - * MA 02111-1307 USA
6082 - *
6083 - ************************************************************************/
6084 -#ifndef SC_VBA_COMMANDBARCONTROLS_HXX
6085 -#define SC_VBA_COMMANDBARCONTROLS_HXX
6086 -
6087 -#include <ooo/vba/XCommandBarControls.hpp>
6088 -
6089 -#include "vbahelperinterface.hxx"
6090 -#include "vbacommandbar.hxx"
6091 -#include "vbacollectionimpl.hxx"
6092 -
6093 -class ScVbaCommandBarControl;
6094 -
6095 -typedef CollTestImplHelper< ov::XCommandBarControls > CommandBarControls_BASE;
6096 -
6097 -class ScVbaCommandBarControls : public CommandBarControls_BASE
6098 -{
6099 -private:
6100 - sal_Bool m_bIsMenu;
6101 - sal_Bool m_bHasElements;
6102 - ScVbaCommandBar* m_pCommandBar;
6103 - ScVbaCommandBarControl* m_pCommandBarControl;
6104 - css::uno::Reference< ov::XHelperInterface > m_xParentHardRef;
6105 - css::uno::Reference< css::ui::XUIConfigurationManager > m_xUICfgManager;
6106 - css::uno::Reference< css::ui::XUIConfigurationPersistence > m_xUICfgPers;
6107 - css::uno::Reference< css::container::XIndexContainer > m_xBarSettings;
6108 - css::uno::Reference< css::container::XIndexContainer > m_xCurrentSettings;
6109 -
6110 -public:
6111 - ScVbaCommandBarControls( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, const css::uno::Reference< css::container::XIndexAccess > xIndexAccess ) throw( css::uno::RuntimeException );
6112 - css::uno::Reference< css::ui::XUIConfigurationManager > GetUICfgManager() { return m_xUICfgManager; };
6113 - css::uno::Reference< css::ui::XUIConfigurationPersistence > GetUICfgPers() { return m_xUICfgPers; };
6114 - css::uno::Reference< css::container::XIndexContainer > GetBarSettings() { return m_xBarSettings; };
6115 - sal_Bool IsMenu() { return m_bIsMenu; };
6116 - ScVbaCommandBar* GetParentCommandBar() { return m_pCommandBar; };
6117 - ScVbaCommandBarControl* GetParentCommandBarControl() { return m_pCommandBarControl; };
6118 - rtl::OUString GetParentToolBarName()
6119 - {
6120 - if( m_pCommandBar ) return m_pCommandBar->GetToolBarName();
6121 - else return rtl::OUString();
6122 - }
6123 - rtl::OUString GetControlNameByIndex( const sal_Int32 nIndex ) throw ( css::uno::RuntimeException );
6124 -
6125 - // Attributes
6126 - virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException);
6127 - // XEnumerationAccess
6128 - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
6129 - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
6130 - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
6131 -
6132 - // Methods
6133 - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) throw (css::uno::RuntimeException);
6134 - virtual css::uno::Reference< ov::XCommandBarControl > SAL_CALL Add( const css::uno::Any& Type, const css::uno::Any& Id, const css::uno::Any& Parameter, const css::uno::Any& Before, const css::uno::Any& Temporary ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
6135 - // XHelperInterface
6136 - virtual rtl::OUString& getServiceImplName();
6137 - virtual css::uno::Sequence<rtl::OUString> getServiceNames();
6138 -};
6139 -
6140 -#endif//SC_VBA_COMMANDBARCONTROLS_HXX
6141 --- sc/source/ui/vba/vbacommandbars.cxx.old 2009-04-06 16:42:00.000000000 +0000
6142 +++ sc/source/ui/vba/vbacommandbars.cxx 1970-01-01 00:00:00.000000000 +0000
6143 @@ -1,261 +0,0 @@
6144 -/*************************************************************************
6145 - *
6146 - * OpenOffice.org - a multi-platform office productivity suite
6147 - *
6148 - * $RCSfile$
6149 - *
6150 - * $Revision$
6151 - *
6152 - * last change: $Author$ $Date$
6153 - *
6154 - * The Contents of this file are made available subject to
6155 - * the terms of GNU Lesser General Public License Version 2.1.
6156 - *
6157 - *
6158 - * GNU Lesser General Public License Version 2.1
6159 - * =============================================
6160 - * Copyright 2005 by Sun Microsystems, Inc.
6161 - * 901 San Antonio Road, Palo Alto, CA 94303, USA
6162 - *
6163 - * This library is free software; you can redistribute it and/or
6164 - * modify it under the terms of the GNU Lesser General Public
6165 - * License version 2.1, as published by the Free Software Foundation.
6166 - *
6167 - * This library is distributed in the hope that it will be useful,
6168 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
6169 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
6170 - * Lesser General Public License for more details.
6171 - *
6172 - * You should have received a copy of the GNU Lesser General Public
6173 - * License along with this library; if not, write to the Free Software
6174 - * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
6175 - * MA 02111-1307 USA
6176 - *
6177 - ************************************************************************/
6178 -#include <com/sun/star/lang/XServiceInfo.hpp>
6179 -#include <com/sun/star/frame/XDesktop.hpp>
6180 -#include <com/sun/star/container/XNameAccess.hpp>
6181 -
6182 -#include "vbacommandbars.hxx"
6183 -#include "vbacommandbar.hxx"
6184 -
6185 -using namespace com::sun::star;
6186 -using namespace ooo::vba;
6187 -
6188 -typedef ::cppu::WeakImplHelper1< container::XEnumeration > CommandBarEnumeration_BASE;
6189 -
6190 -static rtl::OUString sSpreadsheetDocumentUrl( rtl::OUString::createFromAscii( "com.sun.star.sheet.SpreadsheetDocument" ) );
6191 -static rtl::OUString sTextDocumentUrl( rtl::OUString::createFromAscii( "com.sun.star.text.TextDocument" ) );
6192 -static rtl::OUString sWindowStateConfUrl( rtl::OUString::createFromAscii( "com.sun.star.ui.WindowStateConfiguration" ) );
6193 -
6194 -class CommandBarEnumeration : public CommandBarEnumeration_BASE
6195 -{
6196 - uno::Reference< uno::XComponentContext > m_xContext;
6197 - uno::Reference< XCommandBars > m_xCommandBars;
6198 - uno::Sequence< rtl::OUString > m_sNames;
6199 - sal_Int32 m_nCurrentPosition;
6200 -public:
6201 - CommandBarEnumeration( const uno::Reference< uno::XComponentContext > xContext, const uno::Reference< XCommandBars > xCommandBars, const uno::Sequence< rtl::OUString > sNames ) : m_xContext( xContext ), m_xCommandBars( xCommandBars ), m_sNames( sNames ), m_nCurrentPosition( 0 )
6202 - {
6203 - }
6204 - virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException )
6205 - {
6206 - if( m_nCurrentPosition < m_sNames.getLength() )
6207 - return sal_True;
6208 - return sal_False;
6209 - }
6210 - virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException )
6211 - {
6212 - if( hasMoreElements() )
6213 - {
6214 - rtl::OUString sName( m_sNames[ m_nCurrentPosition ] );
6215 - m_nCurrentPosition = m_nCurrentPosition + 1;
6216 - if( sName.indexOf( rtl::OUString::createFromAscii("private:resource/toolbar/") ) != -1 )
6217 - {
6218 - sal_Int32 nLastIndex = sName.lastIndexOf( rtl::OUString::createFromAscii( "/" ) );
6219 - if( ( nLastIndex != -1 ) && ( ( nLastIndex + 1 ) < sName.getLength() ) )
6220 - {
6221 - sName = sName.copy( nLastIndex + 1);
6222 - if( sName.getLength() > 0 )
6223 - {
6224 - uno::Reference< XHelperInterface > xHelperInterface( m_xCommandBars, uno::UNO_QUERY_THROW );
6225 - uno::Reference< XCommandBar > xCommandBar( new ScVbaCommandBar( xHelperInterface, m_xContext, sName, sal_True, sal_False ) );
6226 - if( xCommandBar.is() )
6227 - return uno::makeAny( xCommandBar );
6228 - else
6229 - return nextElement();
6230 - }
6231 - else
6232 - return nextElement();
6233 - }
6234 - }
6235 - else
6236 - return nextElement();
6237 - }
6238 - else
6239 - throw container::NoSuchElementException();
6240 - return uno::Any();
6241 - }
6242 -};
6243 -
6244 -
6245 -ScVbaCommandBars::ScVbaCommandBars( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, const uno::Reference< container::XIndexAccess > xIndexAccess ) : CommandBars_BASE( xParent, xContext, xIndexAccess )
6246 -{
6247 - retrieveObjects();
6248 -}
6249 -void
6250 -ScVbaCommandBars::retrieveObjects() throw ( uno::RuntimeException )
6251 -{
6252 - uno::Reference< lang::XServiceInfo > xServiceInfo( getCurrentDocument(), uno::UNO_QUERY_THROW );
6253 - if( xServiceInfo->supportsService( sSpreadsheetDocumentUrl ) )
6254 - {
6255 - m_sModuleName = sSpreadsheetDocumentUrl;
6256 - }
6257 - else if( xServiceInfo->supportsService( sTextDocumentUrl ) )
6258 - {
6259 - m_sModuleName = sTextDocumentUrl;
6260 - }
6261 - else
6262 - throw uno::RuntimeException( rtl::OUString::createFromAscii( "Unsupported Document" ), uno::Reference< uno::XInterface >() );
6263 -
6264 - uno::Reference < lang::XMultiServiceFactory > xMSF( mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
6265 - uno::Reference < container::XNameAccess > xNameAccess( xMSF->createInstance( sWindowStateConfUrl ), uno::UNO_QUERY_THROW );
6266 - m_xNameAccess.set( xNameAccess->getByName( m_sModuleName ), uno::UNO_QUERY_THROW );
6267 -}
6268 -
6269 -// XEnumerationAccess
6270 -uno::Type SAL_CALL
6271 -ScVbaCommandBars::getElementType() throw ( uno::RuntimeException )
6272 -{
6273 - return XCommandBars::static_type( 0 );
6274 -}
6275 -uno::Reference< container::XEnumeration >
6276 -ScVbaCommandBars::createEnumeration() throw ( uno::RuntimeException )
6277 -{
6278 - return uno::Reference< container::XEnumeration >( new CommandBarEnumeration( mxContext, this, m_xNameAccess->getElementNames() ) );
6279 -}
6280 -
6281 -uno::Any
6282 -ScVbaCommandBars::createCollectionObject( const uno::Any& aSource )
6283 -{
6284 - // aSource should be a name at this time, because of the class is API wrapper.
6285 - rtl::OUString sToolBarName;
6286 - if( aSource >>= sToolBarName )
6287 - {
6288 - sToolBarName = sToolBarName.toAsciiLowerCase();
6289 - if( sToolBarName.equalsIgnoreAsciiCase( rtl::OUString::createFromAscii("Worksheet Menu Bar") ) )
6290 - {
6291 - return uno::makeAny( uno::Reference< XCommandBar > ( new ScVbaCommandBar( this, mxContext, 0 ) ) );
6292 - }
6293 - else if( sToolBarName.equalsIgnoreAsciiCase( rtl::OUString::createFromAscii("Menu Bar") ) )
6294 - {
6295 - return uno::makeAny( uno::Reference< XCommandBar > ( new ScVbaCommandBar( this, mxContext, 1 ) ) );
6296 - }
6297 - else if( checkToolBarExist( sToolBarName ) )
6298 - {
6299 - return uno::makeAny( uno::Reference< XCommandBar > (new ScVbaCommandBar( this, mxContext, sToolBarName, sal_True, sal_False ) ) );
6300 - }
6301 - }
6302 - return uno::Any();
6303 -}
6304 -
6305 -// XCommandBars
6306 -uno::Reference< XCommandBar > SAL_CALL
6307 -ScVbaCommandBars::Add( const css::uno::Any& Name, const css::uno::Any& /*Position*/, const css::uno::Any& /*MenuBar*/, const css::uno::Any& Temporary ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
6308 -{
6309 - // Position - MsoBar MenuBar - sal_Bool
6310 - // Currently only the Name is supported.
6311 - rtl::OUString sName;
6312 - if( !( Name >>= sName ) )
6313 - {
6314 - sName = rtl::OUString::createFromAscii("Custom1");
6315 - }
6316 - sal_Bool bTemporary = false;
6317 - if( !( Temporary >>= bTemporary ) )
6318 - {
6319 - bTemporary = sal_True;
6320 - }
6321 - return uno::Reference< XCommandBar >( new ScVbaCommandBar( this, mxContext, sName.toAsciiLowerCase(), bTemporary, sal_True ) );
6322 -}
6323 -sal_Int32 SAL_CALL
6324 -ScVbaCommandBars::getCount() throw(css::uno::RuntimeException)
6325 -{
6326 - // Filter out all toolbars from the window collection
6327 - sal_Int32 nCount = 0;
6328 - uno::Sequence< ::rtl::OUString > allNames = m_xNameAccess->getElementNames();
6329 - for( sal_Int32 i = 0; i < allNames.getLength(); i++ )
6330 - {
6331 - if(allNames[i].indexOf( rtl::OUString::createFromAscii("private:resource/toolbar/") ) != -1 )
6332 - {
6333 - nCount++;
6334 - }
6335 - }
6336 - return nCount;
6337 -}
6338 -
6339 -// ScVbaCollectionBaseImpl
6340 -uno::Any SAL_CALL
6341 -ScVbaCommandBars::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) throw( uno::RuntimeException )
6342 -{
6343 - if( aIndex.getValueTypeClass() == uno::TypeClass_STRING )
6344 - {
6345 - return createCollectionObject( aIndex );
6346 - }
6347 -
6348 - // hardcode if "aIndex = 1" that would return "main menu".
6349 - sal_Int16 nIndex = 0;
6350 - aIndex >>= nIndex;
6351 - if( nIndex == 1 )
6352 - {
6353 - uno::Any aSource;
6354 - if( m_sModuleName.equalsIgnoreAsciiCase( sSpreadsheetDocumentUrl ) )
6355 - aSource <<= rtl::OUString::createFromAscii( "Worksheet Menu Bar" );
6356 - else if( m_sModuleName.equalsIgnoreAsciiCase( sTextDocumentUrl ) )
6357 - aSource <<= rtl::OUString::createFromAscii( "Menu Bar" );
6358 - if( aSource.hasValue() )
6359 - return createCollectionObject( aSource );
6360 - }
6361 - return uno::Any();
6362 -}
6363 -
6364 -sal_Bool
6365 -ScVbaCommandBars::checkToolBarExist( rtl::OUString sToolBarName )
6366 -{
6367 - CommandBarNameMap::const_iterator iter = mCommandBarNameMap.find( sToolBarName.toAsciiLowerCase() );
6368 - if( iter != mCommandBarNameMap.end() )
6369 - {
6370 - return sal_True;
6371 - }
6372 - uno::Sequence< ::rtl::OUString > allNames = m_xNameAccess->getElementNames();
6373 - for( sal_Int32 i = 0; i < allNames.getLength(); i++ )
6374 - {
6375 - if(allNames[i].indexOf( rtl::OUString::createFromAscii("private:resource/toolbar/") ) != -1 )
6376 - {
6377 - if( allNames[i].indexOf( sToolBarName ) != -1 )
6378 - {
6379 - return sal_True;
6380 - }
6381 - }
6382 - }
6383 - return sal_False;
6384 -}
6385 -
6386 -// XHelperInterface
6387 -rtl::OUString&
6388 -ScVbaCommandBars::getServiceImplName()
6389 -{
6390 - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBars") );
6391 - return sImplName;
6392 -}
6393 -uno::Sequence<rtl::OUString>
6394 -ScVbaCommandBars::getServiceNames()
6395 -{
6396 - static uno::Sequence< rtl::OUString > aServiceNames;
6397 - if ( aServiceNames.getLength() == 0 )
6398 - {
6399 - aServiceNames.realloc( 1 );
6400 - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.CommandBars" ) );
6401 - }
6402 - return aServiceNames;
6403 -}
6404 -
6405 --- sc/source/ui/vba/vbacommandbars.hxx.old 2009-04-02 10:45:35.000000000 +0000
6406 +++ sc/source/ui/vba/vbacommandbars.hxx 1970-01-01 00:00:00.000000000 +0000
6407 @@ -1,79 +0,0 @@
6408 -/*************************************************************************
6409 - *
6410 - * OpenOffice.org - a multi-platform office productivity suite
6411 - *
6412 - * $RCSfile$
6413 - *
6414 - * $Revision$
6415 - *
6416 - * last change: $Author$ $Date$
6417 - *
6418 - * The Contents of this file are made available subject to
6419 - * the terms of GNU Lesser General Public License Version 2.1.
6420 - *
6421 - *
6422 - * GNU Lesser General Public License Version 2.1
6423 - * =============================================
6424 - * Copyright 2005 by Sun Microsystems, Inc.
6425 - * 901 San Antonio Road, Palo Alto, CA 94303, USA
6426 - *
6427 - * This library is free software; you can redistribute it and/or
6428 - * modify it under the terms of the GNU Lesser General Public
6429 - * License version 2.1, as published by the Free Software Foundation.
6430 - *
6431 - * This library is distributed in the hope that it will be useful,
6432 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
6433 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
6434 - * Lesser General Public License for more details.
6435 - *
6436 - * You should have received a copy of the GNU Lesser General Public
6437 - * License along with this library; if not, write to the Free Software
6438 - * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
6439 - * MA 02111-1307 USA
6440 - *
6441 - ************************************************************************/
6442 -#ifndef SC_VBA_COMMANDBARS_HXX
6443 -#define SC_VBA_COMMANDBARS_HXX
6444 -
6445 -#include <ooo/vba/XCommandBar.hpp>
6446 -#include <ooo/vba/XCommandBars.hpp>
6447 -#include <com/sun/star/container/XNameAccess.hpp>
6448 -
6449 -#include <cppuhelper/implbase1.hxx>
6450 -
6451 -#include "vbahelperinterface.hxx"
6452 -#include "vbacollectionimpl.hxx"
6453 -
6454 -typedef CollTestImplHelper< ov::XCommandBars > CommandBars_BASE;
6455 -
6456 -class ScVbaCommandBars : public CommandBars_BASE
6457 -{
6458 -private:
6459 - css::uno::Reference< css::container::XNameAccess > m_xNameAccess;
6460 - rtl::OUString m_sModuleName;
6461 - void retrieveObjects() throw( css::uno::RuntimeException );
6462 -public:
6463 - ScVbaCommandBars( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, const css::uno::Reference< css::container::XIndexAccess > xIndexAccess );
6464 -
6465 - sal_Bool checkToolBarExist( rtl::OUString sToolBarName );
6466 - rtl::OUString GetModuleName(){ return m_sModuleName; };
6467 - css::uno::Reference< css::container::XNameAccess > GetWindows()
6468 - {
6469 - retrieveObjects();
6470 - return m_xNameAccess;
6471 - };
6472 - // XCommandBars
6473 - virtual css::uno::Reference< ov::XCommandBar > SAL_CALL Add( const css::uno::Any& Name, const css::uno::Any& Position, const css::uno::Any& MenuBar, const css::uno::Any& Temporary ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
6474 - // XEnumerationAccess
6475 - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
6476 - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
6477 - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
6478 -
6479 - virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException);
6480 - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& aIndex, const css::uno::Any& /*aIndex2*/ ) throw( css::uno::RuntimeException);
6481 - // XHelperInterface
6482 - virtual rtl::OUString& getServiceImplName();
6483 - virtual css::uno::Sequence<rtl::OUString> getServiceNames();
6484 -};
6485 -
6486 -#endif//SC_VBA_COMMANDBARS_HXX
6487 --- sc/source/ui/vba/vbacomment.hxx.old 2009-04-02 10:45:35.000000000 +0000
6488 +++ sc/source/ui/vba/vbacomment.hxx 2009-04-06 16:42:01.000000000 +0000
6489 @@ -39,7 +39,7 @@
6490 #include <com/sun/star/table/XCellRange.hpp>
6491 #include <com/sun/star/uno/XComponentContext.hpp>
6493 -#include "vbahelperinterface.hxx"
6494 +#include <vbahelper/vbahelperinterface.hxx>
6496 typedef InheritedHelperInterfaceImpl1< ov::excel::XComment > ScVbaComment_BASE;
6498 --- sc/source/ui/vba/vbacomments.hxx.old 2009-04-02 10:45:35.000000000 +0000
6499 +++ sc/source/ui/vba/vbacomments.hxx 2009-04-06 16:42:01.000000000 +0000
6500 @@ -34,8 +34,8 @@
6502 #include <ooo/vba/excel/XComments.hpp>
6504 -#include "vbahelper.hxx"
6505 -#include "vbacollectionimpl.hxx"
6506 +#include "excelvbahelper.hxx"
6507 +#include <vbahelper/vbacollectionimpl.hxx>
6508 #include "vbacomment.hxx"
6510 typedef CollTestImplHelper< ov::excel::XComments > ScVbaComments_BASE;
6511 --- sc/source/ui/vba/vbacondition.hxx.old 2009-04-02 10:45:35.000000000 +0000
6512 +++ sc/source/ui/vba/vbacondition.hxx 2009-04-06 16:42:01.000000000 +0000
6513 @@ -31,7 +31,7 @@
6514 #define SC_VBA_CONDITION_HXX
6515 #include <com/sun/star/sheet/XSheetCondition.hpp>
6516 #include <com/sun/star/sheet/XCellRangeAddressable.hpp>
6517 -#include "vbahelperinterface.hxx"
6518 +#include <vbahelper/vbahelperinterface.hxx>
6519 #include <com/sun/star/sheet/ConditionOperator.hpp>
6521 template< typename Ifc1 >
6522 --- sc/source/ui/vba/vbacontrol.cxx.old 2009-04-02 10:45:35.000000000 +0000
6523 +++ sc/source/ui/vba/vbacontrol.cxx 1970-01-01 00:00:00.000000000 +0000
6524 @@ -1,467 +0,0 @@
6525 -/*************************************************************************
6526 - *
6527 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
6528 - *
6529 - * Copyright 2008 by Sun Microsystems, Inc.
6530 - *
6531 - * OpenOffice.org - a multi-platform office productivity suite
6532 - *
6533 - * $RCSfile: vbacontrol.cxx,v $
6534 - * $Revision: 1.3 $
6535 - *
6536 - * This file is part of OpenOffice.org.
6537 - *
6538 - * OpenOffice.org is free software: you can redistribute it and/or modify
6539 - * it under the terms of the GNU Lesser General Public License version 3
6540 - * only, as published by the Free Software Foundation.
6541 - *
6542 - * OpenOffice.org is distributed in the hope that it will be useful,
6543 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
6544 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
6545 - * GNU Lesser General Public License version 3 for more details
6546 - * (a copy is included in the LICENSE file that accompanied this code).
6547 - *
6548 - * You should have received a copy of the GNU Lesser General Public License
6549 - * version 3 along with OpenOffice.org. If not, see
6550 - * <http://www.openoffice.org/license.html>
6551 - * for a copy of the LGPLv3 License.
6552 - *
6553 - ************************************************************************/
6554 -#include <com/sun/star/form/FormComponentType.hpp>
6555 -#include <com/sun/star/awt/XControlModel.hpp>
6556 -#include <com/sun/star/awt/XControl.hpp>
6557 -#include <com/sun/star/awt/XWindow2.hpp>
6558 -#include <com/sun/star/lang/XEventListener.hpp>
6559 -#include <com/sun/star/drawing/XShape.hpp>
6560 -#include <com/sun/star/frame/XModel.hpp>
6561 -#include <com/sun/star/view/XControlAccess.hpp>
6562 -#include <com/sun/star/container/XChild.hpp>
6563 -#include <com/sun/star/form/binding/XBindableValue.hpp>
6564 -#include <com/sun/star/form/binding/XListEntrySink.hpp>
6565 -#include <com/sun/star/table/CellAddress.hpp>
6566 -#include <com/sun/star/table/CellRangeAddress.hpp>
6567 -#ifdef VBA_OOBUILD_HACK
6568 -#include <svtools/bindablecontrolhelper.hxx>
6569 -#endif
6570 -#include"vbacontrol.hxx"
6571 -#include"vbacombobox.hxx"
6572 -#include "vbabutton.hxx"
6573 -#include "vbalabel.hxx"
6574 -#include "vbatextbox.hxx"
6575 -#include "vbaradiobutton.hxx"
6576 -#include "vbalistbox.hxx"
6577 -#include "vbatogglebutton.hxx"
6578 -#include "vbacheckbox.hxx"
6579 -#include "vbaframe.hxx"
6580 -#include "vbascrollbar.hxx"
6581 -#include "vbaprogressbar.hxx"
6582 -#include "vbamultipage.hxx"
6583 -#include "vbaspinbutton.hxx"
6584 -#include "vbaimage.hxx"
6585 -
6586 -
6587 -using namespace com::sun::star;
6588 -using namespace ooo::vba;
6589 -
6590 -uno::Reference< css::awt::XWindowPeer >
6591 -ScVbaControl::getWindowPeer() throw (uno::RuntimeException)
6592 -{
6593 - uno::Reference< drawing::XControlShape > xControlShape( m_xControl, uno::UNO_QUERY );
6594 -
6595 - uno::Reference< awt::XControlModel > xControlModel;
6596 - uno::Reference< css::awt::XWindowPeer > xWinPeer;
6597 - if ( !xControlShape.is() )
6598 - {
6599 - // would seem to be a Userform control
6600 - uno::Reference< awt::XControl > xControl( m_xControl, uno::UNO_QUERY_THROW );
6601 - xWinPeer = xControl->getPeer();
6602 - return xWinPeer;
6603 - }
6604 - // form control
6605 - xControlModel.set( xControlShape->getControl(), uno::UNO_QUERY_THROW );
6606 -
6607 - uno::Reference< view::XControlAccess > xControlAccess( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
6608 - try
6609 - {
6610 - uno::Reference< awt::XControl > xControl( xControlAccess->getControl( xControlModel ), uno::UNO_QUERY );
6611 - xWinPeer = xControl->getPeer();
6612 - }
6613 - catch( uno::Exception )
6614 - {
6615 - throw uno::RuntimeException( rtl::OUString::createFromAscii( "The Control does not exsit" ),
6616 - uno::Reference< uno::XInterface >() );
6617 - }
6618 - return xWinPeer;
6619 -}
6620 -
6621 -//ScVbaControlListener
6622 -class ScVbaControlListener: public cppu::WeakImplHelper1< lang::XEventListener >
6623 -{
6624 -private:
6625 - ScVbaControl *pControl;
6626 -public:
6627 - ScVbaControlListener( ScVbaControl *pTmpControl );
6628 - virtual ~ScVbaControlListener();
6629 - virtual void SAL_CALL disposing( const lang::EventObject& rEventObject ) throw( uno::RuntimeException );
6630 -};
6631 -
6632 -ScVbaControlListener::ScVbaControlListener( ScVbaControl *pTmpControl ): pControl( pTmpControl )
6633 -{
6634 -}
6635 -
6636 -ScVbaControlListener::~ScVbaControlListener()
6637 -{
6638 -}
6639 -
6640 -void SAL_CALL
6641 -ScVbaControlListener::disposing( const lang::EventObject& ) throw( uno::RuntimeException )
6642 -{
6643 - if( pControl )
6644 - {
6645 - pControl->removeResouce();
6646 - pControl = NULL;
6647 - }
6648 -}
6649 -
6650 -//ScVbaControl
6651 -
6652 -ScVbaControl::ScVbaControl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< ::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : ControlImpl_BASE( xParent, xContext ), m_xControl( xControl ), m_xModel( xModel )
6653 -{
6654 - //add listener
6655 - m_xEventListener.set( new ScVbaControlListener( this ) );
6656 - setGeometryHelper( pGeomHelper );
6657 - uno::Reference< lang::XComponent > xComponent( m_xControl, uno::UNO_QUERY_THROW );
6658 - xComponent->addEventListener( m_xEventListener );
6659 -
6660 - //init m_xProps
6661 - uno::Reference< drawing::XControlShape > xControlShape( m_xControl, uno::UNO_QUERY ) ;
6662 - uno::Reference< awt::XControl> xUserFormControl( m_xControl, uno::UNO_QUERY ) ;
6663 - if ( xControlShape.is() ) // form control
6664 - m_xProps.set( xControlShape->getControl(), uno::UNO_QUERY_THROW );
6665 - else if ( xUserFormControl.is() ) // userform control
6666 - m_xProps.set( xUserFormControl->getModel(), uno::UNO_QUERY_THROW );
6667 -}
6668 -
6669 -ScVbaControl::~ScVbaControl()
6670 -{
6671 - if( m_xControl.is() )
6672 -{
6673 - uno::Reference< lang::XComponent > xComponent( m_xControl, uno::UNO_QUERY_THROW );
6674 - xComponent->removeEventListener( m_xEventListener );
6675 -}
6676 -}
6677 -
6678 -void
6679 -ScVbaControl::setGeometryHelper( AbstractGeometryAttributes* pHelper )
6680 -{
6681 - mpGeometryHelper.reset( pHelper );
6682 -}
6683 -
6684 -void ScVbaControl::removeResouce() throw( uno::RuntimeException )
6685 -{
6686 - uno::Reference< lang::XComponent > xComponent( m_xControl, uno::UNO_QUERY_THROW );
6687 - xComponent->removeEventListener( m_xEventListener );
6688 - m_xControl= NULL;
6689 - m_xProps = NULL;
6690 -}
6691 -
6692 -//In design model has different behavior
6693 -sal_Bool SAL_CALL ScVbaControl::getEnabled() throw (uno::RuntimeException)
6694 -{
6695 - uno::Any aValue = m_xProps->getPropertyValue
6696 - (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Enabled" ) ) );
6697 - sal_Bool bRet = false;
6698 - aValue >>= bRet;
6699 - return bRet;
6700 -}
6701 -
6702 -void SAL_CALL ScVbaControl::setEnabled( sal_Bool bVisible ) throw (uno::RuntimeException)
6703 -{
6704 - uno::Any aValue( bVisible );
6705 - m_xProps->setPropertyValue
6706 - (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Enabled" ) ), aValue);
6707 -
6708 -}
6709 -
6710 -sal_Bool SAL_CALL ScVbaControl::getVisible() throw (uno::RuntimeException)
6711 -{
6712 - uno::Reference< awt::XWindow2 > xWindow2( getWindowPeer(), uno::UNO_QUERY_THROW );
6713 - return xWindow2->isVisible();
6714 -}
6715 -
6716 -void SAL_CALL ScVbaControl::setVisible( sal_Bool bVisible ) throw (uno::RuntimeException)
6717 -{
6718 - uno::Reference< awt::XWindow2 > xWindow2( getWindowPeer(), uno::UNO_QUERY_THROW );
6719 - xWindow2->setVisible( bVisible );
6720 -}
6721 -double SAL_CALL ScVbaControl::getHeight() throw (uno::RuntimeException)
6722 -{
6723 - return mpGeometryHelper->getHeight();
6724 -}
6725 -void SAL_CALL ScVbaControl::setHeight( double _height ) throw (uno::RuntimeException)
6726 -{
6727 - mpGeometryHelper->setHeight( _height );
6728 -}
6729 -
6730 -double SAL_CALL ScVbaControl::getWidth() throw (uno::RuntimeException)
6731 -{
6732 - return mpGeometryHelper->getWidth();
6733 -}
6734 -void SAL_CALL ScVbaControl::setWidth( double _width ) throw (uno::RuntimeException)
6735 -{
6736 - mpGeometryHelper->setWidth( _width );
6737 -}
6738 -
6739 -double SAL_CALL
6740 -ScVbaControl::getLeft() throw (uno::RuntimeException)
6741 -{
6742 - return mpGeometryHelper->getLeft();
6743 -}
6744 -
6745 -void SAL_CALL
6746 -ScVbaControl::setLeft( double _left ) throw (uno::RuntimeException)
6747 -{
6748 - mpGeometryHelper->setLeft( _left );
6749 -
6750 -}
6751 -
6752 -double SAL_CALL
6753 -ScVbaControl::getTop() throw (uno::RuntimeException)
6754 -{
6755 - return mpGeometryHelper->getTop();
6756 -}
6757 -
6758 -void SAL_CALL
6759 -ScVbaControl::setTop( double _top ) throw (uno::RuntimeException)
6760 -{
6761 - mpGeometryHelper->setTop( _top );
6762 -}
6763 -
6764 -uno::Reference< uno::XInterface > SAL_CALL
6765 -ScVbaControl::getObject() throw (uno::RuntimeException)
6766 -{
6767 - uno::Reference< msforms::XControl > xRet( this );
6768 - return xRet;
6769 -}
6770 -
6771 -void SAL_CALL ScVbaControl::SetFocus() throw (uno::RuntimeException)
6772 -{
6773 - uno::Reference< awt::XWindow > xWin( m_xControl, uno::UNO_QUERY_THROW );
6774 - xWin->setFocus();
6775 -}
6776 -
6777 -rtl::OUString SAL_CALL
6778 -ScVbaControl::getControlSource() throw (uno::RuntimeException)
6779 -{
6780 -// #FIXME I *hate* having these upstream differences
6781 -// but this is necessary until I manage to upstream other
6782 -// dependant parts
6783 -#ifdef VBA_OOBUILD_HACK
6784 - rtl::OUString sControlSource;
6785 - uno::Reference< form::binding::XBindableValue > xBindable( m_xProps, uno::UNO_QUERY );
6786 - if ( xBindable.is() )
6787 - {
6788 - try
6789 - {
6790 - uno::Reference< lang::XMultiServiceFactory > xFac( m_xModel, uno::UNO_QUERY_THROW );
6791 - uno::Reference< beans::XPropertySet > xConvertor( xFac->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.table.CellAddressConversion" ))), uno::UNO_QUERY );
6792 - uno::Reference< beans::XPropertySet > xProps( xBindable->getValueBinding(), uno::UNO_QUERY_THROW );
6793 - table::CellAddress aAddress;
6794 - xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BoundCell") ) ) >>= aAddress;
6795 - xConvertor->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Address") ), uno::makeAny( aAddress ) );
6796 - xConvertor->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("XL_A1_Representation") ) ) >>= sControlSource;
6797 - }
6798 - catch( uno::Exception& )
6799 - {
6800 - }
6801 - }
6802 - return sControlSource;
6803 -#else
6804 - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("getControlSource not supported") ), uno::Reference< uno::XInterface >()); // not supported
6805 -#endif
6806 -}
6807 -
6808 -void SAL_CALL
6809 -ScVbaControl::setControlSource( const rtl::OUString& _controlsource ) throw (uno::RuntimeException)
6810 -{
6811 -#ifdef VBA_OOBUILD_HACK
6812 - rtl::OUString sEmpty;
6813 - svt::BindableControlHelper::ApplyListSourceAndBindableData( m_xModel, m_xProps, _controlsource, sEmpty );
6814 -#else
6815 - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("setControlSource not supported ") ).concat( _controlsource ), uno::Reference< uno::XInterface >()); // not supported
6816 -#endif
6817 -}
6818 -
6819 -rtl::OUString SAL_CALL
6820 -ScVbaControl::getRowSource() throw (uno::RuntimeException)
6821 -{
6822 -#ifdef VBA_OOBUILD_HACK
6823 - rtl::OUString sRowSource;
6824 - uno::Reference< form::binding::XListEntrySink > xListSink( m_xProps, uno::UNO_QUERY );
6825 - if ( xListSink.is() )
6826 - {
6827 - try
6828 - {
6829 - uno::Reference< lang::XMultiServiceFactory > xFac( m_xModel, uno::UNO_QUERY_THROW );
6830 - uno::Reference< beans::XPropertySet > xConvertor( xFac->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.table.CellRangeAddressConversion" ))), uno::UNO_QUERY );
6831 -
6832 - uno::Reference< beans::XPropertySet > xProps( xListSink->getListEntrySource(), uno::UNO_QUERY_THROW );
6833 - table::CellRangeAddress aAddress;
6834 - xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CellRange") ) ) >>= aAddress;
6835 - xConvertor->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Address")), uno::makeAny( aAddress ) );
6836 - xConvertor->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("XL_A1_Representation") ) ) >>= sRowSource;
6837 - }
6838 - catch( uno::Exception& )
6839 - {
6840 - }
6841 - }
6842 - return sRowSource;
6843 -#else
6844 - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("getRowSource not supported") ), uno::Reference< uno::XInterface >()); // not supported
6845 -#endif
6846 -}
6847 -
6848 -void SAL_CALL
6849 -ScVbaControl::setRowSource( const rtl::OUString& _rowsource ) throw (uno::RuntimeException)
6850 -{
6851 -#ifdef VBA_OOBUILD_HACK
6852 - rtl::OUString sEmpty;
6853 - svt::BindableControlHelper::ApplyListSourceAndBindableData( m_xModel, m_xProps, sEmpty, _rowsource );
6854 -#else
6855 - throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("setRowSource not supported ") ).concat( _rowsource ), uno::Reference< uno::XInterface >()); // not supported
6856 -#endif
6857 -}
6858 -
6859 -rtl::OUString SAL_CALL
6860 -ScVbaControl::getName() throw (uno::RuntimeException)
6861 -{
6862 - rtl::OUString sName;
6863 - m_xProps->getPropertyValue
6864 - (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ) ) >>= sName;
6865 - return sName;
6866 -
6867 -}
6868 -
6869 -void SAL_CALL
6870 -ScVbaControl::setName( const rtl::OUString& _name ) throw (uno::RuntimeException)
6871 -{
6872 - m_xProps->setPropertyValue
6873 - (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ), uno::makeAny( _name ) );
6874 - }
6875 -//ScVbaControlFactory
6876 -
6877 -ScVbaControlFactory::ScVbaControlFactory( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel ): m_xContext( xContext ), m_xControl( xControl ), m_xModel( xModel )
6878 -{
6879 -}
6880 -
6881 -ScVbaControl* ScVbaControlFactory::createControl() throw (uno::RuntimeException)
6882 -{
6883 - return createControl( m_xModel );
6884 -}
6885 -ScVbaControl* ScVbaControlFactory::createControl( const uno::Reference< uno::XInterface >& xParent ) throw (uno::RuntimeException)
6886 -{
6887 - uno::Reference< drawing::XControlShape > xControlShape( m_xControl, uno::UNO_QUERY );
6888 - if ( xControlShape.is() ) // form controls
6889 - return createControl( xControlShape, xParent );
6890 - uno::Reference< awt::XControl > xControl( m_xControl, uno::UNO_QUERY );
6891 - if ( !xControl.is() )
6892 - throw uno::RuntimeException(); // really we should be more informative
6893 - return createControl( xControl, xParent );
6894 -
6895 -}
6896 -
6897 -ScVbaControl* ScVbaControlFactory::createControl(const uno::Reference< drawing::XControlShape >& xControlShape, const uno::Reference< uno::XInterface >& /*xParent*/ ) throw (uno::RuntimeException)
6898 -{
6899 - uno::Reference< beans::XPropertySet > xProps( xControlShape->getControl(), uno::UNO_QUERY_THROW );
6900 - sal_Int32 nClassId = -1;
6901 - const static rtl::OUString sClassId( RTL_CONSTASCII_USTRINGPARAM("ClassId") );
6902 - xProps->getPropertyValue( sClassId ) >>= nClassId;
6903 - uno::Reference< XHelperInterface > xVbaParent; // #FIXME - should be worksheet I guess
6904 - switch( nClassId )
6905 - {
6906 - case form::FormComponentType::COMBOBOX:
6907 - return new ScVbaComboBox( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
6908 - case form::FormComponentType::COMMANDBUTTON:
6909 - return new ScVbaButton( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
6910 - case form::FormComponentType::FIXEDTEXT:
6911 - return new ScVbaLabel( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
6912 - case form::FormComponentType::TEXTFIELD:
6913 - return new ScVbaTextBox( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
6914 - case form::FormComponentType::RADIOBUTTON:
6915 - return new ScVbaRadioButton( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
6916 - case form::FormComponentType::LISTBOX:
6917 - return new ScVbaListBox( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
6918 - case form::FormComponentType::SPINBUTTON:
6919 - return new ScVbaSpinButton( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
6920 - case form::FormComponentType::IMAGECONTROL:
6921 - return new ScVbaImage( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
6922 - default:
6923 - throw uno::RuntimeException( rtl::OUString::createFromAscii(
6924 - "Donot support this Control Type." ), uno::Reference< uno::XInterface >() );
6925 - }
6926 -}
6927 -
6928 -ScVbaControl* ScVbaControlFactory::createControl( const uno::Reference< awt::XControl >& xControl, const uno::Reference< uno::XInterface >& xParent ) throw (uno::RuntimeException)
6929 -{
6930 - uno::Reference< beans::XPropertySet > xProps( xControl->getModel(), uno::UNO_QUERY_THROW );
6931 - uno::Reference< lang::XServiceInfo > xServiceInfo( xProps, uno::UNO_QUERY_THROW );
6932 - ScVbaControl* pControl = NULL;
6933 - uno::Reference< XHelperInterface > xVbaParent; // #FIXME - should be worksheet I guess
6934 - if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlCheckBoxModel") ) ) )
6935 - pControl = new ScVbaCheckbox( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
6936 - else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlRadioButtonModel") ) ) )
6937 - pControl = new ScVbaRadioButton( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
6938 - else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlEditModel") ) ) )
6939 - pControl = new ScVbaTextBox( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ), true );
6940 - else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlButtonModel") ) ) )
6941 - {
6942 - sal_Bool bToggle = sal_False;
6943 - xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Toggle") ) ) >>= bToggle;
6944 - if ( bToggle )
6945 - pControl = new ScVbaToggleButton( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
6946 - else
6947 - pControl = new ScVbaButton( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
6948 - }
6949 - else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlComboBoxModel") ) ) )
6950 - pControl = new ScVbaComboBox( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ), true );
6951 - else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlListBoxModel") ) ) )
6952 - pControl = new ScVbaListBox( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
6953 - else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFixedTextModel") ) ) )
6954 - pControl = new ScVbaLabel( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
6955 - else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlImageControlModel") ) ) )
6956 - pControl = new ScVbaImage( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
6957 - else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlProgressBarModel") ) ) )
6958 - pControl = new ScVbaProgressBar( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
6959 - else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlGroupBoxModel") ) ) )
6960 - pControl = new ScVbaFrame( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
6961 - else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlScrollBarModel") ) ) )
6962 - pControl = new ScVbaScrollBar( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
6963 - else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoMultiPageModel") ) ) )
6964 - pControl = new ScVbaMultiPage( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ), xParent );
6965 - else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlSpinButtonModel") ) ) )
6966 - pControl = new ScVbaSpinButton( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
6967 - else
6968 - throw uno::RuntimeException( rtl::OUString::createFromAscii("Unsupported control " ), uno::Reference< uno::XInterface >() );
6969 - return pControl;
6970 -}
6971 -
6972 -rtl::OUString&
6973 -ScVbaControl::getServiceImplName()
6974 -{
6975 - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaControl") );
6976 - return sImplName;
6977 -}
6978 -
6979 -uno::Sequence< rtl::OUString >
6980 -ScVbaControl::getServiceNames()
6981 -{
6982 - static uno::Sequence< rtl::OUString > aServiceNames;
6983 - if ( aServiceNames.getLength() == 0 )
6984 - {
6985 - aServiceNames.realloc( 1 );
6986 - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Control" ) );
6987 - }
6988 - return aServiceNames;
6989 -}
6990 -
6991 -
6992 --- sc/source/ui/vba/vbacontrol.hxx.old 2009-04-02 10:45:35.000000000 +0000
6993 +++ sc/source/ui/vba/vbacontrol.hxx 1970-01-01 00:00:00.000000000 +0000
6994 @@ -1,111 +0,0 @@
6995 -/*************************************************************************
6996 - *
6997 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
6998 - *
6999 - * Copyright 2008 by Sun Microsystems, Inc.
7000 - *
7001 - * OpenOffice.org - a multi-platform office productivity suite
7002 - *
7003 - * $RCSfile: vbacontrol.hxx,v $
7004 - * $Revision: 1.3 $
7005 - *
7006 - * This file is part of OpenOffice.org.
7007 - *
7008 - * OpenOffice.org is free software: you can redistribute it and/or modify
7009 - * it under the terms of the GNU Lesser General Public License version 3
7010 - * only, as published by the Free Software Foundation.
7011 - *
7012 - * OpenOffice.org is distributed in the hope that it will be useful,
7013 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
7014 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
7015 - * GNU Lesser General Public License version 3 for more details
7016 - * (a copy is included in the LICENSE file that accompanied this code).
7017 - *
7018 - * You should have received a copy of the GNU Lesser General Public License
7019 - * version 3 along with OpenOffice.org. If not, see
7020 - * <http://www.openoffice.org/license.html>
7021 - * for a copy of the LGPLv3 License.
7022 - *
7023 - ************************************************************************/
7024 -#ifndef SC_VBA_CONTROL_HXX
7025 -#define SC_VBA_CONTROL_HXX
7026 -
7027 -#include <cppuhelper/implbase1.hxx>
7028 -#include <com/sun/star/beans/XPropertySet.hpp>
7029 -#include <com/sun/star/uno/XComponentContext.hpp>
7030 -#include <com/sun/star/script/XDefaultProperty.hpp>
7031 -#include <com/sun/star/drawing/XControlShape.hpp>
7032 -#include <com/sun/star/awt/XControl.hpp>
7033 -#include <com/sun/star/awt/XWindowPeer.hpp>
7034 -#include <ooo/vba/msforms/XControl.hpp>
7035 -
7036 -#include "vbahelper.hxx"
7037 -#include "vbahelperinterface.hxx"
7038 -
7039 -//typedef ::cppu::WeakImplHelper1< ov::msforms::XControl > ControlImpl_BASE;
7040 -typedef InheritedHelperInterfaceImpl1< ov::msforms::XControl > ControlImpl_BASE;
7041 -
7042 -class ScVbaControl : public ControlImpl_BASE
7043 -{
7044 -private:
7045 - com::sun::star::uno::Reference< com::sun::star::lang::XEventListener > m_xEventListener;
7046 -protected:
7047 - std::auto_ptr< ov::AbstractGeometryAttributes > mpGeometryHelper;
7048 - css::uno::Reference< css::beans::XPropertySet > m_xProps;
7049 - css::uno::Reference< css::uno::XInterface > m_xControl;
7050 - css::uno::Reference< css::frame::XModel > m_xModel;
7051 -
7052 - virtual css::uno::Reference< css::awt::XWindowPeer > getWindowPeer() throw (css::uno::RuntimeException);
7053 -public:
7054 - ScVbaControl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext,
7055 - const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pHelper );
7056 - virtual ~ScVbaControl();
7057 - // This class will own the helper, so make sure it is allocated from
7058 - // the heap
7059 - void setGeometryHelper( ov::AbstractGeometryAttributes* pHelper );
7060 - // XControl
7061 - virtual sal_Bool SAL_CALL getEnabled() throw (css::uno::RuntimeException);
7062 - virtual void SAL_CALL setEnabled( sal_Bool _enabled ) throw (css::uno::RuntimeException);
7063 - virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
7064 - virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException);
7065 - virtual double SAL_CALL getHeight() throw (css::uno::RuntimeException);
7066 - virtual void SAL_CALL setHeight( double _height ) throw (css::uno::RuntimeException);
7067 - virtual double SAL_CALL getWidth() throw (css::uno::RuntimeException);
7068 - virtual void SAL_CALL setWidth( double _width ) throw (css::uno::RuntimeException);
7069 - virtual double SAL_CALL getLeft() throw (css::uno::RuntimeException);
7070 - virtual void SAL_CALL setLeft( double _left ) throw (css::uno::RuntimeException);
7071 - virtual double SAL_CALL getTop() throw (css::uno::RuntimeException);
7072 - virtual void SAL_CALL setTop( double _top ) throw (css::uno::RuntimeException);
7073 - virtual void SAL_CALL SetFocus( ) throw (css::uno::RuntimeException);
7074 -
7075 - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getObject() throw (css::uno::RuntimeException);
7076 - virtual rtl::OUString SAL_CALL getControlSource() throw (css::uno::RuntimeException);
7077 - virtual void SAL_CALL setControlSource( const rtl::OUString& _controlsource ) throw (css::uno::RuntimeException);
7078 - virtual rtl::OUString SAL_CALL getRowSource() throw (css::uno::RuntimeException);
7079 - virtual void SAL_CALL setRowSource( const rtl::OUString& _rowsource ) throw (css::uno::RuntimeException);
7080 - virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
7081 - virtual void SAL_CALL setName( const rtl::OUString& _name ) throw (css::uno::RuntimeException);
7082 - //remove resouce because ooo.vba.excel.XControl is a wrapper of com.sun.star.drawing.XControlShape
7083 - virtual void removeResouce() throw( css::uno::RuntimeException );
7084 - //XHelperInterface
7085 - virtual rtl::OUString& getServiceImplName();
7086 - virtual css::uno::Sequence<rtl::OUString> getServiceNames();
7087 -};
7088 -
7089 -
7090 -class ScVbaControlFactory
7091 -{
7092 -public:
7093 - ScVbaControlFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext,
7094 - const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel );
7095 - ScVbaControl* createControl() throw ( css::uno::RuntimeException );
7096 - ScVbaControl* createControl( const css::uno::Reference< css::uno::XInterface >& xParent ) throw ( css::uno::RuntimeException );
7097 -private:
7098 - ScVbaControl* createControl( const css::uno::Reference< css::awt::XControl >&, const css::uno::Reference< css::uno::XInterface >& ) throw ( css::uno::RuntimeException );
7099 - ScVbaControl* createControl( const css::uno::Reference< css::drawing::XControlShape >&, const css::uno::Reference< css::uno::XInterface >& ) throw ( css::uno::RuntimeException );
7100 - css::uno::Reference< css::uno::XComponentContext > m_xContext;
7101 - css::uno::Reference< css::uno::XInterface > m_xControl;
7102 - css::uno::Reference< css::frame::XModel > m_xModel;
7103 -};
7104 -
7105 -#endif//SC_VBA_CONTROL_HXX
7106 --- sc/source/ui/vba/vbacontrols.cxx.old 2009-04-02 10:45:35.000000000 +0000
7107 +++ sc/source/ui/vba/vbacontrols.cxx 1970-01-01 00:00:00.000000000 +0000
7108 @@ -1,227 +0,0 @@
7109 -/*************************************************************************
7110 - *
7111 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
7112 - *
7113 - * Copyright 2008 by Sun Microsystems, Inc.
7114 - *
7115 - * OpenOffice.org - a multi-platform office productivity suite
7116 - *
7117 - * $RCSfile$
7118 - * $Revision$
7119 - *
7120 - * This file is part of OpenOffice.org.
7121 - *
7122 - * OpenOffice.org is free software: you can redistribute it and/or modify
7123 - * it under the terms of the GNU Lesser General Public License version 3
7124 - * only, as published by the Free Software Foundation.
7125 - *
7126 - * OpenOffice.org is distributed in the hope that it will be useful,
7127 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
7128 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
7129 - * GNU Lesser General Public License version 3 for more details
7130 - * (a copy is included in the LICENSE file that accompanied this code).
7131 - *
7132 - * You should have received a copy of the GNU Lesser General Public License
7133 - * version 3 along with OpenOffice.org. If not, see
7134 - * <http://www.openoffice.org/license.html>
7135 - * for a copy of the LGPLv3 License.
7136 - *
7137 - ************************************************************************/
7138 -
7139 -#include "vbacontrols.hxx"
7140 -#include "vbacontrol.hxx"
7141 -#include <cppuhelper/implbase2.hxx>
7142 -#include <com/sun/star/awt/XControlContainer.hpp>
7143 -#include <hash_map>
7144 -
7145 -using namespace com::sun::star;
7146 -using namespace ooo::vba;
7147 -
7148 -
7149 -typedef ::cppu::WeakImplHelper2< container::XNameAccess, container::XIndexAccess > ArrayWrapImpl;
7150 -
7151 -typedef std::hash_map< rtl::OUString, sal_Int32, ::rtl::OUStringHash,
7152 - ::std::equal_to< ::rtl::OUString > > ControlIndexMap;
7153 -typedef std::vector< uno::Reference< awt::XControl > > ControlVec;
7154 -
7155 -class ControlArrayWrapper : public ArrayWrapImpl
7156 -{
7157 - uno::Reference< awt::XControlContainer > mxDialog;
7158 - uno::Sequence< ::rtl::OUString > msNames;
7159 - ControlVec mControls;
7160 - ControlIndexMap mIndices;
7161 -
7162 - rtl::OUString getControlName( const uno::Reference< awt::XControl >& xCtrl )
7163 - {
7164 - uno::Reference< beans::XPropertySet > xProp( xCtrl->getModel(), uno::UNO_QUERY );
7165 - rtl::OUString sName;
7166 - xProp->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ) ) >>= sName;
7167 - return sName;
7168 - }
7169 -
7170 -public:
7171 -
7172 - ControlArrayWrapper( const uno::Reference< awt::XControl >& xDialog )
7173 - {
7174 - mxDialog.set( xDialog, uno::UNO_QUERY_THROW );
7175 - uno::Sequence< uno::Reference< awt::XControl > > sXControls = mxDialog->getControls();
7176 -
7177 - msNames.realloc( sXControls.getLength() );
7178 - for ( sal_Int32 i = 0; i < sXControls.getLength(); ++i )
7179 - {
7180 - uno::Reference< awt::XControl > xCtrl = sXControls[ i ];
7181 - msNames[ i ] = getControlName( xCtrl );
7182 - mControls.push_back( xCtrl );
7183 - mIndices[ msNames[ i ] ] = i;
7184 - }
7185 - }
7186 -
7187 - // XElementAccess
7188 - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException)
7189 - {
7190 - return awt::XControl::static_type(0);
7191 - }
7192 -
7193 - virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException)
7194 - {
7195 - return ( mControls.size() > 0 );
7196 - }
7197 -
7198 - // XNameAcess
7199 - virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
7200 - {
7201 - if ( !hasByName( aName ) )
7202 - throw container::NoSuchElementException();
7203 - return getByIndex( mIndices[ aName ] );
7204 - }
7205 -
7206 - virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException)
7207 - {
7208 - return msNames;
7209 - }
7210 -
7211 - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException)
7212 - {
7213 - ControlIndexMap::iterator it = mIndices.find( aName );
7214 - return it != mIndices.end();
7215 - }
7216 -
7217 - // XElementAccess
7218 - virtual ::sal_Int32 SAL_CALL getCount( ) throw (css::uno::RuntimeException)
7219 - {
7220 - return mControls.size();
7221 - }
7222 -
7223 - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException )
7224 - {
7225 - if ( Index < 0 || Index >= static_cast< sal_Int32 >( mControls.size() ) )
7226 - throw lang::IndexOutOfBoundsException();
7227 - return uno::makeAny( mControls[ Index ] );
7228 - }
7229 -};
7230 -
7231 -
7232 -class ControlsEnumWrapper : public EnumerationHelper_BASE
7233 -{
7234 - uno::Reference<XHelperInterface > m_xParent;
7235 - uno::Reference<uno::XComponentContext > m_xContext;
7236 - uno::Reference<container::XIndexAccess > m_xIndexAccess;
7237 - uno::Reference<awt::XControl > m_xDlg;
7238 - sal_Int32 nIndex;
7239 -
7240 -public:
7241 -
7242 - ControlsEnumWrapper( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess, const uno::Reference< awt::XControl >& xDlg ) : m_xParent( xParent ), m_xContext( xContext), m_xIndexAccess( xIndexAccess ), m_xDlg( xDlg ), nIndex( 0 ) {}
7243 -
7244 - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException)
7245 - {
7246 - return ( nIndex < m_xIndexAccess->getCount() );
7247 - }
7248 -
7249 - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
7250 - {
7251 - if ( nIndex < m_xIndexAccess->getCount() )
7252 - {
7253 - uno::Reference< frame::XModel > xModel;
7254 - uno::Reference< uno::XInterface > xControl;
7255 - m_xIndexAccess->getByIndex( nIndex++ ) >>= xControl;
7256 - // Create control from awt::XControl
7257 - ScVbaControlFactory aFac( m_xContext, xControl, xModel );
7258 - uno::Reference< msforms::XControl > xVBAControl( aFac.createControl( m_xDlg->getModel() ) );
7259 - return uno::makeAny( xVBAControl );
7260 - }
7261 - throw container::NoSuchElementException();
7262 - }
7263 -
7264 -};
7265 -
7266 -
7267 -uno::Reference<container::XIndexAccess >
7268 -lcl_controlsWrapper( const uno::Reference< awt::XControl >& xDlg )
7269 -{
7270 - return new ControlArrayWrapper( xDlg );
7271 -}
7272 -
7273 -ScVbaControls::ScVbaControls( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext,
7274 - const css::uno::Reference< awt::XControl >& xDialog )
7275 - : ControlsImpl_BASE( xParent, xContext, lcl_controlsWrapper( xDialog ) )
7276 -{
7277 - mxDialog.set( xDialog, uno::UNO_QUERY_THROW );
7278 -}
7279 -
7280 -uno::Reference< container::XEnumeration >
7281 -ScVbaControls::createEnumeration() throw (uno::RuntimeException)
7282 -{
7283 - uno::Reference< container::XEnumeration > xEnum( new ControlsEnumWrapper( mxParent, mxContext, m_xIndexAccess, mxDialog ) );
7284 - if ( !xEnum.is() )
7285 - throw uno::RuntimeException();
7286 - return xEnum;
7287 -}
7288 -
7289 -uno::Any
7290 -ScVbaControls::createCollectionObject( const css::uno::Any& aSource )
7291 -{
7292 - // Create control from awt::XControl
7293 - uno::Reference< awt::XControl > xControl;
7294 - aSource >>= xControl;
7295 - uno::Reference< frame::XModel > xModel;
7296 - ScVbaControlFactory aFac( mxContext, xControl, xModel );
7297 - uno::Reference< msforms::XControl > xVBAControl( aFac.createControl( mxDialog->getModel() ) );
7298 - return uno::makeAny( xVBAControl );
7299 -}
7300 -
7301 -void SAL_CALL
7302 -ScVbaControls::Move( double cx, double cy ) throw (uno::RuntimeException)
7303 -{
7304 - uno::Reference< container::XEnumeration > xEnum( createEnumeration() );
7305 - while ( xEnum->hasMoreElements() )
7306 - {
7307 - uno::Reference< msforms::XControl > xControl( xEnum->nextElement(), uno::UNO_QUERY_THROW );
7308 - xControl->setLeft( xControl->getLeft() + cx );
7309 - xControl->setTop( xControl->getTop() + cy );
7310 - }
7311 -}
7312 -
7313 -uno::Type
7314 -ScVbaControls::getElementType() throw (uno::RuntimeException)
7315 -{
7316 - return ooo::vba::msforms::XControl::static_type(0);
7317 -}
7318 -rtl::OUString&
7319 -ScVbaControls::getServiceImplName()
7320 -{
7321 - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaControls") );
7322 - return sImplName;
7323 -}
7324 -
7325 -uno::Sequence< rtl::OUString >
7326 -ScVbaControls::getServiceNames()
7327 -{
7328 - static uno::Sequence< rtl::OUString > aServiceNames;
7329 - if ( aServiceNames.getLength() == 0 )
7330 - {
7331 - aServiceNames.realloc( 1 );
7332 - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Controls" ) );
7333 - }
7334 - return aServiceNames;
7335 -}
7336 --- sc/source/ui/vba/vbacontrols.hxx.old 2009-04-02 10:45:35.000000000 +0000
7337 +++ sc/source/ui/vba/vbacontrols.hxx 1970-01-01 00:00:00.000000000 +0000
7338 @@ -1,62 +0,0 @@
7339 -/*************************************************************************
7340 - *
7341 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
7342 - *
7343 - * Copyright 2008 by Sun Microsystems, Inc.
7344 - *
7345 - * OpenOffice.org - a multi-platform office productivity suite
7346 - *
7347 - * $RCSfile$
7348 - * $Revision$
7349 - *
7350 - * This file is part of OpenOffice.org.
7351 - *
7352 - * OpenOffice.org is free software: you can redistribute it and/or modify
7353 - * it under the terms of the GNU Lesser General Public License version 3
7354 - * only, as published by the Free Software Foundation.
7355 - *
7356 - * OpenOffice.org is distributed in the hope that it will be useful,
7357 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
7358 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
7359 - * GNU Lesser General Public License version 3 for more details
7360 - * (a copy is included in the LICENSE file that accompanied this code).
7361 - *
7362 - * You should have received a copy of the GNU Lesser General Public License
7363 - * version 3 along with OpenOffice.org. If not, see
7364 - * <http://www.openoffice.org/license.html>
7365 - * for a copy of the LGPLv3 License.
7366 - *
7367 - ************************************************************************/
7368 -#ifndef SC_VBA_CONTROLS_HXX
7369 -#define SC_VBA_CONTROLS_HXX
7370 -
7371 -#include <cppuhelper/implbase1.hxx>
7372 -#include <ooo/vba/msforms/XControls.hpp>
7373 -#include <com/sun/star/awt/XControl.hpp>
7374 -
7375 -#include "vbacollectionimpl.hxx"
7376 -#include "vbahelper.hxx"
7377 -
7378 -typedef CollTestImplHelper< ov::msforms::XControls > ControlsImpl_BASE;
7379 -
7380 -class ScVbaControls : public ControlsImpl_BASE
7381 -{
7382 - css::uno::Reference< css::awt::XControl > mxDialog;
7383 -protected:
7384 - virtual rtl::OUString& getServiceImplName();
7385 - virtual css::uno::Sequence<rtl::OUString> getServiceNames();
7386 -public:
7387 - ScVbaControls( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext,
7388 - const css::uno::Reference< css::awt::XControl >& xDialog );
7389 - // XControls
7390 - virtual void SAL_CALL Move( double cx, double cy ) throw (css::uno::RuntimeException);
7391 - // XEnumerationAccess
7392 - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
7393 - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
7394 -
7395 - // ScVbaCollectionBaseImpl
7396 - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
7397 -
7398 -};
7399 -#endif //SC_VBA_OLEOBJECTS_HXX
7400 -
7401 --- sc/source/ui/vba/vbadialog.cxx.old 2009-04-02 10:45:35.000000000 +0000
7402 +++ sc/source/ui/vba/vbadialog.cxx 2009-04-06 16:42:01.000000000 +0000
7403 @@ -35,7 +35,7 @@
7405 #include <tools/string.hxx>
7407 -#include "vbahelper.hxx"
7408 +#include "excelvbahelper.hxx"
7409 #include "vbadialog.hxx"
7410 #include "vbaglobals.hxx"
7412 --- sc/source/ui/vba/vbadialog.hxx.old 2009-04-02 10:45:35.000000000 +0000
7413 +++ sc/source/ui/vba/vbadialog.hxx 2009-04-06 16:42:01.000000000 +0000
7414 @@ -33,11 +33,10 @@
7415 #include <cppuhelper/implbase1.hxx>
7417 #include <com/sun/star/uno/XComponentContext.hpp>
7418 -#include <ooo/vba/XGlobals.hpp>
7419 #include <ooo/vba/excel/XApplication.hpp>
7420 #include <ooo/vba/excel/XDialog.hpp>
7422 -#include "vbahelperinterface.hxx"
7423 +#include <vbahelper/vbahelperinterface.hxx>
7424 #include "vbadialog.hxx"
7426 typedef InheritedHelperInterfaceImpl1< ov::excel::XDialog > ScVbaDialog_BASE;
7427 --- sc/source/ui/vba/vbadialogs.cxx.old 2009-04-02 10:45:35.000000000 +0000
7428 +++ sc/source/ui/vba/vbadialogs.cxx 2009-04-06 16:42:01.000000000 +0000
7429 @@ -36,7 +36,7 @@
7431 #include <tools/string.hxx>
7433 -#include "vbahelper.hxx"
7434 +#include "excelvbahelper.hxx"
7435 #include "vbadialogs.hxx"
7436 #include "vbaglobals.hxx"
7437 #include "vbadialog.hxx"
7438 @@ -62,7 +62,7 @@ ScVbaDialogs::Item( const uno::Any &aIte
7439 {
7440 sal_Int32 nIndex = 0;
7441 aItem >>= nIndex;
7442 - uno::Reference< excel::XDialog > aDialog( new ScVbaDialog( uno::Reference< XHelperInterface >( ScVbaGlobals::getGlobalsImpl( mxContext )->getApplication(), uno::UNO_QUERY_THROW ), nIndex, mxContext ) );
7443 + uno::Reference< excel::XDialog > aDialog( new ScVbaDialog( uno::Reference< XHelperInterface >( Application(),uno::UNO_QUERY_THROW ), nIndex, mxContext ) );
7444 return uno::Any( aDialog );
7445 }
7446 rtl::OUString&
7447 --- sc/source/ui/vba/vbadialogs.hxx.old 2009-04-02 10:45:35.000000000 +0000
7448 +++ sc/source/ui/vba/vbadialogs.hxx 2009-04-06 16:42:01.000000000 +0000
7449 @@ -35,7 +35,7 @@
7450 #include <com/sun/star/uno/XComponentContext.hpp>
7451 #include <ooo/vba/excel/XDialogs.hpp>
7452 #include <ooo/vba/XCollection.hpp>
7453 -#include "vbahelperinterface.hxx"
7454 +#include <vbahelper/vbahelperinterface.hxx>
7456 class ScModelObj;
7458 --- sc/source/ui/vba/vbaeventshelper.cxx.old 2009-04-06 16:42:00.000000000 +0000
7459 +++ sc/source/ui/vba/vbaeventshelper.cxx 2009-04-06 16:42:01.000000000 +0000
7460 @@ -33,12 +33,8 @@
7461 *
7462 ************************************************************************/
7463 #include "vbaeventshelper.hxx"
7464 -#include "helperdecl.hxx"
7465 +#include <vbahelper/helperdecl.hxx>
7466 #include <sfx2/objsh.hxx>
7467 -#include <basic/basmgr.hxx>
7468 -#include <basic/sbmod.hxx>
7469 -#include <basic/sbmeth.hxx>
7470 -#include <basic/sbx.hxx>
7471 #include "scextopt.hxx"
7472 #include <sfx2/evntconf.hxx>
7473 #include <sfx2/event.hxx>
7474 @@ -69,8 +65,6 @@ using namespace com::sun::star;
7475 using namespace ooo::vba;
7476 using namespace com::sun::star::document::VbaEventId;
7478 -const static String sLibrary( RTL_CONSTASCII_USTRINGPARAM("Standard"));
7479 -
7480 const static rtl::OUString sUrlPart0 = rtl::OUString::createFromAscii( "vnd.sun.star.script:");
7481 const static rtl::OUString sUrlPart1 = rtl::OUString::createFromAscii( "vnd.sun.star.script:Standard.");
7482 const static rtl::OUString sUrlPart2 = rtl::OUString::createFromAscii( "?language=Basic&location=document");
7483 @@ -400,7 +394,7 @@ ScVbaEventsHelper::ScVbaEventsHelper( un
7484 : m_xContext( xContext ), mpVbaEventsListener( NULL ), mbOpened( sal_False ), mbIgnoreEvents( sal_False )
7485 {
7486 uno::Reference< frame::XModel > xModel ( getXSomethingFromArgs< frame::XModel >( aArgs, 0 ), uno::UNO_QUERY );
7487 - ScDocShell* pDocShell = getDocShell( xModel );
7488 + ScDocShell* pDocShell = excel::getDocShell( xModel );
7489 pDoc = pDocShell->GetDocument();
7490 }
7492 @@ -452,55 +446,6 @@ sal_Bool ScVbaEventsHelper::executeMacro
7493 }
7494 return sal_True;
7495 }
7496 -String ScVbaEventsHelper::workbookMacroExists( SfxObjectShell* pShell, const String& sMod, const String& sMacro )
7497 -{
7498 - String sFullName;
7499 - // would use the script provider to see if the macro exists but
7500 - // called at this stage tdoc content handler stuff is not set up
7501 - // so it fails
7502 -
7503 - BasicManager* pBasicMgr = pShell-> GetBasicManager();
7504 - if ( pBasicMgr )
7505 - {
7506 - StarBASIC* pBasic = pBasicMgr->GetLib( sLibrary );
7507 - if ( !pBasic )
7508 - {
7509 - USHORT nId = pBasicMgr->GetLibId( sLibrary );
7510 - pBasicMgr->LoadLib( nId );
7511 - pBasic = pBasicMgr->GetLib( sLibrary );
7512 - }
7513 - if ( pBasic )
7514 - {
7515 - if ( sMod.Len() ) // we wish to find the macro is a specific module
7516 - {
7517 - SbModule* pModule = pBasic->FindModule( sMod );
7518 - if ( pModule )
7519 - {
7520 - SbxArray* pMethods = pModule->GetMethods();
7521 - if ( pMethods )
7522 - {
7523 - SbMethod* pMethod = static_cast< SbMethod* >( pMethods->Find( sMacro, SbxCLASS_METHOD ) );
7524 - if ( pMethod )
7525 - {
7526 - sFullName = sMacro;
7527 - sFullName.Insert( '.', 0 ).Insert( sMod, 0 ).Insert( '.', 0 ).Insert( sLibrary, 0 );
7528 - }
7529 - }
7530 - }
7531 - }
7532 - else if( SbMethod* pMethod = dynamic_cast< SbMethod* >( pBasic->Find( sMacro, SbxCLASS_METHOD ) ) )
7533 - {
7534 - if( SbModule* pModule = pMethod->GetModule() )
7535 - {
7536 - sFullName = sMacro;
7537 - sFullName.Insert( '.', 0 ).Insert( pModule->GetName(), 0).Insert( '.', 0 ).Insert( sLibrary, 0 );
7538 - }
7539 - }
7540 -
7541 - }
7542 - }
7543 - return sFullName;
7544 -}
7546 uno::Any ScVbaEventsHelper::createWorkSheet( SfxObjectShell* pShell, SCTAB nTab )
7547 {
7548 @@ -517,7 +462,7 @@ uno::Any ScVbaEventsHelper::createWorkSh
7549 uno::Sequence< uno::Any > aArgs(2);
7550 aArgs[0] = uno::Any( uno::Reference< uno::XInterface >() );
7551 aArgs[1] = uno::Any( pShell->GetModel() );
7552 - uno::Reference< uno::XInterface > xWorkbook( xSMgr->createInstanceWithArgumentsAndContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Workbook") ), aArgs, xCtx ), uno::UNO_QUERY );
7553 + uno::Reference< uno::XInterface > xWorkbook( ov::createVBAUnoAPIServiceWithArgs( pShell, "ooo.vba.excel.Workbook", aArgs ), uno::UNO_QUERY );
7555 // create WorkSheet
7556 String sSheetName;
7557 @@ -526,7 +471,7 @@ uno::Any ScVbaEventsHelper::createWorkSh
7558 aArgs[ 0 ] <<= xWorkbook;
7559 aArgs[ 1 ] <<= pShell->GetModel();
7560 aArgs[ 2 ] = uno::makeAny( rtl::OUString( sSheetName ) );
7561 - aRet <<= xSMgr->createInstanceWithArgumentsAndContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Worksheet") ), aArgs, xCtx );
7562 + aRet <<= ov::createVBAUnoAPIServiceWithArgs( pShell, "ooo.vba.excel.Worksheet", aArgs );
7563 }
7564 catch( uno::Exception& e )
7565 {
7566 @@ -560,7 +505,7 @@ uno::Any ScVbaEventsHelper::createRange(
7567 {
7568 throw uno::RuntimeException(); //
7569 }
7570 - aRet <<= xSMgr->createInstanceWithArgumentsAndContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Range") ), aArgs, xCtx );
7571 + aRet <<= ov::createVBAUnoAPIServiceWithArgs( pDoc->GetDocumentShell(), "ooo.vba.excel.Range", aArgs );
7572 }
7573 }
7574 catch( uno::Exception& e )
7575 @@ -584,7 +529,7 @@ uno::Any ScVbaEventsHelper::createHyperl
7576 aArgs[0] = uno::Any( uno::Reference< uno::XInterface >() ); // dummy parent
7577 aArgs[1] <<= rCell;
7579 - aRet <<= xSMgr->createInstanceWithArgumentsAndContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Hyperlink") ), aArgs, xCtx );
7580 + aRet <<= ov::createVBAUnoAPIServiceWithArgs( pDoc->GetDocumentShell(), "ooo.vba.excel.Hyperlink", aArgs );
7581 }
7582 else
7583 {
7584 @@ -647,7 +592,7 @@ ScVbaEventsHelper::getMacroPath( const s
7585 case VBAEVENT_WORKSHEET_SELECTIONCHANGE :
7586 {
7587 rtl::OUString aSheetModuleName = getSheetModuleName( nTab );
7588 - sMacroPath = workbookMacroExists( pShell, aSheetModuleName, sMacroName );
7589 + sMacroPath = docMacroExists( pShell, aSheetModuleName, sMacroName );
7590 break;
7591 }
7592 // Workbook
7593 @@ -681,7 +626,7 @@ ScVbaEventsHelper::getMacroPath( const s
7594 sWorkbookModuleName = aExtDocSettings.maGlobCodeName;
7595 }
7597 - sMacroPath = workbookMacroExists( pShell, sWorkbookModuleName, sMacroName );
7598 + sMacroPath = docMacroExists( pShell, sWorkbookModuleName, sMacroName );
7599 break;
7600 }
7601 default:
7602 --- sc/source/ui/vba/vbaeventshelper.hxx.old 2009-04-06 16:42:00.000000000 +0000
7603 +++ sc/source/ui/vba/vbaeventshelper.hxx 2009-04-06 16:42:01.000000000 +0000
7604 @@ -40,7 +40,7 @@
7605 #include <cppuhelper/implbase1.hxx>
7606 #include <com/sun/star/document/VbaEventId.hpp>
7607 #include <com/sun/star/document/XVbaEventsHelper.hpp>
7608 -#include "vbahelper.hxx"
7609 +#include "excelvbahelper.hxx"
7611 #define INVALID_TAB -1
7613 @@ -57,7 +57,6 @@ private:
7614 sal_Bool mbIgnoreEvents;
7616 String getSheetModuleName( SCTAB nTab );
7617 - String workbookMacroExists( SfxObjectShell* pShell, const String& sMod, const String& sMacro );
7618 css::uno::Any createWorkSheet( SfxObjectShell* pShell, SCTAB nTab );
7619 css::uno::Any createRange( const css::uno::Any& aRange );
7620 css::uno::Any createHyperlink( const css::uno::Any& rCell );
7621 --- sc/source/ui/vba/vbafillformat.hxx.old 2009-04-02 10:45:35.000000000 +0000
7622 +++ sc/source/ui/vba/vbafillformat.hxx 2009-04-06 16:42:01.000000000 +0000
7623 @@ -33,7 +33,7 @@
7624 #include <com/sun/star/drawing/XShape.hpp>
7625 #include <com/sun/star/drawing/FillStyle.hpp>
7626 #include <ooo/vba/msforms/XFillFormat.hpp>
7627 -#include "vbahelperinterface.hxx"
7628 +#include <vbahelper/vbahelperinterface.hxx>
7630 typedef InheritedHelperInterfaceImpl1< ov::msforms::XFillFormat > ScVbaFillFormat_BASE;
7632 --- sc/source/ui/vba/vbafont.hxx.old 2009-04-02 10:45:35.000000000 +0000
7633 +++ sc/source/ui/vba/vbafont.hxx 2009-04-06 16:42:01.000000000 +0000
7634 @@ -34,7 +34,7 @@
7636 #include <ooo/vba/excel/XFont.hpp>
7637 #include <com/sun/star/beans/XPropertySet.hpp>
7638 -#include "vbahelperinterface.hxx"
7639 +#include <vbahelper/vbahelperinterface.hxx>
7640 #include "vbapalette.hxx"
7642 class ScTableSheetsObj;
7643 --- sc/source/ui/vba/vbaformat.cxx.old 2009-04-02 10:45:35.000000000 +0000
7644 +++ sc/source/ui/vba/vbaformat.cxx 2009-04-06 16:42:01.000000000 +0000
7645 @@ -33,6 +33,7 @@
7646 #include <ooo/vba/excel/XlHAlign.hpp>
7647 #include <ooo/vba/excel/XlOrientation.hpp>
7648 #include <ooo/vba/excel/Constants.hpp>
7649 +#include <ooo/vba/excel/XRange.hpp>
7650 #include <com/sun/star/table/CellVertJustify.hpp>
7651 #include <com/sun/star/table/CellHoriJustify.hpp>
7652 #include <com/sun/star/table/CellOrientation.hpp>
7653 @@ -341,7 +342,7 @@ template< typename Ifc1 >
7654 uno::Any SAL_CALL
7655 ScVbaFormat<Ifc1>::Borders( const uno::Any& Index ) throw (script::BasicErrorException, uno::RuntimeException )
7656 {
7657 - ScVbaPalette aPalette( getDocShell( mxModel ) );
7658 + ScVbaPalette aPalette( excel::getDocShell( mxModel ) );
7659 uno::Reference< XCollection > xColl = new ScVbaBorders( thisHelperIface(), ScVbaFormat_BASE::mxContext, uno::Reference< table::XCellRange >( mxPropertySet, uno::UNO_QUERY_THROW ), aPalette );
7661 if ( Index.hasValue() )
7662 @@ -355,7 +356,7 @@ template< typename Ifc1 >
7663 uno::Reference< excel::XFont > SAL_CALL
7664 ScVbaFormat<Ifc1>::Font( ) throw (script::BasicErrorException, uno::RuntimeException)
7665 {
7666 - ScVbaPalette aPalette( getDocShell( mxModel ) );
7667 + ScVbaPalette aPalette( excel::getDocShell( mxModel ) );
7668 return new ScVbaFont( thisHelperIface(), ScVbaFormat_BASE::mxContext, aPalette, mxPropertySet );
7669 }
7671 --- sc/source/ui/vba/vbaformat.hxx.old 2009-04-02 10:45:35.000000000 +0000
7672 +++ sc/source/ui/vba/vbaformat.hxx 2009-04-06 16:42:01.000000000 +0000
7673 @@ -39,7 +39,7 @@
7674 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
7675 #include <com/sun/star/lang/Locale.hpp>
7676 #include <com/sun/star/beans/XPropertyState.hpp>
7677 -#include "vbahelperinterface.hxx"
7678 +#include <vbahelper/vbahelperinterface.hxx>
7680 template< typename Ifc1 >
7681 class ScVbaFormat : public InheritedHelperInterfaceImpl1< Ifc1 >
7682 --- sc/source/ui/vba/vbaformatconditions.cxx.old 2009-04-02 10:45:35.000000000 +0000
7683 +++ sc/source/ui/vba/vbaformatconditions.cxx 2009-04-06 16:42:01.000000000 +0000
7684 @@ -36,6 +36,7 @@
7685 #include "vbaformatcondition.hxx"
7686 #include "vbaworkbook.hxx"
7687 #include "vbastyles.hxx"
7688 +#include "vbaglobals.hxx"
7689 using namespace ::ooo::vba;
7690 using namespace ::com::sun::star;
7692 @@ -50,7 +51,7 @@ static rtl::OUString sStyleNamePrefix( R
7693 ScVbaFormatConditions::ScVbaFormatConditions( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< sheet::XSheetConditionalEntries >& _xSheetConditionalEntries, const uno::Reference< frame::XModel >& xModel ) : ScVbaFormatConditions_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( _xSheetConditionalEntries, uno::UNO_QUERY_THROW ) ), mxSheetConditionalEntries( _xSheetConditionalEntries )
7694 {
7695 mxRangeParent.set( xParent, uno::UNO_QUERY_THROW );
7696 - uno::Reference< excel::XWorkbook > xWorkbook = new ScVbaWorkbook( uno::Reference< XHelperInterface >( ScVbaGlobals::getGlobalsImpl( xContext )->getApplication(), uno::UNO_QUERY_THROW ), xContext, xModel );
7697 + uno::Reference< excel::XWorkbook > xWorkbook = new ScVbaWorkbook( uno::Reference< XHelperInterface >( Application(), uno::UNO_QUERY_THROW ), xContext, xModel );
7698 mxStyles.set( xWorkbook->Styles( uno::Any() ), uno::UNO_QUERY_THROW );
7699 uno::Reference< sheet::XCellRangeAddressable > xCellRange( mxRangeParent->getCellRange(), uno::UNO_QUERY_THROW );
7700 mxParentRangePropertySet.set( xCellRange, uno::UNO_QUERY_THROW );
7701 --- sc/source/ui/vba/vbaformatconditions.hxx.old 2009-04-02 10:45:35.000000000 +0000
7702 +++ sc/source/ui/vba/vbaformatconditions.hxx 2009-04-06 16:42:01.000000000 +0000
7703 @@ -35,7 +35,7 @@
7704 #include <com/sun/star/beans/XPropertySet.hpp>
7705 #include <com/sun/star/table/CellAddress.hpp>
7706 #include <com/sun/star/sheet/XSheetConditionalEntries.hpp>
7707 -#include "vbacollectionimpl.hxx"
7708 +#include <vbahelper/vbacollectionimpl.hxx>
7710 typedef CollTestImplHelper< ov::excel::XFormatConditions > ScVbaFormatConditions_BASE;
7711 class ScVbaFormatConditions: public ScVbaFormatConditions_BASE
7712 --- sc/source/ui/vba/vbaframe.cxx.old 2009-04-02 10:45:35.000000000 +0000
7713 +++ sc/source/ui/vba/vbaframe.cxx 1970-01-01 00:00:00.000000000 +0000
7714 @@ -1,93 +0,0 @@
7715 -/*************************************************************************
7716 - *
7717 - * OpenOffice.org - a multi-platform office productivity suite
7718 - *
7719 - * $RCSfile$
7720 - *
7721 - * $Revision$
7722 - *
7723 - * last change: $Author$ $Date$
7724 - *
7725 - * The Contents of this file are made available subject to
7726 - * the terms of GNU Lesser General Public License Version 2.1.
7727 - *
7728 - *
7729 - * GNU Lesser General Public License Version 2.1
7730 - * =============================================
7731 - * Copyright 2005 by Sun Microsystems, Inc.
7732 - * 901 San Antonio Road, Palo Alto, CA 94303, USA
7733 - *
7734 - * This library is free software; you can redistribute it and/or
7735 - * modify it under the terms of the GNU Lesser General Public
7736 - * License version 2.1, as published by the Free Software Foundation.
7737 - *
7738 - * This library is distributed in the hope that it will be useful,
7739 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
7740 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
7741 - * Lesser General Public License for more details.
7742 - *
7743 - * You should have received a copy of the GNU Lesser General Public
7744 - * License along with this library; if not, write to the Free Software
7745 - * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
7746 - * MA 02111-1307 USA
7747 - *
7748 - ************************************************************************/
7749 -#include "vbaframe.hxx"
7750 -#include <vector>
7751 -
7752 -using namespace com::sun::star;
7753 -using namespace ooo::vba;
7754 -
7755 -
7756 -const static rtl::OUString LABEL( RTL_CONSTASCII_USTRINGPARAM("Label") );
7757 -ScVbaFrame::ScVbaFrame( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper ) : FrameImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
7758 -{
7759 -}
7760 -
7761 -// Attributes
7762 -rtl::OUString SAL_CALL
7763 -ScVbaFrame::getCaption() throw (css::uno::RuntimeException)
7764 -{
7765 - rtl::OUString Label;
7766 - m_xProps->getPropertyValue( LABEL ) >>= Label;
7767 - return Label;
7768 -}
7769 -
7770 -void SAL_CALL
7771 -ScVbaFrame::setCaption( const rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException)
7772 -{
7773 - m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) );
7774 -}
7775 -
7776 -uno::Any SAL_CALL
7777 -ScVbaFrame::getValue() throw (css::uno::RuntimeException)
7778 -{
7779 - return uno::makeAny( getCaption() );
7780 -}
7781 -
7782 -void SAL_CALL
7783 -ScVbaFrame::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException)
7784 -{
7785 - rtl::OUString sCaption;
7786 - _value >>= sCaption;
7787 - setCaption( sCaption );
7788 -}
7789 -
7790 -rtl::OUString&
7791 -ScVbaFrame::getServiceImplName()
7792 -{
7793 - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaFrame") );
7794 - return sImplName;
7795 -}
7796 -
7797 -uno::Sequence< rtl::OUString >
7798 -ScVbaFrame::getServiceNames()
7799 -{
7800 - static uno::Sequence< rtl::OUString > aServiceNames;
7801 - if ( aServiceNames.getLength() == 0 )
7802 - {
7803 - aServiceNames.realloc( 1 );
7804 - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.Frame" ) );
7805 - }
7806 - return aServiceNames;
7807 -}
7808 --- sc/source/ui/vba/vbaframe.hxx.old 2009-04-02 10:45:35.000000000 +0000
7809 +++ sc/source/ui/vba/vbaframe.hxx 1970-01-01 00:00:00.000000000 +0000
7810 @@ -1,58 +0,0 @@
7811 -/*************************************************************************
7812 - *
7813 - * OpenOffice.org - a multi-platform office productivity suite
7814 - *
7815 - * $RCSfile$
7816 - *
7817 - * $Revision$
7818 - *
7819 - * last change: $Author$ $Date$
7820 - *
7821 - * The Contents of this file are made available subject to
7822 - * the terms of GNU Lesser General Public License Version 2.1.
7823 - *
7824 - *
7825 - * GNU Lesser General Public License Version 2.1
7826 - * =============================================
7827 - * Copyright 2005 by Sun Microsystems, Inc.
7828 - * 901 San Antonio Road, Palo Alto, CA 94303, USA
7829 - *
7830 - * This library is free software; you can redistribute it and/or
7831 - * modify it under the terms of the GNU Lesser General Public
7832 - * License version 2.1, as published by the Free Software Foundation.
7833 - *
7834 - * This library is distributed in the hope that it will be useful,
7835 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
7836 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
7837 - * Lesser General Public License for more details.
7838 - *
7839 - * You should have received a copy of the GNU Lesser General Public
7840 - * License along with this library; if not, write to the Free Software
7841 - * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
7842 - * MA 02111-1307 USA
7843 - *
7844 - ************************************************************************/
7845 -#ifndef SC_VBA_FRAME_HXX
7846 -#define SC_VBA_FRAME_HXX
7847 -#include <cppuhelper/implbase1.hxx>
7848 -#include <ooo/vba/msforms/XLabel.hpp>
7849 -
7850 -#include "vbacontrol.hxx"
7851 -#include "vbahelper.hxx"
7852 -
7853 -typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XLabel > FrameImpl_BASE;
7854 -
7855 -class ScVbaFrame : public FrameImpl_BASE
7856 -{
7857 -public:
7858 - ScVbaFrame( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
7859 - // Attributes
7860 - virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
7861 - virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
7862 - virtual rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
7863 - virtual void SAL_CALL setCaption( const rtl::OUString& _caption ) throw (css::uno::RuntimeException);
7864 - //XHelperInterface
7865 - virtual rtl::OUString& getServiceImplName();
7866 - virtual css::uno::Sequence<rtl::OUString> getServiceNames();
7867 -};
7868 -#endif //SC_VBA_LABEL_HXX
7869 --- sc/source/ui/vba/vbaglobals.cxx.old 2009-04-02 10:45:35.000000000 +0000
7870 +++ sc/source/ui/vba/vbaglobals.cxx 2009-04-06 16:42:01.000000000 +0000
7871 @@ -27,13 +27,14 @@
7872 * for a copy of the LGPLv3 License.
7873 *
7874 ************************************************************************/
7875 -#include "helperdecl.hxx"
7876 +#include <vbahelper/helperdecl.hxx>
7877 #include "vbaglobals.hxx"
7879 #include <comphelper/unwrapargs.hxx>
7881 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
7882 #include <com/sun/star/beans/XPropertySet.hpp>
7883 +#include <cppuhelper/component_context.hxx>
7885 #include "vbaapplication.hxx"
7886 #include "vbaworksheet.hxx"
7887 @@ -49,11 +50,10 @@ using namespace ::ooo::vba;
7888 // ScVbaGlobals
7889 // =============================================================================
7891 -ScVbaGlobals::ScVbaGlobals( css::uno::Reference< css::uno::XComponentContext >const& rxContext )
7892 - :m_xContext( rxContext )
7893 +ScVbaGlobals::ScVbaGlobals( css::uno::Reference< css::uno::XComponentContext >const& rxContext ) : ScVbaGlobals_BASE( uno::Reference< XHelperInterface >(), rxContext )
7894 {
7895 OSL_TRACE("ScVbaGlobals::ScVbaGlobals()");
7896 - mxApplication = uno::Reference< excel::XApplication > ( new ScVbaApplication( m_xContext) );
7897 + init( rxContext, uno::Any( getApplication() ) );
7898 }
7900 ScVbaGlobals::~ScVbaGlobals()
7901 @@ -61,23 +61,6 @@ ScVbaGlobals::~ScVbaGlobals()
7902 OSL_TRACE("ScVbaGlobals::~ScVbaGlobals");
7903 }
7905 -// Will throw if singleton can't be accessed
7906 -uno::Reference< XGlobals >
7907 -ScVbaGlobals::getGlobalsImpl( const uno::Reference< uno::XComponentContext >& xContext ) throw ( uno::RuntimeException )
7908 -{
7909 - uno::Reference< XGlobals > xGlobals(
7910 - xContext->getValueByName( ::rtl::OUString::createFromAscii(
7911 - "/singletons/ooo.vba.theGlobals") ), uno::UNO_QUERY);
7912 -
7913 - if ( !xGlobals.is() )
7914 - {
7915 - throw uno::RuntimeException(
7916 - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ": Couldn't access Globals" ) ),
7917 - uno::Reference< XInterface >() );
7918 - }
7919 - return xGlobals;
7920 -}
7921 -
7922 // =============================================================================
7923 // XGlobals
7924 // =============================================================================
7925 @@ -85,14 +68,15 @@ uno::Reference<excel::XApplication >
7926 ScVbaGlobals::getApplication() throw (uno::RuntimeException)
7927 {
7928 // OSL_TRACE("In ScVbaGlobals::getApplication");
7929 - return mxApplication;
7930 + static uno::Reference< excel::XApplication > ExcelApplication( new ScVbaApplication( mxContext) );
7931 + return ExcelApplication;
7932 }
7934 uno::Reference< excel::XWorkbook > SAL_CALL
7935 ScVbaGlobals::getActiveWorkbook() throw (uno::RuntimeException)
7936 {
7937 // OSL_TRACE("In ScVbaGlobals::getActiveWorkbook");
7938 - uno::Reference< excel::XWorkbook > xWorkbook( mxApplication->getActiveWorkbook(), uno::UNO_QUERY);
7939 + uno::Reference< excel::XWorkbook > xWorkbook( getApplication()->getActiveWorkbook(), uno::UNO_QUERY);
7940 if ( xWorkbook.is() )
7941 {
7942 return xWorkbook;
7943 @@ -103,22 +87,28 @@ ScVbaGlobals::getActiveWorkbook() throw
7944 }
7947 +uno::Reference< excel::XWindow > SAL_CALL
7948 +ScVbaGlobals::getActiveWindow() throw (uno::RuntimeException)
7949 +{
7950 + return getApplication()->getActiveWindow();
7951 +}
7952 +
7953 uno::Reference< excel::XWorksheet > SAL_CALL
7954 ScVbaGlobals::getActiveSheet() throw (uno::RuntimeException)
7955 {
7956 - return mxApplication->getActiveSheet();
7957 + return getApplication()->getActiveSheet();
7958 }
7960 uno::Any SAL_CALL
7961 ScVbaGlobals::WorkBooks( const uno::Any& aIndex ) throw (uno::RuntimeException)
7962 {
7963 - return uno::Any( mxApplication->Workbooks(aIndex) );
7964 + return uno::Any( getApplication()->Workbooks(aIndex) );
7965 }
7967 uno::Any SAL_CALL
7968 ScVbaGlobals::WorkSheets(const uno::Any& aIndex) throw (uno::RuntimeException)
7969 {
7970 - return mxApplication->Worksheets( aIndex );
7971 + return getApplication()->Worksheets( aIndex );
7972 }
7973 uno::Any SAL_CALL
7974 ScVbaGlobals::Sheets( const uno::Any& aIndex ) throw (uno::RuntimeException)
7975 @@ -126,26 +116,6 @@ ScVbaGlobals::Sheets( const uno::Any& aI
7976 return WorkSheets( aIndex );
7977 }
7979 -::uno::Sequence< ::uno::Any > SAL_CALL
7980 -ScVbaGlobals::getGlobals( ) throw (::uno::RuntimeException)
7981 -{
7982 - sal_uInt32 nMax = 0;
7983 - uno::Sequence< uno::Any > maGlobals(4);
7984 - maGlobals[ nMax++ ] <<= ScVbaGlobals::getGlobalsImpl(m_xContext);
7985 - maGlobals[ nMax++ ] <<= mxApplication;
7986 -
7987 - uno::Reference< excel::XWorkbook > xWorkbook = mxApplication->getActiveWorkbook();
7988 - if( xWorkbook.is() )
7989 - {
7990 - maGlobals[ nMax++ ] <<= xWorkbook;
7991 - uno::Reference< excel::XWorksheet > xWorksheet = xWorkbook->getActiveSheet();
7992 - if( xWorksheet.is() )
7993 - maGlobals[ nMax++ ] <<= xWorksheet;
7994 - }
7995 - maGlobals.realloc( nMax );
7996 - return maGlobals;
7997 -}
7998 -
7999 uno::Any SAL_CALL
8000 ScVbaGlobals::Range( const uno::Any& Cell1, const uno::Any& Cell2 ) throw (uno::RuntimeException)
8001 {
8002 @@ -158,13 +128,140 @@ ScVbaGlobals::Names( const css::uno::Any
8003 return getApplication()->Names( aIndex );
8004 }
8006 +uno::Reference< excel::XRange > SAL_CALL
8007 +ScVbaGlobals::getActiveCell() throw (uno::RuntimeException)
8008 +{
8009 + return getApplication()->getActiveCell();
8010 +}
8011 +
8012 +uno::Reference< XAssistant > SAL_CALL
8013 +ScVbaGlobals::getAssistant() throw (uno::RuntimeException)
8014 +{
8015 + return getApplication()->getAssistant();
8016 +}
8017 +
8018 +uno::Any SAL_CALL
8019 +ScVbaGlobals::getSelection() throw (uno::RuntimeException)
8020 +{
8021 + return getApplication()->getSelection();
8022 +}
8023 +
8024 +uno::Reference< excel::XWorkbook > SAL_CALL
8025 +ScVbaGlobals::getThisWorkbook() throw (uno::RuntimeException)
8026 +{
8027 + return getApplication()->getThisWorkbook();
8028 +}
8029 +void SAL_CALL
8030 +ScVbaGlobals::Calculate() throw (::com::sun::star::script::BasicErrorException, ::com::sun::star::uno::RuntimeException)
8031 +{
8032 + return getApplication()->Calculate();
8033 +}
8034 +
8035 +uno::Reference< excel::XRange > SAL_CALL
8036 +ScVbaGlobals::Cells( const uno::Any& RowIndex, const uno::Any& ColumnIndex ) throw (uno::RuntimeException)
8037 +{
8038 + return getApplication()->getActiveSheet()->Cells( RowIndex, ColumnIndex );
8039 +}
8040 +uno::Reference< excel::XRange > SAL_CALL
8041 +ScVbaGlobals::Columns( const uno::Any& aIndex ) throw (uno::RuntimeException)
8042 +{
8043 + return getApplication()->getActiveSheet()->Columns( aIndex );
8044 +}
8045 +
8046 +uno::Any SAL_CALL
8047 +ScVbaGlobals::CommandBars( const uno::Any& aIndex ) throw (uno::RuntimeException)
8048 +{
8049 + uno::Reference< XApplicationBase > xBase( getApplication(), uno::UNO_QUERY_THROW );
8050 + return xBase->CommandBars( aIndex );
8051 +}
8052 +
8053 +css::uno::Reference< ov::excel::XRange > SAL_CALL
8054 +ScVbaGlobals::Union( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::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::BasicErrorException, css::uno::RuntimeException)
8055 +{
8056 + return getApplication()->Union( Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9, Arg10, Arg11, Arg12, Arg13, Arg14, Arg15, Arg16, Arg17, Arg18, Arg19, Arg20, Arg21, Arg22, Arg23, Arg24, Arg25, Arg26, Arg27, Arg28, Arg29, Arg30 );
8057 +}
8058 +css::uno::Reference< ov::excel::XRange > SAL_CALL
8059 +ScVbaGlobals::Intersect( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::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::BasicErrorException, css::uno::RuntimeException)
8060 +{
8061 + return getApplication()->Intersect( Arg1, Arg2, Arg3, Arg4, Arg5, Arg6, Arg7, Arg8, Arg9, Arg10, Arg11, Arg12, Arg13, Arg14, Arg15, Arg16, Arg17, Arg18, Arg19, Arg20, Arg21, Arg22, Arg23, Arg24, Arg25, Arg26, Arg27, Arg28, Arg29, Arg30 );
8062 +}
8063 +
8064 +uno::Any SAL_CALL
8065 +ScVbaGlobals::Evaluate( const ::rtl::OUString& Name ) throw (uno::RuntimeException)
8066 +{
8067 + return getApplication()->Evaluate( Name );
8068 +}
8069 +
8070 +css::uno::Any SAL_CALL
8071 +ScVbaGlobals::WorksheetFunction( ) throw (css::uno::RuntimeException)
8072 +{
8073 + return getApplication()->WorksheetFunction();
8074 +}
8075 +
8076 +uno::Any SAL_CALL
8077 +ScVbaGlobals::Windows( const uno::Any& aIndex ) throw (uno::RuntimeException)
8078 +{
8079 + return getApplication()->Windows( aIndex );
8080 +}
8081 +
8082 +uno::Reference< excel::XRange > SAL_CALL
8083 +ScVbaGlobals::Rows( const uno::Any& aIndex ) throw (uno::RuntimeException)
8084 +{
8085 + return getApplication()->getActiveSheet()->Rows( aIndex );
8086 +
8087 +}
8088 +
8089 +uno::Sequence< ::rtl::OUString > SAL_CALL
8090 +ScVbaGlobals::getAvailableServiceNames( ) throw (uno::RuntimeException)
8091 +{
8092 + static bool bInit = false;
8093 + static uno::Sequence< rtl::OUString > serviceNames( ScVbaGlobals_BASE::getAvailableServiceNames() );
8094 + if ( !bInit )
8095 + {
8096 + rtl::OUString names[] = {
8097 + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "ooo.vba.excel.Range" ) ),
8098 + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "ooo.vba.excel.Workbook" ) ),
8099 + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "ooo.vba.excel.Window" ) ),
8100 + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "ooo.vba.excel.Worksheet" ) ),
8101 + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "ooo.vba.excel.Application" ) ),
8102 + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "ooo.vba.excel.Hyperlink" ) ),
8103 + };
8104 + sal_Int32 nExcelServices = ( sizeof( names )/ sizeof( names[0] ) );
8105 + sal_Int32 startIndex = serviceNames.getLength();
8106 + serviceNames.realloc( serviceNames.getLength() + nExcelServices );
8107 + for ( sal_Int32 index = 0; index < nExcelServices; ++index )
8108 + serviceNames[ startIndex + index ] = names[ index ];
8109 + bInit = true;
8110 + }
8111 + return serviceNames;
8112 +}
8113 +
8114 +rtl::OUString&
8115 +ScVbaGlobals::getServiceImplName()
8116 +{
8117 + static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaGlobals") );
8118 + return sImplName;
8119 +}
8120 +
8121 +uno::Sequence< rtl::OUString >
8122 +ScVbaGlobals::getServiceNames()
8123 +{
8124 + static uno::Sequence< rtl::OUString > aServiceNames;
8125 + if ( aServiceNames.getLength() == 0 )
8126 + {
8127 + aServiceNames.realloc( 1 );
8128 + aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Globals" ) );
8129 + }
8130 + return aServiceNames;
8131 +}
8132 +
8133 namespace globals
8134 {
8135 namespace sdecl = comphelper::service_decl;
8136 -sdecl::class_<ScVbaGlobals, sdecl::with_args<false> > serviceImpl;
8137 +sdecl::vba_service_class_<ScVbaGlobals, sdecl::with_args<false> > serviceImpl;
8138 extern sdecl::ServiceDecl const serviceDecl(
8139 serviceImpl,
8140 "ScVbaGlobals",
8141 - "ooo.vba.Globals" );
8142 + "ooo.vba.excel.Globals" );
8143 }
8145 --- sc/source/ui/vba/vbaglobals.hxx.old 2009-04-02 10:45:35.000000000 +0000
8146 +++ sc/source/ui/vba/vbaglobals.hxx 2009-04-06 16:42:01.000000000 +0000
8147 @@ -33,43 +33,62 @@
8148 #include <com/sun/star/lang/XServiceInfo.hpp>
8149 #include <com/sun/star/lang/XInitialization.hpp>
8150 #include <com/sun/star/uno/XComponentContext.hpp>
8151 -#include <ooo/vba/XGlobals.hpp>
8152 +#include <ooo/vba/excel/XGlobals.hpp>
8153 +#include <ooo/vba/excel/XApplication.hpp>
8155 #include <cppuhelper/implbase1.hxx>
8156 -#include "vbahelper.hxx"
8157 +#include "excelvbahelper.hxx"
8159 +#include <vbahelper/vbaglobalbase.hxx>
8160 // =============================================================================
8161 // class ScVbaGlobals
8162 // =============================================================================
8164 - typedef ::cppu::WeakImplHelper1<
8165 - ov::XGlobals > ScVbaGlobals_BASE;
8166 -
8167 +typedef ::cppu::ImplInheritanceHelper1< VbaGlobalsBase, ov::excel::XGlobals > ScVbaGlobals_BASE;
8169 class ScVbaGlobals : public ScVbaGlobals_BASE
8170 {
8171 - private:
8172 - css::uno::Reference< css::uno::XComponentContext > m_xContext;
8173 - css::uno::Reference< ov::excel::XApplication > mxApplication;
8174 + virtual css::uno::Reference<
8175 + ov::excel::XApplication > SAL_CALL getApplication()
8176 + throw (css::uno::RuntimeException);
8177 public:
8179 ScVbaGlobals(
8180 css::uno::Reference< css::uno::XComponentContext >const& rxContext );
8181 virtual ~ScVbaGlobals();
8183 - static css::uno::Reference< ov::XGlobals > getGlobalsImpl(const css::uno::Reference< css::uno::XComponentContext >& ) throw (css::uno::RuntimeException);
8184 -
8185 // XGlobals
8186 - virtual css::uno::Reference<
8187 - ov::excel::XApplication > SAL_CALL getApplication()
8188 - throw (css::uno::RuntimeException);
8189 virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getActiveWorkbook() throw (css::uno::RuntimeException);
8190 + virtual css::uno::Reference< ov::excel::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException);
8191 virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getActiveSheet() throw (css::uno::RuntimeException);
8192 + virtual css::uno::Reference< ov::XAssistant > SAL_CALL getAssistant() throw (css::uno::RuntimeException);
8193 + virtual void SAL_CALL Calculate( ) throw (::com::sun::star::script::BasicErrorException, ::com::sun::star::uno::RuntimeException);
8194 +
8195 + virtual css::uno::Any SAL_CALL getSelection() throw (css::uno::RuntimeException);
8196 + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getActiveCell() throw (css::uno::RuntimeException);
8197 + virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getThisWorkbook() throw (css::uno::RuntimeException);
8198 + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Cells( const css::uno::Any& RowIndex, const css::uno::Any& ColumnIndex ) throw (css::uno::RuntimeException);
8199 + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Columns( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
8200 + virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
8201 + virtual css::uno::Any SAL_CALL Evaluate( const ::rtl::OUString& Name ) throw (css::uno::RuntimeException);
8202 +
8203 virtual css::uno::Any SAL_CALL WorkSheets(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
8204 virtual css::uno::Any SAL_CALL WorkBooks(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
8205 + virtual css::uno::Any SAL_CALL WorksheetFunction( ) throw (css::uno::RuntimeException);
8206 + virtual css::uno::Any SAL_CALL Windows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
8207 virtual css::uno::Any SAL_CALL Sheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
8208 - virtual css::uno::Sequence< css::uno::Any > SAL_CALL getGlobals( ) throw (css::uno::RuntimeException);
8209 virtual css::uno::Any SAL_CALL Range( const css::uno::Any& Cell1, const css::uno::Any& Cell2 ) throw (css::uno::RuntimeException);
8210 + virtual css::uno::Reference< ::ooo::vba::excel::XRange > SAL_CALL Rows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
8211 virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) throw ( css::uno::RuntimeException );
8212 + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Intersect( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::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::BasicErrorException, css::uno::RuntimeException);
8213 + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Union( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::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::BasicErrorException, css::uno::RuntimeException);
8214 +
8215 +
8216 +
8217 + // XMultiServiceFactory
8218 + virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames( ) throw (css::uno::RuntimeException);
8219 + // XHelperInterface
8220 + virtual rtl::OUString& getServiceImplName();
8221 + virtual css::uno::Sequence<rtl::OUString> getServiceNames();
8222 };
8223 #endif //
8224 --- sc/source/ui/vba/vbahelper.cxx.old 2009-04-02 10:45:35.000000000 +0000
8225 +++ sc/source/ui/vba/vbahelper.cxx 1970-01-01 00:00:00.000000000 +0000
8226 @@ -1,828 +0,0 @@
8227 -/*************************************************************************
8228 - *
8229 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
8230 - *
8231 - * Copyright 2008 by Sun Microsystems, Inc.
8232 - *
8233 - * OpenOffice.org - a multi-platform office productivity suite
8234 - *
8235 - * $RCSfile: vbahelper.cxx,v $
8236 - * $Revision: 1.5.32.1 $
8237 - *
8238 - * This file is part of OpenOffice.org.
8239 - *
8240 - * OpenOffice.org is free software: you can redistribute it and/or modify
8241 - * it under the terms of the GNU Lesser General Public License version 3
8242 - * only, as published by the Free Software Foundation.
8243 - *
8244 - * OpenOffice.org is distributed in the hope that it will be useful,
8245 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
8246 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
8247 - * GNU Lesser General Public License version 3 for more details
8248 - * (a copy is included in the LICENSE file that accompanied this code).
8249 - *
8250 - * You should have received a copy of the GNU Lesser General Public License
8251 - * version 3 along with OpenOffice.org. If not, see
8252 - * <http://www.openoffice.org/license.html>
8253 - * for a copy of the LGPLv3 License.
8254 - *
8255 - ************************************************************************/
8256 -#include <cppuhelper/bootstrap.hxx>
8257 -#include <com/sun/star/util/XURLTransformer.hpp>
8258 -#include <com/sun/star/frame/XDispatchProvider.hpp>
8259 -#include <com/sun/star/frame/XModel.hpp>
8260 -#include <com/sun/star/frame/XFrame.hpp>
8261 -#include <com/sun/star/frame/XDesktop.hpp>
8262 -#include <com/sun/star/frame/XController.hpp>
8263 -#include <com/sun/star/uno/XComponentContext.hpp>
8264 -#include <com/sun/star/lang/XMultiComponentFactory.hpp>
8265 -#include <com/sun/star/beans/XPropertySet.hpp>
8266 -#include <com/sun/star/beans/XIntrospection.hpp>
8267 -
8268 -#include <comphelper/processfactory.hxx>
8269 -
8270 -#include <sfx2/objsh.hxx>
8271 -#include <sfx2/viewfrm.hxx>
8272 -#include <sfx2/dispatch.hxx>
8273 -#include <sfx2/app.hxx>
8274 -#include <svtools/stritem.hxx>
8275 -
8276 -#include <docuno.hxx>
8277 -
8278 -#include <basic/sbx.hxx>
8279 -#include <basic/sbstar.hxx>
8280 -#include <rtl/math.hxx>
8281 -
8282 -#include <math.h>
8283 -#include "vbahelper.hxx"
8284 -#include "tabvwsh.hxx"
8285 -#include "transobj.hxx"
8286 -#include "scmod.hxx"
8287 -#include "vbashape.hxx"
8288 -#include "unonames.hxx"
8289 -#include "cellsuno.hxx"
8290 -using namespace ::com::sun::star;
8291 -using namespace ::ooo::vba;
8292 -
8293 -#define POINTTO100THMILLIMETERFACTOR 35.27778
8294 -void unoToSbxValue( SbxVariable* pVar, const uno::Any& aValue );
8295 -
8296 -uno::Any sbxToUnoValue( SbxVariable* pVar );
8297 -
8298 -
8299 -namespace ooo
8300 -{
8301 -namespace vba
8302 -{
8303 -
8304 -const double Millimeter::factor = 35.27778;
8305 -
8306 -uno::Reference< beans::XIntrospectionAccess >
8307 -getIntrospectionAccess( const uno::Any& aObject ) throw (uno::RuntimeException)
8308 -{
8309 - static uno::Reference< beans::XIntrospection > xIntrospection;
8310 - if( !xIntrospection.is() )
8311 - {
8312 - uno::Reference< lang::XMultiServiceFactory > xFactory( comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
8313 - xIntrospection.set( xFactory->createInstance( rtl::OUString::createFromAscii("com.sun.star.beans.Introspection") ), uno::UNO_QUERY_THROW );
8314 - }
8315 - return xIntrospection->inspect( aObject );
8316 -}
8317 -
8318 -uno::Reference< script::XTypeConverter >
8319 -getTypeConverter( const uno::Reference< uno::XComponentContext >& xContext ) throw (uno::RuntimeException)
8320 -{
8321 - static uno::Reference< script::XTypeConverter > xTypeConv( xContext->getServiceManager()->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter") ), xContext ), uno::UNO_QUERY_THROW );
8322 - return xTypeConv;
8323 -}
8324 -// helper method to determine if the view ( calc ) is in print-preview mode
8325 -bool isInPrintPreview( SfxViewFrame* pView )
8326 -{
8327 - sal_uInt16 nViewNo = SID_VIEWSHELL1 - SID_VIEWSHELL0;
8328 - if ( pView->GetObjectShell()->GetFactory().GetViewFactoryCount() >
8329 -nViewNo && !pView->GetObjectShell()->IsInPlaceActive() )
8330 - {
8331 - SfxViewFactory &rViewFactory =
8332 - pView->GetObjectShell()->GetFactory().GetViewFactory(nViewNo);
8333 - if ( pView->GetCurViewId() == rViewFactory.GetOrdinal() )
8334 - return true;
8335 - }
8336 - return false;
8337 -}
8338 -const ::rtl::OUString REPLACE_CELLS_WARNING( RTL_CONSTASCII_USTRINGPARAM( "ReplaceCellsWarning"));
8339 -const uno::Any&
8340 -aNULL()
8341 -{
8342 - static uno::Any aNULLL = uno::makeAny( uno::Reference< uno::XInterface >() );
8343 - return aNULLL;
8344 -}
8345 -
8346 -class PasteCellsWarningReseter
8347 -{
8348 -private:
8349 - bool bInitialWarningState;
8350 - static uno::Reference< beans::XPropertySet > getGlobalSheetSettings() throw ( uno::RuntimeException )
8351 - {
8352 - static uno::Reference< beans::XPropertySet > xTmpProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
8353 - static uno::Reference<uno::XComponentContext > xContext( xTmpProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), uno::UNO_QUERY_THROW );
8354 - static uno::Reference<lang::XMultiComponentFactory > xServiceManager(
8355 - xContext->getServiceManager(), uno::UNO_QUERY_THROW );
8356 - static uno::Reference< beans::XPropertySet > xProps( xServiceManager->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.GlobalSheetSettings" ) ) ,xContext ), uno::UNO_QUERY_THROW );
8357 - return xProps;
8358 - }
8359 -
8360 - bool getReplaceCellsWarning() throw ( uno::RuntimeException )
8361 - {
8362 - sal_Bool res = sal_False;
8363 - getGlobalSheetSettings()->getPropertyValue( REPLACE_CELLS_WARNING ) >>= res;
8364 - return ( res == sal_True );
8365 - }
8366 -
8367 - void setReplaceCellsWarning( bool bState ) throw ( uno::RuntimeException )
8368 - {
8369 - getGlobalSheetSettings()->setPropertyValue( REPLACE_CELLS_WARNING, uno::makeAny( bState ) );
8370 - }
8371 -public:
8372 - PasteCellsWarningReseter() throw ( uno::RuntimeException )
8373 - {
8374 - bInitialWarningState = getReplaceCellsWarning();
8375 - if ( bInitialWarningState )
8376 - setReplaceCellsWarning( false );
8377 - }
8378 - ~PasteCellsWarningReseter()
8379 - {
8380 - if ( bInitialWarningState )
8381 - {
8382 - // don't allow dtor to throw
8383 - try
8384 - {
8385 - setReplaceCellsWarning( true );
8386 - }
8387 - catch ( uno::Exception& /*e*/ ){}
8388 - }
8389 - }
8390 -};
8391 -
8392 -void
8393 -dispatchRequests (uno::Reference< frame::XModel>& xModel,rtl::OUString & aUrl, uno::Sequence< beans::PropertyValue >& sProps )
8394 -{
8395 -
8396 - util::URL url ;
8397 - url.Complete = aUrl;
8398 - rtl::OUString emptyString = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "" ));
8399 - uno::Reference<frame::XController> xController = xModel->getCurrentController();
8400 - uno::Reference<frame::XFrame> xFrame = xController->getFrame();
8401 - uno::Reference<frame::XDispatchProvider> xDispatchProvider (xFrame,uno::UNO_QUERY_THROW);
8402 - try
8403 - {
8404 - uno::Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
8405 - uno::Reference<uno::XComponentContext > xContext( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), uno::UNO_QUERY_THROW );
8406 - if ( !xContext.is() )
8407 - {
8408 - return ;
8409 - }
8410 -
8411 - uno::Reference<lang::XMultiComponentFactory > xServiceManager(
8412 - xContext->getServiceManager() );
8413 - if ( !xServiceManager.is() )
8414 - {
8415 - return ;
8416 - }
8417 - uno::Reference<util::XURLTransformer> xParser( xServiceManager->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ) )
8418 - ,xContext), uno::UNO_QUERY_THROW );
8419 - if (!xParser.is())
8420 - return;
8421 - xParser->parseStrict (url);
8422 - }
8423 - catch ( uno::Exception & /*e*/ )
8424 - {
8425 - return ;
8426 - }
8427 -
8428 - uno::Reference<frame::XDispatch> xDispatcher = xDispatchProvider->queryDispatch(url,emptyString,0);
8429 -
8430 - uno::Sequence<beans::PropertyValue> dispatchProps(1);
8431 -
8432 - sal_Int32 nProps = sProps.getLength();
8433 - beans::PropertyValue* pDest = dispatchProps.getArray();
8434 - if ( nProps )
8435 - {
8436 - dispatchProps.realloc( nProps + 1 );
8437 - // need to reaccquire pDest after realloc
8438 - pDest = dispatchProps.getArray();
8439 - beans::PropertyValue* pSrc = sProps.getArray();
8440 - for ( sal_Int32 index=0; index<nProps; ++index, ++pSrc, ++pDest )
8441 - *pDest = *pSrc;
8442 - }
8443 -
8444 - (*pDest).Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Silent" ));
8445 - (*pDest).Value <<= (sal_Bool)sal_True;
8446 -
8447 - if (xDispatcher.is())
8448 - xDispatcher->dispatch( url, dispatchProps );
8449 -}
8450 -
8451 -void
8452 -dispatchRequests (uno::Reference< frame::XModel>& xModel,rtl::OUString & aUrl)
8453 -{
8454 - uno::Sequence<beans::PropertyValue> dispatchProps;
8455 - dispatchRequests( xModel, aUrl, dispatchProps );
8456 -}
8457 -
8458 -
8459 -void dispatchExecute(css::uno::Reference< css::frame::XModel>& xModel, USHORT nSlot, SfxCallMode nCall)
8460 -{
8461 - ScTabViewShell* pViewShell = getBestViewShell( xModel );
8462 - SfxViewFrame* pViewFrame = NULL;
8463 - if ( pViewShell )
8464 - pViewFrame = pViewShell->GetViewFrame();
8465 - if ( pViewFrame )
8466 - {
8467 - SfxDispatcher* pDispatcher = pViewFrame->GetDispatcher();
8468 - if( pDispatcher )
8469 - {
8470 - pDispatcher->Execute( nSlot , nCall );
8471 - }
8472 - }
8473 -}
8474 -
8475 -void
8476 -implnPaste()
8477 -{
8478 - PasteCellsWarningReseter resetWarningBox;
8479 - ScTabViewShell* pViewShell = getCurrentBestViewShell();
8480 - if ( pViewShell )
8481 - {
8482 - pViewShell->PasteFromSystem();
8483 - pViewShell->CellContentChanged();
8484 - }
8485 -}
8486 -
8487 -
8488 -void
8489 -implnCopy()
8490 -{
8491 - ScTabViewShell* pViewShell = getCurrentBestViewShell();
8492 - if ( pViewShell )
8493 - pViewShell->CopyToClip(NULL,false,false,true);
8494 -}
8495 -
8496 -void
8497 -implnCut()
8498 -{
8499 - ScTabViewShell* pViewShell = getCurrentBestViewShell();
8500 - if ( pViewShell )
8501 - pViewShell->CutToClip( NULL, TRUE );
8502 -}
8503 -
8504 -void implnPasteSpecial(USHORT nFlags,USHORT nFunction,sal_Bool bSkipEmpty, sal_Bool bTranspose)
8505 -{
8506 - PasteCellsWarningReseter resetWarningBox;
8507 - sal_Bool bAsLink(sal_False), bOtherDoc(sal_False);
8508 - InsCellCmd eMoveMode = INS_NONE;
8509 -
8510 - ScTabViewShell* pTabViewShell = ScTabViewShell::GetActiveViewShell();
8511 - if ( !pTabViewShell )
8512 - // none active, try next best
8513 - pTabViewShell = getCurrentBestViewShell();
8514 - if ( pTabViewShell )
8515 - {
8516 - ScViewData* pView = pTabViewShell->GetViewData();
8517 - Window* pWin = ( pView != NULL ) ? pView->GetActiveWin() : NULL;
8518 - if ( pView && pWin )
8519 - {
8520 - if ( bAsLink && bOtherDoc )
8521 - pTabViewShell->PasteFromSystem(0);//SOT_FORMATSTR_ID_LINK
8522 - else
8523 - {
8524 - ScTransferObj* pOwnClip = ScTransferObj::GetOwnClipboard( pWin );
8525 - ScDocument* pDoc = NULL;
8526 - if ( pOwnClip )
8527 - pDoc = pOwnClip->GetDocument();
8528 - pTabViewShell->PasteFromClip( nFlags, pDoc,
8529 - nFunction, bSkipEmpty, bTranspose, bAsLink,
8530 - eMoveMode, IDF_NONE, TRUE );
8531 - pTabViewShell->CellContentChanged();
8532 - }
8533 - }
8534 - }
8535 -
8536 -}
8537 -
8538 - uno::Reference< frame::XModel >
8539 -getCurrentDocument() throw (uno::RuntimeException)
8540 -{
8541 - uno::Reference< frame::XModel > xModel;
8542 - SbxObject* pBasic = dynamic_cast< SbxObject* > ( SFX_APP()->GetBasic() );
8543 - SbxObject* basicChosen = pBasic ;
8544 - if ( basicChosen == NULL)
8545 - {
8546 - OSL_TRACE("getModelFromBasic() StarBASIC* is NULL" );
8547 - return xModel;
8548 - }
8549 - SbxObject* p = pBasic;
8550 - SbxObject* pParent = p->GetParent();
8551 - SbxObject* pParentParent = pParent ? pParent->GetParent() : NULL;
8552 -
8553 - if( pParentParent )
8554 - {
8555 - basicChosen = pParentParent;
8556 - }
8557 - else if( pParent )
8558 - {
8559 - basicChosen = pParent;
8560 - }
8561 -
8562 -
8563 - uno::Any aModel;
8564 - SbxVariable *pCompVar = basicChosen->Find( UniString(RTL_CONSTASCII_USTRINGPARAM("ThisComponent")), SbxCLASS_OBJECT );
8565 -
8566 - if ( pCompVar )
8567 - {
8568 - aModel = sbxToUnoValue( pCompVar );
8569 - if ( sal_False == ( aModel >>= xModel ) ||
8570 - !xModel.is() )
8571 - {
8572 - // trying last gasp try the current component
8573 - uno::Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
8574 - // test if vba service is present
8575 - uno::Reference< uno::XComponentContext > xCtx( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), uno::UNO_QUERY_THROW );
8576 - uno::Reference<lang::XMultiComponentFactory > xSMgr( xCtx->getServiceManager(), uno::UNO_QUERY_THROW );
8577 - uno::Reference< frame::XDesktop > xDesktop (xSMgr->createInstanceWithContext(::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop"), xCtx), uno::UNO_QUERY_THROW );
8578 - xModel.set( xDesktop->getCurrentComponent(), uno::UNO_QUERY );
8579 - if ( !xModel.is() )
8580 - {
8581 - throw uno::RuntimeException(
8582 - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can't extract model from basic ( its obviously not set yet ) therefore don't know the currently selected document") ), uno::Reference< uno::XInterface >() );
8583 - }
8584 - return xModel;
8585 - }
8586 - else
8587 - {
8588 - OSL_TRACE("Have model ThisComponent points to url %s",
8589 - ::rtl::OUStringToOString( xModel->getURL(),
8590 - RTL_TEXTENCODING_ASCII_US ).pData->buffer );
8591 - }
8592 - }
8593 - else
8594 - {
8595 - OSL_TRACE("Failed to get ThisComponent");
8596 - throw uno::RuntimeException(
8597 - rtl::OUString(
8598 - RTL_CONSTASCII_USTRINGPARAM(
8599 - "Can't determine the currently selected document") ),
8600 - uno::Reference< uno::XInterface >() );
8601 - }
8602 - return xModel;
8603 -}
8604 -
8605 -ScDocShell*
8606 -getDocShell( css::uno::Reference< css::frame::XModel>& xModel )
8607 -{
8608 - uno::Reference< uno::XInterface > xIf( xModel, uno::UNO_QUERY_THROW );
8609 - ScModelObj* pModel = dynamic_cast< ScModelObj* >( xIf.get() );
8610 - ScDocShell* pDocShell = NULL;
8611 - if ( pModel )
8612 - pDocShell = (ScDocShell*)pModel->GetEmbeddedObject();
8613 - return pDocShell;
8614 -
8615 -}
8616 -
8617 -ScTabViewShell*
8618 -getBestViewShell( css::uno::Reference< css::frame::XModel>& xModel )
8619 -{
8620 - ScDocShell* pDocShell = getDocShell( xModel );
8621 - if ( pDocShell )
8622 - return pDocShell->GetBestViewShell();
8623 - return NULL;
8624 -}
8625 -
8626 -ScTabViewShell*
8627 -getCurrentBestViewShell()
8628 -{
8629 - uno::Reference< frame::XModel > xModel = getCurrentDocument();
8630 - return getBestViewShell( xModel );
8631 -}
8632 -
8633 -SfxViewFrame*
8634 -getCurrentViewFrame()
8635 -{
8636 - ScTabViewShell* pViewShell = getCurrentBestViewShell();
8637 - if ( pViewShell )
8638 - return pViewShell->GetViewFrame();
8639 - return NULL;
8640 -}
8641 -
8642 -sal_Int32
8643 -OORGBToXLRGB( sal_Int32 nCol )
8644 -{
8645 - sal_Int32 nRed = nCol;
8646 - nRed &= 0x00FF0000;
8647 - nRed >>= 16;
8648 - sal_Int32 nGreen = nCol;
8649 - nGreen &= 0x0000FF00;
8650 - nGreen >>= 8;
8651 - sal_Int32 nBlue = nCol;
8652 - nBlue &= 0x000000FF;
8653 - sal_Int32 nRGB = ( (nBlue << 16) | (nGreen << 8) | nRed );
8654 - return nRGB;
8655 -}
8656 -sal_Int32
8657 -XLRGBToOORGB( sal_Int32 nCol )
8658 -{
8659 - sal_Int32 nBlue = nCol;
8660 - nBlue &= 0x00FF0000;
8661 - nBlue >>= 16;
8662 - sal_Int32 nGreen = nCol;
8663 - nGreen &= 0x0000FF00;
8664 - nGreen >>= 8;
8665 - sal_Int32 nRed = nCol;
8666 - nRed &= 0x000000FF;
8667 - sal_Int32 nRGB = ( (nRed << 16) | (nGreen << 8) | nBlue );
8668 - return nRGB;
8669 -}
8670 -uno::Any
8671 -OORGBToXLRGB( const uno::Any& aCol )
8672 -{
8673 - sal_Int32 nCol;
8674 - aCol >>= nCol;
8675 - nCol = OORGBToXLRGB( nCol );
8676 - return uno::makeAny( nCol );
8677 -}
8678 -uno::Any
8679 -XLRGBToOORGB( const uno::Any& aCol )
8680 -{
8681 - sal_Int32 nCol;
8682 - aCol >>= nCol;
8683 - nCol = XLRGBToOORGB( nCol );
8684 - return uno::makeAny( nCol );
8685 -}
8686 -
8687 -void PrintOutHelper( 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, css::uno::Reference< frame::XModel >& xModel, sal_Bool bUseSelection )
8688 -{
8689 - sal_Int32 nTo = 0;
8690 - sal_Int32 nFrom = 0;
8691 - sal_Int16 nCopies = 1;
8692 - sal_Bool bPreview = sal_False;
8693 - sal_Bool bCollate = sal_False;
8694 - sal_Bool bSelection = bUseSelection;
8695 - From >>= nFrom;
8696 - To >>= nTo;
8697 - Copies >>= nCopies;
8698 - Preview >>= bPreview;
8699 - if ( nCopies > 1 ) // Collate only useful when more that 1 copy
8700 - Collate >>= bCollate;
8701 -
8702 - rtl::OUString sRange( RTL_CONSTASCII_USTRINGPARAM( "-" ) );
8703 - rtl::OUString sFileName;
8704 -
8705 - if (( nFrom || nTo ) )
8706 - {
8707 - if ( nFrom )
8708 - sRange = ( ::rtl::OUString::valueOf( nFrom ) + sRange );
8709 - if ( nTo )
8710 - sRange += ::rtl::OUString::valueOf( nTo );
8711 - }
8712 -
8713 - if ( PrToFileName.getValue() )
8714 - {
8715 - PrToFileName >>= sFileName;
8716 - }
8717 - ScTabViewShell* pViewShell = getBestViewShell( xModel );
8718 - SfxViewFrame* pViewFrame = NULL;
8719 - if ( pViewShell )
8720 - pViewFrame = pViewShell->GetViewFrame();
8721 - if ( pViewFrame )
8722 - {
8723 - SfxAllItemSet aArgs( SFX_APP()->GetPool() );
8724 -
8725 - SfxBoolItem sfxCollate( SID_PRINT_COLLATE, bCollate );
8726 - aArgs.Put( sfxCollate, sfxCollate.Which() );
8727 - SfxInt16Item sfxCopies( SID_PRINT_COPIES, nCopies );
8728 - aArgs.Put( sfxCopies, sfxCopies.Which() );
8729 - if ( sFileName.getLength() )
8730 - {
8731 - SfxStringItem sfxFileName( SID_FILE_NAME, sFileName);
8732 - aArgs.Put( sfxFileName, sfxFileName.Which() );
8733 -
8734 - }
8735 - if ( sRange.getLength() )
8736 - {
8737 - SfxStringItem sfxRange( SID_PRINT_PAGES, sRange );
8738 - aArgs.Put( sfxRange, sfxRange.Which() );
8739 - }
8740 - SfxBoolItem sfxSelection( SID_SELECTION, bSelection );
8741 - aArgs.Put( sfxSelection, sfxSelection.Which() );
8742 - SfxBoolItem sfxAsync( SID_ASYNCHRON, sal_False );
8743 - aArgs.Put( sfxAsync, sfxAsync.Which() );
8744 - SfxDispatcher* pDispatcher = pViewFrame->GetDispatcher();
8745 -
8746 - if ( pDispatcher )
8747 - {
8748 - if ( bPreview )
8749 - {
8750 - if ( !pViewFrame->GetFrame()->IsInPlace() )
8751 - {
8752 - SC_MOD()->InputEnterHandler();
8753 - pViewFrame->GetDispatcher()->Execute( SID_VIEWSHELL1, SFX_CALLMODE_SYNCHRON );
8754 - while ( isInPrintPreview( pViewFrame ) )
8755 - Application::Yield();
8756 - }
8757 - }
8758 - else
8759 - pDispatcher->Execute( (USHORT)SID_PRINTDOC, (SfxCallMode)SFX_CALLMODE_SYNCHRON, aArgs );
8760 - }
8761 -
8762 - }
8763 -
8764 - // #FIXME #TODO
8765 - // 1 ActivePrinter ( how/can we switch a printer via API? )
8766 - // 2 PrintToFile ( ms behaviour if this option is specified but no
8767 - // filename supplied 'PrToFileName' then the user will be prompted )
8768 - // 3 Need to check behaviour of Selected sheets with range ( e.g. From & To
8769 - // values ) in oOO these options are mutually exclusive
8770 - // 4 There is a pop up to do with transparent objects in the print source
8771 - // should be able to disable that via configuration for the duration
8772 - // of this method
8773 -}
8774 -
8775 - void PrintPreviewHelper( const css::uno::Any& /*EnableChanges*/, css::uno::Reference< css::frame::XModel >& xModel )
8776 -{
8777 - dispatchExecute( xModel, SID_VIEWSHELL1 );
8778 -}
8779 -
8780 -rtl::OUString getAnyAsString( const uno::Any& pvargItem ) throw ( uno::RuntimeException )
8781 -{
8782 - uno::Type aType = pvargItem.getValueType();
8783 - uno::TypeClass eTypeClass = aType.getTypeClass();
8784 - rtl::OUString sString;
8785 - switch ( eTypeClass )
8786 - {
8787 - case uno::TypeClass_BOOLEAN:
8788 - {
8789 - sal_Bool bBool = sal_False;
8790 - pvargItem >>= bBool;
8791 - sString = rtl::OUString::valueOf( bBool );
8792 - break;
8793 - }
8794 - case uno::TypeClass_STRING:
8795 - pvargItem >>= sString;
8796 - break;
8797 - case uno::TypeClass_FLOAT:
8798 - {
8799 - float aFloat = 0;
8800 - pvargItem >>= aFloat;
8801 - sString = rtl::OUString::valueOf( aFloat );
8802 - break;
8803 - }
8804 - case uno::TypeClass_DOUBLE:
8805 - {
8806 - double aDouble = 0;
8807 - pvargItem >>= aDouble;
8808 - sString = rtl::OUString::valueOf( aDouble );
8809 - break;
8810 - }
8811 - case uno::TypeClass_SHORT:
8812 - case uno::TypeClass_LONG:
8813 - case uno::TypeClass_BYTE:
8814 - {
8815 - sal_Int32 aNum = 0;
8816 - pvargItem >>= aNum;
8817 - sString = rtl::OUString::valueOf( aNum );
8818 - break;
8819 - }
8820 -
8821 - case uno::TypeClass_HYPER:
8822 - {
8823 - sal_Int64 aHyper = 0;
8824 - pvargItem >>= aHyper;
8825 - sString = rtl::OUString::valueOf( aHyper );
8826 - break;
8827 - }
8828 - default:
8829 - throw uno::RuntimeException( rtl::OUString::createFromAscii( "Invalid type, can't convert" ), uno::Reference< uno::XInterface >() );
8830 - }
8831 - return sString;
8832 -}
8833 -
8834 -
8835 -rtl::OUString
8836 -ContainerUtilities::getUniqueName( const uno::Sequence< ::rtl::OUString >& _slist, const rtl::OUString& _sElementName, const ::rtl::OUString& _sSuffixSeparator)
8837 -{
8838 - return getUniqueName(_slist, _sElementName, _sSuffixSeparator, sal_Int32(2));
8839 -}
8840 -
8841 -rtl::OUString
8842 -ContainerUtilities::getUniqueName( const uno::Sequence< rtl::OUString >& _slist, const rtl::OUString _sElementName, const rtl::OUString& _sSuffixSeparator, sal_Int32 _nStartSuffix)
8843 -{
8844 - sal_Int32 a = _nStartSuffix;
8845 - rtl::OUString scompname = _sElementName;
8846 - bool bElementexists = true;
8847 - sal_Int32 nLen = _slist.getLength();
8848 - if ( nLen == 0 )
8849 - return _sElementName;
8850 -
8851 - while (bElementexists == true)
8852 - {
8853 - for (sal_Int32 i = 0; i < nLen; i++)
8854 - {
8855 - if (FieldInList(_slist, scompname) == -1)
8856 - {
8857 - return scompname;
8858 - }
8859 - }
8860 - scompname = _sElementName + _sSuffixSeparator + rtl::OUString::valueOf( a++ );
8861 - }
8862 - return rtl::OUString();
8863 -}
8864 -
8865 -sal_Int32
8866 -ContainerUtilities::FieldInList( const uno::Sequence< rtl::OUString >& SearchList, const rtl::OUString& SearchString )
8867 -{
8868 - sal_Int32 FieldLen = SearchList.getLength();
8869 - sal_Int32 retvalue = -1;
8870 - for (sal_Int32 i = 0; i < FieldLen; i++)
8871 - {
8872 - // I wonder why comparing lexicographically is done
8873 - // when its a match is whats interesting?
8874 - //if (SearchList[i].compareTo(SearchString) == 0)
8875 - if ( SearchList[i].equals( SearchString ) )
8876 - {
8877 - retvalue = i;
8878 - break;
8879 - }
8880 - }
8881 - return retvalue;
8882 -
8883 -}
8884 -bool NeedEsc(sal_Unicode cCode)
8885 -{
8886 - String sEsc(RTL_CONSTASCII_USTRINGPARAM(".^$+\\|{}()"));
8887 - return (STRING_NOTFOUND != sEsc.Search(cCode));
8888 -}
8889 -
8890 -rtl::OUString VBAToRegexp(const rtl::OUString &rIn, bool bForLike )
8891 -{
8892 - rtl::OUStringBuffer sResult;
8893 - const sal_Unicode *start = rIn.getStr();
8894 - const sal_Unicode *end = start + rIn.getLength();
8895 -
8896 - int seenright = 0;
8897 - if ( bForLike )
8898 - sResult.append(static_cast<sal_Unicode>('^'));
8899 -
8900 - while (start < end)
8901 - {
8902 - switch (*start)
8903 - {
8904 - case '?':
8905 - sResult.append(static_cast<sal_Unicode>('.'));
8906 - start++;
8907 - break;
8908 - case '*':
8909 - sResult.append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".*")));
8910 - start++;
8911 - break;
8912 - case '#':
8913 - sResult.append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[0-9]")));
8914 - start++;
8915 - break;
8916 - case '~':
8917 - sResult.append(static_cast<sal_Unicode>('\\'));
8918 - sResult.append(*(++start));
8919 - start++;
8920 - break;
8921 - // dump the ~ and escape the next characture
8922 - case ']':
8923 - sResult.append(static_cast<sal_Unicode>('\\'));
8924 - sResult.append(*start++);
8925 - break;
8926 - case '[':
8927 - sResult.append(*start++);
8928 - seenright = 0;
8929 - while (start < end && !seenright)
8930 - {
8931 - switch (*start)
8932 - {
8933 - case '[':
8934 - case '?':
8935 - case '*':
8936 - sResult.append(static_cast<sal_Unicode>('\\'));
8937 - sResult.append(*start);
8938 - break;
8939 - case ']':
8940 - sResult.append(*start);
8941 - seenright = 1;
8942 - break;
8943 - case '!':
8944 - sResult.append(static_cast<sal_Unicode>('^'));
8945 - break;
8946 - default:
8947 - if (NeedEsc(*start))
8948 - sResult.append(static_cast<sal_Unicode>('\\'));
8949 - sResult.append(*start);
8950 - break;
8951 - }
8952 - start++;
8953 - }
8954 - break;
8955 - default:
8956 - if (NeedEsc(*start))
8957 - sResult.append(static_cast<sal_Unicode>('\\'));
8958 - sResult.append(*start++);
8959 - }
8960 - }
8961 -
8962 - if ( bForLike )
8963 - sResult.append(static_cast<sal_Unicode>('$'));
8964 -
8965 - return sResult.makeStringAndClear( );
8966 -}
8967 -
8968 -double getPixelTo100thMillimeterConversionFactor( css::uno::Reference< css::awt::XDevice >& xDevice, sal_Bool bVertical)
8969 -{
8970 - double fConvertFactor = 1.0;
8971 - if( bVertical )
8972 - {
8973 - fConvertFactor = xDevice->getInfo().PixelPerMeterY/100000;
8974 - }
8975 - else
8976 - {
8977 - fConvertFactor = xDevice->getInfo().PixelPerMeterX/100000;
8978 - }
8979 - return fConvertFactor;
8980 -}
8981 -
8982 -double PointsToPixels( css::uno::Reference< css::awt::XDevice >& xDevice, double fPoints, sal_Bool bVertical)
8983 -{
8984 - double fConvertFactor = getPixelTo100thMillimeterConversionFactor( xDevice, bVertical );
8985 - return fPoints * POINTTO100THMILLIMETERFACTOR * fConvertFactor;
8986 -}
8987 -double PixelsToPoints( css::uno::Reference< css::awt::XDevice >& xDevice, double fPixels, sal_Bool bVertical)
8988 -{
8989 - double fConvertFactor = getPixelTo100thMillimeterConversionFactor( xDevice, bVertical );
8990 - return (fPixels/fConvertFactor)/POINTTO100THMILLIMETERFACTOR;
8991 -}
8992 -
8993 -ConcreteXShapeGeometryAttributes::ConcreteXShapeGeometryAttributes( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape )
8994 -{
8995 - m_xShape = new ScVbaShape( xContext, xShape );
8996 -}
8997 -
8998 -#define VBA_LEFT "PositionX"
8999 -#define VBA_TOP "PositionY"
9000 -UserFormGeometryHelper::UserFormGeometryHelper( const uno::Reference< uno::XComponentContext >& /*xContext*/, const uno::Reference< awt::XControl >& xControl )
9001 -{
9002 - mxModel.set( xControl->getModel(), uno::UNO_QUERY_THROW );
9003 -}
9004 - double UserFormGeometryHelper::getLeft()
9005 - {
9006 - sal_Int32 nLeft = 0;
9007 - mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_LEFT ) ) ) >>= nLeft;
9008 - return Millimeter::getInPoints( nLeft );
9009 - }
9010 - void UserFormGeometryHelper::setLeft( double nLeft )
9011 - {
9012 - mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_LEFT ) ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nLeft ) ) );
9013 - }
9014 - double UserFormGeometryHelper::getTop()
9015 - {
9016 - sal_Int32 nTop = 0;
9017 - mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_TOP ) ) ) >>= nTop;
9018 - return Millimeter::getInPoints( nTop );
9019 - }
9020 - void UserFormGeometryHelper::setTop( double nTop )
9021 - {
9022 - mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_TOP ) ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nTop ) ) );
9023 - }
9024 - double UserFormGeometryHelper::getHeight()
9025 - {
9026 - sal_Int32 nHeight = 0;
9027 - mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLHGT ) ) ) >>= nHeight;
9028 - return Millimeter::getInPoints( nHeight );
9029 - }
9030 - void UserFormGeometryHelper::setHeight( double nHeight )
9031 - {
9032 - mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLHGT ) ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nHeight ) ) );
9033 - }
9034 - double UserFormGeometryHelper::getWidth()
9035 - {
9036 - sal_Int32 nWidth = 0;
9037 - mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLWID ) ) ) >>= nWidth;
9038 - return Millimeter::getInPoints( nWidth );
9039 - }
9040 - void UserFormGeometryHelper::setWidth( double nWidth)
9041 - {
9042 - mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLWID ) ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nWidth ) ) );
9043 - }
9044 -
9045 -SfxItemSet*
9046 -ScVbaCellRangeAccess::GetDataSet( ScCellRangeObj* pRangeObj )
9047 -{
9048 - SfxItemSet* pDataSet = pRangeObj ? pRangeObj->GetCurrentDataSet( true ) : NULL ;
9049 - return pDataSet;
9050 -
9051 -}
9052 -
9053 -} // openoffice
9054 -} //org
9055 --- sc/source/ui/vba/vbahelper.hxx.old 2009-04-02 10:45:35.000000000 +0000
9056 +++ sc/source/ui/vba/vbahelper.hxx 1970-01-01 00:00:00.000000000 +0000
9057 @@ -1,352 +0,0 @@
9058 -/*************************************************************************
9059 - *
9060 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
9061 - *
9062 - * Copyright 2008 by Sun Microsystems, Inc.
9063 - *
9064 - * OpenOffice.org - a multi-platform office productivity suite
9065 - *
9066 - * $RCSfile: vbahelper.hxx,v $
9067 - * $Revision: 1.5.32.1 $
9068 - *
9069 - * This file is part of OpenOffice.org.
9070 - *
9071 - * OpenOffice.org is free software: you can redistribute it and/or modify
9072 - * it under the terms of the GNU Lesser General Public License version 3
9073 - * only, as published by the Free Software Foundation.
9074 - *
9075 - * OpenOffice.org is distributed in the hope that it will be useful,
9076 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
9077 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
9078 - * GNU Lesser General Public License version 3 for more details
9079 - * (a copy is included in the LICENSE file that accompanied this code).
9080 - *
9081 - * You should have received a copy of the GNU Lesser General Public License
9082 - * version 3 along with OpenOffice.org. If not, see
9083 - * <http://www.openoffice.org/license.html>
9084 - * for a copy of the LGPLv3 License.
9085 - *
9086 - ************************************************************************/
9087 -#ifndef SC_VBA_HELPER_HXX
9088 -#define SC_VBA_HELPER_HXX
9089 -
9090 -#include <com/sun/star/drawing/XShape.hpp>
9091 -#include <com/sun/star/beans/XIntrospectionAccess.hpp>
9092 -#include <com/sun/star/script/BasicErrorException.hpp>
9093 -#include <com/sun/star/script/XTypeConverter.hpp>
9094 -#include <com/sun/star/lang/IllegalArgumentException.hpp>
9095 -#include <com/sun/star/awt/XControl.hpp>
9096 -#include <com/sun/star/awt/XDevice.hpp>
9097 -#include <basic/sberrors.hxx>
9098 -#include <cppuhelper/implbase1.hxx>
9099 -#include <com/sun/star/frame/XModel.hpp>
9100 -#include <docsh.hxx>
9101 -#include <sfx2/dispatch.hxx>
9102 -#include <ooo/vba/msforms/XShape.hpp>
9103 -#include "cellsuno.hxx"
9104 -
9105 -namespace css = ::com::sun::star;
9106 -
9107 -namespace ooo
9108 -{
9109 - namespace vba
9110 - {
9111 - template < class T >
9112 - css::uno::Reference< T > getXSomethingFromArgs( css::uno::Sequence< css::uno::Any > const & args, sal_Int32 nPos, bool bCanBeNull = true ) throw (css::lang::IllegalArgumentException)
9113 - {
9114 - if ( args.getLength() < ( nPos + 1) )
9115 - throw css::lang::IllegalArgumentException();
9116 - css::uno::Reference< T > aSomething( args[ nPos ], css::uno::UNO_QUERY );
9117 - if ( !bCanBeNull && !aSomething.is() )
9118 - throw css::lang::IllegalArgumentException();
9119 - return aSomething;
9120 - }
9121 - css::uno::Reference< css::beans::XIntrospectionAccess > getIntrospectionAccess( const css::uno::Any& aObject ) throw (css::uno::RuntimeException);
9122 - css::uno::Reference< css::script::XTypeConverter > getTypeConverter( const css::uno::Reference< css::uno::XComponentContext >& xContext ) throw (css::uno::RuntimeException);
9123 -
9124 - void dispatchRequests (css::uno::Reference< css::frame::XModel>& xModel,rtl::OUString & aUrl) ;
9125 - void dispatchRequests (css::uno::Reference< css::frame::XModel>& xModel,rtl::OUString & aUrl, css::uno::Sequence< css::beans::PropertyValue >& sProps ) ;
9126 - void dispatchExecute(css::uno::Reference< css::frame::XModel>& xModel, USHORT nSlot, SfxCallMode nCall = SFX_CALLMODE_SYNCHRON );
9127 - void implnCopy();
9128 - void implnPaste();
9129 - void implnCut();
9130 - void implnPasteSpecial(sal_uInt16 nFlags,sal_uInt16 nFunction,sal_Bool bSkipEmpty, sal_Bool bTranspose);
9131 - css::uno::Reference< css::frame::XModel >
9132 - getCurrentDocument() throw (css::uno::RuntimeException);
9133 - ScTabViewShell* getBestViewShell( css::uno::Reference< css::frame::XModel>& xModel ) ;
9134 - ScDocShell* getDocShell( css::uno::Reference< css::frame::XModel>& xModel ) ;
9135 - ScTabViewShell* getCurrentBestViewShell();
9136 - SfxViewFrame* getCurrentViewFrame();
9137 - sal_Int32 OORGBToXLRGB( sal_Int32 );
9138 - sal_Int32 XLRGBToOORGB( sal_Int32 );
9139 - css::uno::Any OORGBToXLRGB( const css::uno::Any& );
9140 - css::uno::Any XLRGBToOORGB( const css::uno::Any& );
9141 - // provide a NULL object that can be passed as variant so that
9142 - // the object when passed to IsNull will return true. aNULL
9143 - // contains an empty object reference
9144 - const css::uno::Any& aNULL();
9145 - 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 );
9146 - void PrintPreviewHelper( const css::uno::Any& EnableChanges, css::uno::Reference< css::frame::XModel >& xModel );
9147 -
9148 - rtl::OUString getAnyAsString( const css::uno::Any& pvargItem ) throw ( css::uno::RuntimeException );
9149 - rtl::OUString VBAToRegexp(const rtl::OUString &rIn, bool bForLike = false); // needs to be in an uno service ( already this code is duplicated in basic )
9150 - double getPixelTo100thMillimeterConversionFactor( css::uno::Reference< css::awt::XDevice >& xDevice, sal_Bool bVertical);
9151 - double PointsToPixels( css::uno::Reference< css::awt::XDevice >& xDevice, double fPoints, sal_Bool bVertical);
9152 - double PixelsToPoints( css::uno::Reference< css::awt::XDevice >& xDevice, double fPoints, sal_Bool bVertical);
9153 -
9154 -
9155 -class ScVbaCellRangeAccess
9156 -{
9157 -public:
9158 - static SfxItemSet* GetDataSet( ScCellRangeObj* pRangeObj );
9159 -};
9160 -
9161 -class Millimeter
9162 -{
9163 -//Factor to translate between points and hundredths of millimeters:
9164 -private:
9165 - static const double factor;
9166 -
9167 - double m_nMillimeter;
9168 -
9169 -public:
9170 - Millimeter():m_nMillimeter(0) {}
9171 -
9172 - Millimeter(double mm):m_nMillimeter(mm) {}
9173 -
9174 - void set(double mm) { m_nMillimeter = mm; }
9175 - void setInPoints(double points)
9176 - {
9177 - m_nMillimeter = points * 0.352777778;
9178 - // 25.4mm / 72
9179 - }
9180 -
9181 - void setInHundredthsOfOneMillimeter(double hmm)
9182 - {
9183 - m_nMillimeter = hmm / 100;
9184 - }
9185 -
9186 - double get()
9187 - {
9188 - return m_nMillimeter;
9189 - }
9190 - double getInHundredthsOfOneMillimeter()
9191 - {
9192 - return m_nMillimeter * 100;
9193 - }
9194 - double getInPoints()
9195 - {
9196 - return m_nMillimeter * 2.834645669; // 72 / 25.4mm
9197 - }
9198 -
9199 - static sal_Int32 getInHundredthsOfOneMillimeter(double points)
9200 - {
9201 - sal_Int32 mm = static_cast<sal_Int32>(points * factor);
9202 - return mm;
9203 - }
9204 -
9205 - static double getInPoints(int _hmm)
9206 - {
9207 - double points = double( static_cast<double>(_hmm) / factor);
9208 - return points;
9209 - }
9210 -};
9211 -
9212 -class AbstractGeometryAttributes // probably should replace the ShapeHelper below
9213 -{
9214 -public:
9215 - virtual ~AbstractGeometryAttributes() {}
9216 - virtual double getLeft() = 0;
9217 - virtual void setLeft( double ) = 0;
9218 - virtual double getTop() = 0;
9219 - virtual void setTop( double ) = 0;
9220 - virtual double getHeight() = 0;
9221 - virtual void setHeight( double ) = 0;
9222 - virtual double getWidth() = 0;
9223 - virtual void setWidth( double ) = 0;
9224 -};
9225 -
9226 -class ConcreteXShapeGeometryAttributes : public AbstractGeometryAttributes
9227 -{
9228 -public:
9229 - css::uno::Reference< ooo::vba::msforms::XShape > m_xShape;
9230 - ConcreteXShapeGeometryAttributes( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape );
9231 - virtual double getLeft()
9232 - {
9233 - return m_xShape->getLeft();
9234 - }
9235 - virtual void setLeft( double nLeft )
9236 - {
9237 - m_xShape->setLeft( nLeft );
9238 - }
9239 - virtual double getTop()
9240 - {
9241 - return m_xShape->getTop();
9242 - }
9243 - virtual void setTop( double nTop )
9244 - {
9245 - m_xShape->setTop( nTop );
9246 - }
9247 -
9248 - virtual double getHeight()
9249 - {
9250 - return m_xShape->getHeight();
9251 - }
9252 - virtual void setHeight( double nHeight )
9253 - {
9254 - m_xShape->setHeight( nHeight );
9255 - }
9256 - virtual double getWidth()
9257 - {
9258 - return m_xShape->getWidth();
9259 - }
9260 - virtual void setWidth( double nWidth)
9261 - {
9262 - m_xShape->setHeight( nWidth );
9263 - }
9264 -
9265 -
9266 -};
9267 -#define VBA_LEFT "PositionX"
9268 -#define VBA_TOP "PositionY"
9269 -class UserFormGeometryHelper : public AbstractGeometryAttributes
9270 -{
9271 -
9272 - css::uno::Reference< css::beans::XPropertySet > mxModel;
9273 -public:
9274 - UserFormGeometryHelper( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::awt::XControl >& xControl );
9275 - virtual double getLeft();
9276 - virtual void setLeft( double nLeft );
9277 - virtual double getTop();
9278 - virtual void setTop( double nTop );
9279 - virtual double getHeight();
9280 - virtual void setHeight( double nHeight );
9281 - virtual double getWidth();
9282 - virtual void setWidth( double nWidth);
9283 -};
9284 -
9285 -class ShapeHelper
9286 -{
9287 -protected:
9288 - css::uno::Reference< css::drawing::XShape > xShape;
9289 -public:
9290 - ShapeHelper( const css::uno::Reference< css::drawing::XShape >& _xShape) throw (css::script::BasicErrorException ) : xShape( _xShape )
9291 - {
9292 - if( !xShape.is() )
9293 - throw css::uno::RuntimeException( rtl::OUString::createFromAscii("No valid shape for helper"), css::uno::Reference< css::uno::XInterface >() );
9294 - }
9295 -
9296 - double getHeight()
9297 - {
9298 - return Millimeter::getInPoints(xShape->getSize().Height);
9299 - }
9300 -
9301 -
9302 - void setHeight(double _fheight) throw ( css::script::BasicErrorException )
9303 - {
9304 - try
9305 - {
9306 - css::awt::Size aSize = xShape->getSize();
9307 - aSize.Height = Millimeter::getInHundredthsOfOneMillimeter(_fheight);
9308 - xShape->setSize(aSize);
9309 - }
9310 - catch ( css::uno::Exception& /*e*/)
9311 - {
9312 - throw css::script::BasicErrorException( rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() );
9313 - }
9314 - }
9315 -
9316 -
9317 - double getWidth()
9318 - {
9319 - return Millimeter::getInPoints(xShape->getSize().Width);
9320 - }
9321 -
9322 - void setWidth(double _fWidth) throw ( css::script::BasicErrorException )
9323 - {
9324 - try
9325 - {
9326 - css::awt::Size aSize = xShape->getSize();
9327 - aSize.Width = Millimeter::getInHundredthsOfOneMillimeter(_fWidth);
9328 - xShape->setSize(aSize);
9329 - }
9330 - catch (css::uno::Exception& /*e*/)
9331 - {
9332 - throw css::script::BasicErrorException( rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() );
9333 - }
9334 - }
9335 -
9336 -
9337 - double getLeft()
9338 - {
9339 - return Millimeter::getInPoints(xShape->getPosition().X);
9340 - }
9341 -
9342 -
9343 - void setLeft(double _fLeft)
9344 - {
9345 - css::awt::Point aPoint = xShape->getPosition();
9346 - aPoint.X = Millimeter::getInHundredthsOfOneMillimeter(_fLeft);
9347 - xShape->setPosition(aPoint);
9348 - }
9349 -
9350 -
9351 - double getTop()
9352 - {
9353 - return Millimeter::getInPoints(xShape->getPosition().Y);
9354 - }
9355 -
9356 -
9357 - void setTop(double _fTop)
9358 - {
9359 - css::awt::Point aPoint = xShape->getPosition();
9360 - aPoint.Y = Millimeter::getInHundredthsOfOneMillimeter(_fTop);
9361 - xShape->setPosition(aPoint);
9362 - }
9363 -
9364 -};
9365 -
9366 -class ContainerUtilities
9367 -{
9368 -
9369 -public:
9370 - static rtl::OUString getUniqueName( const css::uno::Sequence< ::rtl::OUString >& _slist, const rtl::OUString& _sElementName, const ::rtl::OUString& _sSuffixSeparator);
9371 - static rtl::OUString getUniqueName( const css::uno::Sequence< rtl::OUString >& _slist, const rtl::OUString _sElementName, const rtl::OUString& _sSuffixSeparator, sal_Int32 _nStartSuffix );
9372 -
9373 - static sal_Int32 FieldInList( const css::uno::Sequence< rtl::OUString >& SearchList, const rtl::OUString& SearchString );
9374 -};
9375 -
9376 -// really just a a place holder to ease the porting pain
9377 -class DebugHelper
9378 -{
9379 -public:
9380 - static void exception( const rtl::OUString& DetailedMessage, const css::uno::Exception& ex, int err, const rtl::OUString& /*additionalArgument*/ ) throw( css::script::BasicErrorException )
9381 - {
9382 - // #TODO #FIXME ( do we want to support additionalArg here )
9383 - throw css::script::BasicErrorException( DetailedMessage.concat( rtl::OUString::createFromAscii(" ") ).concat( ex.Message ), css::uno::Reference< css::uno::XInterface >(), err, rtl::OUString() );
9384 - }
9385 -
9386 - static void exception( int err, const rtl::OUString& additionalArgument ) throw( css::script::BasicErrorException )
9387 - {
9388 - exception( rtl::OUString(), css::uno::Exception(), err, additionalArgument );
9389 - }
9390 -
9391 - static void exception( css::uno::Exception& ex ) throw( css::script::BasicErrorException )
9392 - {
9393 - exception( rtl::OUString(), ex, SbERR_INTERNAL_ERROR, rtl::OUString() );
9394 - }
9395 -};
9396 - } // openoffice
9397 -} // org
9398 -
9399 -namespace ov = ooo::vba;
9400 -
9401 -#ifdef DEBUG
9402 -# define SC_VBA_FIXME(a) OSL_TRACE( a )
9403 -# define SC_VBA_STUB() SC_VBA_FIXME(( "%s - stubbed\n", __FUNCTION__ ))
9404 -#else
9405 -# define SC_VBA_FIXME(a)
9406 -# define SC_VBA_STUB()
9407 -#endif
9408 -
9409 -#endif
9410 --- sc/source/ui/vba/vbahelperinterface.hxx.old 2009-04-02 10:45:35.000000000 +0000
9411 +++ sc/source/ui/vba/vbahelperinterface.hxx 1970-01-01 00:00:00.000000000 +0000
9412 @@ -1,116 +0,0 @@
9413 -/*************************************************************************
9414 - *
9415 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
9416 - *
9417 - * Copyright 2008 by Sun Microsystems, Inc.
9418 - *
9419 - * OpenOffice.org - a multi-platform office productivity suite
9420 - *
9421 - * $RCSfile: vbahelperinterface.hxx,v $
9422 - * $Revision: 1.3 $
9423 - *
9424 - * This file is part of OpenOffice.org.
9425 - *
9426 - * OpenOffice.org is free software: you can redistribute it and/or modify
9427 - * it under the terms of the GNU Lesser General Public License version 3
9428 - * only, as published by the Free Software Foundation.
9429 - *
9430 - * OpenOffice.org is distributed in the hope that it will be useful,
9431 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
9432 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
9433 - * GNU Lesser General Public License version 3 for more details
9434 - * (a copy is included in the LICENSE file that accompanied this code).
9435 - *
9436 - * You should have received a copy of the GNU Lesser General Public License
9437 - * version 3 along with OpenOffice.org. If not, see
9438 - * <http://www.openoffice.org/license.html>
9439 - * for a copy of the LGPLv3 License.
9440 - *
9441 - ************************************************************************/
9442 -#ifndef SC_VBA_HELPERINTERFACE_HXX
9443 -#define SC_VBA_HELPERINTERFACE_HXX
9444 -
9445 -#include <cppuhelper/implbase1.hxx>
9446 -#include <ooo/vba/XHelperInterface.hpp>
9447 -#include "vbahelper.hxx"
9448 -#include "vbaglobals.hxx"
9449 -
9450 -// use this class when you have an a object like
9451 -// interface XAnInterface which contains XHelperInterface in its inheritance hierarchy
9452 -// interface XAnInterface
9453 -// {
9454 -// interface XHelperInterface;
9455 -// [attribute, string] name;
9456 -// }
9457 -// or
9458 -// interface XAnInterface : XHelperInterface;
9459 -// {
9460 -// [attribute, string] name;
9461 -// }
9462 -//
9463 -// then this class can provide a default implementation of XHelperInterface,
9464 -// you can use it like this
9465 -// typedef InheritedHelperInterfaceImpl< XAnInterface > > AnInterfaceImpl_BASE;
9466 -// class AnInterfaceImpl : public AnInterfaceImpl_BASE
9467 -// {
9468 -// public:
9469 -// AnInterface( const Reference< HelperInterface >& xParent ) : AnInterfaceImpl_BASE( xParent ) {}
9470 -// // implement XAnInterface methods only, no need to implement the XHelperInterface
9471 -// // methods
9472 -// virtual void setName( const OUString& );
9473 -// virtual OUString getName();
9474 -// }
9475 -//
9476 -const ::rtl::OUString sHelperServiceName( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.HelperServiceBase" ) );
9477 -
9478 -template< typename Ifc1 >
9479 -class InheritedHelperInterfaceImpl : public Ifc1
9480 -{
9481 -protected:
9482 - css::uno::WeakReference< ov::XHelperInterface > mxParent;
9483 - css::uno::Reference< css::uno::XComponentContext > mxContext;
9484 -public:
9485 - InheritedHelperInterfaceImpl() {}
9486 - InheritedHelperInterfaceImpl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext ) : mxParent( xParent ), mxContext( xContext ) {}
9487 - virtual rtl::OUString& getServiceImplName() = 0;
9488 - virtual css::uno::Sequence<rtl::OUString> getServiceNames() = 0;
9489 -
9490 - // XHelperInterface Methods
9491 - virtual ::sal_Int32 SAL_CALL getCreator() throw (css::script::BasicErrorException, css::uno::RuntimeException)
9492 - {
9493 - return 0x53756E4F;
9494 - }
9495 - virtual css::uno::Reference< ov::XHelperInterface > SAL_CALL getParent( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { return mxParent; }
9496 -
9497 - virtual css::uno::Any SAL_CALL Application( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { return css::uno::makeAny( ScVbaGlobals::getGlobalsImpl( mxContext )->getApplication() ); }
9498 -
9499 -
9500 - // XServiceInfo Methods
9501 - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException) { return getServiceImplName(); }
9502 - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (css::uno::RuntimeException)
9503 - {
9504 - css::uno::Sequence< rtl::OUString > sServices = getSupportedServiceNames();
9505 - const rtl::OUString* pStart = sServices.getConstArray();
9506 - const rtl::OUString* pEnd = pStart + sServices.getLength();
9507 - for ( ; pStart != pEnd ; ++pStart )
9508 - if ( (*pStart).equals( ServiceName ) )
9509 - return sal_True;
9510 - return sal_False;
9511 - }
9512 - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException)
9513 - {
9514 - css::uno::Sequence< rtl::OUString > aNames = getServiceNames();;
9515 - return aNames;
9516 - }
9517 - };
9518 -
9519 -template< typename Ifc1 >
9520 -class InheritedHelperInterfaceImpl1 : public InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper1< Ifc1 > >
9521 -
9522 -{
9523 -typedef InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper1< Ifc1 > > Base;
9524 -public:
9525 - InheritedHelperInterfaceImpl1< Ifc1 > ( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext ) : Base( xParent, xContext ) {}
9526 -
9527 -};
9528 -#endif
9529 --- sc/source/ui/vba/vbahyperlink.cxx.old 2009-04-02 10:45:35.000000000 +0000
9530 +++ sc/source/ui/vba/vbahyperlink.cxx 2009-04-06 16:42:01.000000000 +0000
9531 @@ -32,7 +32,7 @@
9532 * MA 02111-1307 USA
9533 *
9534 ************************************************************************/
9535 -#include "helperdecl.hxx"
9536 +#include <vbahelper/helperdecl.hxx>
9537 #include "vbahyperlink.hxx"
9538 #include <com/sun/star/container/XIndexAccess.hpp>
9539 #include <com/sun/star/text/XTextFieldsSupplier.hpp>
9540 --- sc/source/ui/vba/vbahyperlink.hxx.old 2009-04-02 10:45:35.000000000 +0000
9541 +++ sc/source/ui/vba/vbahyperlink.hxx 2009-04-06 16:42:01.000000000 +0000
9542 @@ -40,7 +40,7 @@
9543 #include <com/sun/star/beans/XPropertySet.hpp>
9544 #include <ooo/vba/excel/XRange.hpp>
9546 -#include "vbahelperinterface.hxx"
9547 +#include <vbahelper/vbahelperinterface.hxx>
9549 typedef InheritedHelperInterfaceImpl1< ov::excel::XHyperlink > HyperlinkImpl_BASE;
9551 --- sc/source/ui/vba/vbaimage.cxx.old 2009-04-02 10:45:35.000000000 +0000
9552 +++ sc/source/ui/vba/vbaimage.cxx 1970-01-01 00:00:00.000000000 +0000
9553 @@ -1,59 +0,0 @@
9554 -/*************************************************************************
9555 - *
9556 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
9557 - *
9558 - * Copyright 2008 by Sun Microsystems, Inc.
9559 - *
9560 - * OpenOffice.org - a multi-platform office productivity suite
9561 - *
9562 - * $RCSfile$
9563 - * $Revision$
9564 - *
9565 - * This file is part of OpenOffice.org.
9566 - *
9567 - * OpenOffice.org is free software: you can redistribute it and/or modify
9568 - * it under the terms of the GNU Lesser General Public License version 3
9569 - * only, as published by the Free Software Foundation.
9570 - *
9571 - * OpenOffice.org is distributed in the hope that it will be useful,
9572 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
9573 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
9574 - * GNU Lesser General Public License version 3 for more details
9575 - * (a copy is included in the LICENSE file that accompanied this code).
9576 - *
9577 - * You should have received a copy of the GNU Lesser General Public License
9578 - * version 3 along with OpenOffice.org. If not, see
9579 - * <http://www.openoffice.org/license.html>
9580 - * for a copy of the LGPLv3 License.
9581 - *
9582 - ************************************************************************/
9583 -#include "vbaimage.hxx"
9584 -#include <vector>
9585 -
9586 -using namespace com::sun::star;
9587 -using namespace ooo::vba;
9588 -
9589 -
9590 -const static rtl::OUString LABEL( RTL_CONSTASCII_USTRINGPARAM("Label") );
9591 -ScVbaImage::ScVbaImage( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : ImageImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
9592 -{
9593 -}
9594 -
9595 -rtl::OUString&
9596 -ScVbaImage::getServiceImplName()
9597 -{
9598 - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaImage") );
9599 - return sImplName;
9600 -}
9601 -
9602 -uno::Sequence< rtl::OUString >
9603 -ScVbaImage::getServiceNames()
9604 -{
9605 - static uno::Sequence< rtl::OUString > aServiceNames;
9606 - if ( aServiceNames.getLength() == 0 )
9607 - {
9608 - aServiceNames.realloc( 1 );
9609 - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.Image" ) );
9610 - }
9611 - return aServiceNames;
9612 -}
9613 --- sc/source/ui/vba/vbaimage.hxx.old 2009-04-02 10:45:35.000000000 +0000
9614 +++ sc/source/ui/vba/vbaimage.hxx 1970-01-01 00:00:00.000000000 +0000
9615 @@ -1,48 +0,0 @@
9616 -/*************************************************************************
9617 - *
9618 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
9619 - *
9620 - * Copyright 2008 by Sun Microsystems, Inc.
9621 - *
9622 - * OpenOffice.org - a multi-platform office productivity suite
9623 - *
9624 - * $RCSfile$
9625 - * $Revision$
9626 - *
9627 - * This file is part of OpenOffice.org.
9628 - *
9629 - * OpenOffice.org is free software: you can redistribute it and/or modify
9630 - * it under the terms of the GNU Lesser General Public License version 3
9631 - * only, as published by the Free Software Foundation.
9632 - *
9633 - * OpenOffice.org is distributed in the hope that it will be useful,
9634 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
9635 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
9636 - * GNU Lesser General Public License version 3 for more details
9637 - * (a copy is included in the LICENSE file that accompanied this code).
9638 - *
9639 - * You should have received a copy of the GNU Lesser General Public License
9640 - * version 3 along with OpenOffice.org. If not, see
9641 - * <http://www.openoffice.org/license.html>
9642 - * for a copy of the LGPLv3 License.
9643 - *
9644 - ************************************************************************/
9645 -#ifndef SC_VBA_IMAGE_HXX
9646 -#define SC_VBA_IMAGE_HXX
9647 -#include <cppuhelper/implbase1.hxx>
9648 -#include <ooo/vba/msforms/XImage.hpp>
9649 -
9650 -#include "vbacontrol.hxx"
9651 -#include "vbahelper.hxx"
9652 -
9653 -typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XImage > ImageImpl_BASE;
9654 -
9655 -class ScVbaImage : public ImageImpl_BASE
9656 -{
9657 -public:
9658 - ScVbaImage( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
9659 - //XHelperInterface
9660 - virtual rtl::OUString& getServiceImplName();
9661 - virtual css::uno::Sequence<rtl::OUString> getServiceNames();
9662 -};
9663 -#endif //SC_VBA_IMAGE_HXX
9664 --- sc/source/ui/vba/vbainterior.hxx.old 2009-04-02 10:45:35.000000000 +0000
9665 +++ sc/source/ui/vba/vbainterior.hxx 2009-04-06 16:42:01.000000000 +0000
9666 @@ -34,9 +34,10 @@
9667 #include <com/sun/star/uno/XComponentContext.hpp>
9668 #include <com/sun/star/beans/XPropertySet.hpp>
9669 #include <com/sun/star/container/XIndexAccess.hpp>
9670 +#include <com/sun/star/container/XNameContainer.hpp>
9672 #include <com/sun/star/script/XInvocation.hpp>
9673 -#include "vbahelperinterface.hxx"
9674 +#include <vbahelper/vbahelperinterface.hxx>
9676 class ScDocument;
9678 --- sc/source/ui/vba/vbalabel.cxx.old 2009-04-02 10:45:35.000000000 +0000
9679 +++ sc/source/ui/vba/vbalabel.cxx 1970-01-01 00:00:00.000000000 +0000
9680 @@ -1,88 +0,0 @@
9681 -/*************************************************************************
9682 - *
9683 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
9684 - *
9685 - * Copyright 2008 by Sun Microsystems, Inc.
9686 - *
9687 - * OpenOffice.org - a multi-platform office productivity suite
9688 - *
9689 - * $RCSfile: vbalabel.cxx,v $
9690 - * $Revision: 1.3 $
9691 - *
9692 - * This file is part of OpenOffice.org.
9693 - *
9694 - * OpenOffice.org is free software: you can redistribute it and/or modify
9695 - * it under the terms of the GNU Lesser General Public License version 3
9696 - * only, as published by the Free Software Foundation.
9697 - *
9698 - * OpenOffice.org is distributed in the hope that it will be useful,
9699 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
9700 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
9701 - * GNU Lesser General Public License version 3 for more details
9702 - * (a copy is included in the LICENSE file that accompanied this code).
9703 - *
9704 - * You should have received a copy of the GNU Lesser General Public License
9705 - * version 3 along with OpenOffice.org. If not, see
9706 - * <http://www.openoffice.org/license.html>
9707 - * for a copy of the LGPLv3 License.
9708 - *
9709 - ************************************************************************/
9710 -#include "vbalabel.hxx"
9711 -#include <vector>
9712 -
9713 -using namespace com::sun::star;
9714 -using namespace ooo::vba;
9715 -
9716 -
9717 -const static rtl::OUString LABEL( RTL_CONSTASCII_USTRINGPARAM("Label") );
9718 -ScVbaLabel::ScVbaLabel( const css::uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper ) : LabelImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
9719 -{
9720 -}
9721 -
9722 -// Attributes
9723 -rtl::OUString SAL_CALL
9724 -ScVbaLabel::getCaption() throw (css::uno::RuntimeException)
9725 -{
9726 - rtl::OUString Label;
9727 - m_xProps->getPropertyValue( LABEL ) >>= Label;
9728 - return Label;
9729 -}
9730 -
9731 -void SAL_CALL
9732 -ScVbaLabel::setCaption( const rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException)
9733 -{
9734 - m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) );
9735 -}
9736 -uno::Any SAL_CALL
9737 -ScVbaLabel::getValue() throw (css::uno::RuntimeException)
9738 -{
9739 - return uno::makeAny( getCaption() );
9740 -}
9741 -
9742 -void SAL_CALL
9743 -ScVbaLabel::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException)
9744 -{
9745 - rtl::OUString sCaption;
9746 - _value >>= sCaption;
9747 - setCaption( sCaption );
9748 -}
9749 -
9750 -
9751 -rtl::OUString&
9752 -ScVbaLabel::getServiceImplName()
9753 -{
9754 - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaLabel") );
9755 - return sImplName;
9756 -}
9757 -
9758 -uno::Sequence< rtl::OUString >
9759 -ScVbaLabel::getServiceNames()
9760 -{
9761 - static uno::Sequence< rtl::OUString > aServiceNames;
9762 - if ( aServiceNames.getLength() == 0 )
9763 - {
9764 - aServiceNames.realloc( 1 );
9765 - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.Label" ) );
9766 - }
9767 - return aServiceNames;
9768 -}
9769 --- sc/source/ui/vba/vbalabel.hxx.old 2009-04-02 10:45:35.000000000 +0000
9770 +++ sc/source/ui/vba/vbalabel.hxx 1970-01-01 00:00:00.000000000 +0000
9771 @@ -1,56 +0,0 @@
9772 -/*************************************************************************
9773 - *
9774 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
9775 - *
9776 - * Copyright 2008 by Sun Microsystems, Inc.
9777 - *
9778 - * OpenOffice.org - a multi-platform office productivity suite
9779 - *
9780 - * $RCSfile: vbalabel.hxx,v $
9781 - * $Revision: 1.3 $
9782 - *
9783 - * This file is part of OpenOffice.org.
9784 - *
9785 - * OpenOffice.org is free software: you can redistribute it and/or modify
9786 - * it under the terms of the GNU Lesser General Public License version 3
9787 - * only, as published by the Free Software Foundation.
9788 - *
9789 - * OpenOffice.org is distributed in the hope that it will be useful,
9790 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
9791 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
9792 - * GNU Lesser General Public License version 3 for more details
9793 - * (a copy is included in the LICENSE file that accompanied this code).
9794 - *
9795 - * You should have received a copy of the GNU Lesser General Public License
9796 - * version 3 along with OpenOffice.org. If not, see
9797 - * <http://www.openoffice.org/license.html>
9798 - * for a copy of the LGPLv3 License.
9799 - *
9800 - ************************************************************************/
9801 -#ifndef SC_VBA_LABEL_HXX
9802 -#define SC_VBA_LABEL_HXX
9803 -#include <cppuhelper/implbase1.hxx>
9804 -#include <ooo/vba/msforms/XLabel.hpp>
9805 -
9806 -#include "vbacontrol.hxx"
9807 -#include "vbahelper.hxx"
9808 -#include <cppuhelper/implbase2.hxx>
9809 -
9810 -typedef cppu::ImplInheritanceHelper2< ScVbaControl, ov::msforms::XLabel, css::script::XDefaultProperty > LabelImpl_BASE;
9811 -
9812 -class ScVbaLabel : public LabelImpl_BASE
9813 -{
9814 -public:
9815 - ScVbaLabel( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
9816 - // Attributes
9817 - virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
9818 - virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
9819 - virtual rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
9820 - virtual void SAL_CALL setCaption( const rtl::OUString& _caption ) throw (css::uno::RuntimeException);
9821 - //XHelperInterface
9822 - virtual rtl::OUString& getServiceImplName();
9823 - virtual css::uno::Sequence<rtl::OUString> getServiceNames();
9824 - // XDefaultProperty
9825 - rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
9826 -};
9827 -#endif //SC_VBA_LABEL_HXX
9828 --- sc/source/ui/vba/vbalineformat.hxx.old 2009-04-02 10:45:35.000000000 +0000
9829 +++ sc/source/ui/vba/vbalineformat.hxx 2009-04-06 16:42:01.000000000 +0000
9830 @@ -33,7 +33,7 @@
9831 #include <com/sun/star/drawing/XShape.hpp>
9832 #include <com/sun/star/beans/XPropertySet.hpp>
9833 #include <ooo/vba/msforms/XLineFormat.hpp>
9834 -#include "vbahelperinterface.hxx"
9835 +#include <vbahelper/vbahelperinterface.hxx>
9837 typedef InheritedHelperInterfaceImpl1< ov::msforms::XLineFormat > ScVbaLineFormat_BASE;
9839 --- sc/source/ui/vba/vbalistbox.cxx.old 2009-04-02 10:45:35.000000000 +0000
9840 +++ sc/source/ui/vba/vbalistbox.cxx 1970-01-01 00:00:00.000000000 +0000
9841 @@ -1,289 +0,0 @@
9842 -/*************************************************************************
9843 - *
9844 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
9845 - *
9846 - * Copyright 2008 by Sun Microsystems, Inc.
9847 - *
9848 - * OpenOffice.org - a multi-platform office productivity suite
9849 - *
9850 - * $RCSfile: vbalistbox.cxx,v $
9851 - * $Revision: 1.4 $
9852 - *
9853 - * This file is part of OpenOffice.org.
9854 - *
9855 - * OpenOffice.org is free software: you can redistribute it and/or modify
9856 - * it under the terms of the GNU Lesser General Public License version 3
9857 - * only, as published by the Free Software Foundation.
9858 - *
9859 - * OpenOffice.org is distributed in the hope that it will be useful,
9860 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
9861 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
9862 - * GNU Lesser General Public License version 3 for more details
9863 - * (a copy is included in the LICENSE file that accompanied this code).
9864 - *
9865 - * You should have received a copy of the GNU Lesser General Public License
9866 - * version 3 along with OpenOffice.org. If not, see
9867 - * <http://www.openoffice.org/license.html>
9868 - * for a copy of the LGPLv3 License.
9869 - *
9870 - ************************************************************************/
9871 -#include <com/sun/star/form/validation/XValidatableFormComponent.hpp>
9872 -
9873 -#include "vbalistbox.hxx"
9874 -#include "vbapropvalue.hxx"
9875 -#include <vector>
9876 -#include <comphelper/anytostring.hxx>
9877 -#include <com/sun/star/script/ArrayWrapper.hpp>
9878 -
9879 -using namespace com::sun::star;
9880 -using namespace ooo::vba;
9881 -
9882 -const static rtl::OUString TEXT( RTL_CONSTASCII_USTRINGPARAM("Text") );
9883 -const static rtl::OUString SELECTEDITEMS( RTL_CONSTASCII_USTRINGPARAM("SelectedItems") );
9884 -const static rtl::OUString ITEMS( RTL_CONSTASCII_USTRINGPARAM("StringItemList") );
9885 -
9886 -
9887 -ScVbaListBox::ScVbaListBox( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< css::uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : ListBoxImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
9888 -{
9889 - mpListHelper.reset( new ListControlHelper( m_xProps ) );
9890 -}
9891 -
9892 -// Attributes
9893 -void SAL_CALL
9894 -ScVbaListBox::setListIndex( const uno::Any& _value ) throw (uno::RuntimeException)
9895 -{
9896 - sal_Int32 nIndex = 0;
9897 - _value >>= nIndex;
9898 - Selected( nIndex );
9899 -}
9900 -
9901 -uno::Any SAL_CALL
9902 -ScVbaListBox::getListIndex() throw (uno::RuntimeException)
9903 -{
9904 - uno::Sequence< sal_Int16 > sSelection;
9905 - m_xProps->getPropertyValue( SELECTEDITEMS ) >>= sSelection;
9906 - if ( sSelection.getLength() == 0 )
9907 - return uno::Any( sal_Int32( -1 ) );
9908 - return uno::Any( sSelection[ 0 ] );
9909 -}
9910 -
9911 -uno::Any SAL_CALL
9912 -ScVbaListBox::getValue() throw (uno::RuntimeException)
9913 -{
9914 - uno::Sequence< sal_Int16 > sSelection;
9915 - uno::Sequence< rtl::OUString > sItems;
9916 - m_xProps->getPropertyValue( SELECTEDITEMS ) >>= sSelection;
9917 - m_xProps->getPropertyValue( ITEMS ) >>= sItems;
9918 - if( getMultiSelect() )
9919 - throw uno::RuntimeException( rtl::OUString::createFromAscii(
9920 - "Attribute use invalid." ), uno::Reference< uno::XInterface >() );
9921 - uno::Any aRet;
9922 - if ( sSelection.getLength() )
9923 - aRet = uno::makeAny( sItems[ sSelection[ 0 ] ] );
9924 - return aRet;
9925 -}
9926 -
9927 -void SAL_CALL
9928 -ScVbaListBox::setValue( const uno::Any& _value ) throw (uno::RuntimeException)
9929 -{
9930 - if( getMultiSelect() )
9931 - {
9932 - throw uno::RuntimeException( rtl::OUString::createFromAscii(
9933 - "Attribute use invalid." ), uno::Reference< uno::XInterface >() );
9934 - }
9935 - rtl::OUString sValue = getAnyAsString( _value );
9936 - uno::Sequence< rtl::OUString > sList;
9937 - m_xProps->getPropertyValue( ITEMS ) >>= sList;
9938 - uno::Sequence< sal_Int16 > nList;
9939 - sal_Int16 nLength = static_cast<sal_Int16>( sList.getLength() );
9940 - sal_Int16 nValue = -1;
9941 - sal_Int16 i = 0;
9942 - for( i = 0; i < nLength; i++ )
9943 - {
9944 - if( sList[i].equals( sValue ) )
9945 - {
9946 - nValue = i;
9947 - break;
9948 - }
9949 - }
9950 - if( nValue == -1 )
9951 - throw uno::RuntimeException( rtl::OUString::createFromAscii(
9952 - "Attribute use invalid." ), uno::Reference< uno::XInterface >() );
9953 -
9954 - uno::Sequence< sal_Int16 > nSelectedIndices(1);
9955 - nSelectedIndices[ 0 ] = nValue;
9956 - m_xProps->setPropertyValue( SELECTEDITEMS, uno::makeAny( nSelectedIndices ) );
9957 - m_xProps->setPropertyValue( TEXT, uno::makeAny( sValue ) );
9958 -}
9959 -
9960 -::rtl::OUString SAL_CALL
9961 -ScVbaListBox::getText() throw (uno::RuntimeException)
9962 -{
9963 - rtl::OUString result;
9964 - getValue() >>= result;
9965 - return result;
9966 -}
9967 -
9968 -void SAL_CALL
9969 -ScVbaListBox::setText( const ::rtl::OUString& _text ) throw (uno::RuntimeException)
9970 -{
9971 - setValue( uno::makeAny( _text ) ); // seems the same
9972 -}
9973 -
9974 -sal_Bool SAL_CALL
9975 -ScVbaListBox::getMultiSelect() throw (css::uno::RuntimeException)
9976 -{
9977 - sal_Bool bMultiSelect = sal_False;
9978 - m_xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MultiSelection" ) ) ) >>= bMultiSelect;
9979 - return bMultiSelect;
9980 -}
9981 -
9982 -void SAL_CALL
9983 -ScVbaListBox::setMultiSelect( sal_Bool _multiselect ) throw (css::uno::RuntimeException)
9984 -{
9985 - m_xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MultiSelection" ) ), uno::makeAny( _multiselect ) );
9986 -}
9987 -
9988 -css::uno::Any SAL_CALL
9989 -ScVbaListBox::Selected( sal_Int32 index ) throw (css::uno::RuntimeException)
9990 -{
9991 - uno::Sequence< rtl::OUString > sList;
9992 - m_xProps->getPropertyValue( ITEMS ) >>= sList;
9993 - sal_Int16 nLength = static_cast< sal_Int16 >( sList.getLength() );
9994 - // no choice but to do a horror cast as internally
9995 - // the indices are but sal_Int16
9996 - sal_Int16 nIndex = static_cast< sal_Int16 >( index );
9997 - if( nIndex < 0 || nIndex >= nLength )
9998 - throw uno::RuntimeException( rtl::OUString::createFromAscii(
9999 - "Error Number." ), uno::Reference< uno::XInterface >() );
10000 - m_nIndex = nIndex;
10001 - return uno::makeAny( uno::Reference< XPropValue > ( new ScVbaPropValue( this ) ) );
10002 -}
10003 -
10004 -// Methods
10005 -void SAL_CALL
10006 -ScVbaListBox::AddItem( const uno::Any& pvargItem, const uno::Any& pvargIndex ) throw (uno::RuntimeException)
10007 -{
10008 - mpListHelper->AddItem( pvargItem, pvargIndex );
10009 - }
10010 -
10011 -void SAL_CALL
10012 -ScVbaListBox::removeItem( const uno::Any& index ) throw (uno::RuntimeException)
10013 -{
10014 - mpListHelper->removeItem( index );
10015 -}
10016 -
10017 -void SAL_CALL
10018 -ScVbaListBox::Clear( ) throw (uno::RuntimeException)
10019 -{
10020 - mpListHelper->Clear();
10021 -}
10022 -
10023 -// this is called when something like the following vba code is used
10024 -// to set the selected state of particular entries in the Listbox
10025 -// ListBox1.Selected( 3 ) = false
10026 -//PropListener
10027 -void
10028 -ScVbaListBox::setValueEvent( const uno::Any& value )
10029 -{
10030 - sal_Bool bValue = sal_False;
10031 - if( !(value >>= bValue) )
10032 - throw uno::RuntimeException( rtl::OUString::createFromAscii(
10033 - "Invalid type\n. need boolean." ), uno::Reference< uno::XInterface >() );
10034 - uno::Sequence< sal_Int16 > nList;
10035 - m_xProps->getPropertyValue( SELECTEDITEMS ) >>= nList;
10036 - sal_Int16 nLength = static_cast<sal_Int16>( nList.getLength() );
10037 - sal_Int16 nIndex = m_nIndex;
10038 - for( sal_Int16 i = 0; i < nLength; i++ )
10039 - {
10040 - if( nList[i] == nIndex )
10041 - {
10042 - if( bValue )
10043 - return;
10044 - else
10045 - {
10046 - for( ; i < nLength - 1; i++ )
10047 - {
10048 - nList[i] = nList[i + 1];
10049 - }
10050 - nList.realloc( nLength - 1 );
10051 - //m_xProps->setPropertyValue( sSourceName, uno::makeAny( nList ) );
10052 - m_xProps->setPropertyValue( SELECTEDITEMS, uno::makeAny( nList ) );
10053 - return;
10054 - }
10055 - }
10056 - }
10057 - if( bValue )
10058 - {
10059 - if( getMultiSelect() )
10060 - {
10061 - nList.realloc( nLength + 1 );
10062 - nList[nLength] = nIndex;
10063 - }
10064 - else
10065 - {
10066 - nList.realloc( 1 );
10067 - nList[0] = nIndex;
10068 - }
10069 - m_xProps->setPropertyValue( sSourceName, uno::makeAny( nList ) );
10070 - }
10071 -}
10072 -
10073 -// this is called when something like the following vba code is used
10074 -// to determine the selected state of particular entries in the Listbox
10075 -// msgbox ListBox1.Selected( 3 )
10076 -
10077 -css::uno::Any
10078 -ScVbaListBox::getValueEvent()
10079 -{
10080 - uno::Sequence< sal_Int16 > nList;
10081 - m_xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SelectedItems" ) ) ) >>= nList;
10082 - sal_Int32 nLength = nList.getLength();
10083 - sal_Int32 nIndex = m_nIndex;
10084 -
10085 - for( sal_Int32 i = 0; i < nLength; i++ )
10086 - {
10087 - if( nList[i] == nIndex )
10088 - return uno::makeAny( sal_True );
10089 - }
10090 -
10091 - return uno::makeAny( sal_False );
10092 -}
10093 -
10094 -void SAL_CALL
10095 -ScVbaListBox::setRowSource( const rtl::OUString& _rowsource ) throw (uno::RuntimeException)
10096 -{
10097 - ScVbaControl::setRowSource( _rowsource );
10098 - mpListHelper->setRowSource( _rowsource );
10099 -}
10100 -
10101 -sal_Int32 SAL_CALL
10102 -ScVbaListBox::getListCount() throw (uno::RuntimeException)
10103 -{
10104 - return mpListHelper->getListCount();
10105 -}
10106 -
10107 -uno::Any SAL_CALL
10108 -ScVbaListBox::List( const ::uno::Any& pvargIndex, const uno::Any& pvarColumn ) throw (uno::RuntimeException)
10109 -{
10110 - return mpListHelper->List( pvargIndex, pvarColumn );
10111 -}
10112 -
10113 -rtl::OUString&
10114 -ScVbaListBox::getServiceImplName()
10115 -{
10116 - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaListBox") );
10117 - return sImplName;
10118 -}
10119 -
10120 -uno::Sequence< rtl::OUString >
10121 -ScVbaListBox::getServiceNames()
10122 -{
10123 - static uno::Sequence< rtl::OUString > aServiceNames;
10124 - if ( aServiceNames.getLength() == 0 )
10125 - {
10126 - aServiceNames.realloc( 1 );
10127 - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.ScVbaListBox" ) );
10128 - }
10129 - return aServiceNames;
10130 -}
10131 --- sc/source/ui/vba/vbalistbox.hxx.old 2009-04-02 10:45:35.000000000 +0000
10132 +++ sc/source/ui/vba/vbalistbox.hxx 1970-01-01 00:00:00.000000000 +0000
10133 @@ -1,90 +0,0 @@
10134 -/*************************************************************************
10135 - *
10136 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
10137 - *
10138 - * Copyright 2008 by Sun Microsystems, Inc.
10139 - *
10140 - * OpenOffice.org - a multi-platform office productivity suite
10141 - *
10142 - * $RCSfile: vbalistbox.hxx,v $
10143 - * $Revision: 1.3 $
10144 - *
10145 - * This file is part of OpenOffice.org.
10146 - *
10147 - * OpenOffice.org is free software: you can redistribute it and/or modify
10148 - * it under the terms of the GNU Lesser General Public License version 3
10149 - * only, as published by the Free Software Foundation.
10150 - *
10151 - * OpenOffice.org is distributed in the hope that it will be useful,
10152 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
10153 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10154 - * GNU Lesser General Public License version 3 for more details
10155 - * (a copy is included in the LICENSE file that accompanied this code).
10156 - *
10157 - * You should have received a copy of the GNU Lesser General Public License
10158 - * version 3 along with OpenOffice.org. If not, see
10159 - * <http://www.openoffice.org/license.html>
10160 - * for a copy of the LGPLv3 License.
10161 - *
10162 - ************************************************************************/
10163 -#ifndef SC_VBA_LISTBOX_HXX
10164 -#define SC_VBA_LISTBOX_HXX
10165 -#include <cppuhelper/implbase2.hxx>
10166 -#include <com/sun/star/uno/XComponentContext.hpp>
10167 -#include <com/sun/star/script/XDefaultProperty.hpp>
10168 -#include <ooo/vba/msforms/XListBox.hpp>
10169 -#include <com/sun/star/beans/PropertyAttribute.hpp>
10170 -
10171 -#include "vbacontrol.hxx"
10172 -#include "vbapropvalue.hxx"
10173 -#include "vbalistcontrolhelper.hxx"
10174 -#include "vbahelper.hxx"
10175 -
10176 -typedef cppu::ImplInheritanceHelper2<ScVbaControl, ov::msforms::XListBox, css::script::XDefaultProperty > ListBoxImpl_BASE;
10177 -class ScVbaListBox : public ListBoxImpl_BASE
10178 - ,public PropListener
10179 -{
10180 - std::auto_ptr< ListControlHelper > mpListHelper;
10181 - rtl::OUString sSourceName;
10182 - rtl::OUString msDftPropName;
10183 -
10184 - sal_Int16 m_nIndex;
10185 -
10186 -public:
10187 - ScVbaListBox( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
10188 -
10189 - // Attributes
10190 - virtual css::uno::Any SAL_CALL getListIndex() throw (css::uno::RuntimeException);
10191 - virtual void SAL_CALL setListIndex( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
10192 - virtual ::sal_Int32 SAL_CALL getListCount() throw (css::uno::RuntimeException);
10193 - virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
10194 - virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
10195 - virtual rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException);
10196 - virtual void SAL_CALL setText( const ::rtl::OUString& _text ) throw (css::uno::RuntimeException);
10197 - virtual sal_Bool SAL_CALL getMultiSelect() throw (css::uno::RuntimeException);
10198 - virtual void SAL_CALL setMultiSelect( sal_Bool _multiselect ) throw (css::uno::RuntimeException);
10199 - virtual css::uno::Any SAL_CALL Selected( ::sal_Int32 index ) throw (css::uno::RuntimeException);
10200 -
10201 - // Methods
10202 - virtual void SAL_CALL AddItem( const css::uno::Any& pvargItem, const css::uno::Any& pvargIndex ) throw (css::uno::RuntimeException);
10203 - virtual void SAL_CALL removeItem( const css::uno::Any& index ) throw (css::uno::RuntimeException);
10204 - virtual void SAL_CALL Clear( ) throw (css::uno::RuntimeException);
10205 - virtual css::uno::Any SAL_CALL List( const css::uno::Any& pvargIndex, const css::uno::Any& pvarColumn ) throw (css::uno::RuntimeException);
10206 - // XControl
10207 - virtual void SAL_CALL setRowSource( const rtl::OUString& _rowsource ) throw (css::uno::RuntimeException);
10208 -
10209 - // XDefaultProperty
10210 - rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
10211 -
10212 - //XHelperInterface
10213 - virtual rtl::OUString& getServiceImplName();
10214 - virtual css::uno::Sequence<rtl::OUString> getServiceNames();
10215 -
10216 - //PropListener
10217 - virtual void setValueEvent( const css::uno::Any& value );
10218 - virtual css::uno::Any getValueEvent();
10219 -
10220 -
10221 -};
10222 -
10223 -#endif //
10224 --- sc/source/ui/vba/vbalistcontrolhelper.cxx.old 2009-04-02 10:45:35.000000000 +0000
10225 +++ sc/source/ui/vba/vbalistcontrolhelper.cxx 1970-01-01 00:00:00.000000000 +0000
10226 @@ -1,145 +0,0 @@
10227 -#include <vbalistcontrolhelper.hxx>
10228 -
10229 -using namespace com::sun::star;
10230 -using namespace ooo::vba;
10231 -
10232 -const static rtl::OUString ITEMS( RTL_CONSTASCII_USTRINGPARAM("StringItemList") );
10233 -
10234 -void SAL_CALL
10235 -ListControlHelper::AddItem( const uno::Any& pvargItem, const uno::Any& pvargIndex ) throw (uno::RuntimeException)
10236 -{
10237 - if ( pvargItem.hasValue() )
10238 - {
10239 - uno::Sequence< rtl::OUString > sList;
10240 - m_xProps->getPropertyValue( ITEMS ) >>= sList;
10241 -
10242 - sal_Int32 nIndex = sList.getLength();
10243 -
10244 - if ( pvargIndex.hasValue() )
10245 - pvargIndex >>= nIndex;
10246 -
10247 - rtl::OUString sString = getAnyAsString( pvargItem );
10248 -
10249 - // if no index specified or item is to be appended to end of
10250 - // list just realloc the array and set the last item
10251 - if ( nIndex == sList.getLength() )
10252 - {
10253 - sal_Int32 nOldSize = sList.getLength();
10254 - sList.realloc( nOldSize + 1 );
10255 - sList[ nOldSize ] = sString;
10256 - }
10257 - else
10258 - {
10259 - // just copy those elements above the one to be inserted
10260 - std::vector< rtl::OUString > sVec;
10261 - // reserve just the amount we need to copy
10262 - sVec.reserve( sList.getLength() - nIndex );
10263 -
10264 - // point at first element to copy
10265 - rtl::OUString* pString = sList.getArray() + nIndex;
10266 - const rtl::OUString* pEndString = sList.getArray() + sList.getLength();
10267 - // insert the new element
10268 - sVec.push_back( sString );
10269 - // copy elements
10270 - for ( ; pString != pEndString; ++pString )
10271 - sVec.push_back( *pString );
10272 -
10273 - sList.realloc( sList.getLength() + 1 );
10274 -
10275 - // point at first element to be overwritten
10276 - pString = sList.getArray() + nIndex;
10277 - pEndString = sList.getArray() + sList.getLength();
10278 - std::vector< rtl::OUString >::iterator it = sVec.begin();
10279 - for ( ; pString != pEndString; ++pString, ++it)
10280 - *pString = *it;
10281 - //
10282 - }
10283 -
10284 - m_xProps->setPropertyValue( ITEMS, uno::makeAny( sList ) );
10285 -
10286 - }
10287 -}
10288 -
10289 -void SAL_CALL
10290 -ListControlHelper::removeItem( const uno::Any& index ) throw (uno::RuntimeException)
10291 -{
10292 - sal_Int32 nIndex = 0;
10293 - // for int index
10294 - if ( index >>= nIndex )
10295 - {
10296 - uno::Sequence< rtl::OUString > sList;
10297 - m_xProps->getPropertyValue( ITEMS ) >>= sList;
10298 - if( nIndex < 0 || nIndex > ( sList.getLength() - 1 ) )
10299 - throw uno::RuntimeException( rtl::OUString::createFromAscii( "Invalid index" ), uno::Reference< uno::XInterface > () );
10300 - if( sList.hasElements() )
10301 - {
10302 - if( sList.getLength() == 1 )
10303 - {
10304 - Clear();
10305 - return;
10306 - }
10307 - for( sal_Int32 i = nIndex; i < ( sList.getLength()-1 ); i++ )
10308 - {
10309 - sList[i] = sList[i+1];
10310 - }
10311 - sList.realloc( sList.getLength() - 1 );
10312 - }
10313 -
10314 - m_xProps->setPropertyValue( ITEMS, uno::makeAny( sList ) );
10315 - }
10316 -}
10317 -
10318 -void SAL_CALL
10319 -ListControlHelper::Clear( ) throw (uno::RuntimeException)
10320 -{
10321 - // urk, setValue doesn't seem to work !!
10322 - //setValue( uno::makeAny( sal_Int16() ) );
10323 - m_xProps->setPropertyValue( ITEMS, uno::makeAny( uno::Sequence< rtl::OUString >() ) );
10324 -}
10325 -
10326 -void SAL_CALL
10327 -ListControlHelper::setRowSource( const rtl::OUString& _rowsource ) throw (uno::RuntimeException)
10328 -{
10329 - if ( _rowsource.getLength() == 0 )
10330 - Clear();
10331 -}
10332 -
10333 -sal_Int32 SAL_CALL
10334 -ListControlHelper::getListCount() throw (uno::RuntimeException)
10335 -{
10336 - uno::Sequence< rtl::OUString > sList;
10337 - m_xProps->getPropertyValue( ITEMS ) >>= sList;
10338 - return sList.getLength();
10339 -}
10340 -
10341 -uno::Any SAL_CALL
10342 -ListControlHelper::List( const ::uno::Any& pvargIndex, const uno::Any& pvarColumn ) throw (uno::RuntimeException)
10343 -{
10344 - uno::Sequence< rtl::OUString > sList;
10345 - m_xProps->getPropertyValue( ITEMS ) >>= sList;
10346 - sal_Int16 nLength = static_cast< sal_Int16 >( sList.getLength() );
10347 - uno::Any aRet;
10348 - if ( pvargIndex.hasValue() )
10349 - {
10350 - sal_Int16 nIndex = -1;
10351 - pvargIndex >>= nIndex;
10352 - if( nIndex < 0 || nIndex >= nLength )
10353 - throw uno::RuntimeException( rtl::OUString::createFromAscii(
10354 - "Bad row Index" ), uno::Reference< uno::XInterface >() );
10355 - aRet <<= sList[ nIndex ];
10356 - }
10357 - else if ( pvarColumn.hasValue() ) // pvarColumn on its own would be bad
10358 - throw uno::RuntimeException( rtl::OUString::createFromAscii(
10359 - "Bad column Index" ), uno::Reference< uno::XInterface >() );
10360 - else // List() ( e.g. no args )
10361 - {
10362 - uno::Sequence< uno::Sequence< rtl::OUString > > sReturnArray( nLength );
10363 - for ( sal_Int32 i = 0; i < nLength; ++i )
10364 - {
10365 - sReturnArray[ i ].realloc( 10 );
10366 - sReturnArray[ i ][ 0 ] = sList[ i ];
10367 - }
10368 - aRet = uno::makeAny( sReturnArray );
10369 - }
10370 - return aRet;
10371 -}
10372 --- sc/source/ui/vba/vbalistcontrolhelper.hxx.old 2009-04-02 10:45:35.000000000 +0000
10373 +++ sc/source/ui/vba/vbalistcontrolhelper.hxx 1970-01-01 00:00:00.000000000 +0000
10374 @@ -1,20 +0,0 @@
10375 -#ifndef SC_VBA_LISTCONTROLHELPER
10376 -#define SC_VBA_LISTCONTROLHELPER
10377 -
10378 -#include "vbahelper.hxx"
10379 -
10380 -class ListControlHelper
10381 -{
10382 - css::uno::Reference< css::beans::XPropertySet > m_xProps;
10383 -
10384 -public:
10385 - ListControlHelper( const css::uno::Reference< css::beans::XPropertySet >& rxControl ) : m_xProps( rxControl ){}
10386 - virtual ~ListControlHelper() {}
10387 - virtual void SAL_CALL AddItem( const css::uno::Any& pvargItem, const css::uno::Any& pvargIndex ) throw (css::uno::RuntimeException);
10388 - virtual void SAL_CALL removeItem( const css::uno::Any& index ) throw (css::uno::RuntimeException);
10389 - virtual void SAL_CALL setRowSource( const rtl::OUString& _rowsource ) throw (css::uno::RuntimeException);
10390 - virtual ::sal_Int32 SAL_CALL getListCount() throw (css::uno::RuntimeException);
10391 - virtual css::uno::Any SAL_CALL List( const css::uno::Any& pvargIndex, const css::uno::Any& pvarColumn ) throw (css::uno::RuntimeException);
10392 - virtual void SAL_CALL Clear( ) throw (css::uno::RuntimeException);
10393 -};
10394 -#endif
10395 --- sc/source/ui/vba/vbamultipage.cxx.old 2009-04-02 10:45:35.000000000 +0000
10396 +++ sc/source/ui/vba/vbamultipage.cxx 1970-01-01 00:00:00.000000000 +0000
10397 @@ -1,132 +0,0 @@
10398 -/*************************************************************************
10399 - *
10400 - * OpenOffice.org - a multi-platform office productivity suite
10401 - *
10402 - * $RCSfile$
10403 - *
10404 - * $Revision$
10405 - *
10406 - * last change: $Author$ $Date$
10407 - *
10408 - * The Contents of this file are made available subject to
10409 - * the terms of GNU Lesser General Public License Version 2.1.
10410 - *
10411 - *
10412 - * GNU Lesser General Public License Version 2.1
10413 - * =============================================
10414 - * Copyright 2005 by Sun Microsystems, Inc.
10415 - * 901 San Antonio Road, Palo Alto, CA 94303, USA
10416 - *
10417 - * This library is free software; you can redistribute it and/or
10418 - * modify it under the terms of the GNU Lesser General Public
10419 - * License version 2.1, as published by the Free Software Foundation.
10420 - *
10421 - * This library is distributed in the hope that it will be useful,
10422 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
10423 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
10424 - * Lesser General Public License for more details.
10425 - *
10426 - * You should have received a copy of the GNU Lesser General Public
10427 - * License along with this library; if not, write to the Free Software
10428 - * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
10429 - * MA 02111-1307 USA
10430 - *
10431 - ************************************************************************/
10432 -#include "vbamultipage.hxx"
10433 -#include <ooo/vba/XCollection.hpp>
10434 -#include "vbapages.hxx"
10435 -#include <vector>
10436 -
10437 -using namespace com::sun::star;
10438 -using namespace ooo::vba;
10439 -
10440 -// uno servicename com.sun.star.awt.UnoControlProgressBarMode
10441 -const rtl::OUString SVALUE( RTL_CONSTASCII_USTRINGPARAM("ProgressValue") );
10442 -const rtl::OUString SVALUEMAX( RTL_CONSTASCII_USTRINGPARAM("ProgressValueMax") );
10443 -const rtl::OUString SSTEP( RTL_CONSTASCII_USTRINGPARAM("Step") );
10444 -
10445 -typedef cppu::WeakImplHelper1< container::XIndexAccess > PagesImpl_Base;
10446 -class PagesImpl : public PagesImpl_Base
10447 -{
10448 - sal_Int32 mnPages;
10449 -public:
10450 - PagesImpl( sal_Int32 nPages ) : mnPages( nPages ) {}
10451 - virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException) { return mnPages; }
10452 - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, ::uno::RuntimeException)
10453 - {
10454 - if ( Index < 0 || Index > mnPages )
10455 - throw lang::IndexOutOfBoundsException();
10456 - return uno::makeAny( uno::Reference< uno::XInterface >() );
10457 - }
10458 - // XElementAccess
10459 - virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException)
10460 - {
10461 - // no Pages object yet #FIXME
10462 - //return msforms::XPage::static_type(0);
10463 - return uno::XInterface::static_type(0);
10464 - }
10465 - virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException)
10466 - {
10467 - return ( mnPages > 0 );
10468 - }
10469 -};
10470 -uno::Reference< container::XIndexAccess >
10471 -ScVbaMultiPage::getPages( sal_Int32 nPages )
10472 -{
10473 - return new PagesImpl( nPages );
10474 -}
10475 -
10476 -ScVbaMultiPage::ScVbaMultiPage( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper, const uno::Reference< uno::XInterface >& xDialog ) : MultiPageImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
10477 -{
10478 - mxDialogProps.set( xDialog, uno::UNO_QUERY_THROW );
10479 - // set dialog step to value of multipage pseudo model
10480 - setValue(getValue());
10481 -}
10482 -
10483 -// Attributes
10484 -sal_Int32 SAL_CALL
10485 -ScVbaMultiPage::getValue() throw (css::uno::RuntimeException)
10486 -{
10487 - sal_Int32 nValue = 0;
10488 - m_xProps->getPropertyValue( SVALUE ) >>= nValue;
10489 - return nValue;
10490 -}
10491 -
10492 -void SAL_CALL
10493 -ScVbaMultiPage::setValue( const sal_Int32 _value ) throw (::com::sun::star::uno::RuntimeException)
10494 -{
10495 - // track change in dialog ( dialog value is 1 based, 0 is a special value )
10496 - m_xProps->setPropertyValue( SVALUE, uno::makeAny( _value ) );
10497 - mxDialogProps->setPropertyValue( SSTEP, uno::makeAny( _value + 1) );
10498 -}
10499 -
10500 -
10501 -rtl::OUString&
10502 -ScVbaMultiPage::getServiceImplName()
10503 -{
10504 - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaMultiPage") );
10505 - return sImplName;
10506 -}
10507 -
10508 -uno::Any SAL_CALL
10509 -ScVbaMultiPage::Pages( const uno::Any& index ) throw (uno::RuntimeException)
10510 -{
10511 - sal_Int32 nValue = 0;
10512 - m_xProps->getPropertyValue( SVALUEMAX ) >>= nValue;
10513 - uno::Reference< XCollection > xColl( new ScVbaPages( this, mxContext, getPages( nValue ) ) );
10514 - if ( !index.hasValue() )
10515 - return uno::makeAny( xColl );
10516 - return xColl->Item( uno::makeAny( index ), uno::Any() );
10517 -}
10518 -
10519 -uno::Sequence< rtl::OUString >
10520 -ScVbaMultiPage::getServiceNames()
10521 -{
10522 - static uno::Sequence< rtl::OUString > aServiceNames;
10523 - if ( aServiceNames.getLength() == 0 )
10524 - {
10525 - aServiceNames.realloc( 1 );
10526 - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.MultiPage" ) );
10527 - }
10528 - return aServiceNames;
10529 -}
10530 --- sc/source/ui/vba/vbamultipage.hxx.old 2009-04-02 10:45:35.000000000 +0000
10531 +++ sc/source/ui/vba/vbamultipage.hxx 1970-01-01 00:00:00.000000000 +0000
10532 @@ -1,65 +0,0 @@
10533 -/*************************************************************************
10534 - *
10535 - * OpenOffice.org - a multi-platform office productivity suite
10536 - *
10537 - * $RCSfile$
10538 - *
10539 - * $Revision$
10540 - *
10541 - * last change: $Author$ $Date$
10542 - *
10543 - * The Contents of this file are made available subject to
10544 - * the terms of GNU Lesser General Public License Version 2.1.
10545 - *
10546 - *
10547 - * GNU Lesser General Public License Version 2.1
10548 - * =============================================
10549 - * Copyright 2005 by Sun Microsystems, Inc.
10550 - * 901 San Antonio Road, Palo Alto, CA 94303, USA
10551 - *
10552 - * This library is free software; you can redistribute it and/or
10553 - * modify it under the terms of the GNU Lesser General Public
10554 - * License version 2.1, as published by the Free Software Foundation.
10555 - *
10556 - * This library is distributed in the hope that it will be useful,
10557 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
10558 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
10559 - * Lesser General Public License for more details.
10560 - *
10561 - * You should have received a copy of the GNU Lesser General Public
10562 - * License along with this library; if not, write to the Free Software
10563 - * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
10564 - * MA 02111-1307 USA
10565 - *
10566 - ************************************************************************/
10567 -#ifndef SC_VBA_MULTIPAGE_HXX
10568 -#define SC_VBA_MULTIPAGE_HXX
10569 -#include <cppuhelper/implbase1.hxx>
10570 -#include <ooo/vba/msforms/XMultiPage.hpp>
10571 -#include <com/sun/star/container/XIndexAccess.hpp>
10572 -
10573 -#include "vbacontrol.hxx"
10574 -#include "vbahelper.hxx"
10575 -//#include <cppuhelper/implbase2.hxx>
10576 -#include <cppuhelper/implbase1.hxx>
10577 -
10578 -typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XMultiPage > MultiPageImpl_BASE;
10579 -
10580 -class ScVbaMultiPage : public MultiPageImpl_BASE
10581 -{
10582 - css::uno::Reference< css::container::XIndexAccess > getPages( sal_Int32 nPages );
10583 - css::uno::Reference< css::beans::XPropertySet > mxDialogProps;
10584 -public:
10585 - ScVbaMultiPage( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper, const css::uno::Reference< css::uno::XInterface >& xDialog );
10586 - // Attributes
10587 - virtual sal_Int32 SAL_CALL getValue() throw (css::uno::RuntimeException);
10588 - virtual void SAL_CALL setValue( sal_Int32 _value ) throw (css::uno::RuntimeException);
10589 - virtual css::uno::Any SAL_CALL Pages( const css::uno::Any& index ) throw (css::uno::RuntimeException);
10590 -
10591 - //XHelperInterface
10592 - virtual rtl::OUString& getServiceImplName();
10593 - virtual css::uno::Sequence<rtl::OUString> getServiceNames();
10594 - // XDefaultProperty
10595 - rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
10596 -};
10597 -#endif //SC_VBA_LABEL_HXX
10598 --- sc/source/ui/vba/vbaname.cxx.old 2009-04-02 10:45:35.000000000 +0000
10599 +++ sc/source/ui/vba/vbaname.cxx 2009-04-06 16:42:01.000000000 +0000
10600 @@ -27,7 +27,7 @@
10601 * for a copy of the LGPLv3 License.
10602 *
10603 ************************************************************************/
10604 -#include "helperdecl.hxx"
10605 +#include <vbahelper/helperdecl.hxx>
10607 #include <com/sun/star/table/XCellRange.hpp>
10608 #include <com/sun/star/sheet/XCellRangeAddressable.hpp>
10609 @@ -64,7 +64,8 @@ ScVbaName::~ScVbaName()
10610 css::uno::Reference< ov::excel::XWorksheet >
10611 ScVbaName::getWorkSheet() throw (css::uno::RuntimeException)
10612 {
10613 - return ScVbaGlobals::getGlobalsImpl( mxContext )->getActiveSheet();
10614 + uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW );
10615 + return xApplication->getActiveSheet();
10616 }
10618 ::rtl::OUString
10619 @@ -234,7 +235,7 @@ ScVbaName::setRefersToR1C1Local( const :
10620 css::uno::Reference< ov::excel::XRange >
10621 ScVbaName::getRefersToRange() throw (css::uno::RuntimeException)
10622 {
10623 - uno::Reference< ov::excel::XRange > xRange = ScVbaRange::getRangeObjectForName( mxContext, mxNamedRange->getName(), getDocShell( mxModel ), formula::FormulaGrammar::CONV_XL_R1C1 );
10624 + uno::Reference< ov::excel::XRange > xRange = ScVbaRange::getRangeObjectForName( mxContext, mxNamedRange->getName(), excel::getDocShell( mxModel ), formula::FormulaGrammar::CONV_XL_R1C1 );
10625 return xRange;
10626 }
10628 --- sc/source/ui/vba/vbaname.hxx.old 2009-04-02 10:45:35.000000000 +0000
10629 +++ sc/source/ui/vba/vbaname.hxx 2009-04-06 16:42:01.000000000 +0000
10630 @@ -34,7 +34,9 @@
10631 #include <com/sun/star/sheet/XNamedRange.hpp>
10632 #include <com/sun/star/sheet/XNamedRanges.hpp>
10634 -#include "vbahelperinterface.hxx"
10635 +#include <vbahelper/vbahelperinterface.hxx>
10636 +
10637 +class ScDocument;
10639 typedef InheritedHelperInterfaceImpl1< ov::excel::XName > NameImpl_BASE;
10641 --- sc/source/ui/vba/vbanames.cxx.old 2009-04-02 10:45:35.000000000 +0000
10642 +++ sc/source/ui/vba/vbanames.cxx 2009-04-06 16:42:01.000000000 +0000
10643 @@ -27,7 +27,7 @@
10644 * for a copy of the LGPLv3 License.
10645 *
10646 ************************************************************************/
10647 -#include "helperdecl.hxx"
10648 +#include <vbahelper/helperdecl.hxx>
10650 #include <com/sun/star/table/XCellRange.hpp>
10651 #include <com/sun/star/sheet/XCellRangeAddressable.hpp>
10652 @@ -81,7 +81,7 @@ ScDocument *
10653 ScVbaNames::getScDocument()
10654 {
10655 uno::Reference< frame::XModel > xModel( getModel() , uno::UNO_QUERY_THROW );
10656 - ScTabViewShell * pTabViewShell = getBestViewShell( xModel );
10657 + ScTabViewShell * pTabViewShell = excel::getBestViewShell( xModel );
10658 if ( !pTabViewShell )
10659 throw uno::RuntimeException( rtl::OUString::createFromAscii("No ViewShell available"), uno::Reference< uno::XInterface >() );
10660 ScViewData* pViewData = pTabViewShell->GetViewData();
10661 --- sc/source/ui/vba/vbanames.hxx.old 2009-04-02 10:45:35.000000000 +0000
10662 +++ sc/source/ui/vba/vbanames.hxx 2009-04-06 16:42:01.000000000 +0000
10663 @@ -34,7 +34,10 @@
10664 #include <ooo/vba/XCollection.hpp>
10665 #include <com/sun/star/container/XEnumerationAccess.hpp>
10666 #include <com/sun/star/sheet/XNamedRanges.hpp>
10667 -#include "vbacollectionimpl.hxx"
10668 +#include <vbahelper/vbacollectionimpl.hxx>
10669 +
10670 +class ScDocument;
10671 +class ScDocShell;
10673 typedef CollTestImplHelper< ov::excel::XNames > ScVbaNames_BASE;
10675 --- sc/source/ui/vba/vbaoleobject.hxx.old 2009-04-02 10:45:35.000000000 +0000
10676 +++ sc/source/ui/vba/vbaoleobject.hxx 2009-04-06 16:42:01.000000000 +0000
10677 @@ -35,7 +35,7 @@
10678 #include <com/sun/star/awt/XWindowPeer.hpp>
10679 #include <ooo/vba/excel/XOLEObject.hpp>
10681 -#include "vbahelperinterface.hxx"
10682 +#include <vbahelper/vbahelperinterface.hxx>
10684 typedef InheritedHelperInterfaceImpl1< ov::excel::XOLEObject > OLEObjectImpl_BASE;
10686 --- sc/source/ui/vba/vbaoleobjects.hxx.old 2009-04-02 10:45:35.000000000 +0000
10687 +++ sc/source/ui/vba/vbaoleobjects.hxx 2009-04-06 16:42:01.000000000 +0000
10688 @@ -33,8 +33,8 @@
10689 #include <cppuhelper/implbase1.hxx>
10690 #include <ooo/vba/excel/XOLEObjects.hpp>
10692 -#include "vbacollectionimpl.hxx"
10693 -#include "vbahelper.hxx"
10694 +#include <vbahelper/vbacollectionimpl.hxx>
10695 +#include "excelvbahelper.hxx"
10697 typedef CollTestImplHelper< ov::excel::XOLEObjects > OLEObjectsImpl_BASE;
10699 --- sc/source/ui/vba/vbaoutline.hxx.old 2009-04-02 10:45:35.000000000 +0000
10700 +++ sc/source/ui/vba/vbaoutline.hxx 2009-04-06 16:42:01.000000000 +0000
10701 @@ -34,7 +34,7 @@
10702 #include <cppuhelper/implbase1.hxx>
10703 #include <ooo/vba/excel/XOutline.hpp>
10704 #include <com/sun/star/uno/XComponentContext.hpp>
10705 -#include "vbahelperinterface.hxx"
10706 +#include <vbahelper/vbahelperinterface.hxx>
10708 typedef InheritedHelperInterfaceImpl1< ov::excel::XOutline > ScVbaOutline_BASE;
10710 --- sc/source/ui/vba/vbapagebreak.hxx.old 2009-04-02 10:45:35.000000000 +0000
10711 +++ sc/source/ui/vba/vbapagebreak.hxx 2009-04-06 16:42:01.000000000 +0000
10712 @@ -38,7 +38,7 @@
10713 #include <com/sun/star/script/BasicErrorException.hpp>
10714 #include <com/sun/star/sheet/TablePageBreakData.hpp>
10715 #include <com/sun/star/beans/XPropertySet.hpp>
10716 -#include "vbahelperinterface.hxx"
10717 +#include <vbahelper/vbahelperinterface.hxx>
10719 template< typename Ifc1 >
10720 class ScVbaPageBreak : public InheritedHelperInterfaceImpl1< Ifc1 >
10721 --- sc/source/ui/vba/vbapagebreaks.hxx.old 2009-04-02 10:45:35.000000000 +0000
10722 +++ sc/source/ui/vba/vbapagebreaks.hxx 2009-04-06 16:42:01.000000000 +0000
10723 @@ -41,8 +41,8 @@
10724 #include <com/sun/star/beans/XPropertySet.hpp>
10725 #include <com/sun/star/container/XIndexAccess.hpp>
10726 #include <com/sun/star/table/XColumnRowRange.hpp>
10727 -#include "vbahelperinterface.hxx"
10728 -#include "vbacollectionimpl.hxx"
10729 +#include <vbahelper/vbahelperinterface.hxx>
10730 +#include <vbahelper/vbacollectionimpl.hxx>
10732 typedef CollTestImplHelper< ov::excel::XHPageBreaks > ScVbaHPageBreaks_BASE;
10734 --- sc/source/ui/vba/vbapages.cxx.old 2009-04-02 10:45:35.000000000 +0000
10735 +++ sc/source/ui/vba/vbapages.cxx 1970-01-01 00:00:00.000000000 +0000
10736 @@ -1,81 +0,0 @@
10737 -/*************************************************************************
10738 - *
10739 - * OpenOffice.org - a multi-platform office productivity suite
10740 - *
10741 - * $RCSfile$
10742 - *
10743 - * $Revision$
10744 - *
10745 - * last change: $Author$ $Date$
10746 - *
10747 - * The Contents of this file are made available subject to
10748 - * the terms of GNU Lesser General Public License Version 2.1.
10749 - *
10750 - *
10751 - * GNU Lesser General Public License Version 2.1
10752 - * =============================================
10753 - * Copyright 2005 by Sun Microsystems, Inc.
10754 - * 901 San Antonio Road, Palo Alto, CA 94303, USA
10755 - *
10756 - * This library is free software; you can redistribute it and/or
10757 - * modify it under the terms of the GNU Lesser General Public
10758 - * License version 2.1, as published by the Free Software Foundation.
10759 - *
10760 - * This library is distributed in the hope that it will be useful,
10761 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
10762 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
10763 - * Lesser General Public License for more details.
10764 - *
10765 - * You should have received a copy of the GNU Lesser General Public
10766 - * License along with this library; if not, write to the Free Software
10767 - * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
10768 - * MA 02111-1307 USA
10769 - *
10770 - ************************************************************************/
10771 -#include "vbapages.hxx"
10772 -
10773 -using namespace ::ooo::vba;
10774 -using namespace ::com::sun::star;
10775 -using namespace ::vos;
10776 -
10777 -ScVbaPages::ScVbaPages( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xPages ) throw( lang::IllegalArgumentException ) : ScVbaPages_BASE( xParent, xContext, xPages )
10778 -{
10779 -}
10780 -
10781 -uno::Type SAL_CALL
10782 -ScVbaPages::getElementType() throw (uno::RuntimeException)
10783 -{
10784 - // return msforms::XPage::static_type(0);
10785 - return uno::XInterface::static_type(0);
10786 -}
10787 -
10788 -uno::Any
10789 -ScVbaPages::createCollectionObject( const css::uno::Any& aSource )
10790 -{
10791 - return aSource;
10792 -}
10793 -
10794 -rtl::OUString&
10795 -ScVbaPages::getServiceImplName()
10796 -{
10797 - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaPages") );
10798 - return sImplName;
10799 -}
10800 -
10801 -uno::Reference< container::XEnumeration > SAL_CALL
10802 -ScVbaPages::createEnumeration() throw (uno::RuntimeException)
10803 -{
10804 - return uno::Reference< container::XEnumeration >();
10805 -}
10806 -
10807 -uno::Sequence< rtl::OUString >
10808 -ScVbaPages::getServiceNames()
10809 -{
10810 - static uno::Sequence< rtl::OUString > aServiceNames;
10811 - if ( aServiceNames.getLength() == 0 )
10812 - {
10813 - aServiceNames.realloc( 1 );
10814 - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msform.Pages" ) );
10815 - }
10816 - return aServiceNames;
10817 -}
10818 --- sc/source/ui/vba/vbapages.hxx.old 2009-04-02 10:45:35.000000000 +0000
10819 +++ sc/source/ui/vba/vbapages.hxx 1970-01-01 00:00:00.000000000 +0000
10820 @@ -1,64 +0,0 @@
10821 -/*************************************************************************
10822 - *
10823 - * OpenOffice.org - a multi-platform office productivity suite
10824 - *
10825 - * $RCSfile$
10826 - *
10827 - * $Revision$
10828 - *
10829 - * last change: $Author$ $Date$
10830 - *
10831 - * The Contents of this file are made available subject to
10832 - * the terms of GNU Lesser General Public License Version 2.1.
10833 - *
10834 - *
10835 - * GNU Lesser General Public License Version 2.1
10836 - * =============================================
10837 - * Copyright 2005 by Sun Microsystems, Inc.
10838 - * 901 San Antonio Road, Palo Alto, CA 94303, USA
10839 - *
10840 - * This library is free software; you can redistribute it and/or
10841 - * modify it under the terms of the GNU Lesser General Public
10842 - * License version 2.1, as published by the Free Software Foundation.
10843 - *
10844 - * This library is distributed in the hope that it will be useful,
10845 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
10846 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
10847 - * Lesser General Public License for more details.
10848 - *
10849 - * You should have received a copy of the GNU Lesser General Public
10850 - * License along with this library; if not, write to the Free Software
10851 - * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
10852 - * MA 02111-1307 USA
10853 - *
10854 - ************************************************************************/
10855 -#ifndef SC_VBA_PAGES_HXX
10856 -#define SC_VBA_PAGES_HXX
10857 -
10858 -#include <ooo/vba/office/MsoShapeType.hpp>
10859 -#include <com/sun/star/lang/XEventListener.hpp>
10860 -#include <com/sun/star/beans/XPropertySet.hpp>
10861 -#include <ooo/vba/msforms/XPages.hpp>
10862 -#include <cppuhelper/implbase2.hxx>
10863 -#include <cppuhelper/implbase1.hxx>
10864 -
10865 -#include "vbacollectionimpl.hxx"
10866 -typedef CollTestImplHelper<
10867 -ov::msforms::XPages > ScVbaPages_BASE;
10868 -
10869 -class ScVbaPages : public ScVbaPages_BASE
10870 -{
10871 -protected:
10872 - virtual rtl::OUString& getServiceImplName();
10873 - virtual css::uno::Sequence<rtl::OUString> getServiceNames();
10874 -public:
10875 - ScVbaPages( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xPages ) throw ( css::lang::IllegalArgumentException );
10876 - virtual ~ScVbaPages() {}
10877 - // XEnumerationAccess
10878 - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
10879 - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
10880 - // ScVbaPages_BASE
10881 - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
10882 -
10883 -};
10884 -#endif//SC_VBA_SHAPE_HXX
10885 --- sc/source/ui/vba/vbapagesetup.cxx.old 2009-04-02 10:45:35.000000000 +0000
10886 +++ sc/source/ui/vba/vbapagesetup.cxx 2009-04-06 16:42:01.000000000 +0000
10887 @@ -31,6 +31,7 @@
10888 #include "cellsuno.hxx"
10889 #include "convuno.hxx"
10890 #include "rangelst.hxx"
10891 +#include "excelvbahelper.hxx"
10892 #include <com/sun/star/sheet/XPrintAreas.hpp>
10893 #include <com/sun/star/sheet/XHeaderFooterContent.hpp>
10894 #include <com/sun/star/text/XText.hpp>
10895 @@ -85,7 +86,7 @@ rtl::OUString SAL_CALL ScVbaPageSetup::g
10896 ScUnoConversion::FillScRange( aRange, aSeq[i] );
10897 aRangeList.Append( aRange );
10898 }
10899 - ScDocument* pDoc = getDocShell( mxModel )->GetDocument();
10900 + ScDocument* pDoc = excel::getDocShell( mxModel )->GetDocument();
10901 aRangeList.Format( aPrintArea, nFlags, pDoc, formula::FormulaGrammar::CONV_XL_A1, ',' );
10902 }
10904 @@ -106,7 +107,7 @@ void SAL_CALL ScVbaPageSetup::setPrintAr
10905 {
10906 ScRangeList aCellRanges;
10907 ScRange aRange;
10908 - if( getScRangeListForAddress( rAreas, getDocShell( mxModel ) , aRange, aCellRanges ) )
10909 + if( getScRangeListForAddress( rAreas, excel::getDocShell( mxModel ) , aRange, aCellRanges ) )
10910 {
10911 uno::Sequence< table::CellRangeAddress > aSeq( aCellRanges.Count() );
10912 USHORT i=0;
10913 --- sc/source/ui/vba/vbapagesetup.hxx.old 2009-04-02 10:45:35.000000000 +0000
10914 +++ sc/source/ui/vba/vbapagesetup.hxx 2009-04-06 16:42:01.000000000 +0000
10915 @@ -35,7 +35,7 @@
10916 #include <com/sun/star/uno/XComponentContext.hpp>
10917 #include <com/sun/star/sheet/XSpreadsheet.hpp>
10918 #include <com/sun/star/beans/XPropertySet.hpp>
10919 -#include "vbahelperinterface.hxx"
10920 +#include <vbahelper/vbahelperinterface.hxx>
10922 typedef InheritedHelperInterfaceImpl1< ov::excel::XPageSetup > ScVbaPageSetup_BASE;
10924 --- sc/source/ui/vba/vbapalette.hxx.old 2009-04-02 10:45:35.000000000 +0000
10925 +++ sc/source/ui/vba/vbapalette.hxx 2009-04-06 16:42:01.000000000 +0000
10926 @@ -30,7 +30,7 @@
10927 #ifndef SC_VBAPALETTE_HXX
10928 #define SC_VBAPALETTE_HXX
10930 -#include "vbahelper.hxx"
10931 +#include "excelvbahelper.hxx"
10932 #include <document.hxx>
10933 #include <com/sun/star/container/XIndexAccess.hpp>
10935 --- sc/source/ui/vba/vbapane.hxx.old 2009-04-02 10:45:35.000000000 +0000
10936 +++ sc/source/ui/vba/vbapane.hxx 2009-04-06 16:42:01.000000000 +0000
10937 @@ -34,7 +34,7 @@
10938 #include<com/sun/star/sheet/XViewPane.hpp>
10939 #include<ooo/vba/excel/XPane.hpp>
10941 -#include"vbahelper.hxx"
10942 +#include"excelvbahelper.hxx"
10944 typedef cppu::WeakImplHelper1< ov::excel::XPane > PaneImpl_Base;
10946 --- sc/source/ui/vba/vbapictureformat.hxx.old 2009-04-02 10:45:35.000000000 +0000
10947 +++ sc/source/ui/vba/vbapictureformat.hxx 2009-04-06 16:42:01.000000000 +0000
10948 @@ -33,7 +33,7 @@
10949 #include <com/sun/star/drawing/XShape.hpp>
10950 #include <com/sun/star/beans/XPropertySet.hpp>
10951 #include <ooo/vba/msforms/XPictureFormat.hpp>
10952 -#include "vbahelperinterface.hxx"
10953 +#include <vbahelper/vbahelperinterface.hxx>
10955 typedef InheritedHelperInterfaceImpl1< ov::msforms::XPictureFormat > ScVbaPictureFormat_BASE;
10957 --- sc/source/ui/vba/vbapivotcache.hxx.old 2009-04-02 10:45:35.000000000 +0000
10958 +++ sc/source/ui/vba/vbapivotcache.hxx 2009-04-06 16:42:01.000000000 +0000
10959 @@ -34,7 +34,7 @@
10960 #include <com/sun/star/sheet/XDataPilotTable.hpp>
10962 #include <ooo/vba/excel/XPivotCache.hpp>
10963 -#include "vbahelperinterface.hxx"
10964 +#include <vbahelper/vbahelperinterface.hxx>
10966 typedef InheritedHelperInterfaceImpl1<ov::excel::XPivotCache > PivotCacheImpl_BASE;
10968 --- sc/source/ui/vba/vbapivottable.hxx.old 2009-04-02 10:45:35.000000000 +0000
10969 +++ sc/source/ui/vba/vbapivottable.hxx 2009-04-06 16:42:01.000000000 +0000
10970 @@ -33,8 +33,8 @@
10971 #include <com/sun/star/uno/XComponentContext.hpp>
10972 #include <com/sun/star/sheet/XDataPilotTable.hpp>
10973 #include <ooo/vba/excel/XPivotTable.hpp>
10974 -#include "vbahelper.hxx"
10975 -#include "vbahelperinterface.hxx"
10976 +#include "excelvbahelper.hxx"
10977 +#include <vbahelper/vbahelperinterface.hxx>
10979 typedef InheritedHelperInterfaceImpl1< ov::excel::XPivotTable > PivotTableImpl_BASE;
10981 --- sc/source/ui/vba/vbapivottables.hxx.old 2009-04-02 10:45:35.000000000 +0000
10982 +++ sc/source/ui/vba/vbapivottables.hxx 2009-04-06 16:42:01.000000000 +0000
10983 @@ -36,9 +36,9 @@
10984 #include <com/sun/star/container/XEnumerationAccess.hpp>
10985 #include <com/sun/star/uno/XComponentContext.hpp>
10987 -#include "vbahelper.hxx"
10988 -#include "vbahelperinterface.hxx"
10989 -#include "vbacollectionimpl.hxx"
10990 +#include "excelvbahelper.hxx"
10991 +#include <vbahelper/vbahelperinterface.hxx>
10992 +#include <vbahelper/vbacollectionimpl.hxx>
10995 typedef CollTestImplHelper< ov::excel::XPivotTables > ScVbaPivotTables_BASE;
10996 --- sc/source/ui/vba/vbaprogressbar.cxx.old 2009-04-02 10:45:35.000000000 +0000
10997 +++ sc/source/ui/vba/vbaprogressbar.cxx 1970-01-01 00:00:00.000000000 +0000
10998 @@ -1,78 +0,0 @@
10999 -/*************************************************************************
11000 - *
11001 - * OpenOffice.org - a multi-platform office productivity suite
11002 - *
11003 - * $RCSfile$
11004 - *
11005 - * $Revision$
11006 - *
11007 - * last change: $Author$ $Date$
11008 - *
11009 - * The Contents of this file are made available subject to
11010 - * the terms of GNU Lesser General Public License Version 2.1.
11011 - *
11012 - *
11013 - * GNU Lesser General Public License Version 2.1
11014 - * =============================================
11015 - * Copyright 2005 by Sun Microsystems, Inc.
11016 - * 901 San Antonio Road, Palo Alto, CA 94303, USA
11017 - *
11018 - * This library is free software; you can redistribute it and/or
11019 - * modify it under the terms of the GNU Lesser General Public
11020 - * License version 2.1, as published by the Free Software Foundation.
11021 - *
11022 - * This library is distributed in the hope that it will be useful,
11023 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
11024 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
11025 - * Lesser General Public License for more details.
11026 - *
11027 - * You should have received a copy of the GNU Lesser General Public
11028 - * License along with this library; if not, write to the Free Software
11029 - * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
11030 - * MA 02111-1307 USA
11031 - *
11032 - ************************************************************************/
11033 -#include "vbaprogressbar.hxx"
11034 -#include <vector>
11035 -
11036 -using namespace com::sun::star;
11037 -using namespace ooo::vba;
11038 -
11039 -// uno servicename com.sun.star.awt.UnoControlProgressBarMode
11040 -const rtl::OUString SVALUE( RTL_CONSTASCII_USTRINGPARAM("ProgressValue") );
11041 -
11042 -ScVbaProgressBar::ScVbaProgressBar( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : ProgressBarImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
11043 -{
11044 -}
11045 -
11046 -// Attributes
11047 -uno::Any SAL_CALL
11048 -ScVbaProgressBar::getValue() throw (css::uno::RuntimeException)
11049 -{
11050 - return m_xProps->getPropertyValue( SVALUE );
11051 -}
11052 -
11053 -void SAL_CALL
11054 -ScVbaProgressBar::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException)
11055 -{
11056 - m_xProps->setPropertyValue( SVALUE, _value );
11057 -}
11058 -
11059 -rtl::OUString&
11060 -ScVbaProgressBar::getServiceImplName()
11061 -{
11062 - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaProgressBar") );
11063 - return sImplName;
11064 -}
11065 -
11066 -uno::Sequence< rtl::OUString >
11067 -ScVbaProgressBar::getServiceNames()
11068 -{
11069 - static uno::Sequence< rtl::OUString > aServiceNames;
11070 - if ( aServiceNames.getLength() == 0 )
11071 - {
11072 - aServiceNames.realloc( 1 );
11073 - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.Label" ) );
11074 - }
11075 - return aServiceNames;
11076 -}
11077 --- sc/source/ui/vba/vbaprogressbar.hxx.old 2009-04-02 10:45:35.000000000 +0000
11078 +++ sc/source/ui/vba/vbaprogressbar.hxx 1970-01-01 00:00:00.000000000 +0000
11079 @@ -1,59 +0,0 @@
11080 -/*************************************************************************
11081 - *
11082 - * OpenOffice.org - a multi-platform office productivity suite
11083 - *
11084 - * $RCSfile$
11085 - *
11086 - * $Revision$
11087 - *
11088 - * last change: $Author$ $Date$
11089 - *
11090 - * The Contents of this file are made available subject to
11091 - * the terms of GNU Lesser General Public License Version 2.1.
11092 - *
11093 - *
11094 - * GNU Lesser General Public License Version 2.1
11095 - * =============================================
11096 - * Copyright 2005 by Sun Microsystems, Inc.
11097 - * 901 San Antonio Road, Palo Alto, CA 94303, USA
11098 - *
11099 - * This library is free software; you can redistribute it and/or
11100 - * modify it under the terms of the GNU Lesser General Public
11101 - * License version 2.1, as published by the Free Software Foundation.
11102 - *
11103 - * This library is distributed in the hope that it will be useful,
11104 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
11105 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
11106 - * Lesser General Public License for more details.
11107 - *
11108 - * You should have received a copy of the GNU Lesser General Public
11109 - * License along with this library; if not, write to the Free Software
11110 - * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
11111 - * MA 02111-1307 USA
11112 - *
11113 - ************************************************************************/
11114 -#ifndef SC_VBA_PROGRESSBAR_HXX
11115 -#define SC_VBA_PROGRESSBAR_HXX
11116 -#include <cppuhelper/implbase1.hxx>
11117 -#include <ooo/vba/msforms/XProgressBar.hpp>
11118 -
11119 -#include "vbacontrol.hxx"
11120 -#include "vbahelper.hxx"
11121 -#include <cppuhelper/implbase2.hxx>
11122 -
11123 -typedef cppu::ImplInheritanceHelper2< ScVbaControl, ov::msforms::XProgressBar, css::script::XDefaultProperty > ProgressBarImpl_BASE;
11124 -
11125 -class ScVbaProgressBar : public ProgressBarImpl_BASE
11126 -{
11127 -public:
11128 - ScVbaProgressBar( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
11129 - // Attributes
11130 - virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
11131 - virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
11132 - //XHelperInterface
11133 - virtual rtl::OUString& getServiceImplName();
11134 - virtual css::uno::Sequence<rtl::OUString> getServiceNames();
11135 - // XDefaultProperty
11136 - rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
11137 -};
11138 -#endif //SC_VBA_LABEL_HXX
11139 --- sc/source/ui/vba/vbapropvalue.hxx.old 2009-04-02 10:45:35.000000000 +0000
11140 +++ sc/source/ui/vba/vbapropvalue.hxx 2009-04-06 16:42:01.000000000 +0000
11141 @@ -32,7 +32,7 @@
11142 #include <ooo/vba/XPropValue.hpp>
11143 #include <cppuhelper/implbase1.hxx>
11145 -#include "vbahelper.hxx"
11146 +#include "excelvbahelper.hxx"
11148 typedef ::cppu::WeakImplHelper1< ov::XPropValue > PropValueImpl_BASE;
11150 --- sc/source/ui/vba/vbaradiobutton.cxx.old 2009-04-02 10:45:35.000000000 +0000
11151 +++ sc/source/ui/vba/vbaradiobutton.cxx 1970-01-01 00:00:00.000000000 +0000
11152 @@ -1,107 +0,0 @@
11153 -/*************************************************************************
11154 - *
11155 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
11156 - *
11157 - * Copyright 2008 by Sun Microsystems, Inc.
11158 - *
11159 - * OpenOffice.org - a multi-platform office productivity suite
11160 - *
11161 - * $RCSfile: vbaradiobutton.cxx,v $
11162 - * $Revision: 1.3 $
11163 - *
11164 - * This file is part of OpenOffice.org.
11165 - *
11166 - * OpenOffice.org is free software: you can redistribute it and/or modify
11167 - * it under the terms of the GNU Lesser General Public License version 3
11168 - * only, as published by the Free Software Foundation.
11169 - *
11170 - * OpenOffice.org is distributed in the hope that it will be useful,
11171 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
11172 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11173 - * GNU Lesser General Public License version 3 for more details
11174 - * (a copy is included in the LICENSE file that accompanied this code).
11175 - *
11176 - * You should have received a copy of the GNU Lesser General Public License
11177 - * version 3 along with OpenOffice.org. If not, see
11178 - * <http://www.openoffice.org/license.html>
11179 - * for a copy of the LGPLv3 License.
11180 - *
11181 - ************************************************************************/
11182 -#include "vbaradiobutton.hxx"
11183 -#include <vector>
11184 -
11185 -using namespace com::sun::star;
11186 -using namespace ooo::vba;
11187 -
11188 -
11189 -const static rtl::OUString LABEL( RTL_CONSTASCII_USTRINGPARAM("Label") );
11190 -const static rtl::OUString STATE( RTL_CONSTASCII_USTRINGPARAM("State") );
11191 -ScVbaRadioButton::ScVbaRadioButton( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : RadioButtonImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
11192 -{
11193 -}
11194 -
11195 -// Attributes
11196 -rtl::OUString SAL_CALL
11197 -ScVbaRadioButton::getCaption() throw (css::uno::RuntimeException)
11198 -{
11199 - rtl::OUString Label;
11200 - m_xProps->getPropertyValue( LABEL ) >>= Label;
11201 - return Label;
11202 -}
11203 -
11204 -void SAL_CALL
11205 -ScVbaRadioButton::setCaption( const rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException)
11206 -{
11207 - m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) );
11208 -}
11209 -
11210 -uno::Any SAL_CALL
11211 -ScVbaRadioButton::getValue() throw (css::uno::RuntimeException)
11212 -{
11213 - sal_Int16 nValue = -1;
11214 - m_xProps->getPropertyValue( STATE ) >>= nValue;
11215 - if( nValue != 0 )
11216 - nValue = -1;
11217 -// return uno::makeAny( nValue );
11218 -// I must be missing something MSO says value should be -1 if selected, 0 if not
11219 -// selected
11220 - return uno::makeAny( ( nValue == -1 ) ? sal_True : sal_False );
11221 -
11222 -}
11223 -
11224 -void SAL_CALL
11225 -ScVbaRadioButton::setValue( const uno::Any& _value ) throw (uno::RuntimeException)
11226 -{
11227 - sal_Int16 nValue = 0;
11228 - sal_Bool bValue = sal_False;
11229 - if( _value >>= nValue )
11230 - {
11231 - if( nValue == -1)
11232 - nValue = 1;
11233 - }
11234 - else if ( _value >>= bValue )
11235 - {
11236 - if ( bValue )
11237 - nValue = 1;
11238 - }
11239 - m_xProps->setPropertyValue( STATE, uno::makeAny( nValue ) );
11240 -}
11241 -
11242 -rtl::OUString&
11243 -ScVbaRadioButton::getServiceImplName()
11244 -{
11245 - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaRadioButton") );
11246 - return sImplName;
11247 -}
11248 -
11249 -uno::Sequence< rtl::OUString >
11250 -ScVbaRadioButton::getServiceNames()
11251 -{
11252 - static uno::Sequence< rtl::OUString > aServiceNames;
11253 - if ( aServiceNames.getLength() == 0 )
11254 - {
11255 - aServiceNames.realloc( 1 );
11256 - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.RadioButton" ) );
11257 - }
11258 - return aServiceNames;
11259 -}
11260 --- sc/source/ui/vba/vbaradiobutton.hxx.old 2009-04-02 10:45:35.000000000 +0000
11261 +++ sc/source/ui/vba/vbaradiobutton.hxx 1970-01-01 00:00:00.000000000 +0000
11262 @@ -1,55 +0,0 @@
11263 -/*************************************************************************
11264 - *
11265 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
11266 - *
11267 - * Copyright 2008 by Sun Microsystems, Inc.
11268 - *
11269 - * OpenOffice.org - a multi-platform office productivity suite
11270 - *
11271 - * $RCSfile: vbaradiobutton.hxx,v $
11272 - * $Revision: 1.3 $
11273 - *
11274 - * This file is part of OpenOffice.org.
11275 - *
11276 - * OpenOffice.org is free software: you can redistribute it and/or modify
11277 - * it under the terms of the GNU Lesser General Public License version 3
11278 - * only, as published by the Free Software Foundation.
11279 - *
11280 - * OpenOffice.org is distributed in the hope that it will be useful,
11281 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
11282 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11283 - * GNU Lesser General Public License version 3 for more details
11284 - * (a copy is included in the LICENSE file that accompanied this code).
11285 - *
11286 - * You should have received a copy of the GNU Lesser General Public License
11287 - * version 3 along with OpenOffice.org. If not, see
11288 - * <http://www.openoffice.org/license.html>
11289 - * for a copy of the LGPLv3 License.
11290 - *
11291 - ************************************************************************/
11292 -#ifndef SC_VBA_RADIOBUTTON_HXX
11293 -#define SC_VBA_RADIOBUTTON_HXX
11294 -#include <ooo/vba/msforms/XRadioButton.hpp>
11295 -#include "vbacontrol.hxx"
11296 -#include "vbahelper.hxx"
11297 -#include <cppuhelper/implbase2.hxx>
11298 -
11299 -typedef cppu::ImplInheritanceHelper2< ScVbaControl, ov::msforms::XRadioButton, css::script::XDefaultProperty > RadioButtonImpl_BASE;
11300 -
11301 -class ScVbaRadioButton : public RadioButtonImpl_BASE
11302 -{
11303 -public:
11304 - ScVbaRadioButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
11305 - // Attributes
11306 - virtual rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
11307 - virtual void SAL_CALL setCaption( const rtl::OUString& _caption ) throw (css::uno::RuntimeException);
11308 - virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
11309 - virtual void SAL_CALL setValue(const com::sun::star::uno::Any&) throw (css::uno::RuntimeException);
11310 - //XHelperInterface
11311 - virtual rtl::OUString& getServiceImplName();
11312 - virtual css::uno::Sequence<rtl::OUString> getServiceNames();
11313 - // XDefaultProperty
11314 - rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
11315 -
11316 -};
11317 -#endif //SC_VBA_RADIOBUTTON_HXX
11318 --- sc/source/ui/vba/vbarange.cxx.old 2009-04-06 16:42:00.000000000 +0000
11319 +++ sc/source/ui/vba/vbarange.cxx 2009-04-06 16:42:01.000000000 +0000
11320 @@ -27,7 +27,7 @@
11321 * for a copy of the LGPLv3 License.
11322 *
11323 ************************************************************************/
11324 -#include "helperdecl.hxx"
11325 +#include <vbahelper/helperdecl.hxx>
11327 #include <comphelper/unwrapargs.hxx>
11328 #include <comphelper/processfactory.hxx>
11329 @@ -146,7 +146,6 @@
11330 #include "rangelst.hxx"
11331 #include "convuno.hxx"
11332 #include "compiler.hxx"
11333 -#include "formula/grammar.hxx"
11334 #include "attrib.hxx"
11335 #include "undodat.hxx"
11336 #include "dbdocfun.hxx"
11337 @@ -159,7 +158,7 @@
11338 #include "vbaglobals.hxx"
11339 #include "vbastyle.hxx"
11340 #include <vector>
11341 -#include <vbacollectionimpl.hxx>
11342 +#include <vbahelper/vbacollectionimpl.hxx>
11343 // begin test includes
11344 #include <com/sun/star/sheet/FunctionArgument.hpp>
11345 // end test includes
11346 @@ -253,7 +252,7 @@ ScCellRangeObj* ScVbaRange::getCellRang
11347 SfxItemSet* ScVbaRange::getCurrentDataSet( ) throw ( uno::RuntimeException )
11348 {
11349 ScCellRangeObj* pUnoCellRange = getCellRangeObj();
11350 - SfxItemSet* pDataSet = ScVbaCellRangeAccess::GetDataSet( pUnoCellRange );
11351 + SfxItemSet* pDataSet = excel::ScVbaCellRangeAccess::GetDataSet( pUnoCellRange );
11352 if ( !pDataSet )
11353 throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can't access Itemset for range" ) ), uno::Reference< uno::XInterface >() );
11354 return pDataSet;
11355 @@ -470,7 +469,7 @@ public:
11356 if ( pUnoCellRange )
11357 {
11359 - SfxItemSet* pDataSet = ScVbaCellRangeAccess::GetDataSet( pUnoCellRange );
11360 + SfxItemSet* pDataSet = excel::ScVbaCellRangeAccess::GetDataSet( pUnoCellRange );
11361 SfxItemState eState = pDataSet->GetItemState( ATTR_VALUE_FORMAT, TRUE, NULL);
11362 // one of the cells in the range is not like the other ;-)
11363 // so return a zero length format to indicate that
11364 @@ -1999,7 +1998,7 @@ bool cellInRange( const table::CellRange
11366 void setCursor( const SCCOL& nCol, const SCROW& nRow, bool bInSel = true )
11367 {
11368 - ScTabViewShell* pShell = getCurrentBestViewShell();
11369 + ScTabViewShell* pShell = excel::getCurrentBestViewShell();
11370 if ( pShell )
11371 {
11372 if ( bInSel )
11373 @@ -2210,7 +2209,7 @@ ScVbaRange::Copy(const ::uno::Any& Desti
11374 else
11375 {
11376 Select();
11377 - implnCopy();
11378 + excel::implnCopy();
11379 }
11380 }
11382 @@ -2234,7 +2233,7 @@ ScVbaRange::Cut(const ::uno::Any& Destin
11383 }
11384 {
11385 Select();
11386 - implnCut();
11387 + excel::implnCut();
11388 }
11389 }
11391 @@ -2564,7 +2563,7 @@ ScVbaRange::PasteSpecial( const uno::Any
11393 USHORT nFlags = getPasteFlags(nPaste);
11394 USHORT nFormulaBits = getPasteFormulaBits(nOperation);
11395 - implnPasteSpecial(nFlags,nFormulaBits,bSkipBlanks,bTranspose);
11396 + excel::implnPasteSpecial(nFlags,nFormulaBits,bSkipBlanks,bTranspose);
11397 // restore selection
11398 xSelection->select( uno::makeAny( xSel ) );
11399 }
11400 @@ -3233,13 +3232,13 @@ ScVbaRange::End( ::sal_Int32 Direction )
11402 // Save ActiveCell pos ( to restore later )
11403 uno::Any aDft;
11404 - rtl::OUString sActiveCell = ScVbaGlobals::getGlobalsImpl(
11405 - mxContext )->getApplication()->getActiveCell()->Address(aDft, aDft, aDft, aDft, aDft );
11406 + uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW );
11407 + rtl::OUString sActiveCell = xApplication->getActiveCell()->Address(aDft, aDft, aDft, aDft, aDft );
11409 // position current cell upper left of this range
11410 Cells( uno::makeAny( (sal_Int32) 1 ), uno::makeAny( (sal_Int32) 1 ) )->Select();
11412 - SfxViewFrame* pViewFrame = getCurrentViewFrame();
11413 + SfxViewFrame* pViewFrame = excel::getCurrentViewFrame();
11414 if ( pViewFrame )
11415 {
11416 SfxAllItemSet aArgs( SFX_APP()->GetPool() );
11417 @@ -3275,18 +3274,17 @@ ScVbaRange::End( ::sal_Int32 Direction )
11418 }
11420 // result is the ActiveCell
11421 - rtl::OUString sMoved = ScVbaGlobals::getGlobalsImpl(
11422 - mxContext )->getApplication()->getActiveCell()->Address(aDft, aDft, aDft, aDft, aDft );
11423 + rtl::OUString sMoved = xApplication->getActiveCell()->Address(aDft, aDft, aDft, aDft, aDft );
11425 // restore old ActiveCell
11426 uno::Any aVoid;
11427 - uno::Reference< excel::XRange > xOldActiveCell( ScVbaGlobals::getGlobalsImpl(
11428 - mxContext )->getActiveSheet()->Range( uno::makeAny( sActiveCell ), aVoid ), uno::UNO_QUERY_THROW );
11429 +
11430 + uno::Reference< excel::XRange > xOldActiveCell( xApplication->getActiveSheet()->Range( uno::makeAny( sActiveCell ), aVoid ), uno::UNO_QUERY_THROW );
11431 xOldActiveCell->Select();
11433 uno::Reference< excel::XRange > resultCell;
11434 - resultCell.set( ScVbaGlobals::getGlobalsImpl(
11435 - mxContext )->getActiveSheet()->Range( uno::makeAny( sMoved ), aVoid ), uno::UNO_QUERY_THROW );
11436 +
11437 + resultCell.set( xApplication->getActiveSheet()->Range( uno::makeAny( sMoved ), aVoid ), uno::UNO_QUERY_THROW );
11439 // return result
11441 @@ -3749,7 +3747,7 @@ ScVbaRange::setPageBreak( const uno::Any
11442 uno::Reference< frame::XModel > xModel = pShell->GetModel();
11443 if ( xModel.is() )
11444 {
11445 - ScTabViewShell* pViewShell = getBestViewShell( xModel );
11446 + ScTabViewShell* pViewShell = excel::getBestViewShell( xModel );
11447 if ( nPageBreak == excel::XlPageBreak::xlPageBreakManual )
11448 pViewShell->InsertPageBreak( bColumn, TRUE, &aAddr);
11449 else if ( nPageBreak == excel::XlPageBreak::xlPageBreakNone )
11450 @@ -4711,7 +4709,7 @@ ScVbaRange::PrintOut( const uno::Any& Fr
11451 {
11452 xPrintAreas->setPrintAreas( printAreas );
11453 uno::Reference< frame::XModel > xModel = pShell->GetModel();
11454 - PrintOutHelper( From, To, Copies, Preview, ActivePrinter, PrintToFile, Collate, PrToFileName, xModel, sal_True );
11455 + PrintOutHelper( excel::getBestViewShell( xModel ), From, To, Copies, Preview, ActivePrinter, PrintToFile, Collate, PrToFileName, sal_True );
11456 }
11457 }
11458 }
11459 @@ -5362,7 +5360,8 @@ sal_Bool SAL_CALL
11460 ScVbaRange::hasError() throw (uno::RuntimeException)
11461 {
11462 double dResult = sal_False;
11463 - uno::Reference< script::XInvocation > xInvoc( ScVbaGlobals::getGlobalsImpl( mxContext )->getApplication()->WorksheetFunction(), uno::UNO_QUERY_THROW );
11464 + uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW );
11465 + uno::Reference< script::XInvocation > xInvoc( xApplication->WorksheetFunction(), uno::UNO_QUERY_THROW );
11467 static rtl::OUString FunctionName( RTL_CONSTASCII_USTRINGPARAM("IsError" ) );
11468 uno::Sequence< uno::Any > Params(1);
11469 --- sc/source/ui/vba/vbarange.hxx.old 2009-04-06 16:42:00.000000000 +0000
11470 +++ sc/source/ui/vba/vbarange.hxx 2009-04-06 16:42:01.000000000 +0000
11471 @@ -53,12 +53,15 @@
11472 #include <com/sun/star/sheet/XSpreadsheet.hpp>
11473 #include <com/sun/star/sheet/XSheetCellRangeContainer.hpp>
11475 -//#include "vbahelperinterface.hxx"
11476 +//#include <vbahelper/vbahelperinterface.hxx>
11477 #include "vbaformat.hxx"
11478 +#include <formula/grammar.hxx>
11480 class ScTableSheetsObj;
11481 class ScCellRangesBase;
11482 class ScCellRangeObj;
11483 +class ScDocShell;
11484 +class ScDocument;
11486 //typedef InheritedHelperInterfaceImpl1< ov::excel::XRange > ScVbaRange_BASE;
11487 typedef ScVbaFormat< ov::excel::XRange > ScVbaRange_BASE;
11488 --- sc/source/ui/vba/vbascrollbar.cxx.old 2009-04-02 10:45:35.000000000 +0000
11489 +++ sc/source/ui/vba/vbascrollbar.cxx 1970-01-01 00:00:00.000000000 +0000
11490 @@ -1,139 +0,0 @@
11491 -/*************************************************************************
11492 - *
11493 - * OpenOffice.org - a multi-platform office productivity suite
11494 - *
11495 - * $RCSfile$
11496 - *
11497 - * $Revision$
11498 - *
11499 - * last change: $Author$ $Date$
11500 - *
11501 - * The Contents of this file are made available subject to
11502 - * the terms of GNU Lesser General Public License Version 2.1.
11503 - *
11504 - *
11505 - * GNU Lesser General Public License Version 2.1
11506 - * =============================================
11507 - * Copyright 2005 by Sun Microsystems, Inc.
11508 - * 901 San Antonio Road, Palo Alto, CA 94303, USA
11509 - *
11510 - * This library is free software; you can redistribute it and/or
11511 - * modify it under the terms of the GNU Lesser General Public
11512 - * License version 2.1, as published by the Free Software Foundation.
11513 - *
11514 - * This library is distributed in the hope that it will be useful,
11515 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
11516 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
11517 - * Lesser General Public License for more details.
11518 - *
11519 - * You should have received a copy of the GNU Lesser General Public
11520 - * License along with this library; if not, write to the Free Software
11521 - * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
11522 - * MA 02111-1307 USA
11523 - *
11524 - ************************************************************************/
11525 -#include "vbascrollbar.hxx"
11526 -#include <vector>
11527 -
11528 -using namespace com::sun::star;
11529 -using namespace ooo::vba;
11530 -
11531 -
11532 -const static rtl::OUString LARGECHANGE( RTL_CONSTASCII_USTRINGPARAM("BlockIncrement") );
11533 -const static rtl::OUString SMALLCHANGE( RTL_CONSTASCII_USTRINGPARAM("LineIncrement") );
11534 -const static rtl::OUString ORIENTATION( RTL_CONSTASCII_USTRINGPARAM("Orientation") );
11535 -const static rtl::OUString SCROLLVALUE( RTL_CONSTASCII_USTRINGPARAM("ScrollValue") );
11536 -const static rtl::OUString SCROLLMAX( RTL_CONSTASCII_USTRINGPARAM("ScrollValueMax") );
11537 -const static rtl::OUString SCROLLMIN( RTL_CONSTASCII_USTRINGPARAM("ScrollValueMin") );
11538 -
11539 -ScVbaScrollBar::ScVbaScrollBar( const css::uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : ScrollBarImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
11540 -{
11541 -}
11542 -
11543 -// Attributes
11544 -uno::Any SAL_CALL
11545 -ScVbaScrollBar::getValue() throw (css::uno::RuntimeException)
11546 -{
11547 - return m_xProps->getPropertyValue( SCROLLVALUE );
11548 -}
11549 -
11550 -void SAL_CALL
11551 -ScVbaScrollBar::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException)
11552 -{
11553 - m_xProps->setPropertyValue( SCROLLVALUE, _value );
11554 -}
11555 -
11556 -::sal_Int32 SAL_CALL
11557 -ScVbaScrollBar::getMax() throw (uno::RuntimeException)
11558 -{
11559 - sal_Int32 nMax = 0;
11560 - m_xProps->getPropertyValue( SCROLLMAX ) >>= nMax;
11561 - return nMax;
11562 -}
11563 -
11564 -void SAL_CALL
11565 -ScVbaScrollBar::setMax( sal_Int32 nVal ) throw (uno::RuntimeException)
11566 -{
11567 - m_xProps->setPropertyValue( SCROLLMAX, uno::makeAny( nVal ) );
11568 -}
11569 -
11570 -::sal_Int32 SAL_CALL
11571 -ScVbaScrollBar::getMin() throw (uno::RuntimeException)
11572 -{
11573 - sal_Int32 nVal = 0;
11574 - m_xProps->getPropertyValue( SCROLLMIN ) >>= nVal;
11575 - return nVal;
11576 -}
11577 -
11578 -void SAL_CALL
11579 -ScVbaScrollBar::setMin( sal_Int32 nVal ) throw (uno::RuntimeException)
11580 -{
11581 - m_xProps->setPropertyValue( SCROLLMIN, uno::makeAny( nVal ) );
11582 -}
11583 -
11584 -void SAL_CALL
11585 -ScVbaScrollBar::setLargeChange( ::sal_Int32 _largechange ) throw (uno::RuntimeException)
11586 -{
11587 - m_xProps->setPropertyValue( LARGECHANGE, uno::makeAny( _largechange ) );
11588 -}
11589 -
11590 -::sal_Int32 SAL_CALL
11591 -ScVbaScrollBar::getLargeChange() throw (uno::RuntimeException)
11592 -{
11593 - sal_Int32 nVal = 0;
11594 - m_xProps->getPropertyValue( LARGECHANGE ) >>= nVal;
11595 - return nVal;
11596 -}
11597 -
11598 -::sal_Int32 SAL_CALL
11599 -ScVbaScrollBar::getSmallChange() throw (uno::RuntimeException)
11600 -{
11601 - sal_Int32 nSmallChange = 0;
11602 - m_xProps->getPropertyValue( SMALLCHANGE ) >>= nSmallChange;
11603 - return nSmallChange;
11604 -}
11605 -
11606 -void SAL_CALL
11607 -ScVbaScrollBar::setSmallChange( ::sal_Int32 _smallchange ) throw (uno::RuntimeException)
11608 -{
11609 - m_xProps->setPropertyValue( SMALLCHANGE, uno::makeAny( _smallchange ) );
11610 -}
11611 -
11612 -rtl::OUString&
11613 -ScVbaScrollBar::getServiceImplName()
11614 -{
11615 - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaScrollBar") );
11616 - return sImplName;
11617 -}
11618 -
11619 -uno::Sequence< rtl::OUString >
11620 -ScVbaScrollBar::getServiceNames()
11621 -{
11622 - static uno::Sequence< rtl::OUString > aServiceNames;
11623 - if ( aServiceNames.getLength() == 0 )
11624 - {
11625 - aServiceNames.realloc( 1 );
11626 - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.Frame" ) );
11627 - }
11628 - return aServiceNames;
11629 -}
11630 --- sc/source/ui/vba/vbascrollbar.hxx.old 2009-04-02 10:45:35.000000000 +0000
11631 +++ sc/source/ui/vba/vbascrollbar.hxx 1970-01-01 00:00:00.000000000 +0000
11632 @@ -1,66 +0,0 @@
11633 -/*************************************************************************
11634 - *
11635 - * OpenOffice.org - a multi-platform office productivity suite
11636 - *
11637 - * $RCSfile$
11638 - *
11639 - * $Revision$
11640 - *
11641 - * last change: $Author$ $Date$
11642 - *
11643 - * The Contents of this file are made available subject to
11644 - * the terms of GNU Lesser General Public License Version 2.1.
11645 - *
11646 - *
11647 - * GNU Lesser General Public License Version 2.1
11648 - * =============================================
11649 - * Copyright 2005 by Sun Microsystems, Inc.
11650 - * 901 San Antonio Road, Palo Alto, CA 94303, USA
11651 - *
11652 - * This library is free software; you can redistribute it and/or
11653 - * modify it under the terms of the GNU Lesser General Public
11654 - * License version 2.1, as published by the Free Software Foundation.
11655 - *
11656 - * This library is distributed in the hope that it will be useful,
11657 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
11658 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
11659 - * Lesser General Public License for more details.
11660 - *
11661 - * You should have received a copy of the GNU Lesser General Public
11662 - * License along with this library; if not, write to the Free Software
11663 - * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
11664 - * MA 02111-1307 USA
11665 - *
11666 - ************************************************************************/
11667 -#ifndef SC_VBA_SCROLLBAR_HXX
11668 -#define SC_VBA_SCROLLBAR_HXX
11669 -#include <cppuhelper/implbase1.hxx>
11670 -#include <ooo/vba/msforms/XScrollBar.hpp>
11671 -
11672 -#include "vbacontrol.hxx"
11673 -#include "vbahelper.hxx"
11674 -
11675 -typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XScrollBar > ScrollBarImpl_BASE;
11676 -
11677 -class ScVbaScrollBar : public ScrollBarImpl_BASE
11678 -{
11679 -public:
11680 - ScVbaScrollBar( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
11681 - // Attributes
11682 - virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
11683 - virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
11684 - virtual ::sal_Int32 SAL_CALL getMax() throw (css::uno::RuntimeException);
11685 - virtual void SAL_CALL setMax( ::sal_Int32 _max ) throw (css::uno::RuntimeException);
11686 - virtual ::sal_Int32 SAL_CALL getMin() throw (css::uno::RuntimeException);
11687 - virtual void SAL_CALL setMin( ::sal_Int32 _min ) throw (css::uno::RuntimeException);
11688 - virtual ::sal_Int32 SAL_CALL getLargeChange() throw (css::uno::RuntimeException);
11689 - virtual void SAL_CALL setLargeChange( ::sal_Int32 _largechange ) throw (css::uno::RuntimeException);
11690 - virtual ::sal_Int32 SAL_CALL getSmallChange() throw (css::uno::RuntimeException);
11691 - virtual void SAL_CALL setSmallChange( ::sal_Int32 _smallchange ) throw (css::uno::RuntimeException);
11692 -
11693 -
11694 - //XHelperInterface
11695 - virtual rtl::OUString& getServiceImplName();
11696 - virtual css::uno::Sequence<rtl::OUString> getServiceNames();
11697 -};
11698 -#endif //SC_VBA_LABEL_HXX
11699 --- sc/source/ui/vba/vbaseriescollection.hxx.old 2009-04-02 10:45:35.000000000 +0000
11700 +++ sc/source/ui/vba/vbaseriescollection.hxx 2009-04-06 16:42:01.000000000 +0000
11701 @@ -31,9 +31,9 @@
11702 #define SC_VBA_SERIESCOLLECTION_HXX
11704 #include <ooo/vba/excel/XSeriesCollection.hpp>
11705 -#include "vbahelperinterface.hxx"
11706 -#include "vbacollectionimpl.hxx"
11707 -#include "vbahelper.hxx"
11708 +#include <vbahelper/vbahelperinterface.hxx>
11709 +#include <vbahelper/vbacollectionimpl.hxx>
11710 +#include "excelvbahelper.hxx"
11713 typedef CollTestImplHelper< ov::excel::XSeriesCollection > SeriesCollection_BASE;
11714 --- sc/source/ui/vba/vbashape.hxx.old 2009-04-02 10:45:35.000000000 +0000
11715 +++ sc/source/ui/vba/vbashape.hxx 2009-04-06 16:42:01.000000000 +0000
11716 @@ -39,7 +39,7 @@
11717 #include <ooo/vba/msforms/XLineFormat.hpp>
11718 #include <cppuhelper/implbase2.hxx>
11720 -#include "vbahelperinterface.hxx"
11721 +#include <vbahelper/vbahelperinterface.hxx>
11723 typedef ::cppu::WeakImplHelper2< ov::msforms::XShape, css::lang::XEventListener > ListeningShape;
11725 --- sc/source/ui/vba/vbashaperange.cxx.old 2009-04-02 10:45:35.000000000 +0000
11726 +++ sc/source/ui/vba/vbashaperange.cxx 2009-04-06 16:42:01.000000000 +0000
11727 @@ -30,6 +30,7 @@
11728 #include <com/sun/star/drawing/XShapeGrouper.hpp>
11729 #include <com/sun/star/drawing/XDrawPage.hpp>
11731 +#include "excelvbahelper.hxx"
11732 #include "vbashaperange.hxx"
11733 #include "vbashape.hxx"
11735 --- sc/source/ui/vba/vbashaperange.hxx.old 2009-04-02 10:45:35.000000000 +0000
11736 +++ sc/source/ui/vba/vbashaperange.hxx 2009-04-06 16:42:01.000000000 +0000
11737 @@ -33,7 +33,7 @@
11738 #include <com/sun/star/drawing/XShapes.hpp>
11739 #include <ooo/vba/msforms/XShapeRange.hpp>
11741 -#include "vbacollectionimpl.hxx"
11742 +#include <vbahelper/vbacollectionimpl.hxx>
11744 typedef CollTestImplHelper< ov::msforms::XShapeRange > ScVbaShapeRange_BASE;
11746 --- sc/source/ui/vba/vbashapes.cxx.old 2009-04-02 10:45:35.000000000 +0000
11747 +++ sc/source/ui/vba/vbashapes.cxx 2009-04-06 16:42:01.000000000 +0000
11748 @@ -33,6 +33,7 @@
11749 #include <ooo/vba/msforms/XShapeRange.hpp>
11750 #include <ooo/vba/office/MsoAutoShapeType.hpp>
11752 +#include "excelvbahelper.hxx"
11753 #include "vbashapes.hxx"
11754 #include "vbashape.hxx"
11755 #include "vbashaperange.hxx"
11756 --- sc/source/ui/vba/vbashapes.hxx.old 2009-04-02 10:45:35.000000000 +0000
11757 +++ sc/source/ui/vba/vbashapes.hxx 2009-04-06 16:42:01.000000000 +0000
11758 @@ -35,9 +35,9 @@
11759 #include <com/sun/star/container/XIndexAccess.hpp>
11760 #include <ooo/vba/msforms/XShapes.hpp>
11762 -#include "vbahelperinterface.hxx"
11763 +#include <vbahelper/vbahelperinterface.hxx>
11765 -#include "vbacollectionimpl.hxx"
11766 +#include <vbahelper/vbacollectionimpl.hxx>
11768 typedef CollTestImplHelper< ov::msforms::XShapes > ScVbaShapes_BASE;
11770 --- sc/source/ui/vba/vbaspinbutton.cxx.old 2009-04-02 10:45:35.000000000 +0000
11771 +++ sc/source/ui/vba/vbaspinbutton.cxx 1970-01-01 00:00:00.000000000 +0000
11772 @@ -1,109 +0,0 @@
11773 -/*************************************************************************
11774 - *
11775 - * OpenOffice.org - a multi-platform office productivity suite
11776 - *
11777 - * $RCSfile$
11778 - *
11779 - * $Revision$
11780 - *
11781 - * last change: $Author$ $Date$
11782 - *
11783 - * The Contents of this file are made available subject to
11784 - * the terms of GNU Lesser General Public License Version 2.1.
11785 - *
11786 - *
11787 - * GNU Lesser General Public License Version 2.1
11788 - * =============================================
11789 - * Copyright 2005 by Sun Microsystems, Inc.
11790 - * 901 San Antonio Road, Palo Alto, CA 94303, USA
11791 - *
11792 - * This library is free software; you can redistribute it and/or
11793 - * modify it under the terms of the GNU Lesser General Public
11794 - * License version 2.1, as published by the Free Software Foundation.
11795 - *
11796 - * This library is distributed in the hope that it will be useful,
11797 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
11798 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
11799 - * Lesser General Public License for more details.
11800 - *
11801 - * You should have received a copy of the GNU Lesser General Public
11802 - * License along with this library; if not, write to the Free Software
11803 - * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
11804 - * MA 02111-1307 USA
11805 - *
11806 - ************************************************************************/
11807 -#include "vbaspinbutton.hxx"
11808 -#include <vector>
11809 -
11810 -using namespace com::sun::star;
11811 -using namespace ooo::vba;
11812 -
11813 -
11814 -const static rtl::OUString ORIENTATION( RTL_CONSTASCII_USTRINGPARAM("Orientation") );
11815 -const static rtl::OUString SPINVALUE( RTL_CONSTASCII_USTRINGPARAM("SpinValue") );
11816 -const static rtl::OUString SPINMAX( RTL_CONSTASCII_USTRINGPARAM("SpinValueMax") );
11817 -const static rtl::OUString SPINMIN( RTL_CONSTASCII_USTRINGPARAM("SpinValueMin") );
11818 -
11819 -ScVbaSpinButton::ScVbaSpinButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : SpinButtonImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
11820 -{
11821 -}
11822 -
11823 -// Attributes
11824 -uno::Any SAL_CALL
11825 -ScVbaSpinButton::getValue() throw (css::uno::RuntimeException)
11826 -{
11827 - return m_xProps->getPropertyValue( SPINVALUE );
11828 -}
11829 -
11830 -void SAL_CALL
11831 -ScVbaSpinButton::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException)
11832 -{
11833 - m_xProps->setPropertyValue( SPINVALUE, _value );
11834 -}
11835 -
11836 -::sal_Int32 SAL_CALL
11837 -ScVbaSpinButton::getMax() throw (uno::RuntimeException)
11838 -{
11839 - sal_Int32 nMax = 0;
11840 - m_xProps->getPropertyValue( SPINMAX ) >>= nMax;
11841 - return nMax;
11842 -}
11843 -
11844 -void SAL_CALL
11845 -ScVbaSpinButton::setMax( sal_Int32 nVal ) throw (uno::RuntimeException)
11846 -{
11847 - m_xProps->setPropertyValue( SPINMAX, uno::makeAny( nVal ) );
11848 -}
11849 -
11850 -::sal_Int32 SAL_CALL
11851 -ScVbaSpinButton::getMin() throw (uno::RuntimeException)
11852 -{
11853 - sal_Int32 nVal = 0;
11854 - m_xProps->getPropertyValue( SPINMIN ) >>= nVal;
11855 - return nVal;
11856 -}
11857 -
11858 -void SAL_CALL
11859 -ScVbaSpinButton::setMin( sal_Int32 nVal ) throw (uno::RuntimeException)
11860 -{
11861 - m_xProps->setPropertyValue( SPINMIN, uno::makeAny( nVal ) );
11862 -}
11863 -
11864 -rtl::OUString&
11865 -ScVbaSpinButton::getServiceImplName()
11866 -{
11867 - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaSpinButton") );
11868 - return sImplName;
11869 -}
11870 -
11871 -uno::Sequence< rtl::OUString >
11872 -ScVbaSpinButton::getServiceNames()
11873 -{
11874 - static uno::Sequence< rtl::OUString > aServiceNames;
11875 - if ( aServiceNames.getLength() == 0 )
11876 - {
11877 - aServiceNames.realloc( 1 );
11878 - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.Frame" ) );
11879 - }
11880 - return aServiceNames;
11881 -}
11882 --- sc/source/ui/vba/vbaspinbutton.hxx.old 2009-04-02 10:45:35.000000000 +0000
11883 +++ sc/source/ui/vba/vbaspinbutton.hxx 1970-01-01 00:00:00.000000000 +0000
11884 @@ -1,61 +0,0 @@
11885 -/*************************************************************************
11886 - *
11887 - * OpenOffice.org - a multi-platform office productivity suite
11888 - *
11889 - * $RCSfile$
11890 - *
11891 - * $Revision$
11892 - *
11893 - * last change: $Author$ $Date$
11894 - *
11895 - * The Contents of this file are made available subject to
11896 - * the terms of GNU Lesser General Public License Version 2.1.
11897 - *
11898 - *
11899 - * GNU Lesser General Public License Version 2.1
11900 - * =============================================
11901 - * Copyright 2005 by Sun Microsystems, Inc.
11902 - * 901 San Antonio Road, Palo Alto, CA 94303, USA
11903 - *
11904 - * This library is free software; you can redistribute it and/or
11905 - * modify it under the terms of the GNU Lesser General Public
11906 - * License version 2.1, as published by the Free Software Foundation.
11907 - *
11908 - * This library is distributed in the hope that it will be useful,
11909 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
11910 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
11911 - * Lesser General Public License for more details.
11912 - *
11913 - * You should have received a copy of the GNU Lesser General Public
11914 - * License along with this library; if not, write to the Free Software
11915 - * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
11916 - * MA 02111-1307 USA
11917 - *
11918 - ************************************************************************/
11919 -#ifndef SC_VBA_SPINBUTTON_HXX
11920 -#define SC_VBA_SPINBUTTON_HXX
11921 -#include <cppuhelper/implbase1.hxx>
11922 -#include <ooo/vba/msforms/XSpinButton.hpp>
11923 -
11924 -#include "vbacontrol.hxx"
11925 -#include "vbahelper.hxx"
11926 -
11927 -typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XSpinButton > SpinButtonImpl_BASE;
11928 -
11929 -class ScVbaSpinButton : public SpinButtonImpl_BASE
11930 -{
11931 -public:
11932 - ScVbaSpinButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
11933 - // Attributes
11934 - virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
11935 - virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
11936 - virtual ::sal_Int32 SAL_CALL getMax() throw (css::uno::RuntimeException);
11937 - virtual void SAL_CALL setMax( ::sal_Int32 _max ) throw (css::uno::RuntimeException);
11938 - virtual ::sal_Int32 SAL_CALL getMin() throw (css::uno::RuntimeException);
11939 - virtual void SAL_CALL setMin( ::sal_Int32 _min ) throw (css::uno::RuntimeException);
11940 -
11941 - //XHelperInterface
11942 - virtual rtl::OUString& getServiceImplName();
11943 - virtual css::uno::Sequence<rtl::OUString> getServiceNames();
11944 -};
11945 -#endif //SC_VBA_SPINBUTTON_HXX
11946 --- sc/source/ui/vba/vbastyles.cxx.old 2009-04-02 10:45:35.000000000 +0000
11947 +++ sc/source/ui/vba/vbastyles.cxx 2009-04-06 16:42:01.000000000 +0000
11948 @@ -29,6 +29,7 @@
11949 ************************************************************************/
11950 #include "vbastyles.hxx"
11951 #include "vbastyle.hxx"
11952 +#include <ooo/vba/excel/XRange.hpp>
11954 using namespace ::ooo::vba;
11955 using namespace ::com::sun::star;
11956 --- sc/source/ui/vba/vbastyles.hxx.old 2009-04-02 10:45:35.000000000 +0000
11957 +++ sc/source/ui/vba/vbastyles.hxx 2009-04-06 16:42:01.000000000 +0000
11958 @@ -31,7 +31,7 @@
11959 #define SC_VBA_STYLES_HXX
11960 #include <ooo/vba/excel/XStyles.hpp>
11961 #include <com/sun/star/container/XNameContainer.hpp>
11962 -#include "vbacollectionimpl.hxx"
11963 +#include <vbahelper/vbacollectionimpl.hxx>
11965 typedef CollTestImplHelper< ov::excel::XStyles > ScVbaStyles_BASE;
11966 class ScVbaStyles: public ScVbaStyles_BASE
11967 --- sc/source/ui/vba/vbatextbox.cxx.old 2009-04-02 10:45:35.000000000 +0000
11968 +++ sc/source/ui/vba/vbatextbox.cxx 1970-01-01 00:00:00.000000000 +0000
11969 @@ -1,137 +0,0 @@
11970 -/*************************************************************************
11971 - *
11972 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
11973 - *
11974 - * Copyright 2008 by Sun Microsystems, Inc.
11975 - *
11976 - * OpenOffice.org - a multi-platform office productivity suite
11977 - *
11978 - * $RCSfile: vbatextbox.cxx,v $
11979 - * $Revision: 1.3 $
11980 - *
11981 - * This file is part of OpenOffice.org.
11982 - *
11983 - * OpenOffice.org is free software: you can redistribute it and/or modify
11984 - * it under the terms of the GNU Lesser General Public License version 3
11985 - * only, as published by the Free Software Foundation.
11986 - *
11987 - * OpenOffice.org is distributed in the hope that it will be useful,
11988 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
11989 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11990 - * GNU Lesser General Public License version 3 for more details
11991 - * (a copy is included in the LICENSE file that accompanied this code).
11992 - *
11993 - * You should have received a copy of the GNU Lesser General Public License
11994 - * version 3 along with OpenOffice.org. If not, see
11995 - * <http://www.openoffice.org/license.html>
11996 - * for a copy of the LGPLv3 License.
11997 - *
11998 - ************************************************************************/
11999 -#include <com/sun/star/text/XTextRange.hpp>
12000 -
12001 -#include "vbatextbox.hxx"
12002 -#include <vector>
12003 -
12004 -using namespace com::sun::star;
12005 -using namespace ooo::vba;
12006 -
12007 -
12008 -
12009 -ScVbaTextBox::ScVbaTextBox( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper, bool bDialog ) : TextBoxImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper ), mbDialog( bDialog )
12010 -{
12011 -}
12012 -
12013 -// Attributes
12014 -uno::Any SAL_CALL
12015 -ScVbaTextBox::getValue() throw (css::uno::RuntimeException)
12016 -{
12017 - return uno::makeAny( getText() );
12018 -}
12019 -
12020 -void SAL_CALL
12021 -ScVbaTextBox::setValue( const uno::Any& _value ) throw (css::uno::RuntimeException)
12022 -{
12023 - rtl::OUString sVal = getAnyAsString( _value );
12024 - setText( sVal );
12025 -}
12026 -
12027 -//getString() will cause some imfo lose.
12028 -rtl::OUString SAL_CALL
12029 -ScVbaTextBox::getText() throw (css::uno::RuntimeException)
12030 -{
12031 - uno::Any aValue;
12032 - aValue = m_xProps->getPropertyValue
12033 - (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Text" ) ) );
12034 - rtl::OUString sString;
12035 - aValue >>= sString;
12036 - return sString;
12037 -}
12038 -
12039 -void SAL_CALL
12040 -ScVbaTextBox::setText( const rtl::OUString& _text ) throw (css::uno::RuntimeException)
12041 -{
12042 - if ( !mbDialog )
12043 - {
12044 - uno::Reference< text::XTextRange > xTextRange( m_xProps, uno::UNO_QUERY_THROW );
12045 - xTextRange->setString( _text );
12046 -}
12047 - else
12048 - m_xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Text") ), uno::makeAny( _text ) );
12049 -}
12050 -
12051 -sal_Int32 SAL_CALL
12052 -ScVbaTextBox::getMaxLength() throw (css::uno::RuntimeException)
12053 -{
12054 - uno::Any aValue;
12055 - aValue = m_xProps->getPropertyValue
12056 - (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MaxTextLen" ) ) );
12057 - sal_Int32 nMaxLength = 0;
12058 - aValue >>= nMaxLength;
12059 - return nMaxLength;
12060 -}
12061 -
12062 -void SAL_CALL
12063 -ScVbaTextBox::setMaxLength( sal_Int32 _maxlength ) throw (css::uno::RuntimeException)
12064 -{
12065 - uno::Any aValue( _maxlength );
12066 - m_xProps->setPropertyValue
12067 - (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MaxTextLen" ) ), aValue);
12068 -}
12069 -
12070 -sal_Bool SAL_CALL
12071 -ScVbaTextBox::getMultiline() throw (css::uno::RuntimeException)
12072 -{
12073 - uno::Any aValue;
12074 - aValue = m_xProps->getPropertyValue
12075 - (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MultiLine" ) ) );
12076 - sal_Bool bRet = false;
12077 - aValue >>= bRet;
12078 - return bRet;
12079 -}
12080 -
12081 -void SAL_CALL
12082 -ScVbaTextBox::setMultiline( sal_Bool _multiline ) throw (css::uno::RuntimeException)
12083 -{
12084 - uno::Any aValue( _multiline );
12085 - m_xProps->setPropertyValue
12086 - (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MultiLine" ) ), aValue);
12087 -}
12088 -
12089 -rtl::OUString&
12090 -ScVbaTextBox::getServiceImplName()
12091 -{
12092 - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaTextBox") );
12093 - return sImplName;
12094 -}
12095 -
12096 -uno::Sequence< rtl::OUString >
12097 -ScVbaTextBox::getServiceNames()
12098 -{
12099 - static uno::Sequence< rtl::OUString > aServiceNames;
12100 - if ( aServiceNames.getLength() == 0 )
12101 - {
12102 - aServiceNames.realloc( 1 );
12103 - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.TextBox" ) );
12104 - }
12105 - return aServiceNames;
12106 -}
12107 --- sc/source/ui/vba/vbatextbox.hxx.old 2009-04-02 10:45:35.000000000 +0000
12108 +++ sc/source/ui/vba/vbatextbox.hxx 1970-01-01 00:00:00.000000000 +0000
12109 @@ -1,57 +0,0 @@
12110 -/*************************************************************************
12111 - *
12112 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
12113 - *
12114 - * Copyright 2008 by Sun Microsystems, Inc.
12115 - *
12116 - * OpenOffice.org - a multi-platform office productivity suite
12117 - *
12118 - * $RCSfile: vbatextbox.hxx,v $
12119 - * $Revision: 1.3 $
12120 - *
12121 - * This file is part of OpenOffice.org.
12122 - *
12123 - * OpenOffice.org is free software: you can redistribute it and/or modify
12124 - * it under the terms of the GNU Lesser General Public License version 3
12125 - * only, as published by the Free Software Foundation.
12126 - *
12127 - * OpenOffice.org is distributed in the hope that it will be useful,
12128 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
12129 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12130 - * GNU Lesser General Public License version 3 for more details
12131 - * (a copy is included in the LICENSE file that accompanied this code).
12132 - *
12133 - * You should have received a copy of the GNU Lesser General Public License
12134 - * version 3 along with OpenOffice.org. If not, see
12135 - * <http://www.openoffice.org/license.html>
12136 - * for a copy of the LGPLv3 License.
12137 - *
12138 - ************************************************************************/
12139 -#ifndef SC_VBA_TEXTBOX_HXX
12140 -#define SC_VBA_TEXTBOX_HXX
12141 -#include <cppuhelper/implbase1.hxx>
12142 -#include <ooo/vba/msforms/XTextBox.hpp>
12143 -#include "vbacontrol.hxx"
12144 -#include "vbahelper.hxx"
12145 -
12146 -typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XTextBox > TextBoxImpl_BASE;
12147 -
12148 -class ScVbaTextBox : public TextBoxImpl_BASE
12149 -{
12150 - bool mbDialog;
12151 -public:
12152 - ScVbaTextBox( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper, bool bDialog = false );
12153 - // Attributes
12154 - virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
12155 - virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
12156 - virtual rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException);
12157 - virtual void SAL_CALL setText( const rtl::OUString& _text ) throw (css::uno::RuntimeException);
12158 - virtual sal_Int32 SAL_CALL getMaxLength() throw (css::uno::RuntimeException);
12159 - virtual void SAL_CALL setMaxLength( sal_Int32 _maxlength ) throw (css::uno::RuntimeException);
12160 - virtual sal_Bool SAL_CALL getMultiline() throw (css::uno::RuntimeException);
12161 - virtual void SAL_CALL setMultiline( sal_Bool _multiline ) throw (css::uno::RuntimeException);
12162 - //XHelperInterface
12163 - virtual rtl::OUString& getServiceImplName();
12164 - virtual css::uno::Sequence<rtl::OUString> getServiceNames();
12165 -};
12166 -#endif //SC_VBA_TEXTBOX_HXX
12167 --- sc/source/ui/vba/vbatextboxshape.cxx.old 2009-04-02 10:45:35.000000000 +0000
12168 +++ sc/source/ui/vba/vbatextboxshape.cxx 2009-04-06 16:42:01.000000000 +0000
12169 @@ -62,7 +62,7 @@ ScVbaTextBoxShape::setText( const rtl::O
12170 uno::Reference< excel::XCharacters > SAL_CALL
12171 ScVbaTextBoxShape::characters( const uno::Any& Start, const uno::Any& Length ) throw (uno::RuntimeException)
12172 {
12173 - ScDocShell* pDocShell = getDocShell( m_xModel );
12174 + ScDocShell* pDocShell = excel::getDocShell( m_xModel );
12175 ScDocument* pDoc = pDocShell ? pDocShell->GetDocument() : NULL;
12177 if ( !pDoc )
12178 --- sc/source/ui/vba/vbatextboxshape.hxx.old 2009-04-02 10:45:35.000000000 +0000
12179 +++ sc/source/ui/vba/vbatextboxshape.hxx 2009-04-06 16:42:01.000000000 +0000
12180 @@ -38,7 +38,7 @@
12181 #include <com/sun/star/text/XTextRange.hpp>
12182 #include <ooo/vba/msforms/XTextBoxShape.hpp>
12183 #include "vbashape.hxx"
12184 -#include "vbahelper.hxx"
12185 +#include "excelvbahelper.hxx"
12186 #include "vbacharacters.hxx"
12188 typedef cppu::ImplInheritanceHelper1< ScVbaShape, ov::msforms::XTextBoxShape > TextBoxShapeImpl_BASE;
12189 --- sc/source/ui/vba/vbatextframe.hxx.old 2009-04-02 10:45:35.000000000 +0000
12190 +++ sc/source/ui/vba/vbatextframe.hxx 2009-04-06 16:42:01.000000000 +0000
12191 @@ -34,7 +34,7 @@
12192 #include <ooo/vba/excel/XCharacters.hpp>
12193 #include <ooo/vba/excel/XTextFrame.hpp>
12195 -#include "vbahelperinterface.hxx"
12196 +#include <vbahelper/vbahelperinterface.hxx>
12197 #include "vbapalette.hxx"
12199 typedef InheritedHelperInterfaceImpl1< ov::excel::XTextFrame > ScVbaTextFrame_BASE;
12200 --- sc/source/ui/vba/vbatitle.hxx.old 2009-04-02 10:45:35.000000000 +0000
12201 +++ sc/source/ui/vba/vbatitle.hxx 2009-04-06 16:42:01.000000000 +0000
12202 @@ -30,14 +30,15 @@
12203 #ifndef SC_VBA_TITLE_HXX
12204 #define SC_VBA_TITLE_HXX
12206 -#include "vbahelperinterface.hxx"
12207 -#include "vbahelper.hxx"
12208 +#include <vbahelper/vbahelperinterface.hxx>
12209 +#include "excelvbahelper.hxx"
12210 #include "vbainterior.hxx"
12211 #include "vbafont.hxx"
12212 #include "vbapalette.hxx"
12213 #include <com/sun/star/drawing/XShape.hpp>
12214 #include <com/sun/star/beans/XPropertySet.hpp>
12215 #include <ooo/vba/excel/XTitle.hpp>
12216 +#include <ooo/vba/excel/XCharacters.hpp>
12217 #include <basic/sberrors.hxx>
12218 #include <memory>
12220 --- sc/source/ui/vba/vbatogglebutton.cxx.old 2009-04-02 10:45:35.000000000 +0000
12221 +++ sc/source/ui/vba/vbatogglebutton.cxx 1970-01-01 00:00:00.000000000 +0000
12222 @@ -1,108 +0,0 @@
12223 -/*************************************************************************
12224 - *
12225 - * OpenOffice.org - a multi-platform office productivity suite
12226 - *
12227 - * $RCSfile$
12228 - *
12229 - * $Revision$
12230 - *
12231 - * last change: $Author$ $Date$
12232 - *
12233 - * The Contents of this file are made available subject to
12234 - * the terms of GNU Lesser General Public License Version 2.1.
12235 - *
12236 - *
12237 - * GNU Lesser General Public License Version 2.1
12238 - * =============================================
12239 - * Copyright 2005 by Sun Microsystems, Inc.
12240 - * 901 San Antonio Road, Palo Alto, CA 94303, USA
12241 - *
12242 - * This library is free software; you can redistribute it and/or
12243 - * modify it under the terms of the GNU Lesser General Public
12244 - * License version 2.1, as published by the Free Software Foundation.
12245 - *
12246 - * This library is distributed in the hope that it will be useful,
12247 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
12248 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12249 - * Lesser General Public License for more details.
12250 - *
12251 - * You should have received a copy of the GNU Lesser General Public
12252 - * License along with this library; if not, write to the Free Software
12253 - * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
12254 - * MA 02111-1307 USA
12255 - *
12256 - ************************************************************************/
12257 -#include "vbatogglebutton.hxx"
12258 -#include <vector>
12259 -
12260 -using namespace com::sun::star;
12261 -using namespace ooo::vba;
12262 -
12263 -
12264 -const static rtl::OUString LABEL( RTL_CONSTASCII_USTRINGPARAM("Label") );
12265 -const static rtl::OUString TOGGLE( RTL_CONSTASCII_USTRINGPARAM("Toggle") );
12266 -const static rtl::OUString STATE( RTL_CONSTASCII_USTRINGPARAM("State") );
12267 -ScVbaToggleButton::ScVbaToggleButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper ) : ToggleButtonImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
12268 -{
12269 - OSL_TRACE("ScVbaToggleButton(ctor)");
12270 - m_xProps->setPropertyValue( TOGGLE, uno::makeAny( sal_True ) );
12271 -}
12272 -
12273 -ScVbaToggleButton::~ScVbaToggleButton()
12274 -{
12275 - OSL_TRACE("~ScVbaToggleButton(dtor)");
12276 -}
12277 -
12278 -// Attributes
12279 -rtl::OUString SAL_CALL
12280 -ScVbaToggleButton::getCaption() throw (css::uno::RuntimeException)
12281 -{
12282 - rtl::OUString Label;
12283 - m_xProps->getPropertyValue( LABEL ) >>= Label;
12284 - return Label;
12285 -}
12286 -
12287 -void SAL_CALL
12288 -ScVbaToggleButton::setCaption( const rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException)
12289 -{
12290 - m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) );
12291 -}
12292 -
12293 -uno::Any SAL_CALL
12294 -ScVbaToggleButton::getValue() throw (uno::RuntimeException)
12295 -{
12296 - sal_Int16 nState = 0;
12297 - m_xProps->getPropertyValue( STATE ) >>= nState;
12298 - return uno::makeAny( nState ? sal_Int16( -1 ) : sal_Int16( 0 ) );
12299 -}
12300 -
12301 -void SAL_CALL
12302 -ScVbaToggleButton::setValue( const uno::Any& _value ) throw (uno::RuntimeException)
12303 -{
12304 - sal_Int16 nState = 0;
12305 - _value >>= nState;
12306 - OSL_TRACE( "nState - %d", nState );
12307 - nState = ( nState == -1 ) ? 1 : 0;
12308 - OSL_TRACE( "nState - %d", nState );
12309 - m_xProps->setPropertyValue( STATE, uno::makeAny( nState ) );
12310 -}
12311 -
12312 -rtl::OUString&
12313 -ScVbaToggleButton::getServiceImplName()
12314 -{
12315 - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaToggleButton") );
12316 - return sImplName;
12317 -}
12318 -
12319 -uno::Sequence< rtl::OUString >
12320 -ScVbaToggleButton::getServiceNames()
12321 -{
12322 - static uno::Sequence< rtl::OUString > aServiceNames;
12323 - if ( aServiceNames.getLength() == 0 )
12324 - {
12325 - aServiceNames.realloc( 1 );
12326 - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.ToggleButton" ) );
12327 - }
12328 - return aServiceNames;
12329 -}
12330 -
12331 --- sc/source/ui/vba/vbatogglebutton.hxx.old 2009-04-02 10:45:35.000000000 +0000
12332 +++ sc/source/ui/vba/vbatogglebutton.hxx 1970-01-01 00:00:00.000000000 +0000
12333 @@ -1,63 +0,0 @@
12334 -/*************************************************************************
12335 - *
12336 - * OpenOffice.org - a multi-platform office productivity suite
12337 - *
12338 - * $RCSfile$
12339 - *
12340 - * $Revision$
12341 - *
12342 - * last change: $Author$ $Date$
12343 - *
12344 - * The Contents of this file are made available subject to
12345 - * the terms of GNU Lesser General Public License Version 2.1.
12346 - *
12347 - *
12348 - * GNU Lesser General Public License Version 2.1
12349 - * =============================================
12350 - * Copyright 2005 by Sun Microsystems, Inc.
12351 - * 901 San Antonio Road, Palo Alto, CA 94303, USA
12352 - *
12353 - * This library is free software; you can redistribute it and/or
12354 - * modify it under the terms of the GNU Lesser General Public
12355 - * License version 2.1, as published by the Free Software Foundation.
12356 - *
12357 - * This library is distributed in the hope that it will be useful,
12358 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
12359 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12360 - * Lesser General Public License for more details.
12361 - *
12362 - * You should have received a copy of the GNU Lesser General Public
12363 - * License along with this library; if not, write to the Free Software
12364 - * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
12365 - * MA 02111-1307 USA
12366 - *
12367 - ************************************************************************/
12368 -#ifndef SC_VBA_TOGGLEBUTTON_HXX
12369 -#define SC_VBA_TOGGLEBUTTON_HXX
12370 -#include <cppuhelper/implbase2.hxx>
12371 -#include <ooo/vba/msforms/XToggleButton.hpp>
12372 -
12373 -#include "vbacontrol.hxx"
12374 -#include "vbahelper.hxx"
12375 -
12376 -typedef cppu::ImplInheritanceHelper2< ScVbaControl, ov::msforms::XToggleButton, css::script::XDefaultProperty > ToggleButtonImpl_BASE;
12377 -
12378 -class ScVbaToggleButton : public ToggleButtonImpl_BASE
12379 -{
12380 - rtl::OUString msDftPropName;
12381 -public:
12382 - ScVbaToggleButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
12383 - ~ScVbaToggleButton();
12384 - // Attributes
12385 - virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
12386 - virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
12387 -
12388 - virtual rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
12389 - virtual void SAL_CALL setCaption( const rtl::OUString& _caption ) throw (css::uno::RuntimeException);
12390 - //XHelperInterface
12391 - virtual rtl::OUString& getServiceImplName();
12392 - virtual css::uno::Sequence<rtl::OUString> getServiceNames();
12393 - // XDefaultProperty
12394 - rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
12395 -};
12396 -#endif //SC_VBA_TOGGLEBUTTON_HXX
12397 --- sc/source/ui/vba/vbauserform.cxx.old 2009-04-02 10:45:35.000000000 +0000
12398 +++ sc/source/ui/vba/vbauserform.cxx 1970-01-01 00:00:00.000000000 +0000
12399 @@ -1,228 +0,0 @@
12400 -/*************************************************************************
12401 - *
12402 - * OpenOffice.org - a multi-platform office productivity suite
12403 - *
12404 - * $RCSfile$
12405 - *
12406 - * $Revision$
12407 - *
12408 - * last change: $Author$ $Date$
12409 - *
12410 - * The Contents of this file are made available subject to
12411 - * the terms of GNU Lesser General Public License Version 2.1.
12412 - *
12413 - *
12414 - * GNU Lesser General Public License Version 2.1
12415 - * =============================================
12416 - * Copyright 2005 by Sun Microsystems, Inc.
12417 - * 901 San Antonio Road, Palo Alto, CA 94303, USA
12418 - *
12419 - * This library is free software; you can redistribute it and/or
12420 - * modify it under the terms of the GNU Lesser General Public
12421 - * License version 2.1, as published by the Free Software Foundation.
12422 - *
12423 - * This library is distributed in the hope that it will be useful,
12424 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
12425 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12426 - * Lesser General Public License for more details.
12427 - *
12428 - * You should have received a copy of the GNU Lesser General Public
12429 - * License along with this library; if not, write to the Free Software
12430 - * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
12431 - * MA 02111-1307 USA
12432 - *
12433 - ************************************************************************/
12434 -#include "helperdecl.hxx"
12435 -#include "vbauserform.hxx"
12436 -#include <com/sun/star/awt/XControl.hpp>
12437 -#include <com/sun/star/awt/XControlContainer.hpp>
12438 -#include <com/sun/star/beans/PropertyConcept.hpp>
12439 -#include <basic/sbx.hxx>
12440 -#include <basic/sbstar.hxx>
12441 -#include <basic/sbmeth.hxx>
12442 -#include "unonames.hxx"
12443 -#include "vbacontrols.hxx"
12444 -
12445 -using namespace ::ooo::vba;
12446 -using namespace ::com::sun::star;
12447 -
12448 -// some little notes
12449 -// XDialog implementation has the following interesting bits
12450 -// a Controls property ( which is an array of the container controls )
12451 -// each item in the controls array is a XControl, where the model is
12452 -// basically a property bag
12453 -// additionally the XDialog instance has itself a model
12454 -// this model has a ControlModels ( array of models ) property
12455 -// the models in ControlModels can be accessed by name
12456 -// also the XDialog is a XControl ( to access the model above
12457 -
12458 -ScVbaUserForm::ScVbaUserForm( uno::Sequence< uno::Any > const& aArgs, uno::Reference< uno::XComponentContext >const& xContext ) throw ( lang::IllegalArgumentException ) : ScVbaUserForm_BASE( getXSomethingFromArgs< XHelperInterface >( aArgs, 0 ), xContext, getXSomethingFromArgs< uno::XInterface >( aArgs, 1 ), getXSomethingFromArgs< frame::XModel >( aArgs, 2 ), static_cast< ooo::vba::AbstractGeometryAttributes* >(0) ), m_pDocShell( 0 ), mbDispose( true )
12459 -{
12460 - m_xDialog.set( m_xControl, uno::UNO_QUERY_THROW );
12461 - uno::Reference< awt::XControl > xControl( m_xDialog, uno::UNO_QUERY_THROW );
12462 - m_pDocShell = getDocShell( m_xModel );
12463 - m_xProps.set( xControl->getModel(), uno::UNO_QUERY_THROW );
12464 - setGeometryHelper( new UserFormGeometryHelper( xContext, xControl ) );
12465 -}
12466 -
12467 -ScVbaUserForm::~ScVbaUserForm()
12468 -{
12469 -}
12470 -
12471 -void SAL_CALL
12472 -ScVbaUserForm::Show( ) throw (uno::RuntimeException)
12473 -{
12474 - OSL_TRACE("ScVbaUserForm::Show( )");
12475 - short aRet = 0;
12476 - if ( m_xDialog.is() )
12477 - aRet = m_xDialog->execute();
12478 - OSL_TRACE("ScVbaUserForm::Show() execute returned %d", aRet);
12479 - if ( mbDispose )
12480 - {
12481 - try
12482 - {
12483 - uno::Reference< lang::XComponent > xComp( m_xDialog, uno::UNO_QUERY_THROW );
12484 - m_xDialog = NULL;
12485 - xComp->dispose();
12486 - mbDispose = false;
12487 - }
12488 - catch( uno::Exception& )
12489 - {
12490 - }
12491 - }
12492 -}
12493 -
12494 -rtl::OUString SAL_CALL
12495 -ScVbaUserForm::getCaption() throw (::com::sun::star::uno::RuntimeException)
12496 -{
12497 - rtl::OUString sCaption;
12498 - m_xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Title") ) ) >>= sCaption;
12499 - return sCaption;
12500 -}
12501 -void
12502 -ScVbaUserForm::setCaption( const ::rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException)
12503 -{
12504 - m_xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Title") ), uno::makeAny( _caption ) );
12505 -}
12506 -
12507 -void SAL_CALL
12508 -ScVbaUserForm::Hide( ) throw (uno::RuntimeException)
12509 -{
12510 - mbDispose = false; // hide not dispose
12511 - if ( m_xDialog.is() )
12512 - m_xDialog->endExecute();
12513 -}
12514 -
12515 -void SAL_CALL
12516 -ScVbaUserForm::RePaint( ) throw (uno::RuntimeException)
12517 -{
12518 - // do nothing
12519 -}
12520 -
12521 -void SAL_CALL
12522 -ScVbaUserForm::UnloadObject( ) throw (uno::RuntimeException)
12523 -{
12524 - mbDispose = true;
12525 - if ( m_xDialog.is() )
12526 - m_xDialog->endExecute();
12527 -}
12528 -
12529 -rtl::OUString&
12530 -ScVbaUserForm::getServiceImplName()
12531 -{
12532 - static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaUserForm") );
12533 - return sImplName;
12534 -}
12535 -
12536 -uno::Sequence< rtl::OUString >
12537 -ScVbaUserForm::getServiceNames()
12538 -{
12539 - static uno::Sequence< rtl::OUString > aServiceNames;
12540 - if ( aServiceNames.getLength() == 0 )
12541 - {
12542 - aServiceNames.realloc( 1 );
12543 - aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.UserForm" ) );
12544 - }
12545 - return aServiceNames;
12546 -}
12547 -
12548 -uno::Reference< beans::XIntrospectionAccess > SAL_CALL
12549 -ScVbaUserForm::getIntrospection( ) throw (uno::RuntimeException)
12550 -{
12551 - return uno::Reference< beans::XIntrospectionAccess >();
12552 -}
12553 -
12554 -uno::Any SAL_CALL
12555 -ScVbaUserForm::invoke( const ::rtl::OUString& /*aFunctionName*/, const uno::Sequence< uno::Any >& /*aParams*/, uno::Sequence< ::sal_Int16 >& /*aOutParamIndex*/, uno::Sequence< uno::Any >& /*aOutParam*/ ) throw (lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException)
12556 -{
12557 - throw uno::RuntimeException(); // unsupported operation
12558 -}
12559 -
12560 -void SAL_CALL
12561 -ScVbaUserForm::setValue( const ::rtl::OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException)
12562 -{
12563 - uno::Any aObject = getValue( aPropertyName );
12564 - // The Object *must* support XDefaultProperty here because getValue will
12565 - // only return properties that are Objects ( e.g. controls )
12566 - // e.g. Userform1.aControl = something
12567 - // 'aControl' has to support XDefaultProperty to make sense here
12568 - uno::Reference< script::XDefaultProperty > xDfltProp( aObject, uno::UNO_QUERY_THROW );
12569 - rtl::OUString aDfltPropName = xDfltProp->getDefaultPropertyName();
12570 - uno::Reference< beans::XIntrospectionAccess > xUnoAccess( getIntrospectionAccess( aObject ) );
12571 - uno::Reference< beans::XPropertySet > xPropSet( xUnoAccess->queryAdapter( ::getCppuType( (const uno::Reference< beans::XPropertySet > *)0 ) ), uno::UNO_QUERY_THROW );
12572 - xPropSet->setPropertyValue( aDfltPropName, aValue );
12573 -}
12574 -
12575 -uno::Any SAL_CALL
12576 -ScVbaUserForm::getValue( const ::rtl::OUString& aPropertyName ) throw (beans::UnknownPropertyException, uno::RuntimeException)
12577 -{
12578 - uno::Reference< awt::XControl > xDialogControl( m_xDialog, uno::UNO_QUERY_THROW );
12579 - uno::Reference< awt::XControlContainer > xContainer( m_xDialog, uno::UNO_QUERY_THROW );
12580 - uno::Reference< awt::XControl > xControl = xContainer->getControl( aPropertyName );
12581 - ScVbaControlFactory aFac( mxContext, xControl, m_xModel );
12582 - uno::Reference< msforms::XControl > xVBAControl( aFac.createControl( xDialogControl->getModel() ) );
12583 - ScVbaControl* pControl = dynamic_cast< ScVbaControl* >( xVBAControl.get() );
12584 - pControl->setGeometryHelper( new UserFormGeometryHelper( mxContext, xControl ) );
12585 - return uno::makeAny( xVBAControl );
12586 -}
12587 -
12588 -::sal_Bool SAL_CALL
12589 -ScVbaUserForm::hasMethod( const ::rtl::OUString& /*aName*/ ) throw (uno::RuntimeException)
12590 -{
12591 - return sal_False;
12592 -}
12593 -uno::Any SAL_CALL
12594 -ScVbaUserForm::Controls( const uno::Any& index ) throw (uno::RuntimeException)
12595 -{
12596 - uno::Reference< awt::XControl > xDialogControl( m_xDialog, uno::UNO_QUERY_THROW );
12597 - uno::Reference< XCollection > xControls( new ScVbaControls( this, mxContext, xDialogControl ) );
12598 - if ( index.hasValue() )
12599 - return uno::makeAny( xControls->Item( index, uno::Any() ) );
12600 - return uno::makeAny( xControls );
12601 -}
12602 -
12603 -::sal_Bool SAL_CALL
12604 -ScVbaUserForm::hasProperty( const ::rtl::OUString& aName ) throw (uno::RuntimeException)
12605 -{
12606 - uno::Reference< awt::XControl > xControl( m_xDialog, uno::UNO_QUERY );
12607 - OSL_TRACE("ScVbaUserForm::hasProperty(%s) %d", rtl::OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr(), xControl.is() );
12608 - if ( xControl.is() )
12609 - {
12610 - uno::Reference< container::XNameAccess > xNameAccess( xControl->getModel(), uno::UNO_QUERY_THROW );
12611 - sal_Bool bRes = xNameAccess->hasByName( aName );
12612 - OSL_TRACE("ScVbaUserForm::hasProperty(%s) %d ---> %d", rtl::OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr(), xControl.is(), bRes );
12613 - return bRes;
12614 - }
12615 - return sal_False;
12616 -}
12617 -
12618 -namespace userform
12619 -{
12620 -namespace sdecl = comphelper::service_decl;
12621 -sdecl::vba_service_class_<ScVbaUserForm, sdecl::with_args<true> > serviceImpl;
12622 -extern sdecl::ServiceDecl const serviceDecl(
12623 - serviceImpl,
12624 - "ScVbaUserForm",
12625 - "ooo.vba.excel.UserForm" );
12626 -}
12627 -
12628 --- sc/source/ui/vba/vbauserform.hxx.old 2009-04-02 10:45:35.000000000 +0000
12629 +++ sc/source/ui/vba/vbauserform.hxx 1970-01-01 00:00:00.000000000 +0000
12630 @@ -1,78 +0,0 @@
12631 -/*************************************************************************
12632 - *
12633 - * OpenOffice.org - a multi-platform office productivity suite
12634 - *
12635 - * $RCSfile$
12636 - *
12637 - * $Revision$
12638 - *
12639 - * last change: $Author$ $Date$
12640 - *
12641 - * The Contents of this file are made available subject to
12642 - * the terms of GNU Lesser General Public License Version 2.1.
12643 - *
12644 - *
12645 - * GNU Lesser General Public License Version 2.1
12646 - * =============================================
12647 - * Copyright 2005 by Sun Microsystems, Inc.
12648 - * 901 San Antonio Road, Palo Alto, CA 94303, USA
12649 - *
12650 - * This library is free software; you can redistribute it and/or
12651 - * modify it under the terms of the GNU Lesser General Public
12652 - * License version 2.1, as published by the Free Software Foundation.
12653 - *
12654 - * This library is distributed in the hope that it will be useful,
12655 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
12656 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12657 - * Lesser General Public License for more details.
12658 - *
12659 - * You should have received a copy of the GNU Lesser General Public
12660 - * License along with this library; if not, write to the Free Software
12661 - * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
12662 - * MA 02111-1307 USA
12663 - *
12664 - ************************************************************************/
12665 -#ifndef SC_VBA_USERFORM_HXX
12666 -#define SC_VBA_USERFORM_HXX
12667 -
12668 -#include <cppuhelper/implbase1.hxx>
12669 -#include <ooo/vba/msforms/XUserForm.hpp>
12670 -#include <com/sun/star/awt/XDialog.hpp>
12671 -#include <com/sun/star/frame/XModel.hpp>
12672 -
12673 -#include "vbahelperinterface.hxx"
12674 -#include "vbacontrol.hxx"
12675 -
12676 -//typedef InheritedHelperInterfaceImpl1< ov::msforms::XUserForm > ScVbaUserForm_BASE;
12677 -typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XUserForm > ScVbaUserForm_BASE;
12678 -
12679 -class ScVbaUserForm : public ScVbaUserForm_BASE
12680 -{
12681 -private:
12682 - css::uno::Reference< css::awt::XDialog > m_xDialog;
12683 - ScDocShell* m_pDocShell;
12684 - bool mbDispose;
12685 -protected:
12686 -public:
12687 - ScVbaUserForm( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext ) throw ( css::lang::IllegalArgumentException );
12688 - virtual ~ScVbaUserForm();
12689 - // XUserForm
12690 - virtual void SAL_CALL RePaint( ) throw (css::uno::RuntimeException);
12691 - virtual void SAL_CALL Show( ) throw (css::uno::RuntimeException);
12692 - // XIntrospection
12693 - virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection( ) throw (css::uno::RuntimeException);
12694 - virtual css::uno::Any SAL_CALL invoke( const ::rtl::OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) throw (css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException);
12695 - virtual void SAL_CALL setValue( const ::rtl::OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException);
12696 - virtual css::uno::Any SAL_CALL getValue( const ::rtl::OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException);
12697 - virtual ::sal_Bool SAL_CALL hasMethod( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException);
12698 - virtual ::sal_Bool SAL_CALL hasProperty( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException);
12699 - virtual ::rtl::OUString SAL_CALL getCaption() throw (::com::sun::star::uno::RuntimeException);
12700 - virtual void SAL_CALL setCaption( const ::rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException);
12701 - virtual void SAL_CALL Hide( ) throw (css::uno::RuntimeException);
12702 - virtual void SAL_CALL UnloadObject( ) throw (css::uno::RuntimeException);
12703 - virtual css::uno::Any SAL_CALL Controls( const css::uno::Any& index ) throw (css::uno::RuntimeException);
12704 - //XHelperInterface
12705 - virtual rtl::OUString& getServiceImplName();
12706 - virtual css::uno::Sequence<rtl::OUString> getServiceNames();
12707 -};
12708 -#endif
12709 --- sc/source/ui/vba/vbavalidation.hxx.old 2009-04-02 10:45:35.000000000 +0000
12710 +++ sc/source/ui/vba/vbavalidation.hxx 2009-04-06 16:42:01.000000000 +0000
12711 @@ -33,7 +33,7 @@
12712 #include <com/sun/star/uno/XComponentContext.hpp>
12713 #include <ooo/vba/excel/XValidation.hpp>
12714 #include <com/sun/star/table/XCellRange.hpp>
12715 -#include "vbahelperinterface.hxx"
12716 +#include <vbahelper/vbahelperinterface.hxx>
12718 typedef InheritedHelperInterfaceImpl1<ov::excel::XValidation > ValidationImpl_BASE;
12720 --- sc/source/ui/vba/vbawindow.cxx.old 2009-04-02 10:45:35.000000000 +0000
12721 +++ sc/source/ui/vba/vbawindow.cxx 2009-04-06 16:42:01.000000000 +0000
12722 @@ -27,10 +27,11 @@
12723 * for a copy of the LGPLv3 License.
12724 *
12725 ************************************************************************/
12726 -#include "helperdecl.hxx"
12727 +#include <vbahelper/helperdecl.hxx>
12728 #include "vbawindow.hxx"
12729 #include "vbaworksheets.hxx"
12730 #include "vbaworksheet.hxx"
12731 +#include "vbaglobals.hxx"
12732 #include "vbapane.hxx"
12733 #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
12734 #include <com/sun/star/sheet/XSpreadsheet.hpp>
12735 @@ -118,7 +119,7 @@ public:
12736 ScDocShell* pDocShell = (ScDocShell*)pModel->GetEmbeddedObject();
12737 if ( !pDocShell )
12738 throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cannot obtain docshell" ) ), uno::Reference< uno::XInterface >() );
12739 - ScTabViewShell* pViewShell = getBestViewShell( m_xModel );
12740 + ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );
12741 if ( !pViewShell )
12742 throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cannot obtain view shell" ) ), uno::Reference< uno::XInterface >() );
12744 @@ -202,14 +203,13 @@ public:
12746 };
12748 -ScVbaWindow::ScVbaWindow( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : WindowImpl_BASE( xParent, xContext ), m_xModel( xModel )
12749 +ScVbaWindow::ScVbaWindow( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : WindowImpl_BASE( xParent, xContext, xModel )
12750 {
12751 init();
12752 }
12754 ScVbaWindow::ScVbaWindow( uno::Sequence< uno::Any > const & args, uno::Reference< uno::XComponentContext > const & xContext )
12755 - : WindowImpl_BASE( getXSomethingFromArgs< XHelperInterface >( args, 0 ), xContext ),
12756 - m_xModel( getXSomethingFromArgs< frame::XModel >( args, 1 ) )
12757 + : WindowImpl_BASE( args, xContext )
12758 {
12759 init();
12760 }
12761 @@ -306,8 +306,7 @@ ScVbaWindow::getCaption() throw (uno::Ru
12762 if ( ( nCrudLen + nCrudIndex ) == sTitle.getLength() )
12763 {
12764 sTitle = sTitle.copy( 0, nCrudIndex );
12765 - uno::Reference< ov::XGlobals > xTemp( ScVbaGlobals::getGlobalsImpl( mxContext )); // temporary needed for g++ 3.3.5
12766 - ScVbaWorkbook workbook( uno::Reference< XHelperInterface >( xTemp->getApplication(), uno::UNO_QUERY_THROW ), mxContext, m_xModel );
12767 + ScVbaWorkbook workbook( uno::Reference< XHelperInterface >( Application(), uno::UNO_QUERY_THROW ), mxContext, m_xModel );
12768 rtl::OUString sName = workbook.getName();
12769 // rather bizare hack to make sure the name behavior
12770 // is like XL
12771 @@ -343,7 +342,7 @@ uno::Any SAL_CALL
12772 ScVbaWindow::getScrollRow() throw (uno::RuntimeException)
12773 {
12774 sal_Int32 nValue = 0;
12775 - ScTabViewShell* pViewShell = getBestViewShell( m_xModel );
12776 + ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );
12777 if ( pViewShell )
12778 {
12779 ScSplitPos eWhich = pViewShell->GetViewData()->GetActivePart();
12780 @@ -356,7 +355,7 @@ ScVbaWindow::getScrollRow() throw (uno::
12781 void SAL_CALL
12782 ScVbaWindow::setScrollRow( const uno::Any& _scrollrow ) throw (uno::RuntimeException)
12783 {
12784 - ScTabViewShell* pViewShell = getBestViewShell( m_xModel );
12785 + ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );
12786 if ( pViewShell )
12787 {
12788 sal_Int32 scrollRow = 0;
12789 @@ -371,7 +370,7 @@ uno::Any SAL_CALL
12790 ScVbaWindow::getScrollColumn() throw (uno::RuntimeException)
12791 {
12792 sal_Int32 nValue = 0;
12793 - ScTabViewShell* pViewShell = getBestViewShell( m_xModel );
12794 + ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );
12795 if ( pViewShell )
12796 {
12797 ScSplitPos eWhich = pViewShell->GetViewData()->GetActivePart();
12798 @@ -384,7 +383,7 @@ ScVbaWindow::getScrollColumn() throw (un
12799 void SAL_CALL
12800 ScVbaWindow::setScrollColumn( const uno::Any& _scrollcolumn ) throw (uno::RuntimeException)
12801 {
12802 - ScTabViewShell* pViewShell = getBestViewShell( m_xModel );
12803 + ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );
12804 if ( pViewShell )
12805 {
12806 sal_Int32 scrollColumn = 0;
12807 @@ -399,7 +398,7 @@ uno::Any SAL_CALL
12808 ScVbaWindow::getWindowState() throw (uno::RuntimeException)
12809 {
12810 sal_Int32 nwindowState = xlNormal;
12811 - ScTabViewShell* pViewShell = getBestViewShell( m_xModel );
12812 + ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );
12813 SfxViewFrame* pViewFrame = pViewShell -> GetViewFrame();
12814 SfxTopViewFrame *pTop= PTR_CAST( SfxTopViewFrame, pViewFrame -> GetTopViewFrame() );
12815 if ( pTop )
12816 @@ -421,7 +420,7 @@ ScVbaWindow::setWindowState( const uno::
12817 {
12818 sal_Int32 nwindowState = xlMaximized;
12819 _windowstate >>= nwindowState;
12820 - ScTabViewShell* pViewShell = getBestViewShell( m_xModel );
12821 + ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );
12822 SfxViewFrame* pViewFrame = pViewShell -> GetViewFrame();
12823 SfxTopViewFrame *pTop= PTR_CAST( SfxTopViewFrame, pViewFrame -> GetTopViewFrame() );
12824 if ( pTop )
12825 @@ -444,8 +443,7 @@ ScVbaWindow::setWindowState( const uno::
12826 void
12827 ScVbaWindow::Activate() throw (css::uno::RuntimeException)
12828 {
12829 - uno::Reference< ov::XGlobals > xTemp( ScVbaGlobals::getGlobalsImpl( mxContext )); // temporary needed for g++ 3.3.5
12830 - ScVbaWorkbook workbook( uno::Reference< XHelperInterface >( xTemp->getApplication(), uno::UNO_QUERY_THROW ), mxContext, m_xModel );
12831 + ScVbaWorkbook workbook( uno::Reference< XHelperInterface >( Application(), uno::UNO_QUERY_THROW ), mxContext, m_xModel );
12833 workbook.Activate();
12834 }
12835 @@ -453,8 +451,7 @@ ScVbaWindow::Activate() throw (css::uno:
12836 void
12837 ScVbaWindow::Close( const uno::Any& SaveChanges, const uno::Any& FileName, const uno::Any& RouteWorkBook ) throw (uno::RuntimeException)
12838 {
12839 - uno::Reference< ov::XGlobals > xTemp( ScVbaGlobals::getGlobalsImpl( mxContext )); // temporary needed for g++ 3.3.5
12840 - ScVbaWorkbook workbook( uno::Reference< XHelperInterface >( xTemp->getApplication(), uno::UNO_QUERY_THROW ), mxContext, m_xModel );
12841 + ScVbaWorkbook workbook( uno::Reference< XHelperInterface >( Application(), uno::UNO_QUERY_THROW ), mxContext, m_xModel );
12842 workbook.Close(SaveChanges, FileName, RouteWorkBook );
12843 }
12845 @@ -467,13 +464,15 @@ ScVbaWindow::ActivePane() throw (script:
12846 uno::Reference< excel::XRange > SAL_CALL
12847 ScVbaWindow::ActiveCell( ) throw (script::BasicErrorException, uno::RuntimeException)
12848 {
12849 - return ScVbaGlobals::getGlobalsImpl( mxContext )->getApplication()->getActiveCell();
12850 + uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW );
12851 + return xApplication->getActiveCell();
12852 }
12854 uno::Any SAL_CALL
12855 ScVbaWindow::Selection( ) throw (script::BasicErrorException, uno::RuntimeException)
12856 {
12857 - return ScVbaGlobals::getGlobalsImpl( mxContext )->getApplication()->getSelection();
12858 + uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW );
12859 + return xApplication->getSelection();
12860 }
12862 ::sal_Bool SAL_CALL
12863 @@ -759,7 +758,8 @@ ScVbaWindow::setZoom( const uno::Any& _z
12864 uno::Reference< excel::XWorksheet > SAL_CALL
12865 ScVbaWindow::ActiveSheet( ) throw (script::BasicErrorException, uno::RuntimeException)
12866 {
12867 - return ScVbaGlobals::getGlobalsImpl(mxContext)->getApplication()->getActiveSheet();
12868 + uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW );
12869 + return xApplication->getActiveSheet();
12870 }
12872 uno::Any SAL_CALL
12873 @@ -787,121 +787,9 @@ ScVbaWindow::setView( const uno::Any& _v
12874 default:
12875 DebugHelper::exception(SbERR_BAD_PARAMETER, rtl::OUString() );
12876 }
12877 - dispatchExecute( m_xModel, nSlot );
12878 -}
12879 -
12880 -sal_Bool SAL_CALL
12881 -ScVbaWindow::getVisible() throw (uno::RuntimeException)
12882 -{
12883 - sal_Bool bVisible = sal_True;
12884 - uno::Reference< frame::XController > xController( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
12885 - uno::Reference< css::awt::XWindow > xWindow (xController->getFrame()->getContainerWindow(), uno::UNO_QUERY_THROW );
12886 - uno::Reference< css::awt::XWindow2 > xWindow2 (xWindow, uno::UNO_QUERY_THROW );
12887 - if( xWindow2.is() )
12888 - {
12889 - bVisible = xWindow2->isVisible();
12890 - }
12891 - return bVisible;
12892 -}
12893 -
12894 -void SAL_CALL
12895 -ScVbaWindow::setVisible(sal_Bool _visible) throw (uno::RuntimeException)
12896 -{
12897 - uno::Reference< frame::XController > xController( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
12898 - uno::Reference< css::awt::XWindow > xWindow (xController->getFrame()->getContainerWindow(), uno::UNO_QUERY_THROW );
12899 - if( xWindow.is() )
12900 - {
12901 - xWindow->setVisible( _visible );
12902 - }
12903 -}
12904 -
12905 -css::awt::Rectangle getPosSize( const uno::Reference< frame::XModel >& xModel )
12906 -{
12907 - css::awt::Rectangle aRect;
12908 - uno::Reference< frame::XController > xController( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
12909 - uno::Reference< css::awt::XWindow > xWindow (xController->getFrame()->getContainerWindow(), uno::UNO_QUERY_THROW );
12910 - if( xWindow.is() )
12911 - {
12912 - aRect = xWindow->getPosSize();
12913 - }
12914 - return aRect;
12915 -}
12916 -
12917 -void setPosSize( const uno::Reference< frame::XModel >& xModel, sal_Int32 nValue, USHORT nFlag )
12918 -{
12919 - uno::Reference< frame::XController > xController( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
12920 - uno::Reference< css::awt::XWindow > xWindow (xController->getFrame()->getContainerWindow(), uno::UNO_QUERY_THROW );
12921 - if( xWindow.is() )
12922 - {
12923 - css::awt::Rectangle aRect = xWindow->getPosSize();
12924 - switch( nFlag )
12925 - {
12926 - case css::awt::PosSize::X:
12927 - xWindow->setPosSize( nValue, aRect.Y, 0, 0, css::awt::PosSize::X );
12928 - break;
12929 - case css::awt::PosSize::Y:
12930 - xWindow->setPosSize( aRect.X, nValue, 0, 0, css::awt::PosSize::Y );
12931 - break;
12932 - case css::awt::PosSize::WIDTH:
12933 - xWindow->setPosSize( 0, 0, nValue, aRect.Height, css::awt::PosSize::WIDTH );
12934 - break;
12935 - case css::awt::PosSize::HEIGHT:
12936 - xWindow->setPosSize( 0, 0, aRect.Width, nValue, css::awt::PosSize::HEIGHT );
12937 - break;
12938 - default:
12939 - break;
12940 - }
12941 - }
12942 -}
12943 -
12944 -sal_Int32 SAL_CALL
12945 -ScVbaWindow::getHeight() throw (uno::RuntimeException)
12946 -{
12947 - css::awt::Rectangle aRect = getPosSize(m_xModel);
12948 - return aRect.Height;
12949 -}
12950 -
12951 -void SAL_CALL
12952 -ScVbaWindow::setHeight( sal_Int32 _height ) throw (uno::RuntimeException)
12953 -{
12954 - setPosSize(m_xModel, _height, css::awt::PosSize::HEIGHT);
12955 -}
12956 -
12957 -sal_Int32 SAL_CALL
12958 -ScVbaWindow::getLeft() throw (uno::RuntimeException)
12959 -{
12960 - css::awt::Rectangle aRect = getPosSize(m_xModel);
12961 - return aRect.X;
12962 -}
12963 -
12964 -void SAL_CALL
12965 -ScVbaWindow::setLeft( sal_Int32 _left ) throw (uno::RuntimeException)
12966 -{
12967 - setPosSize(m_xModel, _left, css::awt::PosSize::X);
12968 -}
12969 -sal_Int32 SAL_CALL
12970 -ScVbaWindow::getTop() throw (uno::RuntimeException)
12971 -{
12972 - css::awt::Rectangle aRect = getPosSize(m_xModel);
12973 - return aRect.Y;
12974 -}
12975 -
12976 -void SAL_CALL
12977 -ScVbaWindow::setTop( sal_Int32 _top ) throw (uno::RuntimeException)
12978 -{
12979 - setPosSize(m_xModel, _top, css::awt::PosSize::Y);
12980 -}
12981 -sal_Int32 SAL_CALL
12982 -ScVbaWindow::getWidth() throw (uno::RuntimeException)
12983 -{
12984 - css::awt::Rectangle aRect = getPosSize(m_xModel);
12985 - return aRect.Width;
12986 -}
12987 -
12988 -void SAL_CALL
12989 -ScVbaWindow::setWidth( sal_Int32 _width ) throw (uno::RuntimeException)
12990 -{
12991 - setPosSize(m_xModel, _width, css::awt::PosSize::WIDTH);
12992 + ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );
12993 + if ( pViewShell )
12994 + dispatchExecute( pViewShell, nSlot );
12995 }
12997 sal_Int32 SAL_CALL
12998 @@ -924,14 +812,14 @@ void SAL_CALL
12999 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)
13000 {
13001 // need test, print current active sheet
13002 - PrintOutHelper( From, To, Copies, Preview, ActivePrinter, PrintToFile, Collate, PrToFileName, m_xModel, sal_True );
13003 + PrintOutHelper( excel::getBestViewShell( m_xModel ), From, To, Copies, Preview, ActivePrinter, PrintToFile, Collate, PrToFileName, sal_True );
13004 }
13006 void SAL_CALL
13007 ScVbaWindow::PrintPreview( const css::uno::Any& EnableChanges ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
13008 {
13009 // need test, print preview current active sheet
13010 - PrintPreviewHelper( EnableChanges, m_xModel );
13011 + PrintPreviewHelper( EnableChanges, excel::getBestViewShell( m_xModel ) );
13012 }
13014 rtl::OUString&
13015 --- sc/source/ui/vba/vbawindow.hxx.old 2009-04-02 10:45:35.000000000 +0000
13016 +++ sc/source/ui/vba/vbawindow.hxx 2009-04-06 16:42:01.000000000 +0000
13017 @@ -39,15 +39,16 @@
13018 #include <ooo/vba/excel/XPane.hpp>
13019 #include <com/sun/star/awt/XDevice.hpp>
13021 -#include "vbahelperinterface.hxx"
13022 +#include <vbahelper/vbahelperinterface.hxx>
13023 +#include <vbahelper/vbawindowbase.hxx>
13024 #include "vbaworkbook.hxx"
13026 -typedef InheritedHelperInterfaceImpl1<ov::excel::XWindow > WindowImpl_BASE;
13027 +//typedef InheritedHelperInterfaceImpl1<ov::excel::XWindow > WindowImpl_BASE;
13028 +typedef cppu::ImplInheritanceHelper1< VbaWindowBase, ov::excel::XWindow > WindowImpl_BASE;
13030 class ScVbaWindow : public WindowImpl_BASE
13031 {
13032 private:
13033 - css::uno::Reference< css::frame::XModel > m_xModel;
13034 css::uno::Reference< css::sheet::XViewPane > m_xViewPane;
13035 css::uno::Reference< css::sheet::XViewFreezable > m_xViewFreezable;
13036 css::uno::Reference< css::sheet::XViewSplitable > m_xViewSplitable;
13037 @@ -82,10 +83,6 @@ public:
13038 virtual void SAL_CALL setDisplayWorkbookTabs( ::sal_Bool _bDisplayWorkbookTabs ) throw (css::uno::RuntimeException);
13039 virtual ::sal_Bool SAL_CALL getFreezePanes() throw (css::uno::RuntimeException);
13040 virtual void SAL_CALL setFreezePanes( ::sal_Bool _bFreezePanes ) throw (css::uno::RuntimeException);
13041 - virtual sal_Int32 SAL_CALL getHeight() throw (css::uno::RuntimeException) ;
13042 - virtual void SAL_CALL setHeight( sal_Int32 _height ) throw (css::uno::RuntimeException) ;
13043 - virtual sal_Int32 SAL_CALL getLeft() throw (css::uno::RuntimeException) ;
13044 - virtual void SAL_CALL setLeft( sal_Int32 _left ) throw (css::uno::RuntimeException) ;
13045 virtual ::sal_Bool SAL_CALL getSplit() throw (css::uno::RuntimeException);
13046 virtual void SAL_CALL setSplit( ::sal_Bool _bSplit ) throw (css::uno::RuntimeException);
13047 virtual sal_Int32 SAL_CALL getSplitColumn() throw (css::uno::RuntimeException) ;
13048 @@ -100,14 +97,8 @@ public:
13049 virtual void SAL_CALL setScrollRow( const css::uno::Any& _scrollrow ) throw (css::uno::RuntimeException) ;
13050 virtual css::uno::Any SAL_CALL getScrollColumn() throw (css::uno::RuntimeException) ;
13051 virtual void SAL_CALL setScrollColumn( const css::uno::Any& _scrollcolumn ) throw (css::uno::RuntimeException) ;
13052 - virtual sal_Int32 SAL_CALL getTop() throw (css::uno::RuntimeException) ;
13053 - virtual void SAL_CALL setTop( sal_Int32 _top ) throw (css::uno::RuntimeException) ;
13054 virtual css::uno::Any SAL_CALL getView() throw (css::uno::RuntimeException);
13055 virtual void SAL_CALL setView( const css::uno::Any& _view ) throw (css::uno::RuntimeException);
13056 - virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
13057 - virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException);
13058 - virtual sal_Int32 SAL_CALL getWidth() throw (css::uno::RuntimeException) ;
13059 - virtual void SAL_CALL setWidth( sal_Int32 _width ) throw (css::uno::RuntimeException) ;
13060 virtual css::uno::Any SAL_CALL getWindowState() throw (css::uno::RuntimeException);
13061 virtual void SAL_CALL setWindowState( const css::uno::Any& _windowstate ) throw (css::uno::RuntimeException);
13062 virtual css::uno::Any SAL_CALL getZoom() throw (css::uno::RuntimeException);
13063 --- sc/source/ui/vba/vbawindows.cxx.old 2009-04-02 10:45:35.000000000 +0000
13064 +++ sc/source/ui/vba/vbawindows.cxx 2009-04-06 16:42:01.000000000 +0000
13065 @@ -37,6 +37,7 @@
13067 #include <tools/urlobj.hxx>
13068 #include "vbawindow.hxx"
13069 +#include "vbaglobals.hxx"
13070 //#include "vbaworkbook.hxx"
13072 using namespace ::com::sun::star;
13073 @@ -47,15 +48,15 @@ sal_Int32, ::rtl::OUStringHash,
13074 ::std::equal_to< ::rtl::OUString > > NameIndexHash;
13077 -uno::Reference< XHelperInterface > lcl_createWorkbookHIParent( const uno::Reference< frame::XModel >& xModel, const uno::Reference< uno::XComponentContext >& xContext )
13078 +uno::Reference< XHelperInterface > lcl_createWorkbookHIParent( const uno::Reference< frame::XModel >& xModel, const uno::Reference< uno::XComponentContext >& xContext, const uno::Any& aApplication )
13079 {
13080 - return new ScVbaWorkbook( uno::Reference< XHelperInterface >( ScVbaGlobals::getGlobalsImpl( xContext )->getApplication(), uno::UNO_QUERY_THROW ), xContext, xModel );
13081 + return new ScVbaWorkbook( uno::Reference< XHelperInterface >( aApplication, uno::UNO_QUERY_THROW ), xContext, xModel );
13082 }
13084 -uno::Any ComponentToWindow( const uno::Any& aSource, uno::Reference< uno::XComponentContext > & xContext )
13085 +uno::Any ComponentToWindow( const uno::Any& aSource, uno::Reference< uno::XComponentContext > & xContext, const uno::Any& aApplication )
13086 {
13087 uno::Reference< frame::XModel > xModel( aSource, uno::UNO_QUERY_THROW );
13088 - uno::Reference< excel::XWindow > xWin( new ScVbaWindow( lcl_createWorkbookHIParent( xModel, xContext ), xContext,xModel ) );
13089 + uno::Reference< excel::XWindow > xWin( new ScVbaWindow( lcl_createWorkbookHIParent( xModel, xContext, aApplication ), xContext,xModel ) );
13090 return uno::makeAny( xWin );
13091 }
13093 @@ -108,12 +109,13 @@ public:
13095 class WindowEnumImpl : public WindowComponentEnumImpl
13096 {
13097 + uno::Any m_aApplication;
13098 public:
13099 - WindowEnumImpl(const uno::Reference< uno::XComponentContext >& xContext, const Components& components ):WindowComponentEnumImpl( xContext, components ) {}
13100 - WindowEnumImpl( const uno::Reference< uno::XComponentContext >& xContext ): WindowComponentEnumImpl( xContext ) {}
13101 + WindowEnumImpl(const uno::Reference< uno::XComponentContext >& xContext, const Components& components, const uno::Any& aApplication ):WindowComponentEnumImpl( xContext, components ), m_aApplication( aApplication ){}
13102 + WindowEnumImpl( const uno::Reference< uno::XComponentContext >& xContext, const uno::Any& aApplication ): WindowComponentEnumImpl( xContext ), m_aApplication( aApplication ) {}
13103 virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
13104 {
13105 - return ComponentToWindow( WindowComponentEnumImpl::nextElement(), m_xContext );
13106 + return ComponentToWindow( WindowComponentEnumImpl::nextElement(), m_xContext, m_aApplication );
13107 }
13108 };
13110 @@ -212,16 +214,19 @@ ScVbaWindows::ScVbaWindows( const uno::R
13111 {
13112 }
13114 +ScVbaWindows::ScVbaWindows( const uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext ) : ScVbaWindows_BASE( xParent, xContext, uno::Reference< container::XIndexAccess > ( new WindowsAccessImpl( xContext ) ) )
13115 +{
13116 +}
13117 uno::Reference< container::XEnumeration >
13118 ScVbaWindows::createEnumeration() throw (uno::RuntimeException)
13119 {
13120 - return new WindowEnumImpl( mxContext );
13121 + return new WindowEnumImpl( mxContext, Application() );
13122 }
13124 uno::Any
13125 ScVbaWindows::createCollectionObject( const css::uno::Any& aSource )
13126 {
13127 - return ComponentToWindow( aSource, mxContext );
13128 + return ComponentToWindow( aSource, mxContext, Application() );
13129 }
13131 uno::Type
13132 @@ -230,12 +235,6 @@ ScVbaWindows::getElementType() throw (un
13133 return excel::XWindows::static_type(0);
13134 }
13136 -uno::Reference< XCollection >
13137 -ScVbaWindows::Windows( const css::uno::Reference< css::uno::XComponentContext >& xContext )
13138 -{
13139 - uno::Reference< container::XIndexAccess > xIndex( new WindowsAccessImpl( xContext ) );
13140 - return new ScVbaWindows( uno::Reference< XHelperInterface >( ScVbaGlobals::getGlobalsImpl( xContext )->getApplication(), uno::UNO_QUERY_THROW ), xContext , xIndex );
13141 -}
13143 void SAL_CALL
13144 ScVbaWindows::Arrange( ::sal_Int32 /*ArrangeStyle*/, const uno::Any& /*ActiveWorkbook*/, const uno::Any& /*SyncHorizontal*/, const uno::Any& /*SyncVertical*/ ) throw (uno::RuntimeException)
13145 --- sc/source/ui/vba/vbawindows.hxx.old 2009-04-02 10:45:35.000000000 +0000
13146 +++ sc/source/ui/vba/vbawindows.hxx 2009-04-06 16:42:01.000000000 +0000
13147 @@ -35,8 +35,8 @@
13149 #include <com/sun/star/uno/XComponentContext.hpp>
13151 -#include "vbahelper.hxx"
13152 -#include "vbacollectionimpl.hxx"
13153 +#include "excelvbahelper.hxx"
13154 +#include <vbahelper/vbacollectionimpl.hxx>
13157 typedef CollTestImplHelper< ov::excel::XWindows > ScVbaWindows_BASE;
13158 @@ -45,6 +45,7 @@ class ScVbaWindows : public ScVbaWindows
13159 {
13160 public:
13161 ScVbaWindows( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess );
13162 + ScVbaWindows( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext );
13163 virtual ~ScVbaWindows() {}
13165 // XEnumerationAccess
13166 @@ -57,8 +58,6 @@ public:
13167 // ScVbaCollectionBaseImpl
13168 virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
13170 - static css::uno::Reference< ov::XCollection > Windows( const css::uno::Reference< css::uno::XComponentContext >& xContext );
13171 -
13172 // XHelperInterface
13173 virtual rtl::OUString& getServiceImplName();
13174 virtual css::uno::Sequence<rtl::OUString> getServiceNames();
13175 --- sc/source/ui/vba/vbaworkbook.cxx.old 2009-04-02 10:45:35.000000000 +0000
13176 +++ sc/source/ui/vba/vbaworkbook.cxx 2009-04-06 16:42:01.000000000 +0000
13177 @@ -27,7 +27,7 @@
13178 * for a copy of the LGPLv3 License.
13179 *
13180 ************************************************************************/
13181 -#include "helperdecl.hxx"
13182 +#include <vbahelper/helperdecl.hxx>
13183 #include <tools/urlobj.hxx>
13184 #include <comphelper/unwrapargs.hxx>
13186 @@ -46,7 +46,7 @@
13187 #include "vbaworkbook.hxx"
13188 #include "vbawindows.hxx"
13189 #include "vbastyles.hxx"
13190 -#include "vbahelper.hxx"
13191 +#include "excelvbahelper.hxx"
13192 #include "vbapalette.hxx"
13193 #include <osl/file.hxx>
13194 #include <stdio.h>
13195 @@ -192,7 +192,7 @@ ScVbaWorkbook::init()
13196 if ( !ColorData.getLength() )
13197 ResetColors();
13198 }
13199 -ScVbaWorkbook::ScVbaWorkbook( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext) :ScVbaWorkbook_BASE( xParent, xContext ), mxModel(NULL)
13200 +ScVbaWorkbook::ScVbaWorkbook( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext) :ScVbaWorkbook_BASE( xParent, xContext )
13201 {
13202 //#FIXME this persists the color data per office instance and
13203 // not per workbook instance, need to hook the data into XModel
13204 @@ -203,54 +203,18 @@ ScVbaWorkbook::ScVbaWorkbook( const css
13205 init();
13206 }
13208 -ScVbaWorkbook::ScVbaWorkbook( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, css::uno::Reference< css::frame::XModel > xModel ) : ScVbaWorkbook_BASE( xParent, xContext ), mxModel( xModel )
13209 +ScVbaWorkbook::ScVbaWorkbook( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, css::uno::Reference< css::frame::XModel > xModel ) : ScVbaWorkbook_BASE( xParent, xContext, xModel )
13210 {
13211 init();
13212 }
13214 ScVbaWorkbook::ScVbaWorkbook( uno::Sequence< uno::Any> const & args,
13215 - uno::Reference< uno::XComponentContext> const & xContext ) : ScVbaWorkbook_BASE( getXSomethingFromArgs< XHelperInterface >( args, 0 ), xContext ), mxModel( getXSomethingFromArgs< frame::XModel >( args, 1 ) )
13216 + uno::Reference< uno::XComponentContext> const & xContext ) : ScVbaWorkbook_BASE( args, xContext )
13218 {
13219 init();
13220 }
13222 -::rtl::OUString
13223 -ScVbaWorkbook::getName() throw (uno::RuntimeException)
13224 -{
13225 - rtl::OUString sName = getModel()->getURL();
13226 - if ( sName.getLength() )
13227 - {
13228 -
13229 - INetURLObject aURL( getModel()->getURL() );
13230 - ::osl::File::getSystemPathFromFileURL( aURL.GetLastName(), sName );
13231 - }
13232 - else
13233 - {
13234 - const static rtl::OUString sTitle( RTL_CONSTASCII_USTRINGPARAM("Title" ) );
13235 - // process "UntitledX - $(PRODUCTNAME)"
13236 - uno::Reference< frame::XFrame > xFrame( getModel()->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW );
13237 - uno::Reference< beans::XPropertySet > xProps( xFrame, uno::UNO_QUERY_THROW );
13238 - xProps->getPropertyValue(sTitle ) >>= sName;
13239 - sal_Int32 pos = 0;
13240 - sName = sName.getToken(0,' ',pos);
13241 - }
13242 - return sName;
13243 -}
13244 -::rtl::OUString
13245 -ScVbaWorkbook::getPath() throw (uno::RuntimeException)
13246 -{
13247 - INetURLObject aURL( getModel()->getURL() );
13248 - aURL.CutLastName();
13249 - return aURL.GetURLPath();
13250 -}
13251 -
13252 -::rtl::OUString
13253 -ScVbaWorkbook::getFullName() throw (uno::RuntimeException)
13254 -{
13255 - INetURLObject aURL( getModel()->getURL() );
13256 - return aURL.GetURLPath();
13257 -}
13258 uno::Reference< excel::XWorksheet >
13259 ScVbaWorkbook::getActiveSheet() throw (uno::RuntimeException)
13260 {
13261 @@ -281,91 +245,19 @@ ScVbaWorkbook::Worksheets( const uno::An
13262 uno::Any SAL_CALL
13263 ScVbaWorkbook::Windows( const uno::Any& aIndex ) throw (uno::RuntimeException)
13264 {
13265 - uno::Reference< XCollection > xWindows = ScVbaWindows::Windows( mxContext );
13266 +
13267 + uno::Reference< excel::XWindows > xWindows( new ScVbaWindows( getParent(), mxContext ) );
13268 if ( aIndex.getValueTypeClass() == uno::TypeClass_VOID )
13269 return uno::Any( xWindows );
13270 return uno::Any( xWindows->Item( aIndex, uno::Any() ) );
13271 }
13272 -void
13273 -ScVbaWorkbook::Close( const uno::Any &rSaveArg, const uno::Any &rFileArg,
13274 - const uno::Any &rRouteArg ) throw (uno::RuntimeException)
13275 -{
13276 - sal_Bool bSaveChanges = sal_False;
13277 - rtl::OUString aFileName;
13278 - sal_Bool bRouteWorkbook = sal_True;
13279 -
13280 - rSaveArg >>= bSaveChanges;
13281 - sal_Bool bFileName = ( rFileArg >>= aFileName );
13282 - rRouteArg >>= bRouteWorkbook;
13283 - uno::Reference< frame::XStorable > xStorable( getModel(), uno::UNO_QUERY_THROW );
13284 - uno::Reference< util::XModifiable > xModifiable( getModel(), uno::UNO_QUERY_THROW );
13285 -
13286 - if( bSaveChanges )
13287 - {
13288 - if( xStorable->isReadonly() )
13289 - {
13290 - throw uno::RuntimeException(::rtl::OUString(
13291 - RTL_CONSTASCII_USTRINGPARAM( "Unable to save to a read only file ") ),
13292 - uno::Reference< XInterface >() );
13293 - }
13294 - if( bFileName )
13295 - xStorable->storeAsURL( aFileName, uno::Sequence< beans::PropertyValue >(0) );
13296 - else
13297 - xStorable->store();
13298 - }
13299 - else
13300 - xModifiable->setModified( false );
13301 -
13302 - uno::Reference< util::XCloseable > xCloseable( getModel(), uno::UNO_QUERY );
13304 - if( xCloseable.is() )
13305 - // use close(boolean DeliverOwnership)
13306 -
13307 - // The boolean parameter DeliverOwnership tells objects vetoing the close process that they may
13308 - // assume ownership if they object the closure by throwing a CloseVetoException
13309 - // Here we give up ownership. To be on the safe side, catch possible veto exception anyway.
13310 - xCloseable->close(sal_True);
13311 - // If close is not supported by this model - try to dispose it.
13312 - // But if the model disagree with a reset request for the modify state
13313 - // we shouldn't do so. Otherwhise some strange things can happen.
13314 - else
13315 - {
13316 - uno::Reference< lang::XComponent > xDisposable ( getCurrentDocument(), uno::UNO_QUERY );
13317 - if ( xDisposable.is() )
13318 - xDisposable->dispose();
13319 - }
13320 -}
13321 -
13322 -void
13323 -ScVbaWorkbook::Protect( const uno::Any &aPassword ) throw (uno::RuntimeException)
13324 +void SAL_CALL
13325 +ScVbaWorkbook::Activate() throw (uno::RuntimeException)
13326 {
13327 - rtl::OUString rPassword;
13328 - uno::Reference< util::XProtectable > xProt( getModel(), uno::UNO_QUERY_THROW );
13329 - SC_VBA_FIXME(("Workbook::Protect stub"));
13330 - if( aPassword >>= rPassword )
13331 - xProt->protect( rPassword );
13332 - else
13333 - xProt->protect( rtl::OUString() );
13334 + VbaDocumentBase::Activate();
13335 }
13337 -void
13338 -ScVbaWorkbook::Unprotect( const uno::Any &aPassword ) throw (uno::RuntimeException)
13339 -{
13340 - rtl::OUString rPassword;
13341 - uno::Reference< util::XProtectable > xProt( getModel(), uno::UNO_QUERY_THROW );
13342 - if( !getProtectStructure() )
13343 - throw uno::RuntimeException(::rtl::OUString(
13344 - RTL_CONSTASCII_USTRINGPARAM( "File is already unprotected" ) ),
13345 - uno::Reference< XInterface >() );
13346 - else
13347 - {
13348 - if( aPassword >>= rPassword )
13349 - xProt->unprotect( rPassword );
13350 - else
13351 - xProt->unprotect( rtl::OUString() );
13352 - }
13353 -}
13354 -
13355 ::sal_Bool
13356 ScVbaWorkbook::getProtectStructure() throw (uno::RuntimeException)
13357 {
13358 @@ -373,28 +265,6 @@ ScVbaWorkbook::getProtectStructure() thr
13359 return xProt->isProtected();
13360 }
13362 -void
13363 -ScVbaWorkbook::setSaved( sal_Bool bSave ) throw (uno::RuntimeException)
13364 -{
13365 - uno::Reference< util::XModifiable > xModifiable( getModel(), uno::UNO_QUERY_THROW );
13366 - xModifiable->setModified( bSave );
13367 -}
13368 -
13369 -sal_Bool
13370 -ScVbaWorkbook::getSaved() throw (uno::RuntimeException)
13371 -{
13372 - uno::Reference< util::XModifiable > xModifiable( getModel(), uno::UNO_QUERY_THROW );
13373 - return xModifiable->isModified();
13374 -}
13375 -
13376 -void
13377 -ScVbaWorkbook::Save() throw (uno::RuntimeException)
13378 -{
13379 - rtl::OUString url = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".uno:Save"));
13380 - uno::Reference< frame::XModel > xModel = getModel();
13381 - dispatchRequests(xModel,url);
13382 -}
13383 -
13384 void
13385 ScVbaWorkbook::SaveCopyAs( const rtl::OUString& sFileName ) throw ( uno::RuntimeException)
13386 {
13387 @@ -407,13 +277,6 @@ ScVbaWorkbook::SaveCopyAs( const rtl::OU
13388 xStor->storeToURL( aURL, storeProps );
13389 }
13391 -void
13392 -ScVbaWorkbook::Activate() throw (uno::RuntimeException)
13393 -{
13394 - uno::Reference< frame::XFrame > xFrame( getModel()->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW );
13395 - xFrame->activate();
13396 -}
13397 -
13398 css::uno::Any SAL_CALL
13399 ScVbaWorkbook::Styles( const::uno::Any& Item ) throw (uno::RuntimeException)
13400 {
13401 @@ -465,7 +328,7 @@ ScVbaWorkbook::getCodeName() throw (css:
13402 {
13403 #ifdef VBA_OOBUILD_HACK
13404 uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW );
13405 - ScDocument* pDoc = getDocShell( xModel )->GetDocument();
13406 + ScDocument* pDoc = excel::getDocShell( xModel )->GetDocument();
13407 ScExtDocOptions* pExtOptions = pDoc->GetExtDocOptions();
13408 ScExtDocSettings pExtSettings = pExtOptions->GetDocSettings();
13409 ::rtl::OUString sGlobCodeName = pExtSettings.maGlobCodeName;
13410 @@ -479,7 +342,7 @@ void SAL_CALL
13411 ScVbaWorkbook::setCodeName( const ::rtl::OUString& sGlobCodeName ) throw (css::uno::RuntimeException)
13412 {
13413 uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW );
13414 - ScDocument* pDoc = getDocShell( xModel )->GetDocument();
13415 + ScDocument* pDoc = excel::getDocShell( xModel )->GetDocument();
13416 ScExtDocOptions* pExtOptions = pDoc->GetExtDocOptions();
13417 ScExtDocSettings pExtSettings = pExtOptions->GetDocSettings();
13418 pExtSettings.maGlobCodeName = sGlobCodeName;
13419 --- sc/source/ui/vba/vbaworkbook.hxx.old 2009-04-02 10:45:35.000000000 +0000
13420 +++ sc/source/ui/vba/vbaworkbook.hxx 2009-04-06 16:42:01.000000000 +0000
13421 @@ -32,21 +32,20 @@
13423 #include <com/sun/star/frame/XModel.hpp>
13424 #include <ooo/vba/excel/XWorkbook.hpp>
13425 -#include "vbahelperinterface.hxx"
13426 +#include <vbahelper/vbahelperinterface.hxx>
13427 +#include <vbahelper/vbadocumentbase.hxx>
13429 class ScModelObj;
13431 -typedef InheritedHelperInterfaceImpl1< ov::excel::XWorkbook > ScVbaWorkbook_BASE;
13432 +typedef cppu::ImplInheritanceHelper1< VbaDocumentBase, ov::excel::XWorkbook > ScVbaWorkbook_BASE;
13434 class ScVbaWorkbook : public ScVbaWorkbook_BASE
13435 {
13436 - css::uno::Reference< css::frame::XModel > mxModel;
13437 static css::uno::Sequence< sal_Int32 > ColorData;
13438 void initColorData( const css::uno::Sequence< sal_Int32 >& sColors );
13439 void init();
13440 protected:
13442 - virtual css::uno::Reference< css::frame::XModel > getModel() { return mxModel; }
13443 ScVbaWorkbook( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext);
13444 public:
13445 ScVbaWorkbook( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext,
13446 @@ -55,25 +54,14 @@ public:
13447 virtual ~ScVbaWorkbook() {}
13449 // Attributes
13450 - virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
13451 - virtual ::rtl::OUString SAL_CALL getPath() throw (css::uno::RuntimeException);
13452 - virtual ::rtl::OUString SAL_CALL getFullName() throw (css::uno::RuntimeException);
13453 virtual ::sal_Bool SAL_CALL getProtectStructure() throw (css::uno::RuntimeException);
13454 virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getActiveSheet() throw (css::uno::RuntimeException);
13455 - virtual sal_Bool SAL_CALL getSaved() throw (css::uno::RuntimeException);
13456 - virtual void SAL_CALL setSaved( sal_Bool bSave ) throw (css::uno::RuntimeException);
13458 // Methods
13459 virtual css::uno::Any SAL_CALL Worksheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
13460 virtual css::uno::Any SAL_CALL Sheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
13461 virtual css::uno::Any SAL_CALL Windows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
13462 - virtual void SAL_CALL Close( const css::uno::Any &bSaveChanges,
13463 - const css::uno::Any &aFileName,
13464 - const css::uno::Any &bRouteWorkbook ) throw (css::uno::RuntimeException);
13465 - virtual void SAL_CALL Protect( const css::uno::Any & aPassword ) throw (css::uno::RuntimeException);
13466 - virtual void SAL_CALL Unprotect( const css::uno::Any &aPassword ) throw (css::uno::RuntimeException);
13467 - virtual void SAL_CALL Save() throw (css::uno::RuntimeException);
13468 - virtual void SAL_CALL Activate() throw (css::uno::RuntimeException);
13469 + virtual void SAL_CALL Activate() throw (css::uno::RuntimeException);
13470 // Amelia Wang
13471 virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
13473 --- sc/source/ui/vba/vbaworkbooks.cxx.old 2009-04-02 10:45:35.000000000 +0000
13474 +++ sc/source/ui/vba/vbaworkbooks.cxx 2009-04-06 16:42:01.000000000 +0000
13475 @@ -56,7 +56,7 @@
13476 #include "vbaglobals.hxx"
13477 #include "vbaworkbook.hxx"
13478 #include "vbaworkbooks.hxx"
13479 -#include "vbahelper.hxx"
13480 +#include <vbahelper/vbahelper.hxx>
13482 #include <hash_map>
13483 #include <osl/file.hxx>
13484 @@ -74,14 +74,14 @@ typedef std::vector < uno::Reference< sh
13485 typedef ::cppu::WeakImplHelper1< container::XEnumeration > SpreadSheetDocEnumImpl_BASE;
13487 static uno::Any
13488 -getWorkbook( uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< sheet::XSpreadsheetDocument > &xDoc )
13489 +getWorkbook( uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< sheet::XSpreadsheetDocument > &xDoc, const uno::Any& aApplication )
13490 {
13491 // FIXME: fine as long as ScVbaWorkbook is stateless ...
13492 uno::Reference< frame::XModel > xModel( xDoc, uno::UNO_QUERY );
13493 if( !xModel.is() )
13494 return uno::Any();
13496 - ScVbaWorkbook *pWb = new ScVbaWorkbook( uno::Reference< XHelperInterface >( ScVbaGlobals::getGlobalsImpl( xContext )->getApplication(), uno::UNO_QUERY_THROW ), xContext, xModel );
13497 + ScVbaWorkbook *pWb = new ScVbaWorkbook( uno::Reference< XHelperInterface >( aApplication, uno::UNO_QUERY_THROW ), xContext, xModel );
13498 return uno::Any( uno::Reference< excel::XWorkbook > (pWb) );
13499 }
13501 @@ -134,13 +134,14 @@ public:
13503 class WorkBookEnumImpl : public EnumerationHelperImpl
13504 {
13505 + uno::Any m_aApplication;
13506 public:
13507 - WorkBookEnumImpl( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xContext, xEnumeration ){}
13508 + WorkBookEnumImpl( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Any& aApplication ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xContext, xEnumeration ), m_aApplication( aApplication ) {}
13510 virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
13511 {
13512 uno::Reference< sheet::XSpreadsheetDocument > xDoc( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW );
13513 - return getWorkbook( m_xContext, xDoc );
13514 + return getWorkbook( m_xContext, xDoc, m_aApplication );
13515 }
13517 };
13518 @@ -254,14 +255,14 @@ ScVbaWorkbooks::createEnumeration() thro
13519 // the state of this object ( although it should ) would be
13520 // safer to create an enumeration based on this objects state
13521 // rather than one effectively based of the desktop component
13522 - return new WorkBookEnumImpl( mxContext, uno::Reference< container::XEnumeration >( new SpreadSheetDocEnumImpl(mxContext) ) );
13523 + return new WorkBookEnumImpl( mxContext, uno::Reference< container::XEnumeration >( new SpreadSheetDocEnumImpl(mxContext) ), Application() );
13524 }
13526 uno::Any
13527 ScVbaWorkbooks::createCollectionObject( const css::uno::Any& aSource )
13528 {
13529 uno::Reference< sheet::XSpreadsheetDocument > xDoc( aSource, uno::UNO_QUERY );
13530 - return getWorkbook( mxContext, xDoc );
13531 + return getWorkbook( mxContext, xDoc, Application() );
13532 }
13535 @@ -282,7 +283,7 @@ ScVbaWorkbooks::Add() throw (uno::Runtim
13536 uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( xComponent, uno::UNO_QUERY_THROW );
13538 if( xSpreadDoc.is() )
13539 - return getWorkbook( mxContext, xSpreadDoc );
13540 + return getWorkbook( mxContext, xSpreadDoc, Application() );
13541 return uno::Any();
13542 }
13544 @@ -438,7 +439,7 @@ ScVbaWorkbooks::Open( const rtl::OUStrin
13545 frame::FrameSearchFlag::CREATE,
13546 sProps);
13547 uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( xComponent, uno::UNO_QUERY_THROW );
13548 - uno::Any aRet = getWorkbook( mxContext, xSpreadDoc );
13549 + uno::Any aRet = getWorkbook( mxContext, xSpreadDoc, Application() );
13550 uno::Reference< excel::XWorkbook > xWBook( aRet, uno::UNO_QUERY );
13551 if ( xWBook.is() )
13552 xWBook->Activate();
13553 --- sc/source/ui/vba/vbaworkbooks.hxx.old 2009-04-02 10:45:35.000000000 +0000
13554 +++ sc/source/ui/vba/vbaworkbooks.hxx 2009-04-06 16:42:01.000000000 +0000
13555 @@ -31,11 +31,10 @@
13556 #define SC_VBA_WORKBOOKS_HXX
13559 -#include "vbacollectionimpl.hxx"
13560 -#include <ooo/vba/XGlobals.hpp>
13561 +#include <vbahelper/vbacollectionimpl.hxx>
13562 #include <ooo/vba/excel/XWorkbooks.hpp>
13563 #include <com/sun/star/container/XEnumerationAccess.hpp>
13564 -#include "vbahelper.hxx"
13565 +#include "excelvbahelper.hxx"
13568 class ScModelObj;
13569 @@ -45,7 +44,6 @@ typedef CollTestImplHelper< ov::excel::X
13570 class ScVbaWorkbooks : public ScVbaWorkbooks_BASE
13571 {
13572 private:
13573 - css::uno::Reference< ov::XGlobals > getGlobals() throw (css::uno::RuntimeException);
13574 rtl::OUString getFileFilterType( const rtl::OUString& rString );
13575 bool isTextFile( const rtl::OUString& rString );
13576 bool isSpreadSheetFile( const rtl::OUString& rString );
13577 --- sc/source/ui/vba/vbaworksheet.cxx.old 2009-04-06 16:42:00.000000000 +0000
13578 +++ sc/source/ui/vba/vbaworksheet.cxx 2009-04-06 16:42:01.000000000 +0000
13579 @@ -27,7 +27,7 @@
13580 * for a copy of the LGPLv3 License.
13581 *
13582 ************************************************************************/
13583 -#include "helperdecl.hxx"
13584 +#include <vbahelper/helperdecl.hxx>
13585 #include <cppuhelper/queryinterface.hxx>
13587 #include <com/sun/star/beans/XPropertySet.hpp>
13588 @@ -59,6 +59,7 @@
13589 #include <com/sun/star/form/FormComponentType.hpp>
13590 #include <com/sun/star/form/XFormsSupplier.hpp>
13591 #include <ooo/vba/excel/XlEnableSelection.hpp>
13592 +#include <ooo/vba/XControlProvider.hpp>
13594 #include <comphelper/processfactory.hxx>
13596 @@ -83,7 +84,6 @@
13597 #include "vbaworksheet.hxx"
13598 #include "vbachartobjects.hxx"
13599 #include "vbapivottables.hxx"
13600 -#include "vbacombobox.hxx"
13601 #include "vbaoleobject.hxx"
13602 #include "vbaoleobjects.hxx"
13603 #include "vbashapes.hxx"
13604 @@ -268,7 +268,7 @@ ScVbaWorksheet::getEnableSelection() thr
13605 if ( bSheetExists )
13606 {
13607 uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW );
13608 - ScDocument* pDoc = getDocShell( xModel )->GetDocument();
13609 + ScDocument* pDoc = excel::getDocShell( xModel )->GetDocument();
13610 ScTableProtection* pProtect = pDoc->GetTabProtection(nTab);
13611 sal_Bool bLockedCells = sal_False;
13612 sal_Bool bUnlockedCells = sal_False;
13613 @@ -308,7 +308,7 @@ ScVbaWorksheet::setEnableSelection( sal_
13614 if ( bSheetExists )
13615 {
13616 uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW );
13617 - ScDocument* pDoc = getDocShell( xModel )->GetDocument();
13618 + ScDocument* pDoc = excel::getDocShell( xModel )->GetDocument();
13619 ScTableProtection* pProtect = pDoc->GetTabProtection(nTab);
13620 // default is xlNoSelection
13621 sal_Bool bLockedCells = sal_False;
13622 @@ -431,11 +431,11 @@ ScVbaWorksheet::Move( const uno::Any& Be
13623 uno::Reference<excel::XRange> xRange = new ScVbaRange( this, mxContext, xRange1);
13624 if (xRange.is())
13625 xRange->Select();
13626 - implnCopy();
13627 + excel::implnCopy();
13628 uno::Reference<frame::XModel> xModel = openNewDoc(aCurrSheetName);
13629 if (xModel.is())
13630 {
13631 - implnPaste();
13632 + excel::implnPaste();
13633 Delete();
13634 }
13635 return ;
13636 @@ -469,11 +469,11 @@ ScVbaWorksheet::Copy( const uno::Any& Be
13637 uno::Reference<excel::XRange> xRange = new ScVbaRange( this, mxContext, xRange1);
13638 if (xRange.is())
13639 xRange->Select();
13640 - implnCopy();
13641 + excel::implnCopy();
13642 uno::Reference<frame::XModel> xModel = openNewDoc(aCurrSheetName);
13643 if (xModel.is())
13644 {
13645 - implnPaste();
13646 + excel::implnPaste();
13647 }
13648 return;
13649 }
13650 @@ -502,7 +502,7 @@ ScVbaWorksheet::Paste( const uno::Any& D
13651 uno::Reference<excel::XRange> xRange( Destination, uno::UNO_QUERY );
13652 if ( xRange.is() )
13653 xRange->Select();
13654 - implnPaste();
13655 + excel::implnPaste();
13656 }
13658 void
13659 @@ -713,7 +713,7 @@ ScVbaWorksheet::ShowDataForm( ) throw (u
13660 {
13661 #ifdef VBA_OOBUILD_HACK
13662 uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW );
13663 - ScTabViewShell* pTabViewShell = getBestViewShell( xModel );
13664 + ScTabViewShell* pTabViewShell = excel::getBestViewShell( xModel );
13666 ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
13667 DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
13668 @@ -762,9 +762,11 @@ uno::Any SAL_CALL
13669 ScVbaWorksheet::getValue( const ::rtl::OUString& aPropertyName ) throw (beans::UnknownPropertyException, uno::RuntimeException)
13670 {
13671 uno::Reference< drawing::XControlShape > xControlShape( getControlShape( aPropertyName ), uno::UNO_QUERY_THROW );
13672 - ScVbaControlFactory controlFactory( mxContext, xControlShape, getModel() );
13673 - uno::Reference< msforms::XControl > xControl( controlFactory.createControl( getModel() ) );
13674 - return uno::makeAny( xControl );
13675 +
13676 + uno::Reference<lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
13677 + uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.ControlProvider" ) ), mxContext ), uno::UNO_QUERY_THROW );
13678 + uno::Reference< msforms::XControl > xControl( xControlProvider->createControl( xControlShape, getModel() ) );
13679 + return uno::makeAny( xControl );
13680 }
13682 ::sal_Bool SAL_CALL
13683 @@ -947,10 +949,9 @@ ScVbaWorksheet::PrintOut( const uno::Any
13684 bSelection = sal_True;
13686 uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY_THROW );
13687 - PrintOutHelper( From, To, Copies, Preview, ActivePrinter, PrintToFile, Collate, PrToFileName, xModel, bSelection );
13688 + PrintOutHelper( excel::getBestViewShell( xModel ), From, To, Copies, Preview, ActivePrinter, PrintToFile, Collate, PrToFileName, bSelection );
13689 }
13691 -
13692 namespace worksheet
13693 {
13694 namespace sdecl = comphelper::service_decl;
13695 --- sc/source/ui/vba/vbaworksheet.hxx.old 2009-04-06 16:42:00.000000000 +0000
13696 +++ sc/source/ui/vba/vbaworksheet.hxx 2009-04-06 16:42:01.000000000 +0000
13697 @@ -47,7 +47,8 @@
13698 #include <ooo/vba/excel/XChartObjects.hpp>
13699 #include <com/sun/star/container/XNamed.hpp>
13701 -#include "vbahelperinterface.hxx"
13702 +#include <vbahelper/vbahelperinterface.hxx>
13703 +#include "address.hxx"
13705 typedef InheritedHelperInterfaceImpl1< ov::excel::XWorksheet > WorksheetImpl_BASE;
13707 --- sc/source/ui/vba/vbaworksheets.cxx.old 2009-04-02 10:45:35.000000000 +0000
13708 +++ sc/source/ui/vba/vbaworksheets.cxx 2009-04-06 16:42:01.000000000 +0000
13709 @@ -217,8 +217,8 @@ ScVbaWorksheets::Add( const uno::Any& Be
13710 }
13711 if (!aStringSheet.getLength())
13712 {
13713 - aStringSheet = ScVbaGlobals::getGlobalsImpl(
13714 - mxContext )->getApplication()->getActiveWorkbook()->getActiveSheet()->getName();
13715 + uno::Reference< excel::XApplication > xApplication( Application(), uno::UNO_QUERY_THROW );
13716 + aStringSheet = xApplication->getActiveWorkbook()->getActiveSheet()->getName();
13717 bBefore = sal_True;
13718 }
13719 nCount = static_cast< SCTAB >( m_xIndexAccess->getCount() );
13720 @@ -295,7 +295,7 @@ ScVbaWorksheets::PrintOut( const uno::An
13721 if ( isSelectedSheets() )
13722 bSelection = sal_True;
13724 - PrintOutHelper( From, To, Copies, Preview, ActivePrinter, PrintToFile, Collate, PrToFileName, mxModel, bSelection );
13725 + PrintOutHelper( excel::getBestViewShell( mxModel ), From, To, Copies, Preview, ActivePrinter, PrintToFile, Collate, PrToFileName, bSelection );
13726 }
13728 uno::Any SAL_CALL
13729 @@ -336,7 +336,7 @@ ScVbaWorksheets::setVisible( const uno::
13730 void SAL_CALL
13731 ScVbaWorksheets::Select( const uno::Any& Replace ) throw (uno::RuntimeException)
13732 {
13733 - ScTabViewShell* pViewShell = getBestViewShell( mxModel );
13734 + ScTabViewShell* pViewShell = excel::getBestViewShell( mxModel );
13735 if ( !pViewShell )
13736 throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cannot obtain view shell" ) ), uno::Reference< uno::XInterface >() );
13738 --- sc/source/ui/vba/vbaworksheets.hxx.old 2009-04-02 10:45:35.000000000 +0000
13739 +++ sc/source/ui/vba/vbaworksheets.hxx 2009-04-06 16:42:01.000000000 +0000
13740 @@ -36,9 +36,8 @@
13741 #include <com/sun/star/sheet/XSpreadsheets.hpp>
13742 #include <com/sun/star/container/XEnumerationAccess.hpp>
13743 #include <com/sun/star/uno/XComponentContext.hpp>
13744 -#include <ooo/vba/XGlobals.hpp>
13746 -#include "vbacollectionimpl.hxx"
13747 +#include <vbahelper/vbacollectionimpl.hxx>
13749 class ScModelObj;
13751 --- sc/util/makefile.mk.old 2009-04-06 16:41:56.000000000 +0000
13752 +++ sc/util/makefile.mk 2009-04-06 16:42:01.000000000 +0000
13753 @@ -78,6 +78,7 @@ SHL1IMPLIB= sci
13755 # dynamic libraries
13756 SHL1STDLIBS= \
13757 + $(VBAHELPERLIB) \
13758 $(BASICLIB) \
13759 $(SFXLIB) \
13760 $(SVTOOLLIB) \
13761 @@ -299,6 +300,7 @@ SHL9RPATH=OOO
13762 .ENDIF
13764 SHL9STDLIBS= \
13765 + $(VBAHELPERLIB) \
13766 $(CPPUHELPERLIB) \
13767 $(VCLLIB) \
13768 $(CPPULIB) \
13769 --- scp2/source/ooo/file_library_ooo.scp.old 2009-04-06 16:41:58.000000000 +0000
13770 +++ scp2/source/ooo/file_library_ooo.scp 2009-04-06 16:42:01.000000000 +0000
13771 @@ -406,7 +406,42 @@ File gid_File_Lib_Vbaobj
13772 #endif
13773 End
13775 +File gid_File_Lib_Vbaswobj
13776 + TXT_FILE_BODY;
13777 + Styles = (PACKED,UNO_COMPONENT);
13778 + RegistryID = gid_Starregistry_Services_Rdb;
13779 + Dir = gid_Dir_Program;
13780 + #ifdef UNX
13781 + Name = STRING(CONCAT4(libvbaswobj,DLLPOSTFIX,.uno,UNXSUFFIX));
13782 + #else
13783 + Name = STRING(CONCAT4(vbaswobj,DLLPOSTFIX,.uno,.dll));
13784 + #endif
13785 +End
13786 +
13787 +File gid_File_Lib_Vbamsforms
13788 + TXT_FILE_BODY;
13789 + Styles = (PACKED,UNO_COMPONENT);
13790 + RegistryID = gid_Starregistry_Services_Rdb;
13791 + Dir = gid_Dir_Program;
13792 + #ifdef UNX
13793 + Name = STRING(CONCAT4(libmsforms,DLLPOSTFIX,.uno,UNXSUFFIX));
13794 + #else
13795 + Name = STRING(CONCAT4(msforms,DLLPOSTFIX,.uno,.dll));
13796 + #endif
13797 +End
13798 +
13799 #endif // VBA_EXTENSION
13800 +File gid_File_Lib_Vbahelper
13801 + TXT_FILE_BODY;
13802 + Styles = (PACKED);
13803 + RegistryID = gid_Starregistry_Services_Rdb;
13804 + Dir = gid_Dir_Program;
13805 + #ifdef UNX
13806 + Name = STRING(CONCAT3(libvbahelper,DLLPOSTFIX,UNXSUFFIX));
13807 + #else
13808 + Name = STRING(CONCAT3(vbahelper,DLLPOSTFIX,.dll));
13809 + #endif
13810 +End
13811 #endif // ENABLE_VBA
13814 --- scripting/source/vbaevents/eventhelper.cxx.old 2009-04-06 16:42:00.000000000 +0000
13815 +++ scripting/source/vbaevents/eventhelper.cxx 2009-04-06 16:42:01.000000000 +0000
13816 @@ -768,10 +768,27 @@ EventListener::firing_Impl(const ScriptE
13817 std::list< TranslateInfo >::const_iterator txInfo =
13818 eventInfo_it->second.begin();
13819 std::list< TranslateInfo >::const_iterator txInfo_end = eventInfo_it->second.end();
13820 - rtl::OUString sMacroLoc = rtl::OUString::createFromAscii("Standard.").concat( evt.ScriptCode ).concat( rtl::OUString::createFromAscii(".") );
13822 StarBASIC* pBasic = mpShell->GetBasic();
13823 + BasicManager* pBasicManager = mpShell->GetBasicManager();
13824 + //'Project' is a better default but I want to force failures
13825 + //rtl::OUString sMacroLoc = rtl::OUString::createFromAscii("Project");
13826 + rtl::OUString sProject = rtl::OUString::createFromAscii("Standard");
13827 +
13828 + if ( pBasicManager->GetName().Len() > 0 )
13829 + sProject = pBasicManager->GetName();
13830 +
13831 + rtl::OUString sMacroLoc = sProject;
13832 + sMacroLoc = sMacroLoc.concat( rtl::OUString::createFromAscii(".") );
13833 + sMacroLoc = sMacroLoc.concat( evt.ScriptCode ).concat( rtl::OUString::createFromAscii(".") );
13834 +
13835 + OSL_TRACE("sMacroLoc is %s", rtl::OUStringToOString( sMacroLoc, RTL_TEXTENCODING_UTF8 ).getStr() );
13836 +
13837 + // find library
13838 + pBasic = pBasicManager->GetLib( sProject );
13839 +
13840 SbModule* pModule = pBasic->FindModule( evt.ScriptCode );
13841 +
13842 for ( ; pModule && txInfo != txInfo_end; ++txInfo )
13843 {
13844 // see if we have a match for the handlerextension
13845 --- sfx2/inc/sfx2/sfx.hrc.old 2009-04-02 10:44:03.000000000 +0000
13846 +++ sfx2/inc/sfx2/sfx.hrc 2009-04-06 16:42:01.000000000 +0000
13847 @@ -402,8 +402,10 @@
13848 #define MID_DOCINFO_ENCRYPTED 0x2c
13849 #define MID_DOCINFO_STATISTIC 0x33
13850 #define MID_DOCINFO_CHARLOCALE 0x34
13851 -
13852 -#define MID_LAST_USED_PROPID MID_DOCINFO_CHARLOCALE
13853 +#define MID_CATEGORY 0x35
13854 +#define MID_COMPANY 0x36
13855 +#define MID_MANAGER 0x37
13856 +#define MID_LAST_USED_PROPID MID_MANAGER
13858 // Config-Ids -----------------------------------------------------------
13860 --- sfx2/inc/sfx2/sfxbasemodel.hxx.old 2009-04-02 10:44:03.000000000 +0000
13861 +++ sfx2/inc/sfx2/sfxbasemodel.hxx 2009-04-06 16:42:01.000000000 +0000
13862 @@ -1379,6 +1379,7 @@ protected:
13863 /* returns true if the document signatures are valid, otherwise false */
13864 sal_Bool hasValidSignatures() const;
13866 + void setDocumentProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties >& );
13867 //________________________________________________________________________________________________________
13868 // private methods
13869 //________________________________________________________________________________________________________
13870 --- sfx2/source/appl/appuno.cxx.old 2009-04-02 10:44:02.000000000 +0000
13871 +++ sfx2/source/appl/appuno.cxx 2009-04-06 16:42:01.000000000 +0000
13872 @@ -2283,6 +2283,16 @@ SFX2_DLLPUBLIC sal_Bool SAL_CALL compone
13873 xNewKey = xKey->createKey( aTempStr );
13874 xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.document.DocumentProperties") );
13876 +
13877 + // writer compatable document properties
13878 + aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
13879 + aImpl += comp_CompatWriterDocProps::_getImplementationName();
13880 +
13881 + aTempStr = aImpl;
13882 + aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
13883 + xNewKey = xKey->createKey( aTempStr );
13884 + xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.writer.DocumentProperties") );
13885 +
13886 return sal_True;
13887 }
13889 @@ -2340,6 +2350,16 @@ SFX2_DLLPUBLIC void* SAL_CALL component_
13890 ::comp_SfxDocumentMetaData::_getImplementationName(),
13891 ::comp_SfxDocumentMetaData::_getSupportedServiceNames());
13892 }
13893 + if ( ::comp_CompatWriterDocProps::_getImplementationName().equals(
13894 + ::rtl::OUString::createFromAscii( pImplementationName ) ) )
13895 + {
13896 + xFactory = ::cppu::createSingleComponentFactory(
13897 + ::comp_CompatWriterDocProps::_create,
13898 + ::comp_CompatWriterDocProps::_getImplementationName(),
13899 + ::comp_CompatWriterDocProps::_getSupportedServiceNames());
13900 + }
13901 +
13902 + // Factory is valid - service was found.
13904 // Factory is valid - service was found.
13905 if ( xFactory.is() )
13906 --- sfx2/source/doc/SfxDocumentMetaData.cxx.old 2009-04-02 10:43:58.000000000 +0000
13907 +++ sfx2/source/doc/SfxDocumentMetaData.cxx 2009-04-06 16:42:01.000000000 +0000
13908 @@ -89,6 +89,10 @@
13909 #include <cstring>
13910 #include <limits>
13912 +
13913 +#include <cppuhelper/implbase1.hxx>
13914 +#include <com/sun/star/document/XCompatWriterDocProperties.hpp>
13915 +
13916 /**
13917 * This file contains the implementation of the service
13918 * com.sun.star.document.DocumentProperties.
13919 @@ -298,12 +302,12 @@ public:
13920 const css::uno::Sequence< css::beans::StringPair >& i_rNamespaces)
13921 throw (css::uno::RuntimeException, css::xml::sax::SAXException);
13923 -private:
13924 +protected:
13925 SfxDocumentMetaData(SfxDocumentMetaData &); // not defined
13926 SfxDocumentMetaData& operator =(SfxDocumentMetaData &); // not defined
13928 virtual ~SfxDocumentMetaData() {}
13929 -
13930 + virtual SfxDocumentMetaData* createMe( css::uno::Reference< css::uno::XComponentContext > const & context ) { return new SfxDocumentMetaData( context ); };
13931 const css::uno::Reference< css::uno::XComponentContext > m_xContext;
13933 /// for notification
13934 @@ -377,6 +381,54 @@ private:
13935 // throw (css::uno::RuntimeException);
13936 };
13938 +typedef ::cppu::ImplInheritanceHelper1< SfxDocumentMetaData, css::document::XCompatWriterDocProperties > CompatWriterDocPropsImpl_BASE;
13939 +
13940 +class CompatWriterDocPropsImpl : public CompatWriterDocPropsImpl_BASE
13941 +{
13942 + rtl::OUString msManager;
13943 + rtl::OUString msCategory;
13944 + rtl::OUString msCompany;
13945 +protected:
13946 + virtual SfxDocumentMetaData* createMe( css::uno::Reference< css::uno::XComponentContext > const & context ) { return new CompatWriterDocPropsImpl( context ); };
13947 +public:
13948 + CompatWriterDocPropsImpl( css::uno::Reference< css::uno::XComponentContext > const & context) : CompatWriterDocPropsImpl_BASE( context ) {}
13949 +// XCompatWriterDocPropsImpl
13950 + virtual ::rtl::OUString SAL_CALL getManager() throw (::com::sun::star::uno::RuntimeException) { return msManager; }
13951 + virtual void SAL_CALL setManager( const ::rtl::OUString& _manager ) throw (::com::sun::star::uno::RuntimeException) { msManager = _manager; }
13952 + virtual ::rtl::OUString SAL_CALL getCategory() throw (::com::sun::star::uno::RuntimeException){ return msCategory; }
13953 + virtual void SAL_CALL setCategory( const ::rtl::OUString& _category ) throw (::com::sun::star::uno::RuntimeException){ msCategory = _category; }
13954 + virtual ::rtl::OUString SAL_CALL getCompany() throw (::com::sun::star::uno::RuntimeException){ return msCompany; }
13955 + virtual void SAL_CALL setCompany( const ::rtl::OUString& _company ) throw (::com::sun::star::uno::RuntimeException){ msCompany = _company; }
13956 +
13957 +// XServiceInfo
13958 + virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException)
13959 + {
13960 + return comp_CompatWriterDocProps::_getImplementationName();
13961 + }
13962 +
13963 + virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException)
13964 + {
13965 + css::uno::Sequence< rtl::OUString > sServiceNames= getSupportedServiceNames();
13966 + sal_Int32 nLen = sServiceNames.getLength();
13967 + rtl::OUString* pIt = sServiceNames.getArray();
13968 + rtl::OUString* pEnd = ( pIt + nLen );
13969 + sal_Bool bRes = sal_False;
13970 + for ( ; pIt != pEnd; ++pIt )
13971 + {
13972 + if ( pIt->equals( ServiceName ) )
13973 + {
13974 + bRes = sal_True;
13975 + break;
13976 + }
13977 + }
13978 + return bRes;
13979 + }
13980 +
13981 + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException)
13982 + {
13983 + return comp_CompatWriterDocProps::_getSupportedServiceNames();
13984 + }
13985 +};
13986 ////////////////////////////////////////////////////////////////////////////
13988 bool operator== (const css::util::DateTime &i_rLeft,
13989 @@ -2149,7 +2201,7 @@ SfxDocumentMetaData::createClone()
13990 ::osl::MutexGuard g(m_aMutex);
13991 checkInit();
13993 - SfxDocumentMetaData *pNew = new SfxDocumentMetaData(m_xContext);
13994 + SfxDocumentMetaData *pNew = createMe(m_xContext);
13996 // NB: do not copy the modification listeners, only DOM
13997 css::uno::Reference<css::xml::dom::XDocument> xDoc = createDOM();
13998 @@ -2266,6 +2318,32 @@ void SAL_CALL SfxDocumentMetaData::seria
14001 // component helper namespace
14002 +namespace comp_CompatWriterDocProps {
14003 +
14004 + ::rtl::OUString SAL_CALL _getImplementationName() {
14005 + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
14006 + "CompatWriterDocPropsImpl"));
14007 +}
14008 +
14009 + css::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames()
14010 + {
14011 + static css::uno::Sequence< rtl::OUString > aServiceNames;
14012 + if ( aServiceNames.getLength() == 0 )
14013 + {
14014 + aServiceNames.realloc( 1 );
14015 + aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.writer.DocumentProperties" ) );
14016 + }
14017 + return aServiceNames;
14018 + }
14019 + css::uno::Reference< css::uno::XInterface > SAL_CALL _create(
14020 + const css::uno::Reference< css::uno::XComponentContext > & context)
14021 + SAL_THROW((css::uno::Exception))
14022 + {
14023 + return static_cast< ::cppu::OWeakObject * >
14024 + (new CompatWriterDocPropsImpl(context));
14025 + }
14026 +
14027 +}
14028 namespace comp_SfxDocumentMetaData {
14030 ::rtl::OUString SAL_CALL _getImplementationName() {
14031 --- sfx2/source/doc/docinf.cxx.old 2009-04-02 10:43:58.000000000 +0000
14032 +++ sfx2/source/doc/docinf.cxx 2009-04-06 16:42:01.000000000 +0000
14033 @@ -37,6 +37,7 @@
14034 #include <com/sun/star/beans/XPropertySet.hpp>
14035 #include <com/sun/star/beans/XPropertyContainer.hpp>
14036 #include <com/sun/star/document/XDocumentProperties.hpp>
14037 +#include <com/sun/star/document/XCompatWriterDocProperties.hpp>
14038 #include <com/sun/star/uno/Exception.hpp>
14040 #include <rtl/ustring.hxx>
14041 @@ -46,7 +47,6 @@
14042 #include <vcl/gdimtf.hxx>
14044 #include "oleprops.hxx"
14045 -
14046 // ============================================================================
14048 // stream names
14049 @@ -174,6 +174,28 @@ sal_uInt32 SFX2_DLLPUBLIC LoadOlePropert
14050 }
14051 }
14052 }
14053 +
14054 + uno::Reference< document::XCompatWriterDocProperties > xWriterProps( i_xDocProps, uno::UNO_QUERY );
14055 + if ( xWriterProps.is() )
14056 + {
14057 + SfxOleSectionRef xBuiltin = aDocSet.GetSection( SECTION_BUILTIN );
14058 + if ( xBuiltin.get() )
14059 + {
14060 + try
14061 + {
14062 + String aStrValue;
14063 + if ( xBuiltin->GetStringValue( aStrValue, PROPID_MANAGER ) )
14064 + xWriterProps->setManager( aStrValue );
14065 + if ( xBuiltin->GetStringValue( aStrValue, PROPID_CATEGORY ) )
14066 + xWriterProps->setCategory( aStrValue );
14067 + if ( xBuiltin->GetStringValue( aStrValue, PROPID_COMPANY ) )
14068 + xWriterProps->setCompany( aStrValue );
14069 + }
14070 + catch ( uno::Exception& )
14071 + {
14072 + }
14073 + }
14074 + }
14076 // return code
14077 return (nGlobError != ERRCODE_NONE) ? nGlobError : nDocError;
14078 --- sfx2/source/doc/objuno.cxx.old 2009-04-02 10:43:58.000000000 +0000
14079 +++ sfx2/source/doc/objuno.cxx 2009-04-06 16:42:01.000000000 +0000
14080 @@ -48,6 +48,7 @@
14081 #include <com/sun/star/lang/Locale.hpp>
14082 #include <com/sun/star/util/XModifiable.hpp>
14083 #include <com/sun/star/document/XDocumentProperties.hpp>
14084 +#include <com/sun/star/document/XCompatWriterDocProperties.hpp>
14086 #include <unotools/configmgr.hxx>
14087 #include <tools/inetdef.hxx>
14088 @@ -105,6 +106,9 @@ SfxItemPropertyMap aDocInfoPropertyMap_I
14089 { "AutoloadEnabled" , 15, MID_DOCINFO_AUTOLOADENABLED, &::getBooleanCppuType(), PROPERTY_UNBOUND, 0 },
14090 { "AutoloadSecs" , 12, MID_DOCINFO_AUTOLOADSECS, &::getCppuType((const sal_Int32*)0), PROPERTY_UNBOUND, 0 },
14091 { "AutoloadURL" , 11, MID_DOCINFO_AUTOLOADURL, &::getCppuType((const ::rtl::OUString*)0), PROPERTY_UNBOUND, 0 },
14092 + { "Category" , 8 , MID_CATEGORY, &::getCppuType((const ::rtl::OUString*)0), PROPERTY_UNBOUND, 0 },
14093 + { "Company" , 7 , MID_COMPANY, &::getCppuType((const ::rtl::OUString*)0), PROPERTY_UNBOUND, 0 },
14094 + { "Manager" , 7 , MID_MANAGER, &::getCppuType((const ::rtl::OUString*)0), PROPERTY_UNBOUND, 0 },
14095 { "CreationDate" , 12, WID_DATE_CREATED, &::getCppuType((const ::com::sun::star::util::DateTime*)0),PROPERTY_MAYBEVOID, 0 },
14096 { "DefaultTarget" , 13, MID_DOCINFO_DEFAULTTARGET, &::getCppuType((const ::rtl::OUString*)0), PROPERTY_UNBOUND, 0 },
14097 { "Description" , 11, MID_DOCINFO_DESCRIPTION, &::getCppuType((const ::rtl::OUString*)0), PROPERTY_UNBOUND, 0 },
14098 @@ -824,6 +828,22 @@ void SAL_CALL SfxDocumentInfoObject::se
14099 _pImp->m_xDocProps->setDefaultTarget(sTemp);
14100 break;
14101 // case WID_CONTENT_TYPE : // this is readonly!
14102 + case MID_CATEGORY:
14103 + case MID_MANAGER:
14104 + case MID_COMPANY:
14105 + {
14106 + uno::Reference< document::XCompatWriterDocProperties > xWriterProps( _pImp->m_xDocProps, uno::UNO_QUERY );
14107 + if ( xWriterProps.is() )
14108 + {
14109 + if ( nHandle == MID_CATEGORY )
14110 + xWriterProps->setCategory( sTemp );
14111 + else if ( nHandle == MID_MANAGER )
14112 + xWriterProps->setManager( sTemp );
14113 + else
14114 + xWriterProps->setCompany( sTemp );
14115 + break;
14116 + }
14117 + }
14118 default:
14119 break;
14120 }
14121 @@ -1041,6 +1061,23 @@ void SAL_CALL SfxDocumentInfoObject::se
14122 case MID_DOCINFO_CHARLOCALE:
14123 aValue <<= _pImp->m_xDocProps->getLanguage();
14124 break;
14125 + case MID_CATEGORY:
14126 + case MID_MANAGER:
14127 + case MID_COMPANY:
14128 + {
14129 + uno::Reference< document::XCompatWriterDocProperties > xWriterProps( _pImp->m_xDocProps, uno::UNO_QUERY );
14130 + if ( xWriterProps.is() )
14131 + {
14132 + if ( nHandle == MID_CATEGORY )
14133 + aValue <<= xWriterProps->getCategory();
14134 + else if ( nHandle == MID_MANAGER )
14135 + aValue <<= xWriterProps->getManager();
14136 + else
14137 + aValue <<= xWriterProps->getCompany();
14138 + break;
14139 + }
14140 + }
14141 +
14142 default:
14143 aValue <<= ::rtl::OUString();
14144 break;
14145 --- sfx2/source/doc/oleprops.hxx.old 2009-04-02 10:43:58.000000000 +0000
14146 +++ sfx2/source/doc/oleprops.hxx 2009-04-06 16:42:01.000000000 +0000
14147 @@ -83,6 +83,10 @@ const sal_Int32 PROPID_CREATED
14148 const sal_Int32 PROPID_LASTSAVED = 13;
14149 const sal_Int32 PROPID_THUMBNAIL = 17;
14151 +// some Builtin properties
14152 +const sal_Int32 PROPID_CATEGORY = 0x2;
14153 +const sal_Int32 PROPID_COMPANY = 0xf;
14154 +const sal_Int32 PROPID_MANAGER = 0xe;
14155 // predefined codepages
14156 const sal_uInt16 CODEPAGE_UNKNOWN = 0;
14157 const sal_uInt16 CODEPAGE_UNICODE = 1200;
14158 --- sfx2/source/doc/sfxbasemodel.cxx.old 2009-04-02 10:43:58.000000000 +0000
14159 +++ sfx2/source/doc/sfxbasemodel.cxx 2009-04-06 16:42:01.000000000 +0000
14160 @@ -784,7 +784,15 @@ uno::Reference< document::XDocumentInfo
14162 return m_pData->m_xDocumentInfo;
14163 }
14164 -
14165 +void
14166 +SfxBaseModel::setDocumentProperties( const uno::Reference< document::XDocumentProperties >& rxNewDocProps )
14167 +{
14168 + // object already disposed?
14169 + ::vos::OGuard aGuard( Application::GetSolarMutex() );
14170 + if ( impl_isDisposed() )
14171 + throw lang::DisposedException();
14172 + m_pData->m_xDocumentProperties.set(rxNewDocProps, uno::UNO_QUERY_THROW);
14173 +}
14174 // document::XDocumentPropertiesSupplier:
14175 uno::Reference< document::XDocumentProperties > SAL_CALL
14176 SfxBaseModel::getDocumentProperties()
14177 --- sfx2/source/inc/SfxDocumentMetaData.hxx.old 2009-04-02 10:43:59.000000000 +0000
14178 +++ sfx2/source/inc/SfxDocumentMetaData.hxx 2009-04-06 16:42:01.000000000 +0000
14179 @@ -48,5 +48,16 @@ css::uno::Reference< css::uno::XInterfac
14181 } // closing component helper namespace
14183 +namespace comp_CompatWriterDocProps {
14184 +
14185 +namespace css = ::com::sun::star;
14186 +
14187 +// component and service helper functions:
14188 +::rtl::OUString SAL_CALL _getImplementationName();
14189 +css::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames();
14190 +css::uno::Reference< css::uno::XInterface > SAL_CALL _create(
14191 + css::uno::Reference< css::uno::XComponentContext > const & context );
14192 +
14193 +}
14194 #endif
14196 --- solenv/inc/libs.mk.old 2009-04-02 10:53:10.000000000 +0000
14197 +++ solenv/inc/libs.mk 2009-04-06 16:42:01.000000000 +0000
14198 @@ -192,6 +192,7 @@ SAXLIB=-lsax$(DLLPOSTFIX)
14199 MAILLIB=-lmail
14200 DOCMGRLIB=-ldmg$(DLLPOSTFIX)
14201 BASICLIB=-lsb$(DLLPOSTFIX)
14202 +VBAHELPERLIB=-lvbahelper$(DLLPOSTFIX)
14203 DBTOOLSLIB=-ldbtools$(DLLPOSTFIX)
14204 HM2LIBSH=-lhmwrpdll
14205 HM2LIBST=-lhmwrap
14206 @@ -433,6 +434,7 @@ SAXLIB=isax.lib
14207 MAILLIB=mail.lib
14208 DOCMGRLIB=docmgr.lib
14209 BASICLIB=basic.lib
14210 +VBAHELPERLIB=vbahelper.lib
14211 TKTLIB=tkt.lib
14212 SJLIB=sj.lib
14213 SVXLIB=isvx.lib
14214 --- svx/inc/svx/mstoolbar.hxx.old 2009-04-06 16:42:00.000000000 +0000
14215 +++ svx/inc/svx/mstoolbar.hxx 2009-04-06 16:42:01.000000000 +0000
14216 @@ -27,6 +27,7 @@ public:
14217 virtual rtl::OUString MSOTCIDToOOCommand( sal_Int16 msoTCID ) = 0;
14218 };
14220 +class SfxObjectShell;
14222 class SVX_DLLPUBLIC CustomToolBarImportHelper
14223 {
14224 @@ -39,16 +40,16 @@ class SVX_DLLPUBLIC CustomToolBarImportH
14225 std::auto_ptr< MSOCommandConvertor > pMSOCmdConvertor;
14226 css::uno::Reference< css::ui::XUIConfigurationManagerSupplier > m_xCfgSupp;
14227 css::uno::Reference< css::ui::XUIConfigurationManager > m_xAppCfgMgr;
14228 -
14229 + SfxObjectShell& mrDocSh;
14230 public:
14231 - CustomToolBarImportHelper( const css::uno::Reference< css::frame::XModel >& rxModel, const css::uno::Reference< css::ui::XUIConfigurationManager >& rxAppCfgMgr );
14232 + CustomToolBarImportHelper( SfxObjectShell& rDocSh, const css::uno::Reference< css::ui::XUIConfigurationManager >& rxAppCfgMgr );
14234 void setMSOCommandMap( MSOCommandConvertor* pCnvtr ) { pMSOCmdConvertor.reset( pCnvtr ); }
14235 css::uno::Reference< css::ui::XUIConfigurationManager > getCfgManager();
14236 css::uno::Reference< css::ui::XUIConfigurationManager > getAppCfgManager();
14239 - static css::uno::Any createCommandFromMacro( const rtl::OUString& sCmd );
14240 + css::uno::Any createCommandFromMacro( const rtl::OUString& sCmd );
14242 void addIcon( const css::uno::Reference< css::graphic::XGraphic >& xImage, const rtl::OUString& sString );
14243 void applyIcons();
14244 @@ -131,7 +132,7 @@ public:
14245 ~TBCGeneralInfo() {}
14246 bool Read(SvStream *pS);
14247 void Print( FILE* );
14248 - bool ImportToolBarControlData( std::vector< css::beans::PropertyValue >& );
14249 + bool ImportToolBarControlData( CustomToolBarImportHelper&, std::vector< css::beans::PropertyValue >& );
14250 };
14252 class SVX_DLLPUBLIC TBCBitMap : public TBBase
14253 --- svx/inc/svxmsbas.hxx.old 2009-04-06 16:42:00.000000000 +0000
14254 +++ svx/inc/svxmsbas.hxx 2009-04-06 16:42:01.000000000 +0000
14255 @@ -59,6 +59,8 @@ typedef std::hash_map< sal_Int32, String
14257 typedef std::map< String, ObjIdToName > ControlAttributeInfo;
14259 +class VBA_Impl;
14260 +
14261 class SVX_DLLPUBLIC SvxImportMSVBasic
14262 {
14263 ControlAttributeInfo m_ModuleNameToObjIdHash;
14264 @@ -102,6 +104,9 @@ private:
14265 const String &rSubStorageName, BOOL bVBAMode );
14266 SVX_DLLPRIVATE BOOL CopyStorage_Impl( const String& rStorageName,
14267 const String &rSubStorageName);
14268 + rtl::OUString msProjectName;
14269 + SVX_DLLPRIVATE BOOL ImportCode_Impl( VBA_Impl&, BOOL, BOOL );
14270 + SVX_DLLPRIVATE bool ImportForms_Impl( VBA_Impl&, const String&, const String&, BOOL);
14271 };
14273 #endif
14274 --- svx/source/msfilter/mstoolbar.cxx.old 2009-04-06 16:42:00.000000000 +0000
14275 +++ svx/source/msfilter/mstoolbar.cxx 2009-04-06 16:42:01.000000000 +0000
14276 @@ -8,6 +8,8 @@
14277 #include <vcl/graph.hxx>
14278 #include <vcl/bitmapex.hxx>
14279 #include <map>
14280 +#include <sfx2/objsh.hxx>
14281 +#include <basic/basmgr.hxx>
14283 int TBBase::nIndent = 0;
14285 @@ -36,9 +38,9 @@ void CustomToolBarImportHelper::addIcon(
14286 iconcommands.push_back( item );
14287 }
14289 -CustomToolBarImportHelper::CustomToolBarImportHelper( const uno::Reference< frame::XModel >& rxModel, const css::uno::Reference< css::ui::XUIConfigurationManager>& rxAppCfgMgr )
14290 +CustomToolBarImportHelper::CustomToolBarImportHelper( SfxObjectShell& rDocShell, const css::uno::Reference< css::ui::XUIConfigurationManager>& rxAppCfgMgr ) : mrDocSh( rDocShell )
14291 {
14292 - m_xCfgSupp.set( rxModel, uno::UNO_QUERY_THROW );
14293 + m_xCfgSupp.set( mrDocSh.GetModel(), uno::UNO_QUERY_THROW );
14294 m_xAppCfgMgr.set( rxAppCfgMgr, uno::UNO_QUERY_THROW );
14295 }
14297 @@ -58,10 +60,18 @@ uno::Any
14298 CustomToolBarImportHelper::createCommandFromMacro( const rtl::OUString& sCmd )
14299 {
14300 //"vnd.sun.star.script:Standard.Module1.Main?language=Basic&location=document"
14301 - static rtl::OUString part1 = rtl::OUString::createFromAscii( "vnd.sun.star.script:Standard.");
14302 + static rtl::OUString scheme = rtl::OUString::createFromAscii( "vnd.sun.star.script:");
14303 static rtl::OUString part2 = rtl::OUString::createFromAscii("?language=Basic&location=document");
14304 + rtl::OUString sProject( RTL_CONSTASCII_USTRINGPARAM("Standard") );
14305 + if ( mrDocSh.GetBasicManager()->GetName().Len() )
14306 + sProject = mrDocSh.GetBasicManager()->GetName();
14307 + sProject += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".") );
14308 +
14309 + // #TODO #FIXME a script can also be loosly defined ( e.g. with no module
14310 + // spec )
14311 +
14312 // create script url
14313 - rtl::OUString scriptURL = part1 + sCmd + part2;
14314 + rtl::OUString scriptURL = scheme + sProject + sCmd + part2;
14315 return uno::makeAny( scriptURL );
14316 }
14318 @@ -197,7 +207,7 @@ bool TBCData::Read(SvStream *pS)
14320 bool TBCData::ImportToolBarControl( const css::uno::Reference< css::container::XIndexContainer >& /*toolbarcontainer*/, CustomToolBarImportHelper& helper, std::vector< css::beans::PropertyValue >& props )
14321 {
14322 - controlGeneralInfo.ImportToolBarControlData( props );
14323 + controlGeneralInfo.ImportToolBarControlData( helper, props );
14324 beans::PropertyValue aProp;
14325 aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Visible") ) ;
14326 aProp.Value = uno::makeAny( rHeader.isVisible() ); // where is the visible attribute stored
14327 @@ -356,7 +366,7 @@ TBCGeneralInfo::Print( FILE* fp )
14328 }
14330 bool
14331 -TBCGeneralInfo::ImportToolBarControlData( std::vector< beans::PropertyValue >& sControlData )
14332 +TBCGeneralInfo::ImportToolBarControlData( CustomToolBarImportHelper& helper, std::vector< beans::PropertyValue >& sControlData )
14333 {
14334 if ( ( bFlags & 0x5 ) )
14335 {
14336 @@ -366,7 +376,7 @@ TBCGeneralInfo::ImportToolBarControlData
14337 if ( extraInfo.getOnAction().getLength() )
14338 {
14339 aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CommandURL") );
14340 - aProp.Value = CustomToolBarImportHelper::createCommandFromMacro( extraInfo.getOnAction() );
14341 + aProp.Value = helper.createCommandFromMacro( extraInfo.getOnAction() );
14342 sControlData.push_back( aProp );
14343 }
14345 @@ -379,7 +389,7 @@ TBCGeneralInfo::ImportToolBarControlData
14346 sControlData.push_back( aProp );
14348 aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HelpURL") );
14349 - aProp.Value = uno::makeAny( CustomToolBarImportHelper::createCommandFromMacro( tooltip.getString() ) );
14350 + aProp.Value = uno::makeAny( helper.createCommandFromMacro( tooltip.getString() ) );
14351 sControlData.push_back( aProp );
14353 // #TODO find out what is the property for tooltip?
14354 --- svx/source/msfilter/msvbasic.cxx.old 2009-04-06 16:41:59.000000000 +0000
14355 +++ svx/source/msfilter/msvbasic.cxx 2009-04-06 16:42:01.000000000 +0000
14356 @@ -40,9 +40,929 @@
14357 #include <osl/endian.h>
14358 #include <rtl/tencinfo.h> //rtl_getTextEncodingFromWindowsCodePage
14359 #include "msvbasic.hxx"
14360 +#include <fstream>
14361 +#include <memory>
14362 +#include <rtl/ustrbuf.hxx>
14364 using namespace ::com::sun::star::script;
14366 +// #FIXME this routine is stolen from msocximex ( needs to be somewhere central )
14367 +
14368 +const sal_uInt32 SVX_MSOCX_SIZEMASK = 0x7FFFFFFF; /// Mask for character buffer size.
14369 +const sal_uInt32 SVX_MSOCX_COMPRESSED = 0x80000000;
14370 +
14371 +inline bool lclIsCompressed( sal_uInt32 nLenFld )
14372 +{
14373 + return (nLenFld & SVX_MSOCX_COMPRESSED) != 0;
14374 +}
14375 +
14376 +
14377 +/** Extracts and returns the memory size of the character buffer.
14378 + @return Character buffer size (may differ from resulting string length!).
14379 + */
14380 +inline sal_uInt32 lclGetBufferSize( sal_uInt32 nLenFld )
14381 +{
14382 + return nLenFld & SVX_MSOCX_SIZEMASK;
14383 +}
14384 +/** Creates an OUString from a character array created with lclReadCharArray().
14385 +
14386 + The passed parameters must match, that means the length field must be the
14387 + same used to create the passed character array.
14388 +
14389 + @param pcCharArr
14390 + The character array returned by lclReadCharArray(). May be compressed
14391 + or uncompressed, next parameter nLenFld will specify this.
14392 +
14393 + @param nLenFld
14394 + MUST be the same string length field that has been passed to
14395 + lclReadCharArray() to create the character array in previous parameter
14396 + pcCharArr.
14397 +
14398 + @return
14399 + An OUString containing the decoded string data. Will be empty if
14400 + pcCharArr is 0.
14401 + */
14402 +rtl::OUString lclCreateOUString( const char* pcCharArr, sal_uInt32 nLenFld )
14403 +{
14404 + rtl::OUStringBuffer aBuffer;
14405 + sal_uInt32 nBufSize = lclGetBufferSize( nLenFld );
14406 + if( lclIsCompressed( nLenFld ) )
14407 + {
14408 + // buffer contains compressed Unicode, not encoded bytestring
14409 + sal_Int32 nStrLen = static_cast< sal_Int32 >( nBufSize );
14410 + aBuffer.setLength( nStrLen );
14411 + const char* pcCurrChar = pcCharArr;
14412 + for( sal_Int32 nChar = 0; nChar < nStrLen; ++nChar, ++pcCurrChar )
14413 + /* *pcCurrChar may contain negative values and therefore MUST be
14414 + casted to unsigned char, before assigned to a sal_Unicode. */
14415 + aBuffer.setCharAt( nChar, static_cast< unsigned char >( *pcCurrChar ) );
14416 + }
14417 + else
14418 + {
14419 + // buffer contains Little-Endian Unicode
14420 + sal_Int32 nStrLen = static_cast< sal_Int32 >( nBufSize ) / 2;
14421 + aBuffer.setLength( nStrLen );
14422 + const char* pcCurrChar = pcCharArr;
14423 + for( sal_Int32 nChar = 0; nChar < nStrLen; ++nChar )
14424 + {
14425 + /* *pcCurrChar may contain negative values and therefore MUST be
14426 + casted to unsigned char, before assigned to a sal_Unicode. */
14427 + sal_Unicode cChar = static_cast< unsigned char >( *pcCurrChar++ );
14428 + cChar |= (static_cast< unsigned char >( *pcCurrChar++ ) << 8);
14429 + aBuffer.setCharAt( nChar, cChar );
14430 + }
14431 + }
14432 + return aBuffer.makeStringAndClear();
14433 +}
14434 +
14435 +
14436 +namespace MSLZSS {
14437 +
14438 +static unsigned int getShift( sal_uInt32 nPos )
14439 +{
14440 + if (nPos <= 0x80) {
14441 + if (nPos <= 0x20)
14442 + return (nPos <= 0x10) ? 12 : 11;
14443 + else
14444 + return (nPos <= 0x40) ? 10 : 9;
14445 + } else {
14446 + if (nPos <= 0x200)
14447 + return (nPos <= 0x100) ? 8 : 7;
14448 + else if (nPos <= 0x800)
14449 + return (nPos <= 0x400) ? 6 : 5;
14450 + else
14451 + return 4;
14452 + }
14453 +}
14454 +
14455 +SvMemoryStream *decompressAsStream( SvStream *pStream, sal_uInt32 nOffset, sal_uInt32 *pCompressedLength = NULL, sal_uInt32 *pLength = NULL )
14456 +{
14457 + SvMemoryStream *pResult;
14458 + const sal_Int32 nWINDOWLEN = 4096;
14459 + pResult = new SvMemoryStream();
14460 +
14461 + sal_uInt8 nLeadbyte;
14462 + unsigned int nPos = 0;
14463 + int nLen, nDistance, nShift, nClean=1;
14464 + sal_uInt8 aHistory[ nWINDOWLEN ];
14465 +
14466 + pStream->Seek( nOffset + 3 );
14467 +
14468 + while( pStream->Read( &nLeadbyte, 1 ) )
14469 + {
14470 + for(int nMask=0x01; nMask < 0x100; nMask = nMask<<1)
14471 + {
14472 + // we see if the leadbyte has flagged this location as a dataunit
14473 + // which is actually a token which must be looked up in the history
14474 + if( nLeadbyte & nMask )
14475 + {
14476 + sal_uInt16 nToken;
14477 +
14478 + *pStream >> nToken;
14479 +
14480 + if (nClean == 0)
14481 + nClean=1;
14482 +
14483 + //For some reason the division of the token into the length
14484 + //field of the data to be inserted, and the distance back into
14485 + //the history differs depending on how full the history is
14486 + nShift = getShift( nPos % nWINDOWLEN );
14487 +
14488 + nLen = (nToken & ((1<<nShift) - 1)) + 3;
14489 + nDistance = nToken >> nShift;
14490 +
14491 + //read the len of data from the history, wrapping around the
14492 + //nWINDOWLEN boundary if necessary data read from the history
14493 + //is also copied into the recent part of the history as well.
14494 + for (int i = 0; i < nLen; i++)
14495 + {
14496 + unsigned char c;
14497 + c = aHistory[(nPos-nDistance-1) % nWINDOWLEN];
14498 + aHistory[nPos % nWINDOWLEN] = c;
14499 + nPos++;
14500 + }
14501 + }
14502 + else
14503 + {
14504 + // special boundary case code, not guarantueed to be correct
14505 + // seems to work though, there is something wrong with the
14506 + // compression scheme (or maybe a feature) where when the data
14507 + // ends on a nWINDOWLEN boundary and the excess bytes in the 8
14508 + // dataunit list are discarded, and not interpreted as tokens
14509 + // or normal data.
14510 + if ((nPos != 0) && ((nPos % nWINDOWLEN) == 0) && (nClean))
14511 + {
14512 + pStream->SeekRel(2);
14513 + nClean=0;
14514 + pResult->Write( aHistory, nWINDOWLEN );
14515 + break;
14516 + }
14517 + //This is the normal case for when the data unit is not a
14518 + //token to be looked up, but instead some normal data which
14519 + //can be output, and placed in the history.
14520 + if (pStream->Read(&aHistory[nPos % nWINDOWLEN],1))
14521 + nPos++;
14522 +
14523 + if (nClean == 0)
14524 + nClean=1;
14525 + }
14526 + }
14527 + }
14528 + if (nPos % nWINDOWLEN)
14529 + pResult->Write( aHistory, nPos % nWINDOWLEN );
14530 + pResult->Flush();
14531 +
14532 + if( pCompressedLength )
14533 + *pCompressedLength = nPos;
14534 +
14535 + if( pLength )
14536 + *pLength = pResult->Tell();
14537 +
14538 + pResult->Seek( 0 );
14539 +
14540 + return pResult;
14541 +}
14542 +
14543 +} //MSZSS
14544 +
14545 +// also _VBA_PROJECT_VDPI can be used to create a usable
14546 +// ( and much smaller ) "_VBA_PROJECT" stream
14547 +
14548 +// _VBA_PROJECT Stream Version Dependant Project Information
14549 +// _VBA_PROJECT Stream Version Dependant Project Information
14550 +
14551 +class _VBA_PROJECT_VDPI
14552 +{
14553 +public:
14554 +sal_Int16 Reserved1;
14555 +sal_Int16 Version;
14556 +sal_Int8 Reserved2;
14557 +sal_Int16 Reserved3;
14558 +sal_uInt8* PerformanceCache;
14559 +sal_Int32 PerformanceCacheSize;
14560 +_VBA_PROJECT_VDPI(): Reserved1( 0x61CC), Version( 0xFFFF ), Reserved2(0x0), Reserved3(0x0), PerformanceCache(0), PerformanceCacheSize(0) {}
14561 +~_VBA_PROJECT_VDPI()
14562 +{
14563 + if ( PerformanceCache )
14564 + delete [] PerformanceCache;
14565 + PerformanceCache = 0;
14566 + PerformanceCacheSize = 0;
14567 +}
14568 +void read(){}
14569 +void write( SvStream* pStream )
14570 +{
14571 + *pStream << Reserved1 << Version << Reserved2 << Reserved3;
14572 + for( sal_Int32 i = 0; PerformanceCache && i < PerformanceCacheSize; ++i )
14573 + {
14574 + *pStream >> PerformanceCache[ i ];
14575 + }
14576 +}
14577 +};
14578 +
14579 +class ProjectSysKindRecord
14580 +{
14581 +public:
14582 +sal_Int16 Id;
14583 +sal_Int32 Size;
14584 +sal_Int32 SysKind;
14585 +ProjectSysKindRecord(): Id(0x1), Size(0x4), SysKind( 0x1 ) {}
14586 +void read( SvStream* pStream )
14587 +{
14588 + *pStream >> Id >> Size >> SysKind;
14589 +}
14590 +};
14591 +
14592 +class ProjectLcidRecord
14593 +{
14594 +public:
14595 +sal_Int16 Id;
14596 +sal_Int32 Size;
14597 +sal_Int32 Lcid;
14598 +
14599 +ProjectLcidRecord() : Id( 0x2 ), Size( 0x4 ), Lcid( 0x409 ) {}
14600 +void read( SvStream* pStream )
14601 +{
14602 + OSL_TRACE("ProjectLcidRecord [0x%x]", pStream->Tell() );
14603 + *pStream >> Id >> Size >> Lcid;
14604 +}
14605 +};
14606 +
14607 +class ProjectLcidInvokeRecord
14608 +{
14609 +sal_Int16 Id;
14610 +sal_Int32 Size;
14611 +sal_Int32 LcidInvoke;
14612 +public:
14613 +ProjectLcidInvokeRecord() : Id( 0x14 ), Size( 0x4 ), LcidInvoke( 0x409 ) {}
14614 +void read( SvStream* pStream )
14615 +{
14616 + OSL_TRACE("ProjectLcidInvokeRecord [0x%x]", pStream->Tell() );
14617 + *pStream >> Id >> Size >> LcidInvoke;
14618 +}
14619 +};
14620 +
14621 +class ProjectCodePageRecord
14622 +{
14623 +sal_Int16 Id;
14624 +sal_Int32 Size;
14625 +sal_Int16 CodePage;
14626 +public:
14627 +// #FIXME get a better default for the CodePage
14628 +ProjectCodePageRecord() : Id( 0x03 ), Size( 0x2 ), CodePage( 0x0 ) {}
14629 +void read( SvStream* pStream )
14630 +{
14631 + OSL_TRACE("ProjectCodePageRecord [0x%x]", pStream->Tell() );
14632 + *pStream >> Id >> Size >> CodePage;
14633 +}
14634 +};
14635 +class ProjectNameRecord
14636 +{
14637 +public:
14638 +sal_Int16 Id;
14639 +sal_Int32 SizeOfProjectName;
14640 +sal_uInt8* ProjectName;
14641 +rtl::OUString msProjectName;
14642 +ProjectNameRecord() : Id( 0x04 ), SizeOfProjectName( 0x0 ), ProjectName(0) {}
14643 +~ProjectNameRecord()
14644 +{
14645 + delete [] ProjectName;
14646 + ProjectName = 0;
14647 +}
14648 +void read( SvStream* pStream )
14649 +{
14650 + OSL_TRACE("ProjectNameRecord [0x%x]", pStream->Tell() );
14651 + *pStream >> Id >> SizeOfProjectName;
14652 + if ( ProjectName )
14653 + delete [] ProjectName;
14654 +
14655 + if ( SizeOfProjectName )
14656 + {
14657 + ProjectName = new sal_uInt8[ SizeOfProjectName ];
14658 + OSL_TRACE("ProjectNameRecord about to read name from [0x%x], size %d", pStream->Tell(), SizeOfProjectName );
14659 + pStream->Read( ProjectName, SizeOfProjectName );
14660 + msProjectName = lclCreateOUString( reinterpret_cast< const char* >( ProjectName ), ( SVX_MSOCX_COMPRESSED | SizeOfProjectName ) );
14661 + }
14662 +}
14663 +};
14664 +
14665 +class ProjectDocStringRecord
14666 +{
14667 +public:
14668 +sal_Int16 Id;
14669 +sal_Int32 SizeOfDocString;
14670 +sal_uInt8* DocString;
14671 +sal_Int16 Reserved;
14672 +sal_Int32 SizeOfDocStringUnicode;
14673 +sal_uInt8* DocStringUnicode;
14674 +
14675 +ProjectDocStringRecord() : Id( 0x5 ), SizeOfDocString( 0x0 ), DocString( 0 ), Reserved( 0x0 ), SizeOfDocStringUnicode( 0 ), DocStringUnicode( 0 ) {}
14676 +
14677 +~ProjectDocStringRecord()
14678 +{
14679 + delete [] DocString;
14680 + delete [] DocStringUnicode;
14681 + DocString = 0;
14682 + DocStringUnicode = 0;
14683 +}
14684 +void read( SvStream* pStream )
14685 +{
14686 + OSL_TRACE("ProjectDocStringRecord [0x%x]", pStream->Tell() );
14687 + *pStream >> Id >> SizeOfDocString;
14688 +
14689 + if ( DocString )
14690 + delete [] DocString;
14691 +
14692 + DocString = new sal_uInt8[ SizeOfDocString ];
14693 + pStream->Read( DocString, SizeOfDocString );
14694 +
14695 + if ( SizeOfDocStringUnicode )
14696 + delete [] DocStringUnicode;
14697 +
14698 + *pStream >> Reserved >> SizeOfDocStringUnicode;
14699 +
14700 + if ( DocStringUnicode )
14701 + delete [] DocStringUnicode;
14702 +
14703 + DocStringUnicode = new sal_uInt8[ SizeOfDocStringUnicode ];
14704 +
14705 + pStream->Read( DocStringUnicode, SizeOfDocStringUnicode );
14706 +}
14707 +
14708 +};
14709 +
14710 +class ProjectHelpFilePath
14711 +{
14712 +public:
14713 +sal_Int16 Id;
14714 +sal_Int32 SizeOfHelpFile1;
14715 +sal_uInt8* HelpFile1;
14716 +sal_Int16 Reserved;
14717 +sal_Int32 SizeOfHelpFile2;
14718 +sal_uInt8* HelpFile2;
14719 +
14720 +ProjectHelpFilePath() : Id( 0x06 ), SizeOfHelpFile1(0), HelpFile1(0), Reserved(0x0), SizeOfHelpFile2(0), HelpFile2(0) {}
14721 +~ProjectHelpFilePath()
14722 +{
14723 + if ( HelpFile1 )
14724 + delete [] HelpFile1;
14725 + if ( HelpFile2 )
14726 + delete [] HelpFile2;
14727 + HelpFile1 = 0;
14728 + HelpFile2 = 0;
14729 +}
14730 +void read( SvStream* pStream )
14731 +{
14732 + OSL_TRACE("ProjectHelpFilePath [0x%x]", pStream->Tell() );
14733 + *pStream >> Id >> SizeOfHelpFile1;
14734 +
14735 + if ( HelpFile1 )
14736 + delete HelpFile1;
14737 +
14738 + HelpFile1 = new sal_uInt8[ SizeOfHelpFile1 ];
14739 + pStream->Read( HelpFile1, SizeOfHelpFile1 );
14740 +
14741 + *pStream >> Reserved >> SizeOfHelpFile2;
14742 +
14743 + if ( HelpFile2 )
14744 + delete HelpFile2;
14745 +
14746 + HelpFile2 = new sal_uInt8[ SizeOfHelpFile2 ];
14747 + pStream->Read( HelpFile2, SizeOfHelpFile2 );
14748 +
14749 +}
14750 +};
14751 +
14752 +class ProjectHelpContextRecord
14753 +{
14754 +public:
14755 +sal_Int16 Id;
14756 +sal_Int32 Size;
14757 +sal_Int32 HelpContext;
14758 +
14759 +ProjectHelpContextRecord() : Id( 0x7 ), Size( 0x4 ), HelpContext( 0 ) {}
14760 +void read( SvStream* pStream )
14761 +{
14762 +
14763 + OSL_TRACE("ProjectHelpContextRecord [0x%x]", pStream->Tell() );
14764 + *pStream >> Id >> Size >> HelpContext;
14765 +}
14766 +
14767 +};
14768 +
14769 +class ProjectLibFlagsRecord
14770 +{
14771 +sal_Int16 Id;
14772 +sal_Int32 Size;
14773 +sal_Int32 ProjectLibFlags;
14774 +
14775 +public:
14776 +ProjectLibFlagsRecord() : Id( 0x8 ), Size( 0x4 ), ProjectLibFlags( 0x0 ) {}
14777 +void read( SvStream* pStream )
14778 +{
14779 + OSL_TRACE("ProjectLibFlagsRecord [0x%x]", pStream->Tell() );
14780 + *pStream >> Id >> Size >> ProjectLibFlags;
14781 +}
14782 +};
14783 +
14784 +class ProjectVersionRecord
14785 +{
14786 +public:
14787 +sal_Int16 Id;
14788 +sal_Int32 Reserved;
14789 +sal_Int32 VersionMajor;
14790 +sal_Int16 VersionMinor;
14791 +ProjectVersionRecord() : Id( 0x9 ), Reserved( 0x4 ), VersionMajor( 0x1 ), VersionMinor( 0 ) {}
14792 +void read( SvStream* pStream )
14793 +{
14794 + OSL_TRACE("ProjectVersionRecord [0x%x]", pStream->Tell() );
14795 + *pStream >> Id >> Reserved >> VersionMajor >> VersionMinor;
14796 +}
14797 +};
14798 +
14799 +class ProjectConstantsRecord
14800 +{
14801 +sal_Int16 Id;
14802 +sal_Int32 SizeOfConstants;
14803 +sal_uInt8* Constants;
14804 +sal_Int16 Reserved;
14805 +sal_Int32 SizeOfConstantsUnicode;
14806 +sal_uInt8* ConstantsUnicode;
14807 +public:
14808 +ProjectConstantsRecord() : Id( 0xC ), SizeOfConstants( 0 ), Constants( 0 ), Reserved( 0x3C ), SizeOfConstantsUnicode( 0 ), ConstantsUnicode(0) {}
14809 +
14810 +~ProjectConstantsRecord()
14811 +{
14812 + delete [] Constants;
14813 + Constants = 0;
14814 + delete [] ConstantsUnicode;
14815 + ConstantsUnicode = 0;
14816 +}
14817 +
14818 +void read( SvStream* pStream )
14819 +{
14820 + OSL_TRACE("ProjectConstantsRecord [0x%x]", pStream->Tell() );
14821 + *pStream >> Id >> SizeOfConstants;
14822 + if ( Constants )
14823 + delete [] Constants;
14824 + Constants = new sal_uInt8[ SizeOfConstants ];
14825 +
14826 + pStream->Read( Constants, SizeOfConstants );
14827 +
14828 + *pStream >> Reserved;
14829 +
14830 + if ( ConstantsUnicode )
14831 + delete [] ConstantsUnicode;
14832 +
14833 + *pStream >> SizeOfConstantsUnicode;
14834 +
14835 + ConstantsUnicode = new sal_uInt8[ SizeOfConstantsUnicode ];
14836 + pStream->Read( ConstantsUnicode, SizeOfConstantsUnicode );
14837 +}
14838 +
14839 +};
14840 +
14841 +class ReferenceNameRecord
14842 +{
14843 +public:
14844 +sal_Int16 Id;
14845 +sal_Int32 SizeOfName;
14846 +sal_uInt8* Name;
14847 +sal_Int16 Reserved;
14848 +sal_Int32 SizeOfNameUnicode;
14849 +sal_uInt8* NameUnicode;
14850 +
14851 +ReferenceNameRecord() : Id( 0x16 ), SizeOfName( 0 ), Name( 0 ), Reserved( 0x3E ), SizeOfNameUnicode( 0 ), NameUnicode( 0 ) {}
14852 +~ReferenceNameRecord()
14853 +{
14854 + delete [] Name;
14855 + Name = 0;
14856 + delete [] NameUnicode;
14857 + NameUnicode = 0;
14858 +}
14859 +
14860 +void read( SvStream* pStream )
14861 +{
14862 + OSL_TRACE("NameRecord [0x%x]", pStream->Tell() );
14863 + *pStream >> Id >> SizeOfName;
14864 +
14865 + if ( Name )
14866 + delete [] Name;
14867 +
14868 + Name = new sal_uInt8[ SizeOfName ];
14869 +
14870 + pStream->Read( Name, SizeOfName );
14871 +
14872 + *pStream >> Reserved >> SizeOfNameUnicode;
14873 +
14874 + if ( NameUnicode )
14875 + delete [] Name;
14876 +
14877 + NameUnicode = new sal_uInt8[ SizeOfNameUnicode ];
14878 + pStream->Read( NameUnicode, SizeOfNameUnicode );
14879 +}
14880 +
14881 +};
14882 +
14883 +// Baseclass for ReferenceControlRecord, ReferenceRegisteredRecord, ReferenceProjectRecord
14884 +class DirDumper;
14885 +
14886 +class BaseReferenceRecord
14887 +{
14888 +public:
14889 +virtual ~BaseReferenceRecord(){}
14890 +virtual bool read( SvStream* pStream ) = 0;
14891 +virtual void import( VBA_Impl& ){}
14892 +};
14893 +
14894 +
14895 +class ReferenceProjectRecord : public BaseReferenceRecord
14896 +{
14897 +public:
14898 + sal_uInt16 Id;
14899 + sal_uInt32 Size;
14900 + sal_uInt32 SizeOfLibidAbsolute;
14901 + sal_uInt8* pLibidAbsolute;
14902 + sal_uInt32 SizeOfLibidRelative;
14903 + sal_uInt8* pLibidRelative;
14904 + sal_uInt32 MajorVersion;
14905 + sal_uInt16 MinorVersion;
14906 + rtl::OUString msAbsoluteLibid;
14907 + rtl::OUString msRelativeLibid;
14908 +
14909 + virtual bool read( SvStream* pStream );
14910 + virtual void import( VBA_Impl& rDir );
14911 + ReferenceProjectRecord();
14912 + ~ReferenceProjectRecord();
14913 +};
14914 +
14915 +ReferenceProjectRecord::ReferenceProjectRecord() : Id( 0x000E ), Size( 0 ), SizeOfLibidAbsolute( 0 ), pLibidAbsolute( NULL ), SizeOfLibidRelative( 0 ), pLibidRelative( 0 ), MajorVersion( 0 ), MinorVersion( 0 )
14916 +{
14917 +}
14918 +
14919 +ReferenceProjectRecord::~ReferenceProjectRecord()
14920 +{
14921 + if ( pLibidAbsolute )
14922 + delete[] pLibidAbsolute;
14923 + if ( pLibidRelative )
14924 + delete[] pLibidRelative;
14925 +}
14926 +
14927 +bool ReferenceProjectRecord::read( SvStream* pStream )
14928 +{
14929 + OSL_TRACE("ReferenceProjectRecord [0x%x]", pStream->Tell() );
14930 + *pStream >> Id >> Size >> SizeOfLibidAbsolute;
14931 +
14932 + if ( SizeOfLibidAbsolute )
14933 + {
14934 + pLibidAbsolute = new sal_uInt8[ SizeOfLibidAbsolute ];
14935 + OSL_TRACE("ReferenceProjectRecord about to read LibidAbsolute at [0x%x]", pStream->Tell() );
14936 + pStream->Read( pLibidAbsolute, SizeOfLibidAbsolute );
14937 + }
14938 +
14939 + *pStream >> SizeOfLibidRelative;
14940 +
14941 + if ( SizeOfLibidRelative )
14942 + {
14943 + pLibidRelative = new sal_uInt8[ SizeOfLibidRelative ];
14944 + OSL_TRACE("ReferenceProjectRecord about to read LibidRelative at [0x%x]", pStream->Tell() );
14945 + pStream->Read( pLibidRelative, SizeOfLibidRelative );
14946 + }
14947 +
14948 + *pStream >> MajorVersion >> MinorVersion;
14949 +
14950 + // array size is ORed with SVX_MSOCX_COMPRESSED to force processing of ascii bytes ( and not
14951 + // 16 bit unicode )
14952 + // the offset of 3 is needed to skip the ProjectReference "*\" and project kind ( 0x4[1-4] ) info.
14953 +
14954 + msAbsoluteLibid = lclCreateOUString( reinterpret_cast< const char* >( pLibidAbsolute + 3 ), ( SVX_MSOCX_COMPRESSED | (SizeOfLibidAbsolute - 3 )));
14955 + msRelativeLibid = lclCreateOUString( reinterpret_cast< const char* >( pLibidRelative + 3 ), ( SVX_MSOCX_COMPRESSED | ( SizeOfLibidRelative -3 )));
14956 +
14957 + OSL_TRACE("ReferenceProjectRecord - absolute path %s", rtl::OUStringToOString( msAbsoluteLibid, RTL_TEXTENCODING_UTF8 ).getStr() );
14958 + OSL_TRACE("ReferenceProjectRecord - relative path %s", rtl::OUStringToOString( msRelativeLibid, RTL_TEXTENCODING_UTF8 ).getStr() );
14959 + return true;
14960 +}
14961 +
14962 +void ReferenceProjectRecord::import( VBA_Impl& rDir )
14963 +{
14964 + rDir.AddProjectReference( msAbsoluteLibid );
14965 +}
14966 +
14967 +class ReferenceRegisteredRecord : public BaseReferenceRecord
14968 +{
14969 +public:
14970 + sal_uInt16 Id;
14971 + sal_uInt32 Size;
14972 + sal_uInt32 SizeOfLibid;
14973 + sal_uInt8* pLibid;
14974 + sal_Int32 Reserved1;
14975 + sal_Int16 Reserved2;
14976 +
14977 + ReferenceRegisteredRecord();
14978 + ~ReferenceRegisteredRecord();
14979 + bool read( SvStream* pStream );
14980 +};
14981 +
14982 +ReferenceRegisteredRecord::ReferenceRegisteredRecord() : Id( 0x000D ), Size( 0 ), SizeOfLibid( 0 ), pLibid( NULL ), Reserved1( 0 ), Reserved2( 0 )
14983 +{
14984 +}
14985 +
14986 +ReferenceRegisteredRecord::~ReferenceRegisteredRecord()
14987 +{
14988 + if ( pLibid )
14989 + {
14990 + delete[] pLibid;
14991 + }
14992 +}
14993 +
14994 +bool
14995 +ReferenceRegisteredRecord::read( SvStream* pStream )
14996 +{
14997 + OSL_TRACE("ReferenceRegisteredRecord [0x%x]", pStream->Tell() );
14998 + *pStream >> Id >> Size >> SizeOfLibid;
14999 + if ( SizeOfLibid )
15000 + {
15001 + pLibid = new sal_uInt8[ SizeOfLibid ];
15002 + OSL_TRACE("ReferenceRegisteredRecord about to read Libid [0x%x]", pStream->Tell() );
15003 + pStream->Read( pLibid, SizeOfLibid );
15004 + }
15005 + *pStream >> Reserved1 >> Reserved2;
15006 + return true;
15007 +}
15008 +
15009 +class ReferenceOriginalRecord
15010 +{
15011 +public:
15012 + sal_uInt16 Id;
15013 + sal_uInt32 SizeOfLibOriginal;
15014 + sal_uInt8* pLibidOriginal;
15015 +
15016 +
15017 +ReferenceOriginalRecord() : Id( 0x033 ), SizeOfLibOriginal( 0 ), pLibidOriginal( NULL )
15018 +{
15019 +}
15020 +
15021 +~ReferenceOriginalRecord()
15022 +{
15023 + if ( pLibidOriginal )
15024 + delete[] pLibidOriginal;
15025 +}
15026 +
15027 +void read( SvStream* pStream )
15028 +{
15029 + *pStream >> Id >> SizeOfLibOriginal;
15030 + if ( SizeOfLibOriginal )
15031 + {
15032 + pLibidOriginal = new sal_uInt8[ SizeOfLibOriginal ];
15033 + pStream->Read( pLibidOriginal, SizeOfLibOriginal );
15034 + }
15035 +}
15036 +
15037 +};
15038 +
15039 +class ReferenceControlRecord : public BaseReferenceRecord
15040 +{
15041 +public:
15042 +ReferenceOriginalRecord OriginalRecord;
15043 +sal_Int16 Id;
15044 +sal_uInt32 SizeTwiddled;
15045 +sal_uInt32 SizeOfLibidTwiddled;
15046 +sal_uInt8* LibidTwiddled;
15047 +sal_uInt32 Reserved1;
15048 +sal_uInt16 Reserved2;
15049 +ReferenceNameRecord* NameRecordExtended;// Optional
15050 +sal_uInt16 Reserved3;
15051 +sal_uInt32 SizeExtended;
15052 +sal_uInt32 SizeOfLibidExtended;
15053 +sal_uInt8* LibidExtended;
15054 +sal_uInt32 Reserved4;
15055 +sal_uInt16 Reserved5;
15056 +sal_uInt8 OriginalTypeLib[ 16 ];
15057 +sal_uInt32 Cookie;
15058 +
15059 +ReferenceControlRecord() : Id( 0x2F ), SizeTwiddled( 0 ), SizeOfLibidTwiddled( 0 ), LibidTwiddled( 0 ), Reserved1( 0 ), Reserved2( 0 ), NameRecordExtended( 0 ), Reserved3( 0x30 ), SizeExtended( 0 ), SizeOfLibidExtended( 0 ), LibidExtended( 0 ), Reserved4( 0 ), Reserved5( 0 ), Cookie( 0 )
15060 +{
15061 + for( int i = 0; i < 16; ++i )
15062 + OriginalTypeLib[ i ] = 0;
15063 +}
15064 +
15065 +~ReferenceControlRecord()
15066 +{
15067 + delete LibidTwiddled;
15068 + delete NameRecordExtended;
15069 + delete [] LibidExtended;
15070 + LibidTwiddled = 0;
15071 + NameRecordExtended = 0;
15072 + LibidExtended = 0;
15073 +}
15074 +
15075 +bool read( SvStream* pStream )
15076 +{
15077 + OSL_TRACE("ReferenceControlRecord [0x%x]", pStream->Tell() );
15078 + OriginalRecord.read( pStream );
15079 + *pStream >> Id >> SizeTwiddled >> SizeOfLibidTwiddled;
15080 +
15081 + if ( SizeOfLibidTwiddled )
15082 + {
15083 + LibidTwiddled = new sal_uInt8[ SizeOfLibidTwiddled ];
15084 + pStream->Read( LibidTwiddled, SizeOfLibidTwiddled );
15085 + }
15086 +
15087 + *pStream >> Reserved1 >> Reserved2;
15088 +
15089 + long nPos = pStream->Tell();
15090 + // peek at the id for optional NameRecord
15091 + sal_Int16 nTmpId;
15092 + *pStream >> nTmpId;
15093 + if ( nTmpId == 0x30 )
15094 + {
15095 + Reserved3 = 0x30;
15096 + }
15097 + else
15098 + {
15099 + pStream->Seek( nPos );
15100 + NameRecordExtended = new ReferenceNameRecord();
15101 + NameRecordExtended->read( pStream );
15102 + *pStream >> Reserved3;
15103 + }
15104 + *pStream >> SizeExtended >> SizeOfLibidExtended;
15105 +
15106 + if ( SizeExtended )
15107 + {
15108 + LibidExtended = new sal_uInt8[ SizeOfLibidExtended ];
15109 + pStream->Read( LibidExtended, SizeOfLibidExtended );
15110 + }
15111 +
15112 + *pStream >> Reserved4;
15113 + *pStream >> Reserved5;
15114 +
15115 + pStream->Read( OriginalTypeLib, sizeof( OriginalTypeLib ) );
15116 + *pStream >> Cookie;
15117 + return true;
15118 +}
15119 +
15120 +};
15121 +
15122 +class ReferenceRecord : public BaseReferenceRecord
15123 +{
15124 +public:
15125 +// NameRecord is Optional
15126 +ReferenceNameRecord* NameRecord;
15127 +BaseReferenceRecord* aReferenceRecord;
15128 +ReferenceRecord(): NameRecord(0), aReferenceRecord(0) {}
15129 +~ReferenceRecord()
15130 +{
15131 + if ( NameRecord )
15132 + delete NameRecord;
15133 + if ( aReferenceRecord )
15134 + delete aReferenceRecord;
15135 +}
15136 +
15137 +// false return would mean failed to read Record e.g. end of array encountered
15138 +// Note: this read routine will make sure the stream is pointing to where it was the
15139 +// method was called )
15140 +
15141 +bool read( SvStream* pStream )
15142 +{
15143 + OSL_TRACE("ReferenceRecord [0x%x]", pStream->Tell() );
15144 + bool bRead = true;
15145 + long nStart = pStream->Tell();
15146 + long nPos = nStart;
15147 + // Peek at the ID
15148 + sal_Int16 Id;
15149 + *pStream >> Id;
15150 + pStream->Seek( nPos ); // place back before Id
15151 + if ( Id == 0x16 ) // Optional NameRecord
15152 + {
15153 + NameRecord = new ReferenceNameRecord();
15154 + NameRecord->read( pStream );
15155 + }
15156 + else if ( Id == 0x0f )
15157 + {
15158 + pStream->Seek( nStart );
15159 + bRead = false;
15160 + return bRead; // start of module, terminate read
15161 + }
15162 +
15163 + nPos = pStream->Tell(); // mark position, peek at next Id
15164 + *pStream >> Id;
15165 + pStream->Seek( nPos ); // place back before Id
15166 +
15167 + switch( Id )
15168 + {
15169 + case 0x0D:
15170 + aReferenceRecord = new ReferenceRegisteredRecord();
15171 + break;
15172 + case 0x0E:
15173 + aReferenceRecord = new ReferenceProjectRecord();
15174 + break;
15175 + case 0x2F:
15176 + case 0x33:
15177 + aReferenceRecord = new ReferenceControlRecord();
15178 + break;
15179 + default:
15180 + bRead = false;
15181 + OSL_TRACE("Big fat error, unknown ID 0x%x", Id);
15182 + break;
15183 + }
15184 + if ( bRead )
15185 + aReferenceRecord->read( pStream );
15186 + return bRead;
15187 +}
15188 +
15189 +void import( VBA_Impl& rVBA )
15190 +{
15191 + if ( aReferenceRecord )
15192 + aReferenceRecord->import( rVBA );
15193 +}
15194 +
15195 +};
15196 +
15197 +class DirDumper
15198 +{
15199 +public:
15200 +ProjectSysKindRecord mSysKindRec;
15201 +ProjectLcidRecord mLcidRec;
15202 +ProjectLcidInvokeRecord mLcidInvokeRec;
15203 +ProjectCodePageRecord mCodePageRec;
15204 +ProjectNameRecord mProjectNameRec;
15205 +ProjectDocStringRecord mDocStringRec;
15206 +ProjectHelpFilePath mHelpFileRec;
15207 +ProjectHelpContextRecord mHelpContextRec;
15208 +ProjectLibFlagsRecord mLibFlagsRec;
15209 +ProjectVersionRecord mVersionRec;
15210 +ProjectConstantsRecord mConstantsRecord;
15211 +std::vector< ReferenceRecord* > ReferenceArray;
15212 +
15213 +DirDumper() {}
15214 +~DirDumper()
15215 +{
15216 + for ( std::vector< ReferenceRecord* >::iterator it = ReferenceArray.begin(); it != ReferenceArray.end(); ++it )
15217 + delete *it;
15218 +
15219 +}
15220 +
15221 +void read( SvStream* pStream )
15222 +{
15223 + sal_Int32 nPos = pStream->Tell();
15224 + std::ofstream aDump("dir.dump");
15225 + while ( !pStream->IsEof() )
15226 + {
15227 + sal_Int8 aByte;
15228 + *pStream >> aByte;
15229 + aDump << aByte;
15230 + }
15231 + aDump.flush();
15232 + pStream->Seek( nPos );
15233 + readProjectInformation( pStream );
15234 + readProjectReferenceInformation( pStream );
15235 +}
15236 +
15237 +void readProjectReferenceInformation( SvStream* pStream )
15238 +{
15239 + bool bKeepReading = true;
15240 + while( bKeepReading )
15241 + {
15242 + ReferenceRecord* pRef = new ReferenceRecord();
15243 + bKeepReading = pRef->read( pStream );
15244 + if ( bKeepReading )
15245 + ReferenceArray.push_back( pRef );
15246 + }
15247 +}
15248 +
15249 +void readProjectInformation( SvStream* pStream )
15250 +{
15251 + mSysKindRec.read( pStream );
15252 + mLcidRec.read( pStream );
15253 + mLcidInvokeRec.read( pStream );
15254 + mCodePageRec.read( pStream );
15255 + mProjectNameRec.read( pStream );
15256 + mDocStringRec.read( pStream );
15257 + mHelpFileRec.read( pStream );
15258 + mHelpContextRec.read( pStream );
15259 + mLibFlagsRec.read( pStream );
15260 + mVersionRec.read( pStream );
15261 + sal_Int32 nPos = pStream->Tell();
15262 + sal_uInt16 nTmp;
15263 + *pStream >> nTmp;
15264 + if ( nTmp == 0x0C )
15265 + {
15266 + pStream->Seek( nPos );
15267 + mConstantsRecord.read( pStream );
15268 + }
15269 + OSL_TRACE("After Information pos is 0x%x", pStream->Tell() );
15270 +}
15271 +
15272 +void import( VBA_Impl& rVBA )
15273 +{
15274 + // get project references
15275 + for ( std::vector< ReferenceRecord* >::iterator it = ReferenceArray.begin(); it != ReferenceArray.end(); ++it )
15276 + (*it)->import( rVBA );
15277 + rVBA.SetProjectName( mProjectNameRec.msProjectName );
15278 +
15279 +}
15280 +};
15281 +
15282 +
15283 /*
15284 A few urls which may in the future be of some use
15285 http://www.virusbtn.com/vb2000/Programme/papers/bontchev.pdf
15286 @@ -155,7 +1075,17 @@ int VBA_Impl::ReadVBAProject(const SvSto
15287 xVBAProject = rxVBAStorage->OpenSotStream(
15288 String( RTL_CONSTASCII_USTRINGPARAM( "_VBA_PROJECT" ) ),
15289 STREAM_STD_READ | STREAM_NOCREATE );
15290 -
15291 + // read Dir stream
15292 + SvStorageStreamRef xDir = rxVBAStorage->OpenSotStream(
15293 + String( RTL_CONSTASCII_USTRINGPARAM( "dir" ) ),
15294 + STREAM_STD_READ | STREAM_NOCREATE );
15295 + // decompress the stream
15296 + std::auto_ptr< SvMemoryStream > xCmpDir;
15297 + xCmpDir.reset( MSLZSS::decompressAsStream( xDir, 0 ) );
15298 + // try to parse the dir stream
15299 + DirDumper dDump;
15300 + dDump.read( xCmpDir.get() );
15301 + dDump.import( *this );
15302 if( !xVBAProject.Is() || SVSTREAM_OK != xVBAProject->GetError() )
15303 {
15304 DBG_WARNING("Not able to find vba project, cannot find macros");
15305 @@ -455,6 +1385,7 @@ bool VBA_Impl::Open( const String &rTopl
15306 if( !xMacros.Is() || SVSTREAM_OK != xMacros->GetError() )
15307 {
15308 DBG_WARNING("No Macros Storage");
15309 + OSL_TRACE("No Macros Storage");
15310 }
15311 else
15312 {
15313 @@ -464,6 +1395,7 @@ bool VBA_Impl::Open( const String &rTopl
15314 if( !xVBA.Is() || SVSTREAM_OK != xVBA->GetError() )
15315 {
15316 DBG_WARNING("No Visual Basic in Storage");
15317 + OSL_TRACE("No Visual Basic in Storage");
15318 }
15319 else
15320 {
15321 @@ -478,6 +1410,7 @@ bool VBA_Impl::Open( const String &rTopl
15322 * ( value ) is either a Class Module, Form Module or a plain VB Module. */
15323 SvStorageStreamRef xProject = xMacros->OpenSotStream(
15324 String( RTL_CONSTASCII_USTRINGPARAM( "PROJECT" ) ) );
15325 +
15326 SvStorageStream* pStp = xProject;
15327 UniString tmp;
15328 static const String sThisDoc( RTL_CONSTASCII_USTRINGPARAM( "ThisDocument" ) );
15329 --- svx/source/msfilter/msvbasic.hxx.old 2009-04-06 16:41:59.000000000 +0000
15330 +++ svx/source/msfilter/msvbasic.hxx 2009-04-06 16:42:01.000000000 +0000
15331 @@ -97,9 +97,14 @@ public:
15332 //
15333 // #117718# member map of module names to types of module
15334 ModType GetModuleType( const UniString& rModuleName );
15335 -
15336 - std::vector<String> maReferences;
15337 + rtl::OUString& ProjectName() { return msProjectName; }
15338 + void SetProjectName( const rtl::OUString& rPName ) { msProjectName = rPName; }
15339 + const std::vector<rtl::OUString>& ProjectReferences() { return maPrjReferences; }
15340 + void AddProjectReference( const rtl::OUString& rProject ) { maPrjReferences.push_back( rProject); }
15341 + SvStorage* GetStorage() { return xStor; }
15342 private:
15343 + std::vector<rtl::OUString> maReferences;
15344 + std::vector<rtl::OUString> maPrjReferences;
15345 struct VBAOffset_Impl
15346 {
15347 String sName;
15348 @@ -125,6 +130,7 @@ private:
15349 int ReadVBAProject(const SvStorageRef &rxVBAStorage);
15350 int DecompressVBA(int index, SvStorageStreamRef &rxVBAStream);
15351 sal_uInt8 ReadPString(SvStorageStreamRef &xVBAProject, bool bIsUnicode);
15352 + rtl::OUString msProjectName;
15353 };
15355 #endif
15356 --- svx/source/msfilter/svxmsbas.cxx.old 2009-04-06 16:42:00.000000000 +0000
15357 +++ svx/source/msfilter/svxmsbas.cxx 2009-04-06 16:42:01.000000000 +0000
15358 @@ -83,6 +83,7 @@ int SvxImportMSVBasic::Import( const Str
15359 const String &rSubStorageName,
15360 BOOL bAsComment, BOOL bStripped )
15361 {
15362 + msProjectName = rtl::OUString();
15363 int nRet = 0;
15364 if( bImport && ImportCode_Impl( rStorageName, rSubStorageName,
15365 bAsComment, bStripped ))
15366 @@ -100,7 +101,42 @@ int SvxImportMSVBasic::Import( const Str
15367 bool SvxImportMSVBasic::ImportForms_Impl(const String& rStorageName,
15368 const String& rSubStorageName, BOOL bVBAMode )
15369 {
15370 - SvStorageRef xVBAStg(xRoot->OpenSotStorage(rStorageName,
15371 + BOOL bRet = FALSE;
15372 + // #FIXME VBA_Impl ( or some other new class ) should handle both userforms
15373 + // and code
15374 + VBA_Impl aVBA( *xRoot, TRUE );
15375 + // This call is a waste we read the source ( again ) only to get the refereneces
15376 + // *AGAIN*, we really need to rewrite all of this
15377 + aVBA.Open( rStorageName, rSubStorageName );
15378 +
15379 + bRet = ImportForms_Impl( aVBA, rStorageName, rSubStorageName, bVBAMode );
15380 + std::vector<rtl::OUString> sProjectRefs = aVBA.ProjectReferences();
15381 +
15382 + for ( std::vector<rtl::OUString>::iterator it = sProjectRefs.begin(); it != sProjectRefs.end(); ++it )
15383 + {
15384 + rtl::OUString sFileName = *it;
15385 +#ifndef WIN
15386 +#ifdef DEBUG
15387 + // hacky test code to read referenced projects on linux
15388 + sal_Int32 nPos = (*it).lastIndexOf('\\');
15389 + sFileName = (*it).copy( nPos + 1 );
15390 + sFileName = rtl::OUString::createFromAscii("~/Documents/") + sFileName;
15391 +#endif
15392 +#endif
15393 + SotStorageRef rRoot = new SotStorage( sFileName, STREAM_STD_READWRITE, STORAGE_TRANSACTED );
15394 + VBA_Impl refVBA( *rRoot, TRUE );
15395 + refVBA.Open( rStorageName, rSubStorageName );
15396 + // The return from ImportForms doesn't indicate and error ( it could )
15397 + // but also it just means no userforms were imported
15398 + if ( ImportForms_Impl( refVBA, rStorageName, rSubStorageName, bVBAMode ) )
15399 + bRet = true; // mark that at least on userform was imported
15400 + }
15401 + return bRet;
15402 +}
15403 +
15404 +bool SvxImportMSVBasic::ImportForms_Impl( VBA_Impl& rVBA, const String& rStorageName, const String& rSubStorageName, BOOL bVBAMode )
15405 +{
15406 + SvStorageRef xVBAStg(rVBA.GetStorage()->OpenSotStorage(rStorageName,
15407 STREAM_READWRITE | STREAM_NOCREATE | STREAM_SHARE_DENYALL));
15408 if (!xVBAStg.Is() || xVBAStg->GetError())
15409 return false;
15410 @@ -133,6 +169,10 @@ bool SvxImportMSVBasic::ImportForms_Impl
15411 DBG_ASSERT( xLibContainer.is(), "No BasicContainer!" );
15413 String aLibName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
15414 +
15415 + if (rVBA.ProjectName().getLength() )
15416 + aLibName = rVBA.ProjectName();
15417 + OSL_TRACE( "userformage lib name %s", rtl::OUStringToOString( aLibName, RTL_TEXTENCODING_UTF8 ).getStr() );
15418 Reference<XNameContainer> xLib;
15419 if (xLibContainer.is())
15420 {
15421 @@ -260,17 +300,55 @@ BOOL SvxImportMSVBasic::ImportCode_Impl(
15422 {
15423 BOOL bRet = FALSE;
15424 VBA_Impl aVBA( *xRoot, bAsComment );
15425 +
15426 if( aVBA.Open(rStorageName,rSubStorageName) )
15427 {
15428 + msProjectName = aVBA.ProjectName();
15429 +
15430 + if ( msProjectName.getLength() )
15431 + rDocSh.GetBasicManager()->SetName( msProjectName ); // set name of Project
15432 +
15433 + bRet = ImportCode_Impl( aVBA, bAsComment, bStripped );
15434 + std::vector<rtl::OUString> sProjectRefs = aVBA.ProjectReferences();
15435 +
15436 + for ( std::vector<rtl::OUString>::iterator it = sProjectRefs.begin(); it != sProjectRefs.end(); ++it )
15437 + {
15438 + rtl::OUString sFileName = *it;
15439 +#ifndef WIN
15440 +#ifdef DEBUG
15441 + // hacky test code to read referenced projects on linux
15442 + sal_Int32 nPos = (*it).lastIndexOf('\\');
15443 + sFileName = (*it).copy( nPos + 1 );
15444 + sFileName = rtl::OUString::createFromAscii("~/Documents/") + sFileName;
15445 +#endif
15446 +#endif
15447 + OSL_TRACE("referenced project %s ", rtl::OUStringToOString( sFileName, RTL_TEXTENCODING_UTF8 ).getStr() );
15448 + SotStorageRef rRoot = new SotStorage( sFileName, STREAM_STD_READWRITE, STORAGE_TRANSACTED );
15449 + VBA_Impl refVBA( *rRoot, bAsComment );
15450 + if( refVBA.Open(rStorageName,rSubStorageName) && ImportCode_Impl( refVBA, bAsComment, bStripped ) )
15451 + bRet = TRUE; // mark that some code was imported
15452 + }
15453 + }
15454 + return bRet;
15455 +}
15456 +
15457 +BOOL SvxImportMSVBasic::ImportCode_Impl( VBA_Impl& aVBA, BOOL bAsComment, BOOL bStripped )
15458 +{
15459 + BOOL bRet = FALSE;
15460 SFX_APP()->EnterBasicCall();
15461 Reference<XLibraryContainer> xLibContainer = rDocSh.GetBasicContainer();
15462 DBG_ASSERT( xLibContainer.is(), "No BasicContainer!" );
15464 UINT16 nStreamCount = aVBA.GetNoStreams();
15465 Reference<XNameContainer> xLib;
15466 +
15467 + String aLibName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
15468 +
15469 if( xLibContainer.is() && nStreamCount )
15470 {
15471 - String aLibName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
15472 + if ( aVBA.ProjectName().getLength() )
15473 + aLibName = aVBA.ProjectName();
15474 +
15475 if( !xLibContainer->hasByName( aLibName ) )
15476 xLibContainer->createLibrary( aLibName );
15478 @@ -282,7 +360,7 @@ BOOL SvxImportMSVBasic::ImportCode_Impl(
15479 Reference< container::XNameAccess > xVBAObjectForCodeName;
15480 if ( !bAsComment )
15481 {
15482 - rDocSh.GetBasic()->SetVBAEnabled( true );
15483 + rDocSh.GetBasicManager()->GetLib( aLibName )->SetVBAEnabled( true );
15484 Reference< XMultiServiceFactory> xSF(rDocSh.GetModel(), UNO_QUERY);
15485 if ( xSF.is() )
15486 {
15487 @@ -483,7 +561,6 @@ BOOL SvxImportMSVBasic::ImportCode_Impl(
15488 }
15489 if( bRet )
15490 SFX_APP()->LeaveBasicCall();
15491 - }
15492 return bRet;
15493 }
15495 --- sw/inc/unocoll.hxx.old 2009-04-02 10:50:57.000000000 +0000
15496 +++ sw/inc/unocoll.hxx 2009-04-06 16:42:01.000000000 +0000
15497 @@ -194,8 +194,10 @@ class SwUnoCollection
15498 #define SW_SERVICE_CHART2_DATA_PROVIDER 106
15499 #define SW_SERVICE_TYPE_FIELDMARK 107
15500 #define SW_SERVICE_TYPE_FORMFIELDMARK 108
15501 +#define SW_SERVICE_VBAOBJECTPROVIDER 109
15502 +#define SW_SERVICE_VBACODENAMEPROVIDER 110
15504 -#define SW_SERVICE_LAST SW_SERVICE_TYPE_FORMFIELDMARK
15505 +#define SW_SERVICE_LAST SW_SERVICE_VBACODENAMEPROVIDER
15507 #define SW_SERVICE_INVALID USHRT_MAX
15509 --- sw/prj/build.lst.old 2009-04-06 16:41:57.000000000 +0000
15510 +++ sw/prj/build.lst 2009-04-06 16:42:01.000000000 +0000
15511 @@ -1,4 +1,4 @@
15512 -sw sw : connectivity OOo:writerperfect OOo:lotuswordpro svx stoc uui NULL
15513 +sw sw : connectivity OOo:writerperfect OOo:lotuswordpro svx stoc uui vbahelper NULL
15514 sw sw usr1 - all sw_mkout NULL
15515 sw sw\inc nmake - all sw_inc NULL
15516 sw sw\uiconfig\layout nmake - all sw_layout NULL
15517 @@ -33,6 +33,7 @@ sw sw\source\ui\smartmenu
15518 sw sw\source\ui\table nmake - all sw_table sw_inc NULL
15519 sw sw\source\ui\uiview nmake - all sw_uivw sw_sdi sw_inc NULL
15520 sw sw\source\ui\uno nmake - all sw_uiuno sw_sdi sw_inc NULL
15521 +sw sw\source\ui\vba nmake - all sw_vba sw_inc NULL
15522 sw sw\source\ui\utlui nmake - all sw_utlui sw_inc NULL
15523 sw sw\source\ui\web nmake - all sw_web sw_uinc sw_sdi sw_inc NULL
15524 sw sw\source\ui\wrtsh nmake - all sw_wrtsh sw_inc NULL
15525 @@ -69,7 +70,7 @@ sw sw\source\filter\writer
15526 sw sw\source\filter\ww1 nmake - all sw_ww1 sw_inc NULL
15527 sw sw\source\filter\ww8 nmake - all sw_ww8 sw_inc NULL
15528 sw sw\source\filter\xml nmake - all sw_xml sw_inc NULL
15529 -sw sw\source\ui nmake - all sw_ui sw_app sw_cctrl sw_chrdl sw_conf sw_dbui sw_dchdl sw_dcvw sw_dlg sw_envlp sw_fldui sw_fmtui sw_frmdl sw_globd sw_index sw_ling sw_misc sw_rbbar sw_shell sw_table sw_uiuno sw_uivw sw_utlui sw_web sw_wrtsh sw_smartmenu NULL
15530 +sw sw\source\ui nmake - all sw_ui sw_app sw_cctrl sw_chrdl sw_conf sw_dbui sw_dchdl sw_dcvw sw_dlg sw_envlp sw_fldui sw_fmtui sw_frmdl sw_globd sw_index sw_ling sw_misc sw_rbbar sw_shell sw_table sw_uiuno sw_uivw sw_utlui sw_web sw_wrtsh sw_smartmenu sw_vba NULL
15531 sw sw\source\core nmake - all sw_core sw_attr sw_bast sw_crsr sw_dcnd sw_doc sw_draw sw_edit sw_excpt sw_fld sw_frmed sw_grph sw_layo sw_ole sw_para sw_sw3io sw_swg sw_text sw_tox sw_txtnd sw_uco sw_undo sw_view sw_acc sw_objpos sw_NumberTree sw_tablecore NULL
15532 sw sw\source\filter nmake - all sw_flt sw_ascii sw_bsflt sw_html sw_rtf sw_wrtr sw_ww1 sw_ww8 sw_xml NULL
15533 sw sw\util nmake - all sw_util sw_core sw_flt sw_sdi sw_ui NULL
15534 --- sw/prj/d.lst.old 2009-04-02 10:50:58.000000000 +0000
15535 +++ sw/prj/d.lst 2009-04-06 16:42:01.000000000 +0000
15536 @@ -63,6 +63,7 @@ mkdir: %_DEST%\xml%_EXT%\uiconfig\module
15537 ..\%__SRC%\bin\swd?????.dll %_DEST%\bin%_EXT%\swd?????.dll
15538 ..\%__SRC%\bin\swui?????.dll %_DEST%\bin%_EXT%\swui?????.dll
15539 ..\%__SRC%\bin\msword?????.dll %_DEST%\bin%_EXT%\msword?????.dll
15540 +..\%__SRC%\bin\vbaswobj*.dll %_DEST%\bin%_EXT%\vbaswobj*.dll
15541 ..\%__SRC%\bin\sw*.res %_DEST%\bin%_EXT%\sw*.res
15542 ..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.*
15544 --- sw/source/core/unocore/unocoll.cxx.old 2009-04-02 10:50:23.000000000 +0000
15545 +++ sw/source/core/unocore/unocoll.cxx 2009-04-06 16:42:01.000000000 +0000
15546 @@ -73,7 +73,14 @@
15547 #include <unochart.hxx>
15549 #include "docsh.hxx"
15550 -
15551 +#include <com/sun/star/document/XCodeNameQuery.hpp>
15552 +#include <com/sun/star/drawing/XDrawPageSupplier.hpp>
15553 +#include <com/sun/star/form/XFormsSupplier.hpp>
15554 +#include <com/sun/star/script/ModuleInfo.hpp>
15555 +#include <com/sun/star/script/ModuleType.hpp>
15556 +#include <com/sun/star/script/ScriptEventDescriptor.hpp>
15557 +#include <vbahelper/vbahelper.hxx>
15558 +#include <basic/basmgr.hxx>
15559 using ::rtl::OUString;
15560 using namespace ::com::sun::star;
15561 using namespace ::com::sun::star::document;
15562 @@ -82,6 +89,119 @@ using namespace ::com::sun::star::text;
15563 using namespace ::com::sun::star::container;
15564 using namespace ::com::sun::star::lang;
15566 +class SwVbaCodeNameProvider : public ::cppu::WeakImplHelper1< document::XCodeNameQuery >
15567 +{
15568 + SwDocShell* mpDocShell;
15569 + rtl::OUString msThisDocumentCodeName;
15570 +public:
15571 + SwVbaCodeNameProvider( SwDocShell* pDocShell ) : mpDocShell( pDocShell ) {}
15572 + // XCodeNameQuery
15573 + rtl::OUString SAL_CALL getCodeNameForObject( const uno::Reference< uno::XInterface >& xIf ) throw( uno::RuntimeException )
15574 + {
15575 + // Initialise the code name
15576 + if ( msThisDocumentCodeName.getLength() == 0 )
15577 + {
15578 + try
15579 + {
15580 + uno::Reference< beans::XPropertySet > xProps( mpDocShell->GetModel(), uno::UNO_QUERY_THROW );
15581 + uno::Reference< container::XNameAccess > xLibContainer( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BasicLibraries") ) ), uno::UNO_QUERY_THROW );
15582 + rtl::OUString sProjectName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Standard") ) );
15583 + if ( mpDocShell->GetBasicManager()->GetName().Len() )
15584 + sProjectName = mpDocShell->GetBasicManager()->GetName();
15585 +
15586 + uno::Reference< container::XNameAccess > xStandard( xLibContainer->getByName( sProjectName ), uno::UNO_QUERY_THROW );
15587 + uno::Sequence< rtl::OUString > sModuleNames = xStandard->getElementNames();
15588 + for ( sal_Int32 i=0; i < sModuleNames.getLength(); ++i )
15589 + {
15590 + script::ModuleInfo mInfo;
15591 + if ( xStandard->getByName( sModuleNames[ i ] ) >>= mInfo )
15592 + {
15593 + if ( mInfo.ModuleType == script::ModuleType::Document )
15594 + {
15595 + msThisDocumentCodeName = sModuleNames[ i ];
15596 + break;
15597 + }
15598 + }
15599 + }
15600 + }
15601 + catch( uno::Exception& )
15602 + {
15603 + }
15604 + }
15605 + rtl::OUString sCodeName;
15606 + if ( mpDocShell )
15607 + {
15608 + OSL_TRACE( "*** In ScVbaCodeNameProvider::getCodeNameForObject");
15609 + // need to find the page ( and index ) for this control
15610 + uno::Reference< drawing::XDrawPageSupplier > xSupplier( mpDocShell->GetModel(), uno::UNO_QUERY_THROW );
15611 + uno::Reference< container::XIndexAccess > xIndex( xSupplier->getDrawPage(), uno::UNO_QUERY_THROW );
15612 + sal_Int32 nLen = xIndex->getCount();
15613 + bool bMatched = false;
15614 + uno::Sequence< script::ScriptEventDescriptor > aFakeEvents;
15615 + try
15616 + {
15617 + uno::Reference< form::XFormsSupplier > xFormSupplier( xIndex, uno::UNO_QUERY_THROW );
15618 + uno::Reference< container::XIndexAccess > xFormIndex( xFormSupplier->getForms(), uno::UNO_QUERY_THROW );
15619 + // get the www-standard container
15620 + uno::Reference< container::XIndexAccess > xFormControls( xFormIndex->getByIndex(0), uno::UNO_QUERY_THROW );
15621 + sal_Int32 nCntrls = xFormControls->getCount();
15622 + for( sal_Int32 cIndex = 0; cIndex < nCntrls; ++cIndex )
15623 + {
15624 + uno::Reference< uno::XInterface > xControl( xFormControls->getByIndex( cIndex ), uno::UNO_QUERY_THROW );
15625 + bMatched = ( xControl == xIf );
15626 + if ( bMatched )
15627 + {
15628 + sCodeName = msThisDocumentCodeName;
15629 + break;
15630 + }
15631 + }
15632 + }
15633 + catch( uno::Exception& ) {}
15634 + }
15635 + // Probably should throw here ( if !bMatched )
15636 + return sCodeName;
15637 + }
15638 +};
15639 +
15640 +class SwVbaObjectForCodeNameProvider : public ::cppu::WeakImplHelper1< container::XNameAccess >
15641 +{
15642 + SwDocShell* mpDocShell;
15643 +public:
15644 + SwVbaObjectForCodeNameProvider( SwDocShell* pDocShell ) : mpDocShell( pDocShell )
15645 + {
15646 + // #FIXME #TODO is the code name for ThisDocument read anywhere?
15647 + }
15648 +
15649 + virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException )
15650 + {
15651 + // #FIXME #TODO we really need to be checking against the codename for
15652 + // ThisDocument
15653 + if ( aName.equals( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ThisDocument" ) ) ) )
15654 + return sal_True;
15655 + return sal_False;
15656 + }
15657 + ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
15658 + {
15659 + if ( !hasByName( aName ) )
15660 + throw container::NoSuchElementException();
15661 + uno::Sequence< uno::Any > aArgs( 2 );
15662 + aArgs[0] = uno::Any( uno::Reference< uno::XInterface >() );
15663 + aArgs[1] = uno::Any( mpDocShell->GetModel() );
15664 + uno::Reference< uno::XInterface > xDocObj = ov::createVBAUnoAPIServiceWithArgs( mpDocShell, "ooo.vba.word.Document" , aArgs );
15665 + OSL_TRACE("Creating Object ( ooo.vba.word.Document ) 0x%x", xDocObj.get() );
15666 + return uno::makeAny( xDocObj );
15667 + }
15668 + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException)
15669 + {
15670 + uno::Sequence< rtl::OUString > aNames;
15671 + return aNames;
15672 + }
15673 + // XElemenAccess
15674 + virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException){ return uno::Type(); }
15675 + virtual ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException ) { return sal_True; }
15676 +
15677 +};
15678 +
15679 /******************************************************************************
15680 *
15681 ******************************************************************************/
15682 @@ -203,6 +323,8 @@ const ProvNamesId_Type __FAR_DATA aProvN
15683 { "com.sun.star.text.Fieldmark", SW_SERVICE_TYPE_FIELDMARK },
15684 { "com.sun.star.text.FormFieldmark", SW_SERVICE_TYPE_FORMFIELDMARK },
15685 { "com.sun.star.chart2.data.DataProvider", SW_SERVICE_CHART2_DATA_PROVIDER },
15686 + { "ooo.vba.VBAObjectModuleObjectProvider", SW_SERVICE_VBAOBJECTPROVIDER },
15687 + { "ooo.vba.VBACodeNameProvider", SW_SERVICE_VBACODENAMEPROVIDER },
15689 // case-correct versions of the service names (see #i67811)
15690 { CSS_TEXT_TEXTFIELD_DATE_TIME, SW_SERVICE_FIELDTYPE_DATETIME },
15691 @@ -383,6 +505,18 @@ uno::Reference< uno::XInterface > SwXS
15692 xRet = (cppu::OWeakObject*)pFieldmark;
15693 }
15694 break;
15695 + case SW_SERVICE_VBAOBJECTPROVIDER :
15696 + {
15697 + SwVbaObjectForCodeNameProvider* pObjProv = new SwVbaObjectForCodeNameProvider( pDoc->GetDocShell() );
15698 + xRet = (cppu::OWeakObject*)pObjProv;
15699 + }
15700 + break;
15701 + case SW_SERVICE_VBACODENAMEPROVIDER :
15702 + {
15703 + SwVbaCodeNameProvider* pObjProv = new SwVbaCodeNameProvider( pDoc->GetDocShell() );
15704 + xRet = (cppu::OWeakObject*)pObjProv;
15705 + }
15706 + break;
15707 case SW_SERVICE_TYPE_FOOTNOTE :
15708 xRet = (cppu::OWeakObject*)new SwXFootnote(sal_False);
15709 break;
15710 --- sw/source/filter/ww8/ww8par.cxx.old 2009-04-06 16:42:00.000000000 +0000
15711 +++ sw/source/filter/ww8/ww8par.cxx 2009-04-06 16:42:01.000000000 +0000
15712 @@ -132,6 +132,9 @@
15713 #include <svtools/itemiter.hxx> //SfxItemIter
15715 #include <stdio.h>
15716 +#include <comphelper/processfactory.hxx>
15717 +#include <basic/basmgr.hxx>
15718 +
15719 #include "ww8toolbar.hxx"
15720 #ifdef DEBUG
15721 #include <iostream>
15722 @@ -146,6 +149,76 @@ using namespace sw::util;
15723 using namespace sw::types;
15724 using namespace nsHdFtFlags;
15726 +#include <vbahelper/vbahelper.hxx>
15727 +#include <com/sun/star/document/XEventsSupplier.hpp>
15728 +#include <com/sun/star/container/XNameReplace.hpp>
15729 +#include <com/sun/star/frame/XModel.hpp>
15730 +const static String sModule( RTL_CONSTASCII_USTRINGPARAM("ThisDocument"));
15731 +
15732 +const static rtl::OUString sUrlPart0 = rtl::OUString::createFromAscii( "vnd.sun.star.script:");
15733 +const static rtl::OUString sUrlPart1 = rtl::OUString::createFromAscii( "vnd.sun.star.script:Standard.");
15734 +const static rtl::OUString sUrlPart2 = rtl::OUString::createFromAscii( "?language=Basic&location=document");
15735 +
15736 +struct DocEventNameTable
15737 +{
15738 + const sal_Char* sEventName;
15739 + const sal_Char* sMacroName;
15740 +};
15741 +
15742 +const DocEventNameTable aEventNameTable[] =
15743 +{
15744 + {"OnNew", "Document_New"},
15745 + {"OnLoad", "Document_Open"},
15746 + {"OnPrepareUnload", "Document_Close"},
15747 + {NULL, NULL}
15748 +};
15749 +
15750 +bool registerDocEvent( SfxObjectShell* pShell )
15751 +{
15752 + bool result = false;
15753 + const static rtl::OUString sEvtType( RTL_CONSTASCII_USTRINGPARAM("EventType") );
15754 + const static rtl::OUString sScript( RTL_CONSTASCII_USTRINGPARAM("Script") );
15755 + uno::Reference< document::XEventsSupplier > xEvtSupplier( pShell->GetModel(), uno::UNO_QUERY );
15756 + if( !xEvtSupplier.is() )
15757 + return result;
15758 + uno::Reference< container::XNameReplace > xEvts( xEvtSupplier->getEvents(), uno::UNO_QUERY );
15759 + if ( xEvts.is() )
15760 + {
15761 + for( const DocEventNameTable* pTable = aEventNameTable; pTable->sEventName != NULL; pTable++ )
15762 + {
15763 + rtl::OUString sEvt = rtl::OUString::createFromAscii( pTable->sEventName );
15764 + rtl::OUString sMacroName = rtl::OUString::createFromAscii( pTable->sMacroName );
15765 + // fail to search the macro if the module is not specified.
15766 + String sFullPath = ooo::vba::docMacroExists( pShell, sModule, sMacroName );
15767 + if( sFullPath.Len() == 0 )
15768 + continue;
15769 +
15770 + uno::Sequence< beans::PropertyValue > aEvents;
15771 + xEvts->getByName( sEvt ) >>= aEvents;
15772 + uno::Sequence< beans::PropertyValue > aOpenEvt( 2 );
15773 + aOpenEvt[ 0 ].Name = sEvtType;
15774 + aOpenEvt[ 0 ].Value = uno::makeAny(sScript);
15775 + aOpenEvt[ 1 ].Name = sScript;
15776 + rtl::OUString sUrl = sUrlPart0.concat( sFullPath ).concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".") ) ).concat( sUrlPart2 );
15777 + aOpenEvt[ 1 ].Value = uno::makeAny(sUrl);
15778 + sal_Int32 nPos = aEvents.getLength();
15779 +
15780 + sal_Int32 nNewSize = aEvents.getLength() + aOpenEvt.getLength();
15781 + if ( nNewSize > aEvents.getLength() )
15782 + aEvents.realloc( nNewSize );
15783 +
15784 + for ( sal_Int32 nIndex = nPos, nCpyIndex = 0; nIndex<nNewSize; nIndex++, nCpyIndex++ )
15785 + aEvents[ nIndex ] = aOpenEvt[ nCpyIndex ];
15786 +
15787 + uno::Any aParam = uno::makeAny( aEvents );
15788 +
15789 + xEvts->replaceByName( sEvt, aParam );
15790 + result = true;
15791 + }
15792 + }
15793 + return result;
15794 +}
15795 +
15797 SwMSDffManager::SwMSDffManager( SwWW8ImplReader& rRdr )
15798 : SvxMSDffManager(*rRdr.pTableStream, rRdr.GetBaseURL(), rRdr.pWwFib->fcDggInfo,
15799 @@ -3904,7 +3977,52 @@ ULONG SwWW8ImplReader::CoreLoad(WW8Gloss
15800 }
15801 else //ordinary case
15802 {
15803 + if (mbNewDoc && pStg && !pGloss) /*meaningless for a glossary, cmc*/
15804 + {
15805 + const SvtFilterOptions* pVBAFlags = SvtFilterOptions::Get();
15806 + maTracer.EnterEnvironment(sw::log::eMacros);
15807 + // Create and insert Excel vba Globals
15808 + uno::Any aGlobs;
15809 + aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstance( ::rtl::OUString::createFromAscii( "ooo.vba.word.Globals") );
15810 + mpDocShell->GetBasicManager()->SetGlobalUNOConstant( "VBAGlobals", aGlobs );
15811 +
15812 + SvxImportMSVBasic aVBasic(*mpDocShell, *pStg,
15813 + pVBAFlags->IsLoadWordBasicCode(),
15814 + pVBAFlags->IsLoadWordBasicStorage() );
15815 + String s1(CREATE_CONST_ASC("Macros"));
15816 + String s2(CREATE_CONST_ASC("VBA"));
15817 + int nRet = aVBasic.Import( s1, s2, ! pVBAFlags->IsLoadWordBasicCode() );
15818 + // Read custom toolbars
15819 + if ( pWwFib->lcbCmds )
15820 + {
15821 + // there is a tgc255 structure
15822 + long nCur = pTableStream->Tell();
15823 + Tcg aTCG;
15824 + pTableStream->Seek( pWwFib->fcCmds ); // point at tgc record
15825 + if (!aTCG.Read( pTableStream ) )
15826 + OSL_TRACE("** Read of Customization data failed!!!! ");
15827 + pTableStream->Seek( nCur ); // return to previous position, is that necessary?
15828 +#if DEBUG
15829 + aTCG.Print( stderr );
15830 +#endif
15831 + aTCG.ImportCustomToolBar( *mpDocShell );
15832 + }
15833 + if( 2 & nRet )
15834 + {
15835 + maTracer.Log(sw::log::eContainsVisualBasic);
15836 + rDoc.SetContainsMSVBasic(true);
15837 + }
15838 +
15839 + StoreMacroCmds();
15840 +
15841 + // Hackly to register the document event.
15842 + // should be find a better solution to share the codes with Excel Workbook event.
15843 + registerDocEvent( mpDocShell );
15844 +
15845 + maTracer.LeaveEnvironment(sw::log::eMacros);
15846 + }
15847 ReadText(0, pWwFib->ccpText, MAN_MAINTEXT);
15848 +
15849 }
15851 ::SetProgressState(nProgress, mpDocShell); // Update
15852 @@ -3978,41 +4096,6 @@ ULONG SwWW8ImplReader::CoreLoad(WW8Gloss
15853 eMode |= nsRedlineMode_t::REDLINE_ON;
15854 if( pWDop->fRMView )
15855 eMode |= nsRedlineMode_t::REDLINE_SHOW_DELETE;
15856 - if (pStg && !pGloss) /*meaningless for a glossary, cmc*/
15857 - {
15858 - // Read custom toolbars
15859 - if ( pWwFib->lcbCmds )
15860 - {
15861 - // there is a tgc255 structure
15862 - long nCur = pTableStream->Tell();
15863 - Tcg aTCG;
15864 - pTableStream->Seek( pWwFib->fcCmds ); // point at tgc record
15865 - if (!aTCG.Read( pTableStream ) )
15866 - OSL_TRACE("** Read of Customization data failed!!!! ");
15867 - pTableStream->Seek( nCur ); // return to previous position, is that necessary?
15868 -#if DEBUG
15869 - aTCG.Print( stderr );
15870 -#endif
15871 - aTCG.ImportCustomToolBar( mpDocShell->GetModel() );
15872 - }
15873 - const SvtFilterOptions* pVBAFlags = SvtFilterOptions::Get();
15874 - maTracer.EnterEnvironment(sw::log::eMacros);
15875 - SvxImportMSVBasic aVBasic(*mpDocShell, *pStg,
15876 - pVBAFlags->IsLoadWordBasicCode(),
15877 - pVBAFlags->IsLoadWordBasicStorage() );
15878 - String s1(CREATE_CONST_ASC("Macros"));
15879 - String s2(CREATE_CONST_ASC("VBA"));
15880 - int nRet = aVBasic.Import( s1, s2 );
15881 - if( 2 & nRet )
15882 - {
15883 - maTracer.Log(sw::log::eContainsVisualBasic);
15884 - rDoc.SetContainsMSVBasic(true);
15885 - }
15886 -
15887 - StoreMacroCmds();
15888 -
15889 - maTracer.LeaveEnvironment(sw::log::eMacros);
15890 - }
15891 }
15893 maInsertedTables.DelAndMakeTblFrms();
15894 --- sw/source/filter/ww8/ww8toolbar.cxx.old 2009-04-06 16:42:00.000000000 +0000
15895 +++ sw/source/filter/ww8/ww8toolbar.cxx 2009-04-06 16:42:01.000000000 +0000
15896 @@ -154,14 +154,14 @@ void CTBWrapper::Print( FILE* fp )
15897 }
15898 }
15900 -bool CTBWrapper::ImportCustomToolBar( const uno::Reference< css::frame::XModel >& rxModel )
15901 +bool CTBWrapper::ImportCustomToolBar( SfxObjectShell& rDocSh )
15902 {
15904 for ( std::vector< Customization >::iterator it = rCustomizations.begin(); it != rCustomizations.end(); ++it )
15905 {
15906 uno::Reference< lang::XMultiServiceFactory > xMSF( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
15907 uno::Reference< ui::XModuleUIConfigurationManagerSupplier > xAppCfgSupp( xMSF->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.ModuleUIConfigurationManagerSupplier" ) ) ), uno::UNO_QUERY_THROW );
15908 - CustomToolBarImportHelper helper( rxModel, xAppCfgSupp->getUIConfigurationManager( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextDocument" ) ) ) );
15909 + CustomToolBarImportHelper helper( rDocSh, xAppCfgSupp->getUIConfigurationManager( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextDocument" ) ) ) );
15910 helper.setMSOCommandMap( new MSOWordCommandConvertor() );
15911 if ( !(*it).ImportCustomToolBar( helper ) )
15912 return false;
15913 @@ -538,9 +538,9 @@ void Tcg::Print( FILE* fp )
15914 tcg->Print( fp );
15915 }
15917 -bool Tcg::ImportCustomToolBar( const uno::Reference< frame::XModel >& rxModel )
15918 +bool Tcg::ImportCustomToolBar( SfxObjectShell& rDocSh )
15919 {
15920 - return tcg->ImportCustomToolBar( rxModel );
15921 + return tcg->ImportCustomToolBar( rDocSh );
15922 }
15924 Tcg255::Tcg255()
15925 @@ -601,7 +601,7 @@ bool Tcg255::processSubStruct( sal_uInt8
15926 return true;
15927 }
15929 -bool Tcg255::ImportCustomToolBar( const uno::Reference< css::frame::XModel >& rxModel )
15930 +bool Tcg255::ImportCustomToolBar( SfxObjectShell& rDocSh )
15931 {
15932 // Find the CTBWrapper
15933 for ( std::vector< Tcg255SubStruct* >::const_iterator it = rgtcgData.begin(); it != rgtcgData.end(); ++it )
15934 @@ -612,7 +612,7 @@ bool Tcg255::ImportCustomToolBar( const
15935 CTBWrapper* pCTBWrapper = dynamic_cast< CTBWrapper* > ( *it );
15936 if ( pCTBWrapper )
15937 {
15938 - if ( !pCTBWrapper->ImportCustomToolBar( rxModel ) )
15939 + if ( !pCTBWrapper->ImportCustomToolBar( rDocSh ) )
15940 return false;
15941 }
15942 }
15943 --- sw/source/filter/ww8/ww8toolbar.hxx.old 2009-04-06 16:42:00.000000000 +0000
15944 +++ sw/source/filter/ww8/ww8toolbar.hxx 2009-04-06 16:42:01.000000000 +0000
15945 @@ -117,6 +117,8 @@ public:
15946 void Print( FILE* );
15947 };
15949 +class SfxObjectShell;
15950 +
15951 class CTBWrapper : public Tcg255SubStruct
15952 {
15953 // reserved1 is the ch field of Tcg255SubStruct
15954 @@ -139,7 +141,7 @@ public:
15955 CTBWrapper( bool bReadId = true );
15956 ~CTBWrapper();
15957 bool Read(SvStream *pS);
15958 - bool ImportCustomToolBar( const css::uno::Reference< css::frame::XModel >& rxModel );
15959 + bool ImportCustomToolBar( SfxObjectShell& rDocSh );
15960 void Print( FILE* );
15961 };
15963 @@ -320,7 +322,7 @@ public:
15964 ~Tcg255();
15965 bool Read(SvStream *pS);
15966 void Print( FILE* );
15967 - bool ImportCustomToolBar( const css::uno::Reference< css::frame::XModel >& rxModel );
15968 + bool ImportCustomToolBar( SfxObjectShell& rDocSh );
15969 };
15971 class Tcg: public TBBase
15972 @@ -333,7 +335,7 @@ public:
15973 Tcg();
15974 ~Tcg(){}
15975 bool Read(SvStream *pS);
15976 - bool ImportCustomToolBar( const css::uno::Reference< css::frame::XModel >& rxModel );
15977 + bool ImportCustomToolBar( SfxObjectShell& rDocSh );
15978 void Print( FILE* );
15979 };
15981 --- sw/source/ui/uno/unotxdoc.cxx.old 2009-04-02 10:50:38.000000000 +0000
15982 +++ sw/source/ui/uno/unotxdoc.cxx 2009-04-06 16:42:01.000000000 +0000
15983 @@ -170,6 +170,7 @@ using ::osl::FileBase;
15984 #define SW_CREATE_MARKER_TABLE 0x06
15985 #define SW_CREATE_DRAW_DEFAULTS 0x07
15987 +#include <comphelper/processfactory.hxx>
15989 /******************************************************************************
15990 *
15991 @@ -362,6 +363,9 @@ SwXTextDocument::SwXTextDocument(SwDocSh
15992 pxXRedlines(0),
15993 m_pHiddenViewFrame(0)
15994 {
15995 + uno::Reference< document::XDocumentProperties > xWriterProps( ::comphelper::getProcessServiceFactory()->createInstance( DEFINE_CONST_UNICODE("com.sun.star.writer.DocumentProperties") ), uno::UNO_QUERY_THROW);
15996 +
15997 + SfxBaseModel::setDocumentProperties( xWriterProps );
15998 }
15999 /*-- 18.12.98 11:53:00---------------------------------------------------
16001 @@ -2883,6 +2887,7 @@ uno::Sequence< lang::Locale > SAL_CALL S
16002 {
16003 ::vos::OGuard aGuard(Application::GetSolarMutex());
16005 +
16006 // possible canonical values for nScriptTypes
16007 // any bit wise combination is allowed
16008 const sal_Int16 nLatin = 0x001;
16009 --- sw/source/ui/vba/makefile.mk.old 1970-01-01 00:00:00.000000000 +0000
16010 +++ sw/source/ui/vba/makefile.mk 2009-04-06 16:42:01.000000000 +0000
16011 @@ -0,0 +1,85 @@
16012 +#*************************************************************************
16013 +#
16014 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
16015 +#
16016 +# Copyright 2008 by Sun Microsystems, Inc.
16017 +#
16018 +# OpenOffice.org - a multi-platform office productivity suite
16019 +#
16020 +# $RCSfile: makefile.mk,v $
16021 +#
16022 +# $Revision: 1.6 $
16023 +#
16024 +# This file is part of OpenOffice.org.
16025 +#
16026 +# OpenOffice.org is free software: you can redistribute it and/or modify
16027 +# it under the terms of the GNU Lesser General Public License version 3
16028 +# only, as published by the Free Software Foundation.
16029 +#
16030 +# OpenOffice.org is distributed in the hope that it will be useful,
16031 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
16032 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16033 +# GNU Lesser General Public License version 3 for more details
16034 +# (a copy is included in the LICENSE file that accompanied this code).
16035 +#
16036 +# You should have received a copy of the GNU Lesser General Public License
16037 +# version 3 along with OpenOffice.org. If not, see
16038 +# <http://www.openoffice.org/license.html>
16039 +# for a copy of the LGPLv3 License.
16040 +#
16041 +#*************************************************************************
16042 +
16043 +PRJ=..$/..$/..
16044 +
16045 +PRJNAME=sw
16046 +TARGET=vbaswobj
16047 +ENABLE_EXCEPTIONS=TRUE
16048 +
16049 +# --- Settings -----------------------------------------------------
16050 +
16051 +.INCLUDE : settings.mk
16052 +DLLPRE =
16053 +
16054 +.IF "$(ENABLE_VBA)"!="YES"
16055 +dummy:
16056 + @echo "not building vba..."
16057 +.ENDIF
16058 +
16059 +INCPRE=$(INCCOM)$/$(TARGET)
16060 +CDEFS+=-DVBA_OOBUILD_HACK
16061 +# ------------------------------------------------------------------
16062 +
16063 +SLOFILES= \
16064 + $(SLO)$/vbaglobals.obj \
16065 + $(SLO)$/vbaapplication.obj \
16066 + $(SLO)$/vbadocument.obj \
16067 + $(SLO)$/vbawindow.obj \
16068 + $(SLO)$/vbasystem.obj \
16069 + $(SLO)$/vbarangehelper.obj \
16070 + $(SLO)$/vbarange.obj \
16071 + $(SLO)$/vbabookmark.obj \
16072 + $(SLO)$/vbabookmarks.obj \
16073 + $(SLO)$/vbavariable.obj \
16074 + $(SLO)$/vbavariables.obj \
16075 + $(SLO)$/vbaview.obj \
16076 + $(SLO)$/wordvbahelper.obj \
16077 + $(SLO)$/service.obj \
16078 + $(SLO)$/vbadocumentproperties.obj \
16079 + $(SLO)$/vbapane.obj \
16080 + $(SLO)$/vbapanes.obj \
16081 + $(SLO)$/vbaoptions.obj \
16082 + $(SLO)$/vbaselection.obj \
16083 +
16084 +# --- Targets ------------------------------------------------------
16085 +
16086 +.INCLUDE : target.mk
16087 +
16088 +ALLTAR : \
16089 + $(MISC)$/$(TARGET).don \
16090 +
16091 +$(SLOFILES) : $(MISC)$/$(TARGET).don
16092 +
16093 +$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
16094 + +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
16095 + echo $@
16096 +
16097 --- sw/source/ui/vba/service.cxx.old 1970-01-01 00:00:00.000000000 +0000
16098 +++ sw/source/ui/vba/service.cxx 2009-04-06 16:42:01.000000000 +0000
16099 @@ -0,0 +1,82 @@
16100 +/*************************************************************************
16101 + *
16102 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
16103 + *
16104 + * Copyright 2008 by Sun Microsystems, Inc.
16105 + *
16106 + * OpenOffice.org - a multi-platform office productivity suite
16107 + *
16108 + * $RCSfile: service.cxx,v $
16109 + * $Revision: 1.4 $
16110 + *
16111 + * This file is part of OpenOffice.org.
16112 + *
16113 + * OpenOffice.org is free software: you can redistribute it and/or modify
16114 + * it under the terms of the GNU Lesser General Public License version 3
16115 + * only, as published by the Free Software Foundation.
16116 + *
16117 + * OpenOffice.org is distributed in the hope that it will be useful,
16118 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
16119 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16120 + * GNU Lesser General Public License version 3 for more details
16121 + * (a copy is included in the LICENSE file that accompanied this code).
16122 + *
16123 + * You should have received a copy of the GNU Lesser General Public License
16124 + * version 3 along with OpenOffice.org. If not, see
16125 + * <http://www.openoffice.org/license.html>
16126 + * for a copy of the LGPLv3 License.
16127 + *
16128 + ************************************************************************/
16129 +#include "cppuhelper/implementationentry.hxx"
16130 +#include "com/sun/star/lang/XMultiServiceFactory.hpp"
16131 +#include "com/sun/star/registry/XRegistryKey.hpp"
16132 +#include "comphelper/servicedecl.hxx"
16133 +
16134 +// =============================================================================
16135 +// component exports
16136 +// =============================================================================
16137 +using namespace ::com::sun::star;
16138 +using namespace ::com::sun::star::uno;
16139 +
16140 +namespace sdecl = comphelper::service_decl;
16141 +
16142 +namespace globals
16143 +{
16144 +extern sdecl::ServiceDecl const serviceDecl;
16145 +}
16146 +
16147 +namespace document
16148 +{
16149 +extern sdecl::ServiceDecl const serviceDecl;
16150 +}
16151 +
16152 +extern "C"
16153 +{
16154 + void SAL_CALL component_getImplementationEnvironment(
16155 + const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
16156 + {
16157 + OSL_TRACE("In component_getImplementationEnv");
16158 + *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
16159 + }
16160 +
16161 + sal_Bool SAL_CALL component_writeInfo(
16162 + lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey )
16163 + {
16164 + OSL_TRACE("In component_writeInfo");
16165 +
16166 + // Component registration
16167 + return component_writeInfoHelper( pServiceManager, pRegistryKey,
16168 + globals::serviceDecl, document::serviceDecl );
16169 + }
16170 +
16171 + void * SAL_CALL component_getFactory(
16172 + const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager,
16173 + registry::XRegistryKey * pRegistryKey )
16174 + {
16175 + OSL_TRACE("In component_getFactory for %s", pImplName );
16176 + void* pRet = component_getFactoryHelper(
16177 + pImplName, pServiceManager, pRegistryKey, globals::serviceDecl, document::serviceDecl );
16178 + OSL_TRACE("Ret is 0x%x", pRet);
16179 + return pRet;
16180 + }
16181 +}
16182 --- sw/source/ui/vba/vbaapplication.cxx.old 1970-01-01 00:00:00.000000000 +0000
16183 +++ sw/source/ui/vba/vbaapplication.cxx 2009-04-06 16:42:01.000000000 +0000
16184 @@ -0,0 +1,135 @@
16185 +/*************************************************************************
16186 + *
16187 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
16188 + *
16189 + * Copyright 2008 by Sun Microsystems, Inc.
16190 + *
16191 + * OpenOffice.org - a multi-platform office productivity suite
16192 + *
16193 + * $RCSfile: vbaapplication.cxx,v $
16194 + * $Revision: 1.7 $
16195 + *
16196 + * This file is part of OpenOffice.org.
16197 + *
16198 + * OpenOffice.org is free software: you can redistribute it and/or modify
16199 + * it under the terms of the GNU Lesser General Public License version 3
16200 + * only, as published by the Free Software Foundation.
16201 + *
16202 + * OpenOffice.org is distributed in the hope that it will be useful,
16203 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
16204 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16205 + * GNU Lesser General Public License version 3 for more details
16206 + * (a copy is included in the LICENSE file that accompanied this code).
16207 + *
16208 + * You should have received a copy of the GNU Lesser General Public License
16209 + * version 3 along with OpenOffice.org. If not, see
16210 + * <http://www.openoffice.org/license.html>
16211 + * for a copy of the LGPLv3 License.
16212 + *
16213 + ************************************************************************/
16214 +#include <stdio.h>
16215 +#include "vbaapplication.hxx"
16216 +#include "vbadocument.hxx"
16217 +#include <osl/file.hxx>
16218 +#include <vbahelper/vbahelper.hxx>
16219 +#include "vbawindow.hxx"
16220 +#include "vbasystem.hxx"
16221 +#include "vbaoptions.hxx"
16222 +#include "vbaselection.hxx"
16223 +
16224 +using namespace ::ooo;
16225 +using namespace ::ooo::vba;
16226 +using namespace ::com::sun::star;
16227 +
16228 +using ::com::sun::star::uno::Reference;
16229 +using ::com::sun::star::uno::UNO_QUERY_THROW;
16230 +using ::com::sun::star::uno::UNO_QUERY;
16231 +using ::rtl::OUString;
16232 +
16233 +// Enable our own join detection for Intersection and Union
16234 +// should be more efficient than using ScRangeList::Join ( because
16235 +// we already are testing the same things )
16236 +
16237 +#define OWN_JOIN 1
16238 +
16239 +// #TODO is this defined somewhere else?
16240 +#if ( defined UNX ) || ( defined OS2 ) //unix
16241 +#define FILE_PATH_SEPERATOR "/"
16242 +#else // windows
16243 +#define FILE_PATH_SEPERATOR "\\"
16244 +#endif
16245 +
16246 +#define EXCELVERSION "11.0"
16247 +
16248 +uno::Any sbxToUnoValue( SbxVariable* pVar );
16249 +
16250 +SwVbaApplication::SwVbaApplication( uno::Reference<uno::XComponentContext >& xContext ): SwVbaApplication_BASE( xContext )
16251 +{
16252 +}
16253 +
16254 +SwVbaApplication::~SwVbaApplication()
16255 +{
16256 +}
16257 +
16258 +rtl::OUString SAL_CALL
16259 +SwVbaApplication::getName() throw (uno::RuntimeException)
16260 +{
16261 + static rtl::OUString appName( RTL_CONSTASCII_USTRINGPARAM("Microsoft Word" ) );
16262 + return appName;
16263 +}
16264 +
16265 +uno::Reference< word::XDocument > SAL_CALL
16266 +SwVbaApplication::getActiveDocument() throw (uno::RuntimeException)
16267 +{
16268 + return new SwVbaDocument( this, mxContext, getCurrentDocument() );
16269 +}
16270 +
16271 +uno::Reference< word::XWindow > SAL_CALL
16272 +SwVbaApplication::getActiveWindow() throw (uno::RuntimeException)
16273 +{
16274 + // #FIXME sofar can't determine Parent
16275 + return new SwVbaWindow( uno::Reference< XHelperInterface >(), mxContext, getCurrentDocument() );
16276 +}
16277 +
16278 +uno::Reference<word::XSystem > SAL_CALL
16279 +SwVbaApplication::getSystem() throw (uno::RuntimeException)
16280 +{
16281 + return uno::Reference< word::XSystem >( new SwVbaSystem( mxContext ) );
16282 +}
16283 +
16284 +uno::Reference<word::XOptions > SAL_CALL
16285 +SwVbaApplication::getOptions() throw (uno::RuntimeException)
16286 +{
16287 + return uno::Reference< word::XOptions >( new SwVbaOptions( mxContext ) );
16288 +}
16289 +
16290 +uno::Any SAL_CALL
16291 +SwVbaApplication::CommandBars( const uno::Any& aIndex ) throw (uno::RuntimeException)
16292 +{
16293 + return VbaApplicationBase::CommandBars( aIndex );
16294 +}
16295 +
16296 +uno::Reference< word::XSelection > SAL_CALL
16297 +SwVbaApplication::getSelection() throw (uno::RuntimeException)
16298 +{
16299 + return new SwVbaSelection( this, mxContext, getCurrentDocument() );
16300 +}
16301 +
16302 +rtl::OUString&
16303 +SwVbaApplication::getServiceImplName()
16304 +{
16305 + static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaApplication") );
16306 + return sImplName;
16307 +}
16308 +
16309 +uno::Sequence< rtl::OUString >
16310 +SwVbaApplication::getServiceNames()
16311 +{
16312 + static uno::Sequence< rtl::OUString > aServiceNames;
16313 + if ( aServiceNames.getLength() == 0 )
16314 + {
16315 + aServiceNames.realloc( 1 );
16316 + aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Application" ) );
16317 + }
16318 + return aServiceNames;
16319 +}
16320 --- sw/source/ui/vba/vbaapplication.hxx.old 1970-01-01 00:00:00.000000000 +0000
16321 +++ sw/source/ui/vba/vbaapplication.hxx 2009-04-06 16:42:01.000000000 +0000
16322 @@ -0,0 +1,64 @@
16323 +/*************************************************************************
16324 + *
16325 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
16326 + *
16327 + * Copyright 2008 by Sun Microsystems, Inc.
16328 + *
16329 + * OpenOffice.org - a multi-platform office productivity suite
16330 + *
16331 + * $RCSfile: vbaapplication.hxx,v $
16332 + * $Revision: 1.4 $
16333 + *
16334 + * This file is part of OpenOffice.org.
16335 + *
16336 + * OpenOffice.org is free software: you can redistribute it and/or modify
16337 + * it under the terms of the GNU Lesser General Public License version 3
16338 + * only, as published by the Free Software Foundation.
16339 + *
16340 + * OpenOffice.org is distributed in the hope that it will be useful,
16341 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
16342 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16343 + * GNU Lesser General Public License version 3 for more details
16344 + * (a copy is included in the LICENSE file that accompanied this code).
16345 + *
16346 + * You should have received a copy of the GNU Lesser General Public License
16347 + * version 3 along with OpenOffice.org. If not, see
16348 + * <http://www.openoffice.org/license.html>
16349 + * for a copy of the LGPLv3 License.
16350 + *
16351 + ************************************************************************/
16352 +#ifndef SW_VBA_APPLICATION_HXX
16353 +#define SW_VBA_APPLICATION_HXX
16354 +
16355 +#include <ooo/vba/word/XApplication.hpp>
16356 +#include <ooo/vba/word/XDocument.hpp>
16357 +#include <ooo/vba/word/XWindow.hpp>
16358 +#include <ooo/vba/word/XSystem.hpp>
16359 +#include <ooo/vba/word/XOptions.hpp>
16360 +#include <ooo/vba/word/XSelection.hpp>
16361 +#include <vbahelper/vbahelperinterface.hxx>
16362 +#include <vbahelper/vbaapplicationbase.hxx>
16363 +#include <cppuhelper/implbase1.hxx>
16364 +
16365 +//typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XApplication > SwVbaApplication_BASE;
16366 +typedef cppu::ImplInheritanceHelper1< VbaApplicationBase, ooo::vba::word::XApplication > SwVbaApplication_BASE;
16367 +
16368 +class SwVbaApplication : public SwVbaApplication_BASE
16369 +{
16370 +public:
16371 + SwVbaApplication( css::uno::Reference< css::uno::XComponentContext >& m_xContext );
16372 + virtual ~SwVbaApplication();
16373 +
16374 + // XApplication
16375 + virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
16376 + virtual css::uno::Reference< ooo::vba::word::XSystem > SAL_CALL getSystem() throw (css::uno::RuntimeException);
16377 + virtual css::uno::Reference< ov::word::XDocument > SAL_CALL getActiveDocument() throw (css::uno::RuntimeException);
16378 + virtual css::uno::Reference< ov::word::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException);
16379 + virtual css::uno::Reference< ooo::vba::word::XOptions > SAL_CALL getOptions() throw (css::uno::RuntimeException);
16380 + virtual css::uno::Reference< ooo::vba::word::XSelection > SAL_CALL getSelection() throw (css::uno::RuntimeException);
16381 + virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
16382 + // XHelperInterface
16383 + virtual rtl::OUString& getServiceImplName();
16384 + virtual css::uno::Sequence<rtl::OUString> getServiceNames();
16385 +};
16386 +#endif /* SW_VBA_APPLICATION_HXX */
16387 --- sw/source/ui/vba/vbabookmark.cxx.old 1970-01-01 00:00:00.000000000 +0000
16388 +++ sw/source/ui/vba/vbabookmark.cxx 2009-04-06 16:42:01.000000000 +0000
16389 @@ -0,0 +1,111 @@
16390 +/*************************************************************************
16391 + *
16392 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
16393 + *
16394 + * Copyright 2008 by Sun Microsystems, Inc.
16395 + *
16396 + * OpenOffice.org - a multi-platform office productivity suite
16397 + *
16398 + * $RCSfile:
16399 + * $Revision:
16400 + *
16401 + * This file is part of OpenOffice.org.
16402 + *
16403 + * OpenOffice.org is free software: you can redistribute it and/or modify
16404 + * it under the terms of the GNU Lesser General Public License version 3
16405 + * only, as published by the Free Software Foundation.
16406 + *
16407 + * OpenOffice.org is distributed in the hope that it will be useful,
16408 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
16409 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16410 + * GNU Lesser General Public License version 3 for more details
16411 + * (a copy is included in the LICENSE file that accompanied this code).
16412 + *
16413 + * You should have received a copy of the GNU Lesser General Public License
16414 + * version 3 along with OpenOffice.org. If not, see
16415 + * <http://www.openoffice.org/license.html>
16416 + * for a copy of the LGPLv3 License.
16417 + *
16418 + ************************************************************************/
16419 +#include "vbabookmark.hxx"
16420 +#include <vbahelper/vbahelper.hxx>
16421 +#include <tools/diagnose_ex.h>
16422 +#include <com/sun/star/text/XTextDocument.hpp>
16423 +#include <com/sun/star/text/XTextContent.hpp>
16424 +#include <com/sun/star/text/XTextViewCursor.hpp>
16425 +#include <com/sun/star/text/XTextViewCursorSupplier.hpp>
16426 +#include "vbarange.hxx"
16427 +
16428 +using namespace ::ooo::vba;
16429 +using namespace ::com::sun::star;
16430 +
16431 +SwVbaBookmark::SwVbaBookmark( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext,
16432 + const css::uno::Reference< frame::XModel >& rModel, const rtl::OUString& rName ) throw ( css::uno::RuntimeException ) :
16433 + SwVbaBookmark_BASE( rParent, rContext ), mxModel( rModel ), maName( rName ), mbValid( sal_True )
16434 +{
16435 + uno::Reference< text::XBookmarksSupplier > xBookmarksSupplier( mxModel, uno::UNO_QUERY_THROW );
16436 + mxBookmark.set( xBookmarksSupplier->getBookmarks()->getByName( maName ), uno::UNO_QUERY_THROW );
16437 +}
16438 +
16439 +SwVbaBookmark::~SwVbaBookmark()
16440 +{
16441 +}
16442 +
16443 +void SwVbaBookmark::checkVality() throw ( uno::RuntimeException )
16444 +{
16445 + if( !mbValid )
16446 + throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("The bookmark is not valid" ) ), uno::Reference< uno::XInterface >() );
16447 +}
16448 +
16449 +void SAL_CALL SwVbaBookmark::Delete() throw ( uno::RuntimeException )
16450 +{
16451 + checkVality();
16452 + uno::Reference< text::XTextDocument > xTextDocument( mxModel, uno::UNO_QUERY_THROW );
16453 + xTextDocument->getText()->removeTextContent( mxBookmark );
16454 + mbValid = sal_False;
16455 +}
16456 +
16457 +void SAL_CALL SwVbaBookmark::Select() throw ( uno::RuntimeException )
16458 +{
16459 + checkVality();
16460 + uno::Reference< text::XTextViewCursorSupplier > xViewCursorSupplier( mxModel->getCurrentController(), uno::UNO_QUERY_THROW );
16461 + xViewCursorSupplier->getViewCursor()->gotoRange( mxBookmark->getAnchor(),sal_False );
16462 +}
16463 +
16464 +rtl::OUString SAL_CALL SwVbaBookmark::getName() throw ( uno::RuntimeException )
16465 +{
16466 + return maName;
16467 +}
16468 +
16469 +void SAL_CALL SwVbaBookmark::setName( const rtl::OUString& _name ) throw ( uno::RuntimeException )
16470 +{
16471 + uno::Reference< container::XNamed > xNamed( mxBookmark, uno::UNO_QUERY_THROW );
16472 + xNamed->setName( _name );
16473 +}
16474 +
16475 +uno::Any SAL_CALL SwVbaBookmark::Range() throw ( uno::RuntimeException )
16476 +{
16477 + uno::Reference< text::XTextContent > xTextContent( mxBookmark, uno::UNO_QUERY_THROW );
16478 + uno::Reference< text::XTextDocument > xTextDocument( mxModel, uno::UNO_QUERY_THROW );
16479 + return uno::makeAny( uno::Reference< word::XRange>( new SwVbaRange( this, mxContext, xTextDocument, xTextContent->getAnchor()->getStart(), xTextContent->getAnchor()->getEnd() ) ) );
16480 +}
16481 +
16482 +rtl::OUString&
16483 +SwVbaBookmark::getServiceImplName()
16484 +{
16485 + static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaBookmark") );
16486 + return sImplName;
16487 +}
16488 +
16489 +uno::Sequence< rtl::OUString >
16490 +SwVbaBookmark::getServiceNames()
16491 +{
16492 + static uno::Sequence< rtl::OUString > aServiceNames;
16493 + if ( aServiceNames.getLength() == 0 )
16494 + {
16495 + aServiceNames.realloc( 1 );
16496 + aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Bookmark" ) );
16497 + }
16498 + return aServiceNames;
16499 +}
16500 +
16501 --- sw/source/ui/vba/vbabookmark.hxx.old 1970-01-01 00:00:00.000000000 +0000
16502 +++ sw/source/ui/vba/vbabookmark.hxx 2009-04-06 16:42:01.000000000 +0000
16503 @@ -0,0 +1,68 @@
16504 +/*************************************************************************
16505 + *
16506 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
16507 + *
16508 + * Copyright 2008 by Sun Microsystems, Inc.
16509 + *
16510 + * OpenOffice.org - a multi-platform office productivity suite
16511 + *
16512 + * $RCSfile:
16513 + * $Revision:
16514 + *
16515 + * This file is part of OpenOffice.org.
16516 + *
16517 + * OpenOffice.org is free software: you can redistribute it and/or modify
16518 + * it under the terms of the GNU Lesser General Public License version 3
16519 + * only, as published by the Free Software Foundation.
16520 + *
16521 + * OpenOffice.org is distributed in the hope that it will be useful,
16522 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
16523 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16524 + * GNU Lesser General Public License version 3 for more details
16525 + * (a copy is included in the LICENSE file that accompanied this code).
16526 + *
16527 + * You should have received a copy of the GNU Lesser General Public License
16528 + * version 3 along with OpenOffice.org. If not, see
16529 + * <http://www.openoffice.org/license.html>
16530 + * for a copy of the LGPLv3 License.
16531 + *
16532 + ************************************************************************/
16533 +#ifndef SW_VBA_BOOKMARK_HXX
16534 +#define SW_VBA_BOOKMARK_HXX
16535 +
16536 +#include <ooo/vba/word/XBookmark.hpp>
16537 +#include <vbahelper/vbahelperinterface.hxx>
16538 +#include <cppuhelper/implbase1.hxx>
16539 +#include <com/sun/star/text/XBookmarksSupplier.hpp>
16540 +#include <com/sun/star/text/XTextContent.hpp>
16541 +
16542 +typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XBookmark > SwVbaBookmark_BASE;
16543 +
16544 +class SwVbaBookmark : public SwVbaBookmark_BASE
16545 +{
16546 +private:
16547 + css::uno::Reference< css::frame::XModel > mxModel;
16548 + css::uno::Reference< css::text::XTextContent > mxBookmark;
16549 + rtl::OUString maName;
16550 + sal_Bool mbValid;
16551 +
16552 +private:
16553 + void checkVality() throw ( css::uno::RuntimeException );
16554 +
16555 +public:
16556 + SwVbaBookmark( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext,
16557 + const css::uno::Reference< css::frame::XModel >& rModel, const rtl::OUString& rName ) throw ( css::uno::RuntimeException );
16558 + virtual ~SwVbaBookmark();
16559 +
16560 + // Methods
16561 + virtual rtl::OUString SAL_CALL getName() throw ( css::uno::RuntimeException );
16562 + virtual void SAL_CALL setName( const rtl::OUString& ) throw ( css::uno::RuntimeException );
16563 + virtual void SAL_CALL Delete() throw ( css::uno::RuntimeException );
16564 + virtual void SAL_CALL Select() throw ( css::uno::RuntimeException );
16565 + virtual css::uno::Any SAL_CALL Range() throw ( css::uno::RuntimeException );
16566 +
16567 + // XHelperInterface
16568 + virtual rtl::OUString& getServiceImplName();
16569 + virtual css::uno::Sequence<rtl::OUString> getServiceNames();
16570 +};
16571 +#endif /* SW_VBA_BOOKMARK_HXX */
16572 --- sw/source/ui/vba/vbabookmarks.cxx.old 1970-01-01 00:00:00.000000000 +0000
16573 +++ sw/source/ui/vba/vbabookmarks.cxx 2009-04-06 16:42:01.000000000 +0000
16574 @@ -0,0 +1,193 @@
16575 +/*************************************************************************
16576 + *
16577 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
16578 + *
16579 + * Copyright 2008 by Sun Microsystems, Inc.
16580 + *
16581 + * OpenOffice.org - a multi-platform office productivity suite
16582 + *
16583 + * $RCSfile:
16584 + * $Revision:
16585 + *
16586 + * This file is part of OpenOffice.org.
16587 + *
16588 + * OpenOffice.org is free software: you can redistribute it and/or modify
16589 + * it under the terms of the GNU Lesser General Public License version 3
16590 + * only, as published by the Free Software Foundation.
16591 + *
16592 + * OpenOffice.org is distributed in the hope that it will be useful,
16593 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
16594 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16595 + * GNU Lesser General Public License version 3 for more details
16596 + * (a copy is included in the LICENSE file that accompanied this code).
16597 + *
16598 + * You should have received a copy of the GNU Lesser General Public License
16599 + * version 3 along with OpenOffice.org. If not, see
16600 + * <http://www.openoffice.org/license.html>
16601 + * for a copy of the LGPLv3 License.
16602 + *
16603 + ************************************************************************/
16604 +#include "vbabookmarks.hxx"
16605 +#include "vbabookmark.hxx"
16606 +#include <com/sun/star/container/XNamed.hpp>
16607 +#include <com/sun/star/text/XTextDocument.hpp>
16608 +#include <com/sun/star/text/XTextViewCursor.hpp>
16609 +#include <com/sun/star/text/XTextViewCursorSupplier.hpp>
16610 +#include <ooo/vba/word/WdBookmarkSortBy.hpp>
16611 +#include "vbarange.hxx"
16612 +
16613 +using namespace ::ooo::vba;
16614 +using namespace ::com::sun::star;
16615 +
16616 +class BookmarksEnumeration : public EnumerationHelperImpl
16617 +{
16618 + uno::Reference< frame::XModel > mxModel;
16619 + uno::WeakReference< XHelperInterface > mxParent;
16620 +public:
16621 + BookmarksEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xContext, xEnumeration ), mxModel( xModel ), mxParent( xParent ) {}
16622 +
16623 + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
16624 + {
16625 + uno::Reference< container::XNamed > xNamed( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW );
16626 + rtl::OUString aName = xNamed->getName();
16627 + return uno::makeAny( uno::Reference< word::XBookmark > ( new SwVbaBookmark( mxParent, m_xContext, mxModel, aName ) ) );
16628 + }
16629 +
16630 +};
16631 +
16632 +SwVbaBookmarks::SwVbaBookmarks( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, const uno::Reference< container::XIndexAccess >& xBookmarks, const uno::Reference< frame::XModel >& xModel ): SwVbaBookmarks_BASE( xParent, xContext, xBookmarks ), mxModel( xModel )
16633 +{
16634 + mxBookmarksSupplier.set( mxModel, uno::UNO_QUERY_THROW );
16635 + uno::Reference< text::XTextDocument > xDocument( mxModel, uno::UNO_QUERY_THROW );
16636 + mxText = xDocument->getText();
16637 +
16638 + // FIXME: fail to rename the bookmark
16639 + // word doesn't distinguish cases, so set all bookmarknames to Lowercase
16640 + //renameAllBookmarksToLowercase();
16641 +}
16642 +// XEnumerationAccess
16643 +uno::Type
16644 +SwVbaBookmarks::getElementType() throw (uno::RuntimeException)
16645 +{
16646 + return word::XBookmark::static_type(0);
16647 +}
16648 +uno::Reference< container::XEnumeration >
16649 +SwVbaBookmarks::createEnumeration() throw (uno::RuntimeException)
16650 +{
16651 + uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xIndexAccess, uno::UNO_QUERY_THROW );
16652 + return new BookmarksEnumeration( getParent(), mxContext,xEnumAccess->createEnumeration(), mxModel );
16653 +}
16654 +
16655 +uno::Any
16656 +SwVbaBookmarks::createCollectionObject( const css::uno::Any& aSource )
16657 +{
16658 + uno::Reference< container::XNamed > xNamed( aSource, uno::UNO_QUERY_THROW );
16659 + rtl::OUString aName = xNamed->getName();
16660 + return uno::makeAny( uno::Reference< word::XBookmark > ( new SwVbaBookmark( getParent(), mxContext, mxModel, aName ) ) );
16661 +}
16662 +
16663 +void SwVbaBookmarks::removeBookmarkByName( const rtl::OUString& rName ) throw (uno::RuntimeException)
16664 +{
16665 + uno::Reference< text::XTextContent > xBookmark( mxBookmarksSupplier->getBookmarks()->getByName( rName ), uno::UNO_QUERY_THROW );
16666 + mxText->removeTextContent( xBookmark );
16667 +}
16668 +
16669 +void SwVbaBookmarks::addBookmarkByName( const rtl::OUString& rName, const uno::Reference< text::XTextRange >& rTextRange ) throw (uno::RuntimeException)
16670 +{
16671 + uno::Reference< lang::XMultiServiceFactory > xDocMSF( mxModel, uno::UNO_QUERY_THROW );
16672 + uno::Reference< text::XTextContent > xBookmark( xDocMSF->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.Bookmark")) ), uno::UNO_QUERY_THROW );
16673 + uno::Reference< container::XNamed > xNamed( xBookmark, uno::UNO_QUERY_THROW );
16674 + xNamed->setName( rName );
16675 + mxText->insertTextContent( rTextRange, xBookmark, sal_False );
16676 +}
16677 +
16678 +void SwVbaBookmarks::renameAllBookmarksToLowercase() throw (uno::RuntimeException)
16679 +{
16680 + uno::Reference< container::XIndexAccess > xBookmarks( mxBookmarksSupplier->getBookmarks(),uno::UNO_QUERY_THROW );
16681 + for( sal_Int32 nIndex = 0; nIndex < xBookmarks->getCount(); nIndex++ )
16682 + {
16683 + uno::Reference< container::XNamed > xNamed( xBookmarks->getByIndex( nIndex ), uno::UNO_QUERY_THROW );
16684 + rtl::OUString aName = xNamed->getName();
16685 + rtl::OUString aNameLowerCase = aName.toAsciiLowerCase();
16686 + if( !aName.equals( aNameLowerCase ) );
16687 + xNamed->setName( aNameLowerCase );
16688 + }
16689 +}
16690 +
16691 +uno::Any SAL_CALL
16692 +SwVbaBookmarks::Add( const rtl::OUString& rName, const uno::Any& rRange ) throw (uno::RuntimeException)
16693 +{
16694 + uno::Reference< text::XTextRange > xTextRange;
16695 + uno::Reference< word::XRange > xRange;
16696 + if( rRange >>= xRange )
16697 + {
16698 + SwVbaRange* pRange = dynamic_cast< SwVbaRange* >( xRange.get() );
16699 + if( pRange )
16700 + xTextRange = pRange->getXTextRange();
16701 + }
16702 + else
16703 + {
16704 + // FIXME: insert the bookmark into current view cursor
16705 + uno::Reference< text::XTextViewCursorSupplier > xViewCursorSupplier( mxModel->getCurrentController(), uno::UNO_QUERY_THROW );
16706 + xTextRange.set( xViewCursorSupplier->getViewCursor(), uno::UNO_QUERY_THROW );
16707 + }
16708 +
16709 + // remove the exist bookmark
16710 + rtl::OUString aName = rName.toAsciiLowerCase();
16711 + if( mxBookmarksSupplier->getBookmarks()->hasByName( aName ) )
16712 + removeBookmarkByName( aName );
16713 +
16714 + addBookmarkByName( aName, xTextRange );
16715 +
16716 + return uno::makeAny( uno::Reference< word::XBookmark >( new SwVbaBookmark( getParent(), mxContext, mxModel, aName ) ) );
16717 +}
16718 +
16719 +sal_Int32 SAL_CALL
16720 +SwVbaBookmarks::getDefaultSorting() throw (css::uno::RuntimeException)
16721 +{
16722 + return word::WdBookmarkSortBy::wdSortByName;
16723 +}
16724 +
16725 +void SAL_CALL
16726 +SwVbaBookmarks::setDefaultSorting( sal_Int32/* _type*/ ) throw (css::uno::RuntimeException)
16727 +{
16728 + // not support in Writer
16729 +}
16730 +
16731 +sal_Bool SAL_CALL
16732 +SwVbaBookmarks::getShowHidden() throw (css::uno::RuntimeException)
16733 +{
16734 + return sal_True;
16735 +}
16736 +
16737 +void SAL_CALL
16738 +SwVbaBookmarks::setShowHidden( sal_Bool /*_hidden*/ ) throw (css::uno::RuntimeException)
16739 +{
16740 + // not support in Writer
16741 +}
16742 +
16743 +sal_Bool SAL_CALL
16744 +SwVbaBookmarks::Exists( const rtl::OUString& rName ) throw (css::uno::RuntimeException)
16745 +{
16746 + sal_Bool bExist = mxBookmarksSupplier->getBookmarks()->hasByName( rName.toAsciiLowerCase() );
16747 + return bExist;
16748 +}
16749 +
16750 +rtl::OUString&
16751 +SwVbaBookmarks::getServiceImplName()
16752 +{
16753 + static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaBookmarks") );
16754 + return sImplName;
16755 +}
16756 +
16757 +css::uno::Sequence<rtl::OUString>
16758 +SwVbaBookmarks::getServiceNames()
16759 +{
16760 + static uno::Sequence< rtl::OUString > sNames;
16761 + if ( sNames.getLength() == 0 )
16762 + {
16763 + sNames.realloc( 1 );
16764 + sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Bookmarks") );
16765 + }
16766 + return sNames;
16767 +}
16768 --- sw/source/ui/vba/vbabookmarks.hxx.old 1970-01-01 00:00:00.000000000 +0000
16769 +++ sw/source/ui/vba/vbabookmarks.hxx 2009-04-06 16:42:01.000000000 +0000
16770 @@ -0,0 +1,79 @@
16771 +/*************************************************************************
16772 + *
16773 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
16774 + *
16775 + * Copyright 2008 by Sun Microsystems, Inc.
16776 + *
16777 + * OpenOffice.org - a multi-platform office productivity suite
16778 + *
16779 + * $RCSfile:
16780 + * $Revision:
16781 + *
16782 + * This file is part of OpenOffice.org.
16783 + *
16784 + * OpenOffice.org is free software: you can redistribute it and/or modify
16785 + * it under the terms of the GNU Lesser General Public License version 3
16786 + * only, as published by the Free Software Foundation.
16787 + *
16788 + * OpenOffice.org is distributed in the hope that it will be useful,
16789 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
16790 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16791 + * GNU Lesser General Public License version 3 for more details
16792 + * (a copy is included in the LICENSE file that accompanied this code).
16793 + *
16794 + * You should have received a copy of the GNU Lesser General Public License
16795 + * version 3 along with OpenOffice.org. If not, see
16796 + * <http://www.openoffice.org/license.html>
16797 + * for a copy of the LGPLv3 License.
16798 + *
16799 + ************************************************************************/
16800 +#ifndef SW_VBA_BOOKMARKS_HXX
16801 +#define SW_VBA_BOOKMARKS_HXX
16802 +
16803 +#include <vbahelper/vbacollectionimpl.hxx>
16804 +#include <ooo/vba/word/XBookmarks.hpp>
16805 +#include <com/sun/star/container/XEnumerationAccess.hpp>
16806 +#include <com/sun/star/container/XIndexAccess.hpp>
16807 +#include <vbahelper/vbahelperinterface.hxx>
16808 +#include <com/sun/star/text/XBookmarksSupplier.hpp>
16809 +#include <com/sun/star/text/XTextRange.hpp>
16810 +#include <com/sun/star/text/XText.hpp>
16811 +
16812 +typedef CollTestImplHelper< ooo::vba::word::XBookmarks > SwVbaBookmarks_BASE;
16813 +
16814 +class SwVbaBookmarks : public SwVbaBookmarks_BASE
16815 +{
16816 +private:
16817 + css::uno::Reference< css::frame::XModel > mxModel;
16818 + css::uno::Reference< css::text::XBookmarksSupplier > mxBookmarksSupplier;
16819 + css::uno::Reference< css::text::XText > mxText;
16820 +
16821 +private:
16822 + void removeBookmarkByName( const rtl::OUString& rName ) throw (css::uno::RuntimeException);
16823 + void addBookmarkByName( const rtl::OUString& rName, const css::uno::Reference< css::text::XTextRange >& rTextRange ) throw (css::uno::RuntimeException);
16824 + void renameAllBookmarksToLowercase() throw (css::uno::RuntimeException);
16825 +
16826 +public:
16827 + SwVbaBookmarks( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::container::XIndexAccess >& xBookmarks, const css::uno::Reference< css::frame::XModel >& xModel );
16828 + virtual ~SwVbaBookmarks() {}
16829 +
16830 + // XEnumerationAccess
16831 + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
16832 + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
16833 +
16834 + // SwVbaBookmarks_BASE
16835 + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
16836 + virtual rtl::OUString& getServiceImplName();
16837 + virtual css::uno::Sequence<rtl::OUString> getServiceNames();
16838 +
16839 + // XBookmarks
16840 + virtual sal_Int32 SAL_CALL getDefaultSorting() throw (css::uno::RuntimeException);
16841 + virtual void SAL_CALL setDefaultSorting( sal_Int32 _type ) throw (css::uno::RuntimeException);
16842 + virtual sal_Bool SAL_CALL getShowHidden() throw (css::uno::RuntimeException);
16843 + virtual void SAL_CALL setShowHidden( sal_Bool _hidden ) throw (css::uno::RuntimeException);
16844 +
16845 + virtual css::uno::Any SAL_CALL Add( const rtl::OUString& rName, const css::uno::Any& rRange ) throw (css::uno::RuntimeException);
16846 + virtual sal_Bool SAL_CALL Exists( const rtl::OUString& rName ) throw (css::uno::RuntimeException);
16847 +};
16848 +
16849 +#endif /* SW_VBA_BOOKMARKS_HXX */
16850 --- sw/source/ui/vba/vbadocument.cxx.old 1970-01-01 00:00:00.000000000 +0000
16851 +++ sw/source/ui/vba/vbadocument.cxx 2009-04-06 16:42:01.000000000 +0000
16852 @@ -0,0 +1,186 @@
16853 +/*************************************************************************
16854 + *
16855 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
16856 + *
16857 + * Copyright 2008 by Sun Microsystems, Inc.
16858 + *
16859 + * OpenOffice.org - a multi-platform office productivity suite
16860 + *
16861 + * $RCSfile: vbadocument.cxx,v $
16862 + * $Revision: 1.7 $
16863 + *
16864 + * This file is part of OpenOffice.org.
16865 + *
16866 + * OpenOffice.org is free software: you can redistribute it and/or modify
16867 + * it under the terms of the GNU Lesser General Public License version 3
16868 + * only, as published by the Free Software Foundation.
16869 + *
16870 + * OpenOffice.org is distributed in the hope that it will be useful,
16871 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
16872 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16873 + * GNU Lesser General Public License version 3 for more details
16874 + * (a copy is included in the LICENSE file that accompanied this code).
16875 + *
16876 + * You should have received a copy of the GNU Lesser General Public License
16877 + * version 3 along with OpenOffice.org. If not, see
16878 + * <http://www.openoffice.org/license.html>
16879 + * for a copy of the LGPLv3 License.
16880 + *
16881 + ************************************************************************/
16882 +#include "vbadocument.hxx"
16883 +#include "vbarange.hxx"
16884 +#include "vbarangehelper.hxx"
16885 +#include "vbadocumentproperties.hxx"
16886 +#include "vbabookmarks.hxx"
16887 +#include "vbavariables.hxx"
16888 +#include <com/sun/star/text/XBookmarksSupplier.hpp>
16889 +#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
16890 +#include <com/sun/star/document/XDocumentProperties.hpp>
16891 +#include <vbahelper/helperdecl.hxx>
16892 +
16893 +using namespace ::ooo::vba;
16894 +using namespace ::com::sun::star;
16895 +
16896 +SwVbaDocument::SwVbaDocument( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, uno::Reference< frame::XModel > xModel ): SwVbaDocument_BASE( xParent, xContext, xModel )
16897 +{
16898 + Initialize();
16899 +}
16900 +SwVbaDocument::SwVbaDocument( uno::Sequence< uno::Any > const& aArgs, uno::Reference< uno::XComponentContext >const& xContext ) : SwVbaDocument_BASE( aArgs, xContext )
16901 +{
16902 + Initialize();
16903 +}
16904 +
16905 +SwVbaDocument::~SwVbaDocument()
16906 +{
16907 +}
16908 +
16909 +void SwVbaDocument::Initialize()
16910 +{
16911 + mxTextDocument.set( getModel(), uno::UNO_QUERY_THROW );
16912 +}
16913 +
16914 +uno::Reference< word::XRange > SAL_CALL
16915 +SwVbaDocument::getContent() throw ( uno::RuntimeException )
16916 +{
16917 + uno::Reference< text::XTextRange > xStart = mxTextDocument->getText()->getStart();
16918 + uno::Reference< text::XTextRange > xEnd;
16919 + return uno::Reference< word::XRange >( new SwVbaRange( this, mxContext, mxTextDocument, xStart, xEnd, sal_True ) );
16920 +}
16921 +
16922 +uno::Reference< word::XRange > SAL_CALL
16923 +SwVbaDocument::Range( const uno::Any& rStart, const uno::Any& rEnd ) throw ( uno::RuntimeException )
16924 +{
16925 + if( !rStart.hasValue() && !rEnd.hasValue() )
16926 + return getContent();
16927 +
16928 + sal_Int32 nStart = 0;
16929 + sal_Int32 nEnd = 0;
16930 + rStart >>= nStart;
16931 + rEnd >>= nEnd;
16932 + nStart--;
16933 + nEnd--;
16934 +
16935 + uno::Reference< text::XTextRange > xStart;
16936 + uno::Reference< text::XTextRange > xEnd;
16937 + if( nStart != -1 || nEnd != -1 )
16938 + {
16939 + if( nStart == -1 )
16940 + xStart = mxTextDocument->getText()->getStart();
16941 + else
16942 + xStart = SwVbaRangeHelper::getRangeByPosition( mxTextDocument->getText(), nStart );
16943 +
16944 + if( nEnd == -1 )
16945 + xEnd = mxTextDocument->getText()->getEnd();
16946 + else
16947 + xEnd = SwVbaRangeHelper::getRangeByPosition( mxTextDocument->getText(), nEnd );
16948 + }
16949 +
16950 + if( !xStart.is() && !xEnd.is() )
16951 + {
16952 + try
16953 + {
16954 + // FIXME
16955 + xStart = mxTextDocument->getText()->getStart();
16956 + xEnd = mxTextDocument->getText()->getEnd();
16957 + }
16958 + catch( uno::Exception )
16959 + {
16960 + DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString());
16961 + }
16962 + }
16963 + return uno::Reference< word::XRange >( new SwVbaRange( this, mxContext, mxTextDocument, xStart, xEnd ) );
16964 +}
16965 +
16966 +uno::Any SAL_CALL
16967 +SwVbaDocument::BuiltInDocumentProperties( const uno::Any& index ) throw (uno::RuntimeException)
16968 +{
16969 + uno::Reference< XCollection > xCol( new SwVbaBuiltinDocumentProperties( mxParent, mxContext, getModel() ) );
16970 + if ( index.hasValue() )
16971 + return xCol->Item( index, uno::Any() );
16972 + return uno::makeAny( xCol );
16973 +}
16974 +
16975 +uno::Any SAL_CALL
16976 +SwVbaDocument::CustomDocumentProperties( const uno::Any& index ) throw (uno::RuntimeException)
16977 +{
16978 + uno::Reference< XCollection > xCol( new SwVbaCustomDocumentProperties( mxParent, mxContext, getModel() ) );
16979 + if ( index.hasValue() )
16980 + return xCol->Item( index, uno::Any() );
16981 + return uno::makeAny( xCol );
16982 +}
16983 +
16984 +uno::Any SAL_CALL
16985 +SwVbaDocument::Bookmarks( const uno::Any& rIndex ) throw ( uno::RuntimeException )
16986 +{
16987 + uno::Reference< text::XBookmarksSupplier > xBookmarksSupplier( getModel(),uno::UNO_QUERY_THROW );
16988 + uno::Reference<container::XIndexAccess > xBookmarks( xBookmarksSupplier->getBookmarks(), uno::UNO_QUERY_THROW );
16989 + uno::Reference< XCollection > xBookmarksVba( new SwVbaBookmarks( this, mxContext, xBookmarks, getModel() ) );
16990 + if ( rIndex.getValueTypeClass() == uno::TypeClass_VOID )
16991 + return uno::makeAny( xBookmarksVba );
16992 +
16993 + return uno::Any( xBookmarksVba->Item( rIndex, uno::Any() ) );
16994 +}
16995 +
16996 +uno::Any SAL_CALL
16997 +SwVbaDocument::Variables( const uno::Any& rIndex ) throw ( uno::RuntimeException )
16998 +{
16999 + uno::Reference< document::XDocumentPropertiesSupplier > xDocumentPropertiesSupplier( getModel(),uno::UNO_QUERY_THROW );
17000 + uno::Reference< document::XDocumentProperties > xDocumentProperties = xDocumentPropertiesSupplier->getDocumentProperties();
17001 + uno::Reference< beans::XPropertyAccess > xUserDefined( xDocumentProperties->getUserDefinedProperties(), uno::UNO_QUERY_THROW );
17002 +
17003 + uno::Reference< XCollection > xVariables( new SwVbaVariables( this, mxContext, xUserDefined ) );
17004 + if ( rIndex.getValueTypeClass() == uno::TypeClass_VOID )
17005 + return uno::makeAny( xVariables );
17006 +
17007 + return uno::Any( xVariables->Item( rIndex, uno::Any() ) );
17008 +}
17009 +
17010 +rtl::OUString&
17011 +SwVbaDocument::getServiceImplName()
17012 +{
17013 + static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaDocument") );
17014 + return sImplName;
17015 +}
17016 +
17017 +uno::Sequence< rtl::OUString >
17018 +SwVbaDocument::getServiceNames()
17019 +{
17020 + static uno::Sequence< rtl::OUString > aServiceNames;
17021 + if ( aServiceNames.getLength() == 0 )
17022 + {
17023 + aServiceNames.realloc( 1 );
17024 + aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Document" ) );
17025 + }
17026 + return aServiceNames;
17027 +}
17028 +
17029 +namespace document
17030 +{
17031 +namespace sdecl = comphelper::service_decl;
17032 +sdecl::vba_service_class_<SwVbaDocument, sdecl::with_args<true> > serviceImpl;
17033 +extern sdecl::ServiceDecl const serviceDecl(
17034 + serviceImpl,
17035 + "SwVbaDocument",
17036 + "ooo.vba.word.Document" );
17037 +}
17038 +
17039 --- sw/source/ui/vba/vbadocument.hxx.old 1970-01-01 00:00:00.000000000 +0000
17040 +++ sw/source/ui/vba/vbadocument.hxx 2009-04-06 16:42:01.000000000 +0000
17041 @@ -0,0 +1,63 @@
17042 +/*************************************************************************
17043 + *
17044 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
17045 + *
17046 + * Copyright 2008 by Sun Microsystems, Inc.
17047 + *
17048 + * OpenOffice.org - a multi-platform office productivity suite
17049 + *
17050 + * $RCSfile: vbadocument.hxx,v $
17051 + * $Revision: 1.4 $
17052 + *
17053 + * This file is part of OpenOffice.org.
17054 + *
17055 + * OpenOffice.org is free software: you can redistribute it and/or modify
17056 + * it under the terms of the GNU Lesser General Public License version 3
17057 + * only, as published by the Free Software Foundation.
17058 + *
17059 + * OpenOffice.org is distributed in the hope that it will be useful,
17060 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
17061 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17062 + * GNU Lesser General Public License version 3 for more details
17063 + * (a copy is included in the LICENSE file that accompanied this code).
17064 + *
17065 + * You should have received a copy of the GNU Lesser General Public License
17066 + * version 3 along with OpenOffice.org. If not, see
17067 + * <http://www.openoffice.org/license.html>
17068 + * for a copy of the LGPLv3 License.
17069 + *
17070 + ************************************************************************/
17071 +#ifndef SW_VBA_DOCUMENT_HXX
17072 +#define SW_VBA_DOCUMENT_HXX
17073 +
17074 +#include <ooo/vba/word/XDocument.hpp>
17075 +#include <vbahelper/vbahelperinterface.hxx>
17076 +#include <vbahelper/vbadocumentbase.hxx>
17077 +#include <com/sun/star/text/XTextDocument.hpp>
17078 +
17079 +typedef cppu::ImplInheritanceHelper1< VbaDocumentBase, ooo::vba::word::XDocument > SwVbaDocument_BASE;
17080 +
17081 +class SwVbaDocument : public SwVbaDocument_BASE
17082 +{
17083 +private:
17084 + css::uno::Reference< css::text::XTextDocument > mxTextDocument;
17085 +
17086 + void Initialize();
17087 +public:
17088 + SwVbaDocument( const css::uno::Reference< ooo::vba::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& m_xContext, css::uno::Reference< css::frame::XModel > xModel );
17089 + SwVbaDocument( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext );
17090 + virtual ~SwVbaDocument();
17091 +
17092 + // XDocument
17093 + virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL getContent() throw ( css::uno::RuntimeException );
17094 + virtual css::uno::Reference< ooo::vba::word::XRange > SAL_CALL Range( const css::uno::Any& rStart, const css::uno::Any& rEnd ) throw ( css::uno::RuntimeException );
17095 + virtual css::uno::Any SAL_CALL BuiltInDocumentProperties( const css::uno::Any& index ) throw (css::uno::RuntimeException);
17096 + virtual css::uno::Any SAL_CALL CustomDocumentProperties( const css::uno::Any& index ) throw (css::uno::RuntimeException);
17097 + virtual css::uno::Any SAL_CALL Bookmarks( const css::uno::Any& rIndex ) throw ( css::uno::RuntimeException );
17098 + virtual css::uno::Any SAL_CALL Variables( const css::uno::Any& rIndex ) throw ( css::uno::RuntimeException );
17099 +
17100 + // XHelperInterface
17101 + virtual rtl::OUString& getServiceImplName();
17102 + virtual css::uno::Sequence<rtl::OUString> getServiceNames();
17103 +};
17104 +#endif /* SW_VBA_DOCUMENT_HXX */
17105 --- sw/source/ui/vba/vbadocumentproperties.cxx.old 1970-01-01 00:00:00.000000000 +0000
17106 +++ sw/source/ui/vba/vbadocumentproperties.cxx 2009-04-06 16:42:01.000000000 +0000
17107 @@ -0,0 +1,798 @@
17108 +/*************************************************************************
17109 + *
17110 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
17111 + *
17112 + * Copyright 2008 by Sun Microsystems, Inc.
17113 + *
17114 + * OpenOffice.org - a multi-platform office productivity suite
17115 + *
17116 + * $RCSfile: vbadocument.cxx,v $
17117 + * $Revision: 1.7 $
17118 + *
17119 + * This file is part of OpenOffice.org.
17120 + *
17121 + * OpenOffice.org is free software: you can redistribute it and/or modify
17122 + * it under the terms of the GNU Lesser General Public License version 3
17123 + * only, as published by the Free Software Foundation.
17124 + *
17125 + * OpenOffice.org is distributed in the hope that it will be useful,
17126 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
17127 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17128 + * GNU Lesser General Public License version 3 for more details
17129 + * (a copy is included in the LICENSE file that accompanied this code).
17130 + *
17131 + * You should have received a copy of the GNU Lesser General Public License
17132 + * version 3 along with OpenOffice.org. If not, see
17133 + * <http://www.openoffice.org/license.html>
17134 + * for a copy of the LGPLv3 License.
17135 + *
17136 + ************************************************************************/
17137 +#include "vbadocumentproperties.hxx"
17138 +#include <cppuhelper/implbase1.hxx>
17139 +#include <cppuhelper/implbase3.hxx>
17140 +#include <com/sun/star/document/XDocumentInfoSupplier.hpp>
17141 +#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
17142 +#include <com/sun/star/beans/NamedValue.hpp>
17143 +#include <com/sun/star/beans/XPropertyContainer.hpp>
17144 +#include <ooo/vba/word/WdBuiltInProperty.hpp>
17145 +#include <ooo/vba/office/MsoDocProperties.hpp>
17146 +#include <memory>
17147 +#include <boost/shared_ptr.hpp>
17148 +#include "wordvbahelper.hxx"
17149 +#include "fesh.hxx"
17150 +#include "docsh.hxx"
17151 +using namespace ::ooo::vba;
17152 +using namespace css;
17153 +
17154 +sal_Int8 lcl_toMSOPropType( const uno::Type& aType ) throw ( lang::IllegalArgumentException )
17155 +{
17156 + sal_Int16 msoType = office::MsoDocProperties::msoPropertyTypeString;
17157 +
17158 + switch ( aType.getTypeClass() )
17159 + {
17160 + case uno::TypeClass_BOOLEAN:
17161 + msoType = office::MsoDocProperties::msoPropertyTypeBoolean;
17162 + break;
17163 + case uno::TypeClass_FLOAT:
17164 + msoType = office::MsoDocProperties::msoPropertyTypeFloat;
17165 + break;
17166 + case uno::TypeClass_STRUCT: // Assume date
17167 + msoType = office::MsoDocProperties::msoPropertyTypeDate;
17168 + break;
17169 + case uno::TypeClass_BYTE:
17170 + case uno::TypeClass_SHORT:
17171 + case uno::TypeClass_LONG:
17172 + case uno::TypeClass_HYPER:
17173 + msoType = office::MsoDocProperties::msoPropertyTypeNumber;
17174 + break;
17175 + default:
17176 + throw lang::IllegalArgumentException();
17177 + }
17178 + return msoType;
17179 +}
17180 +
17181 +class PropertGetSetHelper
17182 +{
17183 +protected:
17184 + uno::Reference< frame::XModel > m_xModel;
17185 + uno::Reference< beans::XPropertySet > mxProps;
17186 +public:
17187 + PropertGetSetHelper( const uno::Reference< frame::XModel >& xModel ):m_xModel( xModel )
17188 + {
17189 + uno::Reference< document::XDocumentInfoSupplier > xDocInfoSupp( m_xModel, uno::UNO_QUERY_THROW );
17190 + mxProps.set( xDocInfoSupp->getDocumentInfo(), uno::UNO_QUERY_THROW );
17191 + }
17192 + virtual ~PropertGetSetHelper() {}
17193 + virtual uno::Any getPropertyValue( const rtl::OUString& rPropName ) = 0;
17194 + virtual void setPropertyValue( const rtl::OUString& rPropName, const uno::Any& aValue ) = 0;
17195 + virtual uno::Reference< beans::XPropertySet > getUnoProperties() { return mxProps; }
17196 +
17197 +};
17198 +
17199 +class BuiltinPropertyGetSetHelper : public PropertGetSetHelper
17200 +{
17201 +public:
17202 + BuiltinPropertyGetSetHelper( const uno::Reference< frame::XModel >& xModel ) :PropertGetSetHelper( xModel )
17203 + {
17204 + }
17205 + virtual uno::Any getPropertyValue( const rtl::OUString& rPropName )
17206 + {
17207 + if ( rPropName.equals( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("EditingDuration" ) ) ) )
17208 + {
17209 + sal_Int32 nSecs = 0;
17210 + mxProps->getPropertyValue( rPropName ) >>= nSecs;
17211 + return uno::makeAny( nSecs/60 ); // minutes
17212 + }
17213 + return mxProps->getPropertyValue( rPropName );
17214 + }
17215 + virtual void setPropertyValue( const rtl::OUString& rPropName, const uno::Any& aValue )
17216 + {
17217 + mxProps->setPropertyValue( rPropName, aValue );
17218 + }
17219 +};
17220 +
17221 +class CustomPropertyGetSetHelper : public BuiltinPropertyGetSetHelper
17222 +{
17223 +public:
17224 + CustomPropertyGetSetHelper( const uno::Reference< frame::XModel >& xModel ) :BuiltinPropertyGetSetHelper( xModel )
17225 + {
17226 + uno::Reference< document::XDocumentPropertiesSupplier > xDocPropSupp( mxProps, uno::UNO_QUERY_THROW );
17227 + uno::Reference< document::XDocumentProperties > xDocProp( xDocPropSupp->getDocumentProperties(), uno::UNO_QUERY_THROW );
17228 + mxProps.set( xDocProp->getUserDefinedProperties(), uno::UNO_QUERY_THROW );
17229 + }
17230 +};
17231 +class StatisticPropertyGetSetHelper : public PropertGetSetHelper
17232 +{
17233 + SwDocShell* mpDocShell;
17234 + uno::Reference< beans::XPropertySet > mxModelProps;
17235 +public:
17236 + StatisticPropertyGetSetHelper( const uno::Reference< frame::XModel >& xModel ) :PropertGetSetHelper( xModel ) , mpDocShell( NULL )
17237 + {
17238 + mxModelProps.set( m_xModel, uno::UNO_QUERY_THROW );
17239 + mpDocShell = word::getDocShell( xModel );
17240 + }
17241 + virtual uno::Any getPropertyValue( const rtl::OUString& rPropName )
17242 + {
17243 + uno::Sequence< beans::NamedValue > stats;
17244 + try
17245 + {
17246 + // Characters, ParagraphCount & WordCount are available from
17247 + // the model ( and addtionally these also update the statics object )
17248 + //return mxProps->getPropertyValue( rPropName );
17249 + return mxModelProps->getPropertyValue( rPropName );
17250 + }
17251 + catch( uno::Exception& )
17252 + {
17253 + OSL_TRACE("Got exception");
17254 + }
17255 + uno::Any aReturn;
17256 + if ( rPropName.equals( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("LineCount")) ) ) // special processing needed
17257 + {
17258 + if ( mpDocShell )
17259 + {
17260 + SwFEShell* pFEShell = mpDocShell->GetFEShell();
17261 + if(pFEShell)
17262 + {
17263 + aReturn <<= pFEShell->GetLineCount(FALSE);
17264 + }
17265 + }
17266 + }
17267 + else
17268 + {
17269 + mxModelProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ParagraphCount") ) ) >>= stats;
17270 + mxProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("DocumentStatistic") ) ) >>= stats;
17271 +
17272 + sal_Int32 nLen = stats.getLength();
17273 + bool bFound = false;
17274 + for ( sal_Int32 index = 0; index < nLen && !bFound ; ++index )
17275 + {
17276 + if ( rPropName.equals( stats[ index ].Name ) )
17277 + {
17278 + aReturn = stats[ index ].Value;
17279 + bFound = true;
17280 + }
17281 + }
17282 + if ( !bFound )
17283 + throw uno::RuntimeException(); // bad Property
17284 + }
17285 + return aReturn;
17286 + }
17287 +
17288 + virtual void setPropertyValue( const rtl::OUString& rPropName, const uno::Any& aValue )
17289 + {
17290 +
17291 + uno::Sequence< beans::NamedValue > stats;
17292 + mxProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("DocumentStatistic") ) ) >>= stats;
17293 +
17294 + sal_Int32 nLen = stats.getLength();
17295 + for ( sal_Int32 index = 0; index < nLen; ++index )
17296 + {
17297 + if ( rPropName.equals( stats[ index ].Name ) )
17298 + {
17299 + stats[ index ].Value = aValue;
17300 + mxProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("DocumentStatistic") ), uno::makeAny( stats ) );
17301 + break;
17302 + }
17303 + }
17304 + }
17305 +};
17306 +
17307 +class DocPropInfo
17308 +{
17309 +public:
17310 + rtl::OUString msMSODesc;
17311 + rtl::OUString msOOOPropName;
17312 + boost::shared_ptr< PropertGetSetHelper > mpPropGetSetHelper;
17313 +
17314 + static DocPropInfo createDocPropInfo( const rtl::OUString& sDesc, const rtl::OUString& sPropName, boost::shared_ptr< PropertGetSetHelper >& rHelper )
17315 + {
17316 + return createDocPropInfo( rtl::OUStringToOString( sDesc, RTL_TEXTENCODING_UTF8 ).getStr(), rtl::OUStringToOString( sPropName, RTL_TEXTENCODING_UTF8 ).getStr(), rHelper );
17317 + }
17318 +
17319 + static DocPropInfo createDocPropInfo( const sal_Char* sDesc, const sal_Char* sPropName, boost::shared_ptr< PropertGetSetHelper >& rHelper )
17320 + {
17321 + DocPropInfo aItem;
17322 + aItem.msMSODesc = rtl::OUString::createFromAscii( sDesc );
17323 + aItem.msOOOPropName = rtl::OUString::createFromAscii( sPropName );
17324 + aItem.mpPropGetSetHelper = rHelper;
17325 + return aItem;
17326 + }
17327 + uno::Any getValue()
17328 + {
17329 + if ( mpPropGetSetHelper.get() )
17330 + return mpPropGetSetHelper->getPropertyValue( msOOOPropName );
17331 + return uno::Any();
17332 + }
17333 + void setValue( const uno::Any& rValue )
17334 + {
17335 + if ( mpPropGetSetHelper.get() )
17336 + mpPropGetSetHelper->setPropertyValue( msOOOPropName, rValue );
17337 + }
17338 + uno::Reference< beans::XPropertySet > getUnoProperties()
17339 + {
17340 +
17341 + uno::Reference< beans::XPropertySet > xProps;
17342 + if ( mpPropGetSetHelper.get() )
17343 + return mpPropGetSetHelper->getUnoProperties();
17344 + return xProps;
17345 + }
17346 +};
17347 +
17348 +
17349 +typedef std::hash_map< sal_Int32, DocPropInfo > MSOIndexToOODocPropInfo;
17350 +
17351 +class BuiltInIndexHelper
17352 +{
17353 + MSOIndexToOODocPropInfo m_docPropInfoMap;
17354 + BuiltInIndexHelper();
17355 +public:
17356 + BuiltInIndexHelper( const uno::Reference< frame::XModel >& xModel )
17357 + {
17358 + boost::shared_ptr< PropertGetSetHelper > aStandardHelper( new BuiltinPropertyGetSetHelper( xModel ) );
17359 + boost::shared_ptr< PropertGetSetHelper > aUsingStatsHelper( new StatisticPropertyGetSetHelper( xModel ) );
17360 +/*
17361 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyTitle ] = DocPropInfo::createDocPropInfo( "Title", "Title", office::MsoDocProperties::msoPropertyTypeString, aStandardHelper );
17362 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertySubject ] = DocPropInfo::createDocPropInfo( "Subject", "Subject", office::MsoDocProperties::msoPropertyTypeString, aStandardHelper );
17363 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyAuthor ] = DocPropInfo::createDocPropInfo( "Author", "Author", office::MsoDocProperties::msoPropertyTypeString, aStandardHelper );
17364 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyKeywords ] = DocPropInfo::createDocPropInfo( "Keywords", "Keywords", office::MsoDocProperties::msoPropertyTypeString, aStandardHelper );
17365 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyComments ] = DocPropInfo::createDocPropInfo( "Comments", "Description", office::MsoDocProperties::msoPropertyTypeString, aStandardHelper );
17366 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyTemplate ] = DocPropInfo::createDocPropInfo( "Template", "Template", office::MsoDocProperties::msoPropertyTypeString, aStandardHelper );
17367 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyLastAuthor ] = DocPropInfo::createDocPropInfo( "Last author", "", office::MsoDocProperties::msoPropertyTypeString, aStandardHelper ); // doesn't seem to exist - throw or return nothing ?
17368 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyRevision ] = DocPropInfo::createDocPropInfo( "Revision number", "", office::MsoDocProperties::msoPropertyTypeString, aStandardHelper ); // doesn't seem to exist - throw or return nothing ?
17369 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyAppName ] = DocPropInfo::createDocPropInfo( "Application name", "Generator", office::MsoDocProperties::msoPropertyTypeString, aStandardHelper ); // doesn't seem to exist - throw or return nothing ?
17370 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyTimeLastPrinted ] = DocPropInfo::createDocPropInfo( "Last print date", "PrintDate", office::MsoDocProperties::msoPropertyTypeDate, aStandardHelper ); // doesn't seem to exist - throw or return nothing ?
17371 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyTimeCreated ] = DocPropInfo::createDocPropInfo( "Creation date", "CreationDate", office::MsoDocProperties::msoPropertyTypeDate, aStandardHelper ); // doesn't seem to exist - throw or return nothing ?
17372 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyTimeLastSaved ] = DocPropInfo::createDocPropInfo( "Last save time", "ModifyDate", office::MsoDocProperties::msoPropertyTypeDate, aStandardHelper ); // doesn't seem to exist - throw or return nothing ?
17373 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyVBATotalEdit ] = DocPropInfo::createDocPropInfo( "Total editing time", "EditingDuration", office::MsoDocProperties::msoPropertyTypeNumber, aStandardHelper ); // Not sure if this is correct
17374 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyPages ] = DocPropInfo::createDocPropInfo( "Number of pages", "PageCount", office::MsoDocProperties::msoPropertyTypeNumber, aUsingStatsHelper ); // special handling required
17375 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyWords ] = DocPropInfo::createDocPropInfo( "Number of words", "WordCount", office::MsoDocProperties::msoPropertyTypeNumber, aUsingStatsHelper ); // special handling required
17376 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyCharacters ] = DocPropInfo::createDocPropInfo( "Number of characters", "CharacterCount", office::MsoDocProperties::msoPropertyTypeNumber, aUsingStatsHelper ); // special handling required
17377 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertySecurity ] = DocPropInfo::createDocPropInfo( "Security", "", office::MsoDocProperties::msoPropertyTypeNumber, aStandardHelper ); // doesn't seem to exist
17378 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyCategory ] = DocPropInfo::createDocPropInfo( "Category", "", office::MsoDocProperties::msoPropertyTypeString, aStandardHelper ); // doesn't seem to exist
17379 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyFormat ] = DocPropInfo::createDocPropInfo( "Format", "", office::MsoDocProperties::msoPropertyTypeString, aStandardHelper ); // doesn't seem to exist
17380 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyManager ] = DocPropInfo::createDocPropInfo( "Manager", "", office::MsoDocProperties::msoPropertyTypeString, aStandardHelper ); // doesn't seem to exist
17381 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyCompany ] = DocPropInfo::createDocPropInfo( "Company", "", office::MsoDocProperties::msoPropertyTypeString, aStandardHelper ); // doesn't seem to exist
17382 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyBytes ] = DocPropInfo::createDocPropInfo( "Number of bytes", "", office::MsoDocProperties::msoPropertyTypeNumber, aStandardHelper ); // doesn't seem to exist - size on disk exists ( for an already saved document ) perhaps it will do ( or we need something else )
17383 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyLines ] = DocPropInfo::createDocPropInfo( "Number of lines", "LineCount", office::MsoDocProperties::msoPropertyTypeNumber, aUsingStatsHelper ); // special handling
17384 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyParas ] = DocPropInfo::createDocPropInfo( "Number of paragraphs", "", office::MsoDocProperties::msoPropertyTypeNumber, aUsingStatsHelper ); // special handling
17385 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertySlides ] = DocPropInfo::createDocPropInfo( "Number of slides", "" , office::MsoDocProperties::msoPropertyTypeNumber, aStandardHelper ); // doesn't seem to exist
17386 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyNotes ] = DocPropInfo::createDocPropInfo( "Number of notes", "", office::MsoDocProperties::msoPropertyTypeNumber, aStandardHelper ); // doesn't seem to exist
17387 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyHiddenSlides ] = DocPropInfo::createDocPropInfo("Number of hidden Slides", "", office::MsoDocProperties::msoPropertyTypeNumber, aStandardHelper ); // doesn't seem to exist
17388 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyMMClips ] = DocPropInfo::createDocPropInfo( "Number of multimedia clips", "", office::MsoDocProperties::msoPropertyTypeNumber, aStandardHelper ); // doesn't seem to exist
17389 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyHyperlinkBase ] = DocPropInfo::createDocPropInfo( "Hyperlink base", "AutoloadURL", office::MsoDocProperties::msoPropertyTypeString, aStandardHelper );
17390 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyCharsWSpaces ] = DocPropInfo::createDocPropInfo( "Number of characters (with spaces)", "", office::MsoDocProperties::msoPropertyTypeNumber, aStandardHelper ); // doesn't seem to be supported
17391 +*/
17392 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyTitle ] = DocPropInfo::createDocPropInfo( "Title", "Title", aStandardHelper );
17393 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertySubject ] = DocPropInfo::createDocPropInfo( "Subject", "Subject", aStandardHelper );
17394 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyAuthor ] = DocPropInfo::createDocPropInfo( "Author", "Author", aStandardHelper );
17395 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyKeywords ] = DocPropInfo::createDocPropInfo( "Keywords", "Keywords", aStandardHelper );
17396 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyComments ] = DocPropInfo::createDocPropInfo( "Comments", "Description", aStandardHelper );
17397 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyTemplate ] = DocPropInfo::createDocPropInfo( "Template", "Template", aStandardHelper );
17398 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyLastAuthor ] = DocPropInfo::createDocPropInfo( "Last author", "ModifiedBy", aStandardHelper ); // doesn't seem to exist - throw or return nothing ?
17399 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyRevision ] = DocPropInfo::createDocPropInfo( "Revision number", "EditingCycles", aStandardHelper ); // doesn't seem to exist - throw or return nothing ?
17400 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyAppName ] = DocPropInfo::createDocPropInfo( "Application name", "Generator", aStandardHelper ); // doesn't seem to exist - throw or return nothing ?
17401 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyTimeLastPrinted ] = DocPropInfo::createDocPropInfo( "Last print date", "PrintDate", aStandardHelper ); // doesn't seem to exist - throw or return nothing ?
17402 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyTimeCreated ] = DocPropInfo::createDocPropInfo( "Creation date", "CreationDate", aStandardHelper );
17403 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyTimeLastSaved ] = DocPropInfo::createDocPropInfo( "Last save time", "ModifyDate", aStandardHelper );
17404 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyVBATotalEdit ] = DocPropInfo::createDocPropInfo( "Total editing time", "EditingDuration", aStandardHelper ); // Not sure if this is correct
17405 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyPages ] = DocPropInfo::createDocPropInfo( "Number of pages", "PageCount", aUsingStatsHelper ); // special handling required ?
17406 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyWords ] = DocPropInfo::createDocPropInfo( "Number of words", "WordCount", aUsingStatsHelper ); // special handling require ?
17407 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyCharacters ] = DocPropInfo::createDocPropInfo( "Number of characters", "CharacterCount", aUsingStatsHelper ); // special handling required ?
17408 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertySecurity ] = DocPropInfo::createDocPropInfo( "Security", "", aStandardHelper ); // doesn't seem to exist
17409 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyCategory ] = DocPropInfo::createDocPropInfo( "Category", "Category", aStandardHelper ); // hacked in
17410 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyFormat ] = DocPropInfo::createDocPropInfo( "Format", "", aStandardHelper ); // doesn't seem to exist
17411 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyManager ] = DocPropInfo::createDocPropInfo( "Manager", "Manager", aStandardHelper ); // hacked in
17412 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyCompany ] = DocPropInfo::createDocPropInfo( "Company", "Company", aStandardHelper ); // hacked in
17413 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyBytes ] = DocPropInfo::createDocPropInfo( "Number of bytes", "", aStandardHelper ); // doesn't seem to exist - size on disk exists ( for an already saved document ) perhaps it will do ( or we need something else )
17414 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyLines ] = DocPropInfo::createDocPropInfo( "Number of lines", "LineCount", aUsingStatsHelper ); // special handling
17415 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyParas ] = DocPropInfo::createDocPropInfo( "Number of paragraphs", "ParagraphCount", aUsingStatsHelper ); // special handling
17416 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertySlides ] = DocPropInfo::createDocPropInfo( "Number of slides", "" , aStandardHelper ); // doesn't seem to exist
17417 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyNotes ] = DocPropInfo::createDocPropInfo( "Number of notes", "", aStandardHelper ); // doesn't seem to exist
17418 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyHiddenSlides ] = DocPropInfo::createDocPropInfo("Number of hidden Slides", "", aStandardHelper ); // doesn't seem to exist
17419 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyMMClips ] = DocPropInfo::createDocPropInfo( "Number of multimedia clips", "", aStandardHelper ); // doesn't seem to exist
17420 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyHyperlinkBase ] = DocPropInfo::createDocPropInfo( "Hyperlink base", "AutoloadURL", aStandardHelper );
17421 + m_docPropInfoMap[ word::WdBuiltInProperty::wdPropertyCharsWSpaces ] = DocPropInfo::createDocPropInfo( "Number of characters (with spaces)", "", aStandardHelper ); // doesn't seem to be supported
17422 + }
17423 +
17424 + MSOIndexToOODocPropInfo& getDocPropInfoMap() { return m_docPropInfoMap; }
17425 +};
17426 +
17427 +
17428 +typedef InheritedHelperInterfaceImpl1< ooo::vba::XDocumentProperty > SwVbaDocumentProperty_BASE;
17429 +
17430 +class SwVbaBuiltInDocumentProperty : public SwVbaDocumentProperty_BASE
17431 +{
17432 +protected:
17433 + DocPropInfo mPropInfo;
17434 +public:
17435 + SwVbaBuiltInDocumentProperty( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const DocPropInfo& rInfo );
17436 + // XDocumentProperty
17437 + virtual void SAL_CALL Delete( ) throw (script::BasicErrorException, uno::RuntimeException);
17438 + virtual ::rtl::OUString SAL_CALL getName( ) throw (script::BasicErrorException, uno::RuntimeException);
17439 + virtual void SAL_CALL setName( const ::rtl::OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException);
17440 + virtual ::sal_Int8 SAL_CALL getType( ) throw (script::BasicErrorException, uno::RuntimeException);
17441 + virtual void SAL_CALL setType( ::sal_Int8 Type ) throw (script::BasicErrorException, uno::RuntimeException);
17442 + virtual ::sal_Bool SAL_CALL getLinkToContent( ) throw (script::BasicErrorException, uno::RuntimeException);
17443 + virtual void SAL_CALL setLinkToContent( ::sal_Bool LinkToContent ) throw (script::BasicErrorException, uno::RuntimeException);
17444 + virtual uno::Any SAL_CALL getValue( ) throw (script::BasicErrorException, uno::RuntimeException);
17445 + virtual void SAL_CALL setValue( const uno::Any& Value ) throw (script::BasicErrorException, uno::RuntimeException);
17446 + virtual rtl::OUString SAL_CALL getLinkSource( ) throw (script::BasicErrorException, uno::RuntimeException);
17447 + virtual void SAL_CALL setLinkSource( const rtl::OUString& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException);
17448 + //XDefaultProperty
17449 + virtual ::rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (uno::RuntimeException) { return rtl::OUString::createFromAscii("Value"); }
17450 + // XHelperInterface
17451 + virtual rtl::OUString& getServiceImplName();
17452 + virtual uno::Sequence<rtl::OUString> getServiceNames();
17453 +};
17454 +
17455 +class SwVbaCustomDocumentProperty : public SwVbaBuiltInDocumentProperty
17456 +{
17457 +public:
17458 +
17459 + SwVbaCustomDocumentProperty( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const DocPropInfo& rInfo );
17460 +
17461 + virtual ::sal_Bool SAL_CALL getLinkToContent( ) throw (script::BasicErrorException, uno::RuntimeException);
17462 + virtual void SAL_CALL setLinkToContent( ::sal_Bool LinkToContent ) throw (script::BasicErrorException, uno::RuntimeException);
17463 +
17464 + virtual rtl::OUString SAL_CALL getLinkSource( ) throw (script::BasicErrorException, uno::RuntimeException);
17465 + virtual void SAL_CALL setLinkSource( const rtl::OUString& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException);
17466 + virtual void SAL_CALL Delete( ) throw (script::BasicErrorException, uno::RuntimeException);
17467 + virtual void SAL_CALL setName( const ::rtl::OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException);
17468 + virtual void SAL_CALL setType( ::sal_Int8 Type ) throw (script::BasicErrorException, uno::RuntimeException);
17469 +
17470 +};
17471 +
17472 +
17473 +SwVbaCustomDocumentProperty::SwVbaCustomDocumentProperty( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const DocPropInfo& rInfo ) : SwVbaBuiltInDocumentProperty( xParent, xContext, rInfo )
17474 +{
17475 +}
17476 +
17477 +sal_Bool
17478 +SwVbaCustomDocumentProperty::getLinkToContent( ) throw (script::BasicErrorException, uno::RuntimeException)
17479 +{
17480 + // #FIXME we need to store the link content somewhere
17481 + return sal_False;
17482 +}
17483 +
17484 +void
17485 +SwVbaCustomDocumentProperty::setLinkToContent( sal_Bool /*bLinkContent*/ ) throw (script::BasicErrorException, uno::RuntimeException)
17486 +{
17487 +}
17488 +
17489 +rtl::OUString
17490 +SwVbaCustomDocumentProperty::getLinkSource( ) throw (script::BasicErrorException, uno::RuntimeException)
17491 +{
17492 + // #FIXME we need to store the link content somewhere
17493 + return rtl::OUString();;
17494 +}
17495 +
17496 +void
17497 +SwVbaCustomDocumentProperty::setLinkSource( const rtl::OUString& /*rsLinkContent*/ ) throw (script::BasicErrorException, uno::RuntimeException)
17498 +{
17499 + // #FIXME we need to store the link source somewhere
17500 +}
17501 +
17502 +void SAL_CALL
17503 +SwVbaCustomDocumentProperty::setName( const ::rtl::OUString& Name ) throw (script::BasicErrorException, uno::RuntimeException)
17504 +{
17505 + // setName on existing property ?
17506 + // #FIXME
17507 + // do we need to delete existing property and create a new one?
17508 +}
17509 +
17510 +void SAL_CALL
17511 +SwVbaCustomDocumentProperty::setType( ::sal_Int8 Type ) throw (script::BasicErrorException, uno::RuntimeException)
17512 +{
17513 + // setType, do we need to do a conversion?
17514 + // #FIXME the underlying value needs to be changed to the new type
17515 +}
17516 +
17517 +void SAL_CALL
17518 +SwVbaCustomDocumentProperty::Delete( ) throw (script::BasicErrorException, uno::RuntimeException)
17519 +{
17520 + uno::Reference< beans::XPropertyContainer > xContainer( mPropInfo.getUnoProperties(), uno::UNO_QUERY_THROW );
17521 + xContainer->removeProperty( getName() );
17522 +}
17523 +
17524 +SwVbaBuiltInDocumentProperty::SwVbaBuiltInDocumentProperty( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const DocPropInfo& rInfo ) : SwVbaDocumentProperty_BASE( xParent, xContext ), mPropInfo( rInfo )
17525 +{
17526 +}
17527 +
17528 +void SAL_CALL
17529 +SwVbaBuiltInDocumentProperty::Delete( ) throw (script::BasicErrorException, uno::RuntimeException)
17530 +{
17531 + // not valid for Builtin
17532 + throw uno::RuntimeException();
17533 +}
17534 +
17535 +::rtl::OUString SAL_CALL
17536 +SwVbaBuiltInDocumentProperty::getName( ) throw (script::BasicErrorException, uno::RuntimeException)
17537 +{
17538 + return mPropInfo.msMSODesc;
17539 +}
17540 +
17541 +void SAL_CALL
17542 +SwVbaBuiltInDocumentProperty::setName( const rtl::OUString& ) throw (script::BasicErrorException, uno::RuntimeException)
17543 +{
17544 + // not valid for Builtin
17545 + throw uno::RuntimeException();
17546 +}
17547 +
17548 +::sal_Int8 SAL_CALL
17549 +SwVbaBuiltInDocumentProperty::getType( ) throw (script::BasicErrorException, uno::RuntimeException)
17550 +{
17551 + return lcl_toMSOPropType( getValue().getValueType() );
17552 +}
17553 +
17554 +void SAL_CALL
17555 +SwVbaBuiltInDocumentProperty::setType( ::sal_Int8 /*Type*/ ) throw (script::BasicErrorException, uno::RuntimeException)
17556 +{
17557 + // not valid for Builtin
17558 + throw uno::RuntimeException();
17559 +}
17560 +
17561 +::sal_Bool SAL_CALL
17562 +SwVbaBuiltInDocumentProperty::getLinkToContent( ) throw (script::BasicErrorException, uno::RuntimeException)
17563 +{
17564 + return sal_False; // built-in always false
17565 +}
17566 +
17567 +void SAL_CALL
17568 +SwVbaBuiltInDocumentProperty::setLinkToContent( ::sal_Bool /*LinkToContent*/ ) throw (script::BasicErrorException, uno::RuntimeException)
17569 +{
17570 + // not valid for Builtin
17571 + throw uno::RuntimeException();
17572 +}
17573 +
17574 +uno::Any SAL_CALL
17575 +SwVbaBuiltInDocumentProperty::getValue( ) throw (script::BasicErrorException, uno::RuntimeException)
17576 +{
17577 + uno::Any aRet = mPropInfo.getValue();
17578 + if ( !aRet.hasValue() )
17579 + throw uno::RuntimeException();
17580 + return aRet;
17581 +}
17582 +
17583 +void SAL_CALL
17584 +SwVbaBuiltInDocumentProperty::setValue( const uno::Any& Value ) throw (script::BasicErrorException, uno::RuntimeException)
17585 +{
17586 + mPropInfo.setValue( Value );
17587 +}
17588 +
17589 +rtl::OUString SAL_CALL
17590 +SwVbaBuiltInDocumentProperty::getLinkSource( ) throw (script::BasicErrorException, uno::RuntimeException)
17591 +{
17592 + // not valid for Builtin
17593 + throw uno::RuntimeException();
17594 +}
17595 +
17596 +void SAL_CALL
17597 +SwVbaBuiltInDocumentProperty::setLinkSource( const rtl::OUString& /*LinkSource*/ ) throw (script::BasicErrorException, uno::RuntimeException)
17598 +{
17599 + // not valid for Builtin
17600 + throw uno::RuntimeException();
17601 +}
17602 +
17603 +rtl::OUString&
17604 +SwVbaBuiltInDocumentProperty::getServiceImplName()
17605 +{
17606 + static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaBuiltinDocumentProperty") );
17607 + return sImplName;
17608 +}
17609 +
17610 +uno::Sequence<rtl::OUString>
17611 +SwVbaBuiltInDocumentProperty::getServiceNames()
17612 +{
17613 + static uno::Sequence< rtl::OUString > aServiceNames;
17614 + if ( aServiceNames.getLength() == 0 )
17615 + {
17616 + aServiceNames.realloc( 1 );
17617 + aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.DocumentProperty" ) );
17618 + }
17619 + return aServiceNames;
17620 +}
17621 +typedef ::cppu::WeakImplHelper3< com::sun::star::container::XIndexAccess
17622 + ,com::sun::star::container::XNameAccess
17623 + ,com::sun::star::container::XEnumerationAccess
17624 + > PropertiesImpl_BASE;
17625 +
17626 +typedef std::hash_map< sal_Int32, uno::Reference< XDocumentProperty > > DocProps;
17627 +
17628 +typedef ::cppu::WeakImplHelper1< com::sun::star::container::XEnumeration > DocPropEnumeration_BASE;
17629 +class DocPropEnumeration : public DocPropEnumeration_BASE
17630 +{
17631 + DocProps mDocProps;
17632 + DocProps::iterator mIt;
17633 +public:
17634 +
17635 + DocPropEnumeration( const DocProps& rProps ) : mDocProps( rProps ), mIt( mDocProps.begin() ) {}
17636 + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException)
17637 + {
17638 + return mIt != mDocProps.end();
17639 + }
17640 + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
17641 + {
17642 + if ( !hasMoreElements() )
17643 + throw container::NoSuchElementException();
17644 + return uno::makeAny( mIt++->second );
17645 + }
17646 +};
17647 +
17648 +typedef std::hash_map< rtl::OUString, uno::Reference< XDocumentProperty >, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > DocPropsByName;
17649 +
17650 +class BuiltInPropertiesImpl : public PropertiesImpl_BASE
17651 +{
17652 +protected:
17653 +
17654 + uno::Reference< XHelperInterface > m_xParent;
17655 + uno::Reference< uno::XComponentContext > m_xContext;
17656 + uno::Reference< frame::XModel > m_xModel;
17657 + uno::Reference< document::XDocumentInfo > m_xOOOBuiltIns;
17658 +
17659 + DocProps mDocProps;
17660 + DocPropsByName mNamedDocProps;
17661 +
17662 + public:
17663 + BuiltInPropertiesImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : m_xParent( xParent ), m_xContext( xContext ), m_xModel( xModel )
17664 + {
17665 + BuiltInIndexHelper builtIns( m_xModel );
17666 + for ( sal_Int32 index = word::WdBuiltInProperty::wdPropertyTitle; index <= word::WdBuiltInProperty::wdPropertyCharsWSpaces; ++index )
17667 + {
17668 + mDocProps[ index ] = new SwVbaBuiltInDocumentProperty( xParent, xContext, builtIns.getDocPropInfoMap()[ index ] );
17669 + mNamedDocProps[ mDocProps[ index ]->getName() ] = mDocProps[ index ];
17670 + }
17671 + }
17672 +// XIndexAccess
17673 + virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException)
17674 + {
17675 + return mDocProps.size();
17676 + }
17677 + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException )
17678 + {
17679 + // correct the correct by the base class for 1 based indices
17680 + DocProps::iterator it = mDocProps.find( ++Index );
17681 + if ( it == mDocProps.end() )
17682 + throw lang::IndexOutOfBoundsException();
17683 + return uno::makeAny( it->second );
17684 + }
17685 + virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
17686 + {
17687 + if ( !hasByName( aName ) )
17688 + throw container::NoSuchElementException();
17689 + DocPropsByName::iterator it = mNamedDocProps.find( aName );
17690 + return uno::Any( it->second );
17691 +
17692 + }
17693 + virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException)
17694 + {
17695 + uno::Sequence< rtl::OUString > aNames( getCount() );
17696 + rtl::OUString* pName = aNames.getArray();
17697 + DocPropsByName::iterator it_end = mNamedDocProps.end();
17698 + for( DocPropsByName::iterator it = mNamedDocProps.begin(); it != it_end; ++it, ++pName )
17699 + *pName = it->first;
17700 + return aNames;
17701 + }
17702 +
17703 + virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException)
17704 + {
17705 + DocPropsByName::iterator it = mNamedDocProps.find( aName );
17706 + if ( it == mNamedDocProps.end() )
17707 + return sal_False;
17708 + return sal_True;
17709 + }
17710 +// XElementAccess
17711 + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException)
17712 + {
17713 + return XDocumentProperty::static_type(0);
17714 + }
17715 + virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException)
17716 + {
17717 + return mDocProps.size() > 0;
17718 + }
17719 + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException)
17720 + {
17721 + return new DocPropEnumeration( mDocProps );
17722 + }
17723 +};
17724 +
17725 +SwVbaBuiltinDocumentProperties::SwVbaBuiltinDocumentProperties( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : SwVbaDocumentproperties_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( new BuiltInPropertiesImpl( xParent, xContext, xModel ) ) ), m_xModel( xModel )
17726 +{
17727 +}
17728 +
17729 +uno::Reference< XDocumentProperty > SAL_CALL
17730 +SwVbaBuiltinDocumentProperties::Add( const ::rtl::OUString& /*Name*/, ::sal_Bool /*LinkToContent*/, ::sal_Int8 /*Type*/, const uno::Any& value, const uno::Any& /*LinkSource*/ ) throw (script::BasicErrorException, uno::RuntimeException)
17731 +{
17732 + throw uno::RuntimeException(
17733 + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("not supported for Builtin properties") ), uno::Reference< uno::XInterface >() );
17734 +}
17735 +
17736 +// XEnumerationAccess
17737 +uno::Type SAL_CALL
17738 +SwVbaBuiltinDocumentProperties::getElementType() throw (uno::RuntimeException)
17739 +{
17740 + return XDocumentProperty::static_type(0);
17741 +}
17742 +
17743 +uno::Reference< container::XEnumeration > SAL_CALL
17744 +SwVbaBuiltinDocumentProperties::createEnumeration() throw (uno::RuntimeException)
17745 +{
17746 + uno::Reference< container::XEnumerationAccess > xEnumAccess( m_xIndexAccess, uno::UNO_QUERY_THROW );
17747 + return xEnumAccess->createEnumeration();
17748 +}
17749 +
17750 +// ScVbaCollectionBaseImpl
17751 +uno::Any
17752 +SwVbaBuiltinDocumentProperties::createCollectionObject( const uno::Any& aSource )
17753 +{
17754 + // pass through
17755 + return aSource;
17756 +}
17757 +
17758 +// XHelperInterface
17759 +rtl::OUString&
17760 +SwVbaBuiltinDocumentProperties::getServiceImplName()
17761 +{
17762 + static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaBuiltinDocumentProperties") );
17763 + return sImplName;
17764 +}
17765 +
17766 +uno::Sequence<rtl::OUString>
17767 +SwVbaBuiltinDocumentProperties::getServiceNames()
17768 +{
17769 + static uno::Sequence< rtl::OUString > aServiceNames;
17770 + if ( aServiceNames.getLength() == 0 )
17771 + {
17772 + aServiceNames.realloc( 1 );
17773 + aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.DocumentProperties" ) );
17774 + }
17775 + return aServiceNames;
17776 +}
17777 +
17778 +class CustomPropertiesImpl : public PropertiesImpl_BASE
17779 +{
17780 + uno::Reference< XHelperInterface > m_xParent;
17781 + uno::Reference< uno::XComponentContext > m_xContext;
17782 + uno::Reference< frame::XModel > m_xModel;
17783 + uno::Reference< beans::XPropertySet > mxUserDefinedProp;
17784 + boost::shared_ptr< PropertGetSetHelper > mpPropGetSetHelper;
17785 +public:
17786 + CustomPropertiesImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : m_xParent( xParent ), m_xContext( xContext ), m_xModel( xModel )
17787 + {
17788 + // suck in the document( custom ) properties
17789 + uno::Reference< document::XDocumentInfoSupplier > xDocInfoSupp( m_xModel, uno::UNO_QUERY_THROW );
17790 + uno::Reference< document::XDocumentPropertiesSupplier > xDocPropSupp( xDocInfoSupp->getDocumentInfo(), uno::UNO_QUERY_THROW );
17791 + uno::Reference< document::XDocumentProperties > xDocProp( xDocPropSupp->getDocumentProperties(), uno::UNO_QUERY_THROW );
17792 + mxUserDefinedProp.set( xDocProp->getUserDefinedProperties(), uno::UNO_QUERY_THROW );
17793 + mpPropGetSetHelper.reset( new CustomPropertyGetSetHelper( m_xModel ) );
17794 + };
17795 + // XIndexAccess
17796 + virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException)
17797 + {
17798 + return mxUserDefinedProp->getPropertySetInfo()->getProperties().getLength();
17799 + }
17800 +
17801 + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException )
17802 + {
17803 + uno::Sequence< beans::Property > aProps = mxUserDefinedProp->getPropertySetInfo()->getProperties();
17804 + if ( Index >= aProps.getLength() )
17805 + throw lang::IndexOutOfBoundsException();
17806 + // How to determine type e.g Date? ( com.sun.star.util.DateTime )
17807 + DocPropInfo aPropInfo = DocPropInfo::createDocPropInfo( aProps[ Index ].Name, aProps[ Index ].Name, mpPropGetSetHelper );
17808 + return uno::makeAny( uno::Reference< XDocumentProperty >( new SwVbaCustomDocumentProperty( m_xParent, m_xContext, aPropInfo ) ) );
17809 + }
17810 +
17811 + virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
17812 + {
17813 + if ( !hasByName( aName ) )
17814 + throw container::NoSuchElementException();
17815 +
17816 + DocPropInfo aPropInfo = DocPropInfo::createDocPropInfo( aName, aName, mpPropGetSetHelper );
17817 + return uno::makeAny( uno::Reference< XDocumentProperty >( new SwVbaCustomDocumentProperty( m_xParent, m_xContext, aPropInfo ) ) );
17818 + }
17819 +
17820 + virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException)
17821 + {
17822 + uno::Sequence< beans::Property > aProps = mxUserDefinedProp->getPropertySetInfo()->getProperties();
17823 + uno::Sequence< rtl::OUString > aNames( aProps.getLength() );
17824 + rtl::OUString* pString = aNames.getArray();
17825 + rtl::OUString* pEnd = ( pString + aNames.getLength() );
17826 + beans::Property* pProp = aProps.getArray();
17827 + for ( ; pString != pEnd; ++pString, ++pProp )
17828 + *pString = pProp->Name;
17829 + return aNames;
17830 + }
17831 +
17832 + virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException)
17833 + {
17834 + OSL_TRACE("hasByName(%s) returns %d", rtl::OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr(), mxUserDefinedProp->getPropertySetInfo()->hasPropertyByName( aName ) );
17835 + return mxUserDefinedProp->getPropertySetInfo()->hasPropertyByName( aName );
17836 + }
17837 +
17838 + // XElementAccess
17839 + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException)
17840 + {
17841 + return XDocumentProperty::static_type(0);
17842 + }
17843 +
17844 + virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException)
17845 + {
17846 + return getCount() > 0;
17847 + }
17848 +
17849 + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException)
17850 + {
17851 + // create a map of properties ( the key doesn't matter )
17852 + OSL_TRACE("Creating an enumeration");
17853 + sal_Int32 key = 0;
17854 + sal_Int32 nElem = getCount();
17855 + DocProps simpleDocPropSnapShot;
17856 + for ( ; key < nElem; ++key )
17857 + simpleDocPropSnapShot[ key ].set( getByIndex( key ), uno::UNO_QUERY_THROW );
17858 + OSL_TRACE("After creating the enumeration");
17859 + return new DocPropEnumeration( simpleDocPropSnapShot );
17860 + }
17861 +
17862 + void addProp( const ::rtl::OUString& Name, ::sal_Int8 Type, const uno::Any& Value )
17863 + {
17864 + sal_Int16 attributes = 128;
17865 + uno::Reference< beans::XPropertyContainer > xContainer( mxUserDefinedProp, uno::UNO_QUERY_THROW );
17866 + // TODO fixme, perform the necessary Type Value conversions
17867 + xContainer->addProperty( Name, attributes, Value );
17868 + }
17869 +
17870 +};
17871 +
17872 +
17873 +SwVbaCustomDocumentProperties::SwVbaCustomDocumentProperties( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : SwVbaBuiltinDocumentProperties( xParent, xContext, xModel )
17874 +{
17875 + // replace the m_xIndexAccess implementation ( we need a virtual init )
17876 + m_xIndexAccess.set( new CustomPropertiesImpl( xParent, xContext, xModel ) );
17877 + m_xNameAccess.set( m_xIndexAccess, uno::UNO_QUERY_THROW );
17878 +}
17879 +
17880 +uno::Reference< XDocumentProperty > SAL_CALL
17881 +SwVbaCustomDocumentProperties::Add( const ::rtl::OUString& Name, ::sal_Bool LinkToContent, ::sal_Int8 Type, const uno::Any& Value, const uno::Any& LinkSource ) throw (script::BasicErrorException, uno::RuntimeException)
17882 +{
17883 + CustomPropertiesImpl* pCustomProps = dynamic_cast< CustomPropertiesImpl* > ( m_xIndexAccess.get() );
17884 + uno::Reference< XDocumentProperty > xDocProp;
17885 + if ( pCustomProps )
17886 + {
17887 + rtl::OUString sLinkSource;
17888 + pCustomProps->addProp( Name, Type, Value );
17889 +
17890 + xDocProp.set( m_xNameAccess->getByName( Name ), uno::UNO_QUERY_THROW );
17891 + xDocProp->setLinkToContent( LinkToContent );
17892 +
17893 + if ( LinkSource >>= sLinkSource )
17894 + xDocProp->setLinkSource( sLinkSource );
17895 + }
17896 + return xDocProp;
17897 +}
17898 +
17899 +// XHelperInterface
17900 +rtl::OUString&
17901 +SwVbaCustomDocumentProperties::getServiceImplName()
17902 +{
17903 + static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaCustomDocumentProperties") );
17904 + return sImplName;
17905 +}
17906 --- sw/source/ui/vba/vbadocumentproperties.hxx.old 1970-01-01 00:00:00.000000000 +0000
17907 +++ sw/source/ui/vba/vbadocumentproperties.hxx 2009-04-06 16:42:01.000000000 +0000
17908 @@ -0,0 +1,70 @@
17909 +/*************************************************************************
17910 + *
17911 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
17912 + *
17913 + * Copyright 2008 by Sun Microsystems, Inc.
17914 + *
17915 + * OpenOffice.org - a multi-platform office productivity suite
17916 + *
17917 + * $RCSfile: vbadocument.hxx,v $
17918 + * $Revision: 1.4 $
17919 + *
17920 + * This file is part of OpenOffice.org.
17921 + *
17922 + * OpenOffice.org is free software: you can redistribute it and/or modify
17923 + * it under the terms of the GNU Lesser General Public License version 3
17924 + * only, as published by the Free Software Foundation.
17925 + *
17926 + * OpenOffice.org is distributed in the hope that it will be useful,
17927 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
17928 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17929 + * GNU Lesser General Public License version 3 for more details
17930 + * (a copy is included in the LICENSE file that accompanied this code).
17931 + *
17932 + * You should have received a copy of the GNU Lesser General Public License
17933 + * version 3 along with OpenOffice.org. If not, see
17934 + * <http://www.openoffice.org/license.html>
17935 + * for a copy of the LGPLv3 License.
17936 + *
17937 + ************************************************************************/
17938 +#ifndef SW_VBA_DOCUMENTPROPERTIES_HXX
17939 +#define SW_VBA_DOCUMENTPROPERTIES_HXX
17940 +
17941 +#include <ooo/vba/XDocumentProperties.hpp>
17942 +#include <com/sun/star/frame/XModel.hpp>
17943 +#include <vbahelper/vbacollectionimpl.hxx>
17944 +#include <hash_map>
17945 +
17946 +typedef CollTestImplHelper< ov::XDocumentProperties > SwVbaDocumentproperties_BASE;
17947 +
17948 +class SwVbaBuiltinDocumentProperties : public SwVbaDocumentproperties_BASE
17949 +{
17950 +protected:
17951 + css::uno::Reference< css::frame::XModel > m_xModel;
17952 +public:
17953 + SwVbaBuiltinDocumentProperties( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xDocument );
17954 +
17955 + // XDocumentProperties
17956 + virtual css::uno::Reference< ::ooo::vba::XDocumentProperty > SAL_CALL Add( const ::rtl::OUString& Name, ::sal_Bool LinkToContent, ::sal_Int8 Type, const css::uno::Any& Value, const css::uno::Any& LinkSource ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
17957 + // XEnumerationAccess
17958 + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
17959 + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
17960 + // ScVbaCollectionBaseImpl
17961 + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
17962 +
17963 + // XHelperInterface
17964 + virtual rtl::OUString& getServiceImplName();
17965 + virtual css::uno::Sequence<rtl::OUString> getServiceNames();
17966 +};
17967 +
17968 +class SwVbaCustomDocumentProperties : public SwVbaBuiltinDocumentProperties
17969 +{
17970 +public:
17971 + SwVbaCustomDocumentProperties( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xDocument );
17972 +// XDocumentProperties
17973 + virtual css::uno::Reference< ::ooo::vba::XDocumentProperty > SAL_CALL Add( const ::rtl::OUString& Name, ::sal_Bool LinkToContent, ::sal_Int8 Type, const css::uno::Any& Value, const css::uno::Any& LinkSource ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
17974 + // XHelperInterface
17975 + virtual rtl::OUString& getServiceImplName();
17976 +};
17977 +
17978 +#endif /* SW_VBA_DOCUMENTPROPERTY_HXX */
17979 --- sw/source/ui/vba/vbaglobals.cxx.old 1970-01-01 00:00:00.000000000 +0000
17980 +++ sw/source/ui/vba/vbaglobals.cxx 2009-04-06 16:42:01.000000000 +0000
17981 @@ -0,0 +1,164 @@
17982 +/*************************************************************************
17983 + *
17984 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
17985 + *
17986 + * Copyright 2008 by Sun Microsystems, Inc.
17987 + *
17988 + * OpenOffice.org - a multi-platform office productivity suite
17989 + *
17990 + * $RCSfile: vbaglobals.cxx,v $
17991 + * $Revision: 1.4 $
17992 + *
17993 + * This file is part of OpenOffice.org.
17994 + *
17995 + * OpenOffice.org is free software: you can redistribute it and/or modify
17996 + * it under the terms of the GNU Lesser General Public License version 3
17997 + * only, as published by the Free Software Foundation.
17998 + *
17999 + * OpenOffice.org is distributed in the hope that it will be useful,
18000 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
18001 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18002 + * GNU Lesser General Public License version 3 for more details
18003 + * (a copy is included in the LICENSE file that accompanied this code).
18004 + *
18005 + * You should have received a copy of the GNU Lesser General Public License
18006 + * version 3 along with OpenOffice.org. If not, see
18007 + * <http://www.openoffice.org/license.html>
18008 + * for a copy of the LGPLv3 License.
18009 + *
18010 + ************************************************************************/
18011 +#include <vbahelper/helperdecl.hxx>
18012 +#include "vbaglobals.hxx"
18013 +
18014 +#include <comphelper/unwrapargs.hxx>
18015 +
18016 +#include <com/sun/star/lang/XMultiComponentFactory.hpp>
18017 +#include <com/sun/star/beans/XPropertySet.hpp>
18018 +#include <com/sun/star/container/XNameContainer.hpp>
18019 +#include <cppuhelper/bootstrap.hxx>
18020 +#include "vbaapplication.hxx"
18021 +using namespace ::com::sun::star;
18022 +using namespace ::com::sun::star::uno;
18023 +using namespace ::ooo::vba;
18024 +
18025 +
18026 +
18027 +// =============================================================================
18028 +// SwVbaGlobals
18029 +// =============================================================================
18030 +
18031 +SwVbaGlobals::SwVbaGlobals( css::uno::Reference< css::uno::XComponentContext >const& rxContext ) : SwVbaGlobals_BASE( uno::Reference< XHelperInterface >(), rxContext )
18032 +{
18033 + OSL_TRACE("SwVbaGlobals::SwVbaGlobals()");
18034 + init( rxContext, uno::makeAny( getApplication() ) );
18035 +}
18036 +
18037 +SwVbaGlobals::~SwVbaGlobals()
18038 +{
18039 + OSL_TRACE("SwVbaGlobals::~SwVbaGlobals");
18040 +}
18041 +
18042 +// =============================================================================
18043 +// XGlobals
18044 +// =============================================================================
18045 +uno::Reference<word::XApplication >
18046 +SwVbaGlobals::getApplication() throw (uno::RuntimeException)
18047 +{
18048 + OSL_TRACE("In SwVbaGlobals::getApplication");
18049 + static uno::Reference< word::XApplication > WordApplication( new SwVbaApplication( mxContext) );
18050 + return WordApplication;
18051 +}
18052 +
18053 +uno::Reference<word::XSystem > SAL_CALL
18054 +SwVbaGlobals::getSystem() throw (uno::RuntimeException)
18055 +{
18056 + return getApplication()->getSystem();
18057 +}
18058 +
18059 +uno::Reference< word::XDocument > SAL_CALL
18060 +SwVbaGlobals::getActiveDocument() throw (uno::RuntimeException)
18061 +{
18062 + return getApplication()->getActiveDocument();
18063 +}
18064 +
18065 +uno::Reference< word::XWindow > SAL_CALL
18066 +SwVbaGlobals::getActiveWindow() throw (uno::RuntimeException)
18067 +{
18068 + return getApplication()->getActiveWindow();
18069 +}
18070 +
18071 +rtl::OUString SAL_CALL
18072 +SwVbaGlobals::getName() throw (uno::RuntimeException)
18073 +{
18074 + return getApplication()->getName();
18075 +}
18076 +
18077 +uno::Reference<word::XOptions > SAL_CALL
18078 +SwVbaGlobals::getOptions() throw (uno::RuntimeException)
18079 +{
18080 + return getApplication()->getOptions();
18081 +}
18082 +
18083 +uno::Any SAL_CALL
18084 +SwVbaGlobals::CommandBars( const uno::Any& aIndex ) throw (uno::RuntimeException)
18085 +{
18086 + return getApplication()->CommandBars( aIndex );
18087 +}
18088 +
18089 +uno::Reference<word::XSelection > SAL_CALL
18090 +SwVbaGlobals::getSelection() throw (uno::RuntimeException)
18091 +{
18092 + return getApplication()->getSelection();
18093 +}
18094 +
18095 +rtl::OUString&
18096 +SwVbaGlobals::getServiceImplName()
18097 +{
18098 + static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaGlobals") );
18099 + return sImplName;
18100 +}
18101 +
18102 +uno::Sequence< rtl::OUString >
18103 +SwVbaGlobals::getServiceNames()
18104 +{
18105 + static uno::Sequence< rtl::OUString > aServiceNames;
18106 + if ( aServiceNames.getLength() == 0 )
18107 + {
18108 + aServiceNames.realloc( 1 );
18109 + aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Globals" ) );
18110 + }
18111 + return aServiceNames;
18112 +}
18113 +
18114 +uno::Sequence< rtl::OUString >
18115 +SwVbaGlobals::getAvailableServiceNames( ) throw (uno::RuntimeException)
18116 +{
18117 + static bool bInit = false;
18118 + static uno::Sequence< rtl::OUString > serviceNames( SwVbaGlobals_BASE::getAvailableServiceNames() );
18119 + if ( !bInit )
18120 + {
18121 + rtl::OUString names[] = {
18122 + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "ooo.vba.word.Document" ) ),
18123 +// #FIXME #TODO make Application a proper service
18124 +// ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "ooo.vba.word.Application" ) ),
18125 + };
18126 + sal_Int32 nWordServices = ( sizeof( names )/ sizeof( names[0] ) );
18127 + sal_Int32 startIndex = serviceNames.getLength();
18128 + serviceNames.realloc( serviceNames.getLength() + nWordServices );
18129 + for ( sal_Int32 index = 0; index < nWordServices; ++index )
18130 + serviceNames[ startIndex + index ] = names[ index ];
18131 + bInit = true;
18132 + }
18133 + return serviceNames;
18134 +}
18135 +
18136 +namespace globals
18137 +{
18138 +namespace sdecl = comphelper::service_decl;
18139 +sdecl::vba_service_class_<SwVbaGlobals, sdecl::with_args<false> > serviceImpl;
18140 +extern sdecl::ServiceDecl const serviceDecl(
18141 + serviceImpl,
18142 + "SwVbaGlobals",
18143 + "ooo.vba.word.Globals" );
18144 +}
18145 +
18146 --- sw/source/ui/vba/vbaglobals.hxx.old 1970-01-01 00:00:00.000000000 +0000
18147 +++ sw/source/ui/vba/vbaglobals.hxx 2009-04-06 16:42:01.000000000 +0000
18148 @@ -0,0 +1,80 @@
18149 +/*************************************************************************
18150 + *
18151 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
18152 + *
18153 + * Copyright 2008 by Sun Microsystems, Inc.
18154 + *
18155 + * OpenOffice.org - a multi-platform office productivity suite
18156 + *
18157 + * $RCSfile: vbaglobals.hxx,v $
18158 + * $Revision: 1.4 $
18159 + *
18160 + * This file is part of OpenOffice.org.
18161 + *
18162 + * OpenOffice.org is free software: you can redistribute it and/or modify
18163 + * it under the terms of the GNU Lesser General Public License version 3
18164 + * only, as published by the Free Software Foundation.
18165 + *
18166 + * OpenOffice.org is distributed in the hope that it will be useful,
18167 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
18168 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18169 + * GNU Lesser General Public License version 3 for more details
18170 + * (a copy is included in the LICENSE file that accompanied this code).
18171 + *
18172 + * You should have received a copy of the GNU Lesser General Public License
18173 + * version 3 along with OpenOffice.org. If not, see
18174 + * <http://www.openoffice.org/license.html>
18175 + * for a copy of the LGPLv3 License.
18176 + *
18177 + ************************************************************************/
18178 +#ifndef SW_VBA_GLOBALS_HXX
18179 +#define SW_VBA_GLOBALS_HXX
18180 +
18181 +#include <com/sun/star/lang/XServiceInfo.hpp>
18182 +#include <com/sun/star/lang/XInitialization.hpp>
18183 +#include <com/sun/star/uno/XComponentContext.hpp>
18184 +#include <ooo/vba/word/XGlobals.hpp>
18185 +#include <ooo/vba/word/XApplication.hpp>
18186 +#include <ooo/vba/word/XSystem.hpp>
18187 +#include <ooo/vba/word/XOptions.hpp>
18188 +#include <ooo/vba/word/XSelection.hpp>
18189 +
18190 +#include <cppuhelper/implbase1.hxx>
18191 +#include <vbahelper/vbahelper.hxx>
18192 +#include <vbahelper/vbaglobalbase.hxx>
18193 +
18194 +// =============================================================================
18195 +// class SwVbaGlobals
18196 +// =============================================================================
18197 +
18198 +
18199 +typedef ::cppu::ImplInheritanceHelper1< VbaGlobalsBase, ov::word::XGlobals > SwVbaGlobals_BASE;
18200 +
18201 +class SwVbaGlobals : public SwVbaGlobals_BASE
18202 +{
18203 +private:
18204 + css::uno::Reference< ooo::vba::word::XApplication > mxApplication;
18205 +
18206 + virtual css::uno::Reference< ooo::vba::word::XApplication > getApplication() throw (css::uno::RuntimeException);
18207 +
18208 +public:
18209 +
18210 + SwVbaGlobals( css::uno::Reference< css::uno::XComponentContext >const& rxContext );
18211 + virtual ~SwVbaGlobals();
18212 +
18213 + // XGlobals
18214 + virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
18215 + virtual css::uno::Reference< ooo::vba::word::XSystem > SAL_CALL getSystem() throw (css::uno::RuntimeException);
18216 + virtual css::uno::Reference< ov::word::XDocument > SAL_CALL getActiveDocument() throw (css::uno::RuntimeException);
18217 + virtual css::uno::Reference< ov::word::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException);
18218 + virtual css::uno::Reference< ooo::vba::word::XOptions > SAL_CALL getOptions() throw (css::uno::RuntimeException);
18219 + virtual css::uno::Reference< ooo::vba::word::XSelection > SAL_CALL getSelection() throw (css::uno::RuntimeException);
18220 + virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
18221 + // XMultiServiceFactory
18222 + virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames( ) throw (css::uno::RuntimeException);
18223 +
18224 + // XHelperInterface
18225 + virtual rtl::OUString& getServiceImplName();
18226 + virtual css::uno::Sequence<rtl::OUString> getServiceNames();
18227 +};
18228 +#endif /* SW_VBA_GLOBALS_HXX */
18229 --- sw/source/ui/vba/vbaoptions.cxx.old 1970-01-01 00:00:00.000000000 +0000
18230 +++ sw/source/ui/vba/vbaoptions.cxx 2009-04-06 16:42:01.000000000 +0000
18231 @@ -0,0 +1,148 @@
18232 +/*************************************************************************
18233 + *
18234 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
18235 + *
18236 + * Copyright 2008 by Sun Microoptionss, Inc.
18237 + *
18238 + * OpenOffice.org - a multi-platform office productivity suite
18239 + *
18240 + * $RCSfile:
18241 + * $Revision:
18242 + *
18243 + * This file is part of OpenOffice.org.
18244 + *
18245 + * OpenOffice.org is free software: you can redistribute it and/or modify
18246 + * it under the terms of the GNU Lesser General Public License version 3
18247 + * only, as published by the Free Software Foundation.
18248 + *
18249 + * OpenOffice.org is distributed in the hope that it will be useful,
18250 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
18251 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18252 + * GNU Lesser General Public License version 3 for more details
18253 + * (a copy is included in the LICENSE file that accompanied this code).
18254 + *
18255 + * You should have received a copy of the GNU Lesser General Public License
18256 + * version 3 along with OpenOffice.org. If not, see
18257 + * <http://www.openoffice.org/license.html>
18258 + * for a copy of the LGPLv3 License.
18259 + *
18260 + ************************************************************************/
18261 +#include "vbaoptions.hxx"
18262 +#include <vbahelper/vbahelper.hxx>
18263 +#include <ooo/vba/word/WdDefaultFilePath.hpp>
18264 +#include <com/sun/star/util/XStringSubstitution.hpp>
18265 +#include <com/sun/star/beans/XPropertySet.hpp>
18266 +#include <osl/file.hxx>
18267 +
18268 +using namespace ::ooo::vba;
18269 +using namespace ::com::sun::star;
18270 +
18271 +SwVbaOptions::SwVbaOptions( uno::Reference<uno::XComponentContext >& xContext ) throw ( uno::RuntimeException ) : SwVbaOptions_BASE( uno::Reference< XHelperInterface >(), xContext )
18272 +{
18273 + mxFactory.set( comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
18274 +}
18275 +
18276 +SwVbaOptions::~SwVbaOptions()
18277 +{
18278 +}
18279 +
18280 +uno::Any SAL_CALL
18281 +SwVbaOptions::DefaultFilePath( sal_Int32 _path ) throw ( uno::RuntimeException )
18282 +{
18283 + switch( _path )
18284 + {
18285 + case word::WdDefaultFilePath::wdDocumentsPath:
18286 + {
18287 + msDefaultFilePath = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Work") );
18288 + break;
18289 + }
18290 + case word::WdDefaultFilePath::wdPicturesPath:
18291 + {
18292 + msDefaultFilePath = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Gallery") );
18293 + break;
18294 + }
18295 + case word::WdDefaultFilePath::wdUserTemplatesPath:
18296 + case word::WdDefaultFilePath::wdWorkgroupTemplatesPath:
18297 + {
18298 + msDefaultFilePath = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Template") );
18299 + break;
18300 + }
18301 + case word::WdDefaultFilePath::wdUserOptionsPath:
18302 + {
18303 + msDefaultFilePath = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("UserConfig") );
18304 + break;
18305 + }
18306 + case word::WdDefaultFilePath::wdToolsPath:
18307 + case word::WdDefaultFilePath::wdProgramPath:
18308 + {
18309 + msDefaultFilePath = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Module") );
18310 + break;
18311 + }
18312 + case word::WdDefaultFilePath::wdTempFilePath:
18313 + {
18314 + msDefaultFilePath = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Temp") );
18315 + break;
18316 + }
18317 + default:
18318 + {
18319 + DebugHelper::exception( SbERR_NOT_IMPLEMENTED, rtl::OUString() );
18320 + break;
18321 + }
18322 + }
18323 + return uno::makeAny( uno::Reference< XPropValue > ( new ScVbaPropValue( this ) ) );
18324 +}
18325 +
18326 +void SwVbaOptions::setValueEvent( const uno::Any& value )
18327 +{
18328 + rtl::OUString sNewPath;
18329 + value >>= sNewPath;
18330 + rtl::OUString sNewPathUrl;
18331 + ::osl::File::getFileURLFromSystemPath( sNewPath, sNewPathUrl );
18332 + uno::Reference< beans::XPropertySet > xPathSettings( mxFactory->createInstance( rtl::OUString::createFromAscii("com.sun.star.util.PathSettings") ), uno::UNO_QUERY_THROW );
18333 + rtl::OUString sOldPathUrl;
18334 + xPathSettings->getPropertyValue( msDefaultFilePath ) >>= sOldPathUrl;
18335 + // path could be a multipath, Microsoft doesn't support this feature in Word currently
18336 + // only the last path is from interest.
18337 + sal_Int32 nIndex = sOldPathUrl.lastIndexOf( sal_Unicode(';') );
18338 + if( nIndex != -1 )
18339 + {
18340 + sNewPathUrl = sOldPathUrl.copy( 0, nIndex + 1 ).concat( sNewPathUrl );
18341 + }
18342 + xPathSettings->setPropertyValue( msDefaultFilePath, uno::makeAny( sNewPathUrl ) );
18343 +}
18344 +
18345 +uno::Any SwVbaOptions::getValueEvent()
18346 +{
18347 + uno::Reference< beans::XPropertySet > xPathSettings( mxFactory->createInstance( rtl::OUString::createFromAscii("com.sun.star.util.PathSettings") ), uno::UNO_QUERY_THROW );
18348 + rtl::OUString sPathUrl;
18349 + xPathSettings->getPropertyValue( msDefaultFilePath ) >>= sPathUrl;
18350 + // path could be a multipath, Microsoft doesn't support this feature in Word currently
18351 + // only the last path is from interest.
18352 + sal_Int32 nIndex = sPathUrl.lastIndexOf( sal_Unicode(';') );
18353 + if( nIndex != -1 )
18354 + {
18355 + sPathUrl = sPathUrl.copy( nIndex + 1 );
18356 + }
18357 + rtl::OUString sPath;
18358 + ::osl::File::getSystemPathFromFileURL( sPathUrl, sPath );
18359 + return uno::makeAny( sPath );
18360 +}
18361 +
18362 +rtl::OUString&
18363 +SwVbaOptions::getServiceImplName()
18364 +{
18365 + static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaOptions") );
18366 + return sImplName;
18367 +}
18368 +
18369 +uno::Sequence< rtl::OUString >
18370 +SwVbaOptions::getServiceNames()
18371 +{
18372 + static uno::Sequence< rtl::OUString > aServiceNames;
18373 + if ( aServiceNames.getLength() == 0 )
18374 + {
18375 + aServiceNames.realloc( 1 );
18376 + aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Options" ) );
18377 + }
18378 + return aServiceNames;
18379 +}
18380 --- sw/source/ui/vba/vbaoptions.hxx.old 1970-01-01 00:00:00.000000000 +0000
18381 +++ sw/source/ui/vba/vbaoptions.hxx 2009-04-06 16:42:01.000000000 +0000
18382 @@ -0,0 +1,62 @@
18383 +/*************************************************************************
18384 + *
18385 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
18386 + *
18387 + * Copyright 2008 by Sun Microsystems, Inc.
18388 + *
18389 + * OpenOffice.org - a multi-platform office productivity suite
18390 + *
18391 + * $RCSfile: vbasystem.hxx,v $
18392 + * $Revision: 1.4 $
18393 + *
18394 + * This file is part of OpenOffice.org.
18395 + *
18396 + * OpenOffice.org is free software: you can redistribute it and/or modify
18397 + * it under the terms of the GNU Lesser General Public License version 3
18398 + * only, as published by the Free Software Foundation.
18399 + *
18400 + * OpenOffice.org is distributed in the hope that it will be useful,
18401 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
18402 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18403 + * GNU Lesser General Public License version 3 for more details
18404 + * (a copy is included in the LICENSE file that accompanied this code).
18405 + *
18406 + * You should have received a copy of the GNU Lesser General Public License
18407 + * version 3 along with OpenOffice.org. If not, see
18408 + * <http://www.openoffice.org/license.html>
18409 + * for a copy of the LGPLv3 License.
18410 + *
18411 + ************************************************************************/
18412 +#ifndef SW_VBA_OPTIONS_HXX
18413 +#define SW_VBA_OPTIONS_HXX
18414 +
18415 +#include <ooo/vba/word/XOptions.hpp>
18416 +#include <vbahelper/vbahelperinterface.hxx>
18417 +#include <cppuhelper/implbase1.hxx>
18418 +#include <vbahelper/vbapropvalue.hxx>
18419 +#include <comphelper/processfactory.hxx>
18420 +
18421 +typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XOptions > SwVbaOptions_BASE;
18422 +
18423 +class SwVbaOptions : public SwVbaOptions_BASE,
18424 + public PropListener
18425 +{
18426 +private:
18427 + rtl::OUString msDefaultFilePath;
18428 + css::uno::Reference< css::lang::XMultiServiceFactory > mxFactory;
18429 +public:
18430 + SwVbaOptions( css::uno::Reference< css::uno::XComponentContext >& m_xContext ) throw ( css::uno::RuntimeException );
18431 + virtual ~SwVbaOptions();
18432 +
18433 + // XOptions
18434 + virtual css::uno::Any SAL_CALL DefaultFilePath( sal_Int32 _path ) throw ( css::uno::RuntimeException );
18435 +
18436 + //PropListener
18437 + virtual void setValueEvent( const css::uno::Any& value );
18438 + virtual css::uno::Any getValueEvent();
18439 +
18440 + // XHelperInterface
18441 + virtual rtl::OUString& getServiceImplName();
18442 + virtual css::uno::Sequence<rtl::OUString> getServiceNames();
18443 +};
18444 +#endif /* SW_VBA_OPTIONS_HXX */
18445 --- sw/source/ui/vba/vbapane.cxx.old 1970-01-01 00:00:00.000000000 +0000
18446 +++ sw/source/ui/vba/vbapane.cxx 2009-04-06 16:42:01.000000000 +0000
18447 @@ -0,0 +1,79 @@
18448 +/*************************************************************************
18449 + *
18450 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
18451 + *
18452 + * Copyright 2008 by Sun Microsystems, Inc.
18453 + *
18454 + * OpenOffice.org - a multi-platform office productivity suite
18455 + *
18456 + * $RCSfile:
18457 + * $Revision:
18458 + *
18459 + * This file is part of OpenOffice.org.
18460 + *
18461 + * OpenOffice.org is free software: you can redistribute it and/or modify
18462 + * it under the terms of the GNU Lesser General Public License version 3
18463 + * only, as published by the Free Software Foundation.
18464 + *
18465 + * OpenOffice.org is distributed in the hope that it will be useful,
18466 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
18467 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18468 + * GNU Lesser General Public License version 3 for more details
18469 + * (a copy is included in the LICENSE file that accompanied this code).
18470 + *
18471 + * You should have received a copy of the GNU Lesser General Public License
18472 + * version 3 along with OpenOffice.org. If not, see
18473 + * <http://www.openoffice.org/license.html>
18474 + * for a copy of the LGPLv3 License.
18475 + *
18476 + ************************************************************************/
18477 +#include "vbapane.hxx"
18478 +#include <vbahelper/vbahelper.hxx>
18479 +#include <tools/diagnose_ex.h>
18480 +#include "vbaview.hxx"
18481 +
18482 +using namespace ::ooo::vba;
18483 +using namespace ::com::sun::star;
18484 +
18485 +SwVbaPane::SwVbaPane( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext,
18486 + const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) :
18487 + SwVbaPane_BASE( rParent, rContext ), mxModel( xModel )
18488 +{
18489 +}
18490 +
18491 +SwVbaPane::~SwVbaPane()
18492 +{
18493 +}
18494 +
18495 +uno::Any SAL_CALL
18496 +SwVbaPane::View() throw ( css::uno::RuntimeException )
18497 +{
18498 + return uno::makeAny( uno::Reference< word::XView >( new SwVbaView( this, mxContext, mxModel ) ) );
18499 +}
18500 +
18501 +void SAL_CALL
18502 +SwVbaPane::Close( ) throw ( css::uno::RuntimeException )
18503 +{
18504 + rtl::OUString url = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CloseWin"));
18505 + dispatchRequests( mxModel,url );
18506 +}
18507 +
18508 +rtl::OUString&
18509 +SwVbaPane::getServiceImplName()
18510 +{
18511 + static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaPane") );
18512 + return sImplName;
18513 +}
18514 +
18515 +uno::Sequence< rtl::OUString >
18516 +SwVbaPane::getServiceNames()
18517 +{
18518 + static uno::Sequence< rtl::OUString > aServiceNames;
18519 + if ( aServiceNames.getLength() == 0 )
18520 + {
18521 + aServiceNames.realloc( 1 );
18522 + aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Pane" ) );
18523 + }
18524 + return aServiceNames;
18525 +}
18526 +
18527 --- sw/source/ui/vba/vbapane.hxx.old 1970-01-01 00:00:00.000000000 +0000
18528 +++ sw/source/ui/vba/vbapane.hxx 2009-04-06 16:42:01.000000000 +0000
18529 @@ -0,0 +1,57 @@
18530 +/*************************************************************************
18531 + *
18532 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
18533 + *
18534 + * Copyright 2008 by Sun Microsystems, Inc.
18535 + *
18536 + * OpenOffice.org - a multi-platform office productivity suite
18537 + *
18538 + * $RCSfile:
18539 + * $Revision:
18540 + *
18541 + * This file is part of OpenOffice.org.
18542 + *
18543 + * OpenOffice.org is free software: you can redistribute it and/or modify
18544 + * it under the terms of the GNU Lesser General Public License version 3
18545 + * only, as published by the Free Software Foundation.
18546 + *
18547 + * OpenOffice.org is distributed in the hope that it will be useful,
18548 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
18549 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18550 + * GNU Lesser General Public License version 3 for more details
18551 + * (a copy is included in the LICENSE file that accompanied this code).
18552 + *
18553 + * You should have received a copy of the GNU Lesser General Public License
18554 + * version 3 along with OpenOffice.org. If not, see
18555 + * <http://www.openoffice.org/license.html>
18556 + * for a copy of the LGPLv3 License.
18557 + *
18558 + ************************************************************************/
18559 +#ifndef SW_VBA_PANE_HXX
18560 +#define SW_VBA_PANE_HXX
18561 +
18562 +#include <ooo/vba/word/XPane.hpp>
18563 +#include <vbahelper/vbahelperinterface.hxx>
18564 +#include <cppuhelper/implbase1.hxx>
18565 +
18566 +typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XPane > SwVbaPane_BASE;
18567 +
18568 +class SwVbaPane : public SwVbaPane_BASE
18569 +{
18570 +private:
18571 + css::uno::Reference< css::frame::XModel > mxModel;
18572 +
18573 +public:
18574 + SwVbaPane( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext,
18575 + const css::uno::Reference< css::frame::XModel >& xModel ) throw ( css::uno::RuntimeException );
18576 + virtual ~SwVbaPane();
18577 +
18578 + // Methods
18579 + virtual css::uno::Any SAL_CALL View( ) throw (css::uno::RuntimeException);
18580 + virtual void SAL_CALL Close( ) throw (css::uno::RuntimeException);
18581 +
18582 + // XHelperInterface
18583 + virtual rtl::OUString& getServiceImplName();
18584 + virtual css::uno::Sequence<rtl::OUString> getServiceNames();
18585 +};
18586 +#endif /* SW_VBA_PANE_HXX */
18587 --- sw/source/ui/vba/vbapanes.cxx.old 1970-01-01 00:00:00.000000000 +0000
18588 +++ sw/source/ui/vba/vbapanes.cxx 2009-04-06 16:42:01.000000000 +0000
18589 @@ -0,0 +1,127 @@
18590 +/*************************************************************************
18591 + *
18592 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
18593 + *
18594 + * Copyright 2008 by Sun Microsystems, Inc.
18595 + *
18596 + * OpenOffice.org - a multi-platform office productivity suite
18597 + *
18598 + * $RCSfile:
18599 + * $Revision:
18600 + *
18601 + * This file is part of OpenOffice.org.
18602 + *
18603 + * OpenOffice.org is free software: you can redistribute it and/or modify
18604 + * it under the terms of the GNU Lesser General Public License version 3
18605 + * only, as published by the Free Software Foundation.
18606 + *
18607 + * OpenOffice.org is distributed in the hope that it will be useful,
18608 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
18609 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18610 + * GNU Lesser General Public License version 3 for more details
18611 + * (a copy is included in the LICENSE file that accompanied this code).
18612 + *
18613 + * You should have received a copy of the GNU Lesser General Public License
18614 + * version 3 along with OpenOffice.org. If not, see
18615 + * <http://www.openoffice.org/license.html>
18616 + * for a copy of the LGPLv3 License.
18617 + *
18618 + ************************************************************************/
18619 +#include "vbapanes.hxx"
18620 +#include "vbapane.hxx"
18621 +
18622 +using namespace ::ooo::vba;
18623 +using namespace ::com::sun::star;
18624 +
18625 +// I assume there is only one pane in Writer
18626 +typedef ::cppu::WeakImplHelper1<container::XIndexAccess > PanesIndexAccess_Base;
18627 +class PanesIndexAccess : public PanesIndexAccess_Base
18628 +{
18629 +private:
18630 + uno::Reference< XHelperInterface > mxParent;
18631 + uno::Reference< uno::XComponentContext > mxContext;
18632 + uno::Reference< frame::XModel > mxModel;
18633 +
18634 +public:
18635 + PanesIndexAccess( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : mxParent( xParent ), mxContext( xContext ), mxModel( xModel ) {}
18636 + ~PanesIndexAccess(){}
18637 +
18638 + // XIndexAccess
18639 + virtual sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException)
18640 + {
18641 + return 1;
18642 + }
18643 + virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
18644 + {
18645 + if( Index != 1 )
18646 + throw container::NoSuchElementException();
18647 + return uno::makeAny( uno::Reference< word::XPane >( new SwVbaPane( mxParent, mxContext, mxModel ) ) );
18648 + }
18649 + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException)
18650 + {
18651 + return word::XPane::static_type(0);
18652 + }
18653 + virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException)
18654 + {
18655 + return sal_True;
18656 + }
18657 +};
18658 +
18659 +class PanesEnumWrapper : public EnumerationHelper_BASE
18660 +{
18661 + uno::Reference<container::XIndexAccess > m_xIndexAccess;
18662 + sal_Int32 nIndex;
18663 +public:
18664 + PanesEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {}
18665 + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException)
18666 + {
18667 + return ( nIndex < m_xIndexAccess->getCount() );
18668 + }
18669 +
18670 + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
18671 + {
18672 + if ( nIndex < m_xIndexAccess->getCount() )
18673 + return m_xIndexAccess->getByIndex( nIndex++ );
18674 + throw container::NoSuchElementException();
18675 + }
18676 +};
18677 +
18678 +SwVbaPanes::SwVbaPanes( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xModel ): SwVbaPanes_BASE( xParent, xContext, new PanesIndexAccess( xParent, xContext, xModel ) ), mxModel( xModel )
18679 +{
18680 +}
18681 +// XEnumerationAccess
18682 +uno::Type
18683 +SwVbaPanes::getElementType() throw (uno::RuntimeException)
18684 +{
18685 + return word::XPane::static_type(0);
18686 +}
18687 +uno::Reference< container::XEnumeration >
18688 +SwVbaPanes::createEnumeration() throw (uno::RuntimeException)
18689 +{
18690 + return new PanesEnumWrapper( m_xIndexAccess );
18691 +}
18692 +
18693 +uno::Any
18694 +SwVbaPanes::createCollectionObject( const css::uno::Any& aSource )
18695 +{
18696 + return aSource;
18697 +}
18698 +
18699 +rtl::OUString&
18700 +SwVbaPanes::getServiceImplName()
18701 +{
18702 + static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaPanes") );
18703 + return sImplName;
18704 +}
18705 +
18706 +css::uno::Sequence<rtl::OUString>
18707 +SwVbaPanes::getServiceNames()
18708 +{
18709 + static uno::Sequence< rtl::OUString > sNames;
18710 + if ( sNames.getLength() == 0 )
18711 + {
18712 + sNames.realloc( 1 );
18713 + sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Panes") );
18714 + }
18715 + return sNames;
18716 +}
18717 --- sw/source/ui/vba/vbapanes.hxx.old 1970-01-01 00:00:00.000000000 +0000
18718 +++ sw/source/ui/vba/vbapanes.hxx 2009-04-06 16:42:01.000000000 +0000
18719 @@ -0,0 +1,60 @@
18720 +/*************************************************************************
18721 + *
18722 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
18723 + *
18724 + * Copyright 2008 by Sun Microsystems, Inc.
18725 + *
18726 + * OpenOffice.org - a multi-platform office productivity suite
18727 + *
18728 + * $RCSfile:
18729 + * $Revision:
18730 + *
18731 + * This file is part of OpenOffice.org.
18732 + *
18733 + * OpenOffice.org is free software: you can redistribute it and/or modify
18734 + * it under the terms of the GNU Lesser General Public License version 3
18735 + * only, as published by the Free Software Foundation.
18736 + *
18737 + * OpenOffice.org is distributed in the hope that it will be useful,
18738 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
18739 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18740 + * GNU Lesser General Public License version 3 for more details
18741 + * (a copy is included in the LICENSE file that accompanied this code).
18742 + *
18743 + * You should have received a copy of the GNU Lesser General Public License
18744 + * version 3 along with OpenOffice.org. If not, see
18745 + * <http://www.openoffice.org/license.html>
18746 + * for a copy of the LGPLv3 License.
18747 + *
18748 + ************************************************************************/
18749 +#ifndef SW_VBA_PANES_HXX
18750 +#define SW_VBA_PANES_HXX
18751 +
18752 +#include <vbahelper/vbacollectionimpl.hxx>
18753 +#include <ooo/vba/word/XPanes.hpp>
18754 +#include <com/sun/star/container/XEnumerationAccess.hpp>
18755 +#include <com/sun/star/container/XIndexAccess.hpp>
18756 +#include <vbahelper/vbahelperinterface.hxx>
18757 +
18758 +typedef CollTestImplHelper< ooo::vba::word::XPanes > SwVbaPanes_BASE;
18759 +
18760 +class SwVbaPanes : public SwVbaPanes_BASE
18761 +{
18762 +private:
18763 + css::uno::Reference< css::frame::XModel > mxModel;
18764 +
18765 +public:
18766 + SwVbaPanes( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel );
18767 + virtual ~SwVbaPanes() {}
18768 +
18769 + // XEnumerationAccess
18770 + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
18771 + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
18772 +
18773 + // SwVbaPanes_BASE
18774 + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
18775 + virtual rtl::OUString& getServiceImplName();
18776 + virtual css::uno::Sequence<rtl::OUString> getServiceNames();
18777 +};
18778 +
18779 +#endif /* SW_VBA_PANES_HXX */
18780 --- sw/source/ui/vba/vbarange.cxx.old 1970-01-01 00:00:00.000000000 +0000
18781 +++ sw/source/ui/vba/vbarange.cxx 2009-04-06 16:42:01.000000000 +0000
18782 @@ -0,0 +1,302 @@
18783 +/*************************************************************************
18784 + *
18785 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
18786 + *
18787 + * Copyright 2008 by Sun Microsystems, Inc.
18788 + *
18789 + * OpenOffice.org - a multi-platform office productivity suite
18790 + *
18791 + * $RCSfile:
18792 + * $Revision:
18793 + *
18794 + * This file is part of OpenOffice.org.
18795 + *
18796 + * OpenOffice.org is free software: you can redistribute it and/or modify
18797 + * it under the terms of the GNU Lesser General Public License version 3
18798 + * only, as published by the Free Software Foundation.
18799 + *
18800 + * OpenOffice.org is distributed in the hope that it will be useful,
18801 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
18802 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18803 + * GNU Lesser General Public License version 3 for more details
18804 + * (a copy is included in the LICENSE file that accompanied this code).
18805 + *
18806 + * You should have received a copy of the GNU Lesser General Public License
18807 + * version 3 along with OpenOffice.org. If not, see
18808 + * <http://www.openoffice.org/license.html>
18809 + * for a copy of the LGPLv3 License.
18810 + *
18811 + ************************************************************************/
18812 +#include "vbarange.hxx"
18813 +#include <vbahelper/vbahelper.hxx>
18814 +#include <tools/diagnose_ex.h>
18815 +#include "vbarangehelper.hxx"
18816 +#include <com/sun/star/text/XTextDocument.hpp>
18817 +#include <ooo/vba/word/WdBreakType.hpp>
18818 +#include <com/sun/star/style/BreakType.hpp>
18819 +
18820 +using namespace ::ooo::vba;
18821 +using namespace ::com::sun::star;
18822 +
18823 +typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XRange > SwVbaBaseRange_BASE;
18824 +
18825 +class SwVbaBaseRange : public SwVbaBaseRange_BASE
18826 +{
18827 +protected:
18828 + uno::Reference< text::XTextDocument > mxTextDocument;
18829 + uno::Reference< text::XTextCursor > mxTextCursor;
18830 + uno::Reference< text::XText > mxText;
18831 + sal_Bool mbMaySpanEndOfDocument;
18832 +
18833 + SwVbaBaseRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext );
18834 + virtual ~SwVbaBaseRange();
18835 +
18836 +public:
18837 + uno::Reference< text::XTextRange > getXTextRange() throw (uno::RuntimeException);
18838 +
18839 + // XRange
18840 + virtual rtl::OUString SAL_CALL getText() throw (uno::RuntimeException);
18841 + virtual void SAL_CALL setText( const rtl::OUString& rText ) throw (uno::RuntimeException);
18842 +
18843 + // Methods
18844 + virtual void SAL_CALL InsertBreak( const uno::Any& _breakType ) throw (uno::RuntimeException);
18845 +
18846 + // XHelperInterface
18847 + virtual rtl::OUString& getServiceImplName();
18848 + virtual uno::Sequence<rtl::OUString> getServiceNames();
18849 +};
18850 +
18851 +
18852 +SwVbaBaseRange::SwVbaBaseRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext )
18853 + : SwVbaBaseRange_BASE( rParent, rContext )
18854 +{
18855 +}
18856 +
18857 +SwVbaBaseRange::~SwVbaBaseRange()
18858 +{
18859 +}
18860 +
18861 +uno::Reference< text::XTextRange >
18862 +SwVbaBaseRange::getXTextRange() throw (uno::RuntimeException)
18863 +{
18864 + uno::Reference< text::XTextRange > xTextRange( mxTextCursor, uno::UNO_QUERY_THROW );
18865 + return xTextRange;
18866 +}
18867 +
18868 +/**
18869 +* The complexity in this method is because we need to workaround
18870 +* an issue that the last paragraph in a document does not have a trailing CRLF.
18871 +* @return
18872 +*/
18873 +rtl::OUString SAL_CALL
18874 +SwVbaBaseRange::getText() throw ( uno::RuntimeException )
18875 +{
18876 + rtl::OUString aText = mxTextCursor->getString();
18877 + sal_Int32 nLen = aText.getLength();
18878 +
18879 + // FIXME: should add a line separator if the range includes the last paragraph
18880 + if( nLen == 0 )
18881 + {
18882 + if( mxTextCursor->isCollapsed() )
18883 + {
18884 + mxTextCursor->goRight( 1, sal_True );
18885 + aText = mxTextCursor->getString();
18886 + mxTextCursor->collapseToStart();
18887 + }
18888 + else
18889 + {
18890 + uno::Reference< text::XTextRange > xStart = mxTextCursor->getStart();
18891 + uno::Reference< text::XTextRange > xEnd = mxTextCursor->getEnd();
18892 + mxTextCursor->collapseToEnd();
18893 + mxTextCursor->goRight( 1, sal_True );
18894 + mxTextCursor->gotoRange( xStart, sal_False );
18895 + mxTextCursor->gotoRange( xEnd, sal_True );
18896 + }
18897 + }
18898 +
18899 + return aText;
18900 +}
18901 +
18902 +void SAL_CALL
18903 +SwVbaBaseRange::setText( const rtl::OUString& rText ) throw ( uno::RuntimeException )
18904 +{
18905 + if( rText.indexOf( '\n' ) != -1 )
18906 + {
18907 + mxTextCursor->setString( rtl::OUString() );
18908 + // process CR in strings
18909 + uno::Reference< text::XTextRange > xRange( mxTextCursor, uno::UNO_QUERY_THROW );
18910 + SwVbaRangeHelper::insertString( xRange, mxText, rText, sal_True );
18911 + }
18912 + else
18913 + {
18914 + mxTextCursor->setString( rText );
18915 + }
18916 +}
18917 +
18918 +// FIXME: test is not pass
18919 +void SAL_CALL SwVbaBaseRange::InsertBreak( const uno::Any& _breakType ) throw (uno::RuntimeException)
18920 +{
18921 + // default type is wdPageBreak;
18922 + sal_Int32 nBreakType = word::WdBreakType::wdPageBreak;
18923 + if( _breakType.hasValue() )
18924 + _breakType >>= nBreakType;
18925 +
18926 + style::BreakType eBreakType = style::BreakType_NONE;
18927 + switch( nBreakType )
18928 + {
18929 + case word::WdBreakType::wdPageBreak:
18930 + eBreakType = style::BreakType_PAGE_AFTER;
18931 + break;
18932 + case word::WdBreakType::wdColumnBreak:
18933 + eBreakType = style::BreakType_COLUMN_AFTER;
18934 + break;
18935 + case word::WdBreakType::wdLineBreak:
18936 + case word::WdBreakType::wdLineBreakClearLeft:
18937 + case word::WdBreakType::wdLineBreakClearRight:
18938 + case word::WdBreakType::wdSectionBreakContinuous:
18939 + case word::WdBreakType::wdSectionBreakEvenPage:
18940 + case word::WdBreakType::wdSectionBreakNextPage:
18941 + case word::WdBreakType::wdSectionBreakOddPage:
18942 + case word::WdBreakType::wdTextWrappingBreak:
18943 + DebugHelper::exception( SbERR_NOT_IMPLEMENTED, rtl::OUString() );
18944 + break;
18945 + default:
18946 + DebugHelper::exception( SbERR_BAD_PARAMETER, rtl::OUString() );
18947 + }
18948 +
18949 + if( eBreakType != style::BreakType_NONE )
18950 + {
18951 + if( !mxTextCursor->isCollapsed() )
18952 + {
18953 + mxTextCursor->setString( rtl::OUString() );
18954 + mxTextCursor->collapseToStart();
18955 + }
18956 +
18957 + uno::Reference< beans::XPropertySet > xProp( mxTextCursor, uno::UNO_QUERY_THROW );
18958 + xProp->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BreakType") ), uno::makeAny( eBreakType ) );
18959 + }
18960 +}
18961 +
18962 +rtl::OUString&
18963 +SwVbaBaseRange::getServiceImplName()
18964 +{
18965 + static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaBaseRange") );
18966 + return sImplName;
18967 +}
18968 +
18969 +uno::Sequence< rtl::OUString >
18970 +SwVbaBaseRange::getServiceNames()
18971 +{
18972 + static uno::Sequence< rtl::OUString > aServiceNames;
18973 + if ( aServiceNames.getLength() == 0 )
18974 + {
18975 + aServiceNames.realloc( 1 );
18976 + aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.BaseRange" ) );
18977 + }
18978 + return aServiceNames;
18979 +}
18980 +
18981 +
18982 +/*
18983 +* class SwVbaDocRange
18984 +*/
18985 +class SwVbaDocRange : public SwVbaBaseRange
18986 +{
18987 +public:
18988 + SwVbaDocRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext,
18989 + const uno::Reference< text::XTextDocument >& rDocument, const uno::Reference< text::XTextRange >& rStart,
18990 + const uno::Reference< text::XTextRange >& rEnd, const uno::Reference< text::XText >& rText, sal_Bool _bMaySpanEndOfDocument = sal_False )
18991 + throw ( uno::RuntimeException );
18992 + virtual ~SwVbaDocRange();
18993 +};
18994 +
18995 +SwVbaDocRange::SwVbaDocRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext,
18996 + const uno::Reference< text::XTextDocument >& rDocument, const uno::Reference< text::XTextRange >& rStart,
18997 + const uno::Reference< text::XTextRange >& rEnd, const uno::Reference< text::XText >& rText, sal_Bool _bMaySpanEndOfDocument ) throw ( uno::RuntimeException ) : SwVbaBaseRange( rParent, rContext )
18998 +{
18999 + mxTextDocument = rDocument;
19000 + mbMaySpanEndOfDocument = _bMaySpanEndOfDocument;
19001 +
19002 + if( rText.is() )
19003 + mxText = rText;
19004 + else
19005 + mxText = mxTextDocument->getText();
19006 +
19007 + mxTextCursor = SwVbaRangeHelper::initCursor( rStart, mxText );
19008 + mxTextCursor->collapseToStart();
19009 +
19010 + if( rEnd.is() )
19011 + mxTextCursor->gotoRange( rEnd, sal_True );
19012 + else
19013 + mxTextCursor->gotoEnd( sal_True );
19014 +}
19015 +
19016 +SwVbaDocRange::~SwVbaDocRange()
19017 +{
19018 +}
19019 +
19020 +/*
19021 +* class SwVbaRange
19022 +*/
19023 +SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext,
19024 + const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart, const uno::Reference< text::XTextRange >& rEnd, sal_Bool _bMaySpanEndOfDocument ) : SwVbaRange_BASE( rParent, rContext )
19025 +{
19026 + uno::Reference< text::XText > xText;
19027 + mxActualRange = uno::Reference< word::XRange > ( new SwVbaDocRange( rParent, rContext, rTextDocument, rStart, rEnd, xText, _bMaySpanEndOfDocument ) );
19028 +}
19029 +
19030 +SwVbaRange::~SwVbaRange()
19031 +{
19032 +}
19033 +
19034 +uno::Reference< text::XTextRange >
19035 +SwVbaRange::getXTextRange() throw (uno::RuntimeException)
19036 +{
19037 + uno::Reference< text::XTextRange > xTextRange;
19038 + SwVbaBaseRange* pBaseRange = dynamic_cast< SwVbaBaseRange* >( mxActualRange.get() );
19039 + if( pBaseRange )
19040 + xTextRange = pBaseRange->getXTextRange();
19041 + return xTextRange;
19042 +}
19043 +
19044 +rtl::OUString SAL_CALL
19045 +SwVbaRange::getText() throw ( uno::RuntimeException )
19046 +{
19047 + rtl::OUString aText;
19048 + if( mxActualRange.is() )
19049 + return mxActualRange->getText();
19050 + return aText;
19051 +}
19052 +
19053 +void SAL_CALL
19054 +SwVbaRange::setText( const rtl::OUString& rText ) throw ( uno::RuntimeException )
19055 +{
19056 + if( mxActualRange.is() )
19057 + mxActualRange->setText( rText );
19058 +}
19059 +
19060 +void SAL_CALL SwVbaRange::InsertBreak( const uno::Any& _breakType ) throw (uno::RuntimeException)
19061 +{
19062 + if( mxActualRange.is() )
19063 + mxActualRange->InsertBreak( _breakType );
19064 +}
19065 +
19066 +rtl::OUString&
19067 +SwVbaRange::getServiceImplName()
19068 +{
19069 + static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaRange") );
19070 + return sImplName;
19071 +}
19072 +
19073 +uno::Sequence< rtl::OUString >
19074 +SwVbaRange::getServiceNames()
19075 +{
19076 + static uno::Sequence< rtl::OUString > aServiceNames;
19077 + if ( aServiceNames.getLength() == 0 )
19078 + {
19079 + aServiceNames.realloc( 1 );
19080 + aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Range" ) );
19081 + }
19082 + return aServiceNames;
19083 +}
19084 +
19085 --- sw/source/ui/vba/vbarange.hxx.old 1970-01-01 00:00:00.000000000 +0000
19086 +++ sw/source/ui/vba/vbarange.hxx 2009-04-06 16:42:01.000000000 +0000
19087 @@ -0,0 +1,65 @@
19088 +/*************************************************************************
19089 + *
19090 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
19091 + *
19092 + * Copyright 2008 by Sun Microsystems, Inc.
19093 + *
19094 + * OpenOffice.org - a multi-platform office productivity suite
19095 + *
19096 + * $RCSfile:
19097 + * $Revision:
19098 + *
19099 + * This file is part of OpenOffice.org.
19100 + *
19101 + * OpenOffice.org is free software: you can redistribute it and/or modify
19102 + * it under the terms of the GNU Lesser General Public License version 3
19103 + * only, as published by the Free Software Foundation.
19104 + *
19105 + * OpenOffice.org is distributed in the hope that it will be useful,
19106 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
19107 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19108 + * GNU Lesser General Public License version 3 for more details
19109 + * (a copy is included in the LICENSE file that accompanied this code).
19110 + *
19111 + * You should have received a copy of the GNU Lesser General Public License
19112 + * version 3 along with OpenOffice.org. If not, see
19113 + * <http://www.openoffice.org/license.html>
19114 + * for a copy of the LGPLv3 License.
19115 + *
19116 + ************************************************************************/
19117 +#ifndef SW_VBA_RANGE_HXX
19118 +#define SW_VBA_RANGE_HXX
19119 +
19120 +#include <ooo/vba/word/XRange.hpp>
19121 +#include <vbahelper/vbahelperinterface.hxx>
19122 +#include <cppuhelper/implbase1.hxx>
19123 +#include <com/sun/star/text/XTextRange.hpp>
19124 +#include <com/sun/star/text/XTextDocument.hpp>
19125 +
19126 +typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XRange > SwVbaRange_BASE;
19127 +
19128 +class SwVbaRange : public SwVbaRange_BASE
19129 +{
19130 +private:
19131 + css::uno::Reference< ooo::vba::word::XRange > mxActualRange;
19132 +
19133 +public:
19134 + SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext,
19135 + const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd, sal_Bool _bMaySpanEndOfDocument = sal_False );
19136 + virtual ~SwVbaRange();
19137 +
19138 + css::uno::Reference< css::text::XTextRange > getXTextRange() throw (css::uno::RuntimeException);
19139 +
19140 + // Attribute
19141 + virtual rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException);
19142 + virtual void SAL_CALL setText( const rtl::OUString& rText ) throw (css::uno::RuntimeException);
19143 +
19144 + // Methods
19145 + virtual void SAL_CALL InsertBreak( const css::uno::Any& _breakType ) throw (css::uno::RuntimeException);
19146 +
19147 +
19148 + // XHelperInterface
19149 + virtual rtl::OUString& getServiceImplName();
19150 + virtual css::uno::Sequence<rtl::OUString> getServiceNames();
19151 +};
19152 +#endif /* SW_VBA_RANGE_HXX */
19153 --- sw/source/ui/vba/vbarangehelper.cxx.old 1970-01-01 00:00:00.000000000 +0000
19154 +++ sw/source/ui/vba/vbarangehelper.cxx 2009-04-06 16:42:01.000000000 +0000
19155 @@ -0,0 +1,143 @@
19156 +/*************************************************************************
19157 + *
19158 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
19159 + *
19160 + * Copyright 2008 by Sun Microsystems, Inc.
19161 + *
19162 + * OpenOffice.org - a multi-platform office productivity suite
19163 + *
19164 + * $RCSfile:
19165 + * $Revision:
19166 + *
19167 + * This file is part of OpenOffice.org.
19168 + *
19169 + * OpenOffice.org is free software: you can redistribute it and/or modify
19170 + * it under the terms of the GNU Lesser General Public License version 3
19171 + * only, as published by the Free Software Foundation.
19172 + *
19173 + * OpenOffice.org is distributed in the hope that it will be useful,
19174 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
19175 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19176 + * GNU Lesser General Public License version 3 for more details
19177 + * (a copy is included in the LICENSE file that accompanied this code).
19178 + *
19179 + * You should have received a copy of the GNU Lesser General Public License
19180 + * version 3 along with OpenOffice.org. If not, see
19181 + * <http://www.openoffice.org/license.html>
19182 + * for a copy of the LGPLv3 License.
19183 + *
19184 + ************************************************************************/
19185 +#include "vbarangehelper.hxx"
19186 +#include <com/sun/star/text/ControlCharacter.hpp>
19187 +
19188 +using namespace ::ooo::vba;
19189 +using namespace ::com::sun::star;
19190 +
19191 +/**
19192 + * get a range in a xText by creating
19193 + * a cursor that iterates over the text. If the iterating cursor is
19194 + * equal to the desired position, the range equivalent is returned.
19195 + * Some special cases are tables that are inside of the text, because the
19196 + * position has to be adjusted.
19197 + * @param xText a text where a range position is searched
19198 + * @param position a position inside o the text
19199 + * @return a range for the postion; null is returned if no range can be
19200 + * constructed.
19201 + */
19202 +uno::Reference< text::XTextRange > SwVbaRangeHelper::getRangeByPosition( const uno::Reference< text::XText >& rText, sal_Int32 _position ) throw ( uno::RuntimeException )
19203 +{
19204 + uno::Reference< text::XTextRange > xRange;
19205 + if( rText.is() )
19206 + {
19207 + sal_Int32 nPos = 0;
19208 + uno::Reference< text::XTextCursor > xCursor = rText->createTextCursor();
19209 + xCursor->collapseToStart();
19210 + sal_Bool bCanGo = sal_True;
19211 + while( !xRange.is() && bCanGo )
19212 + {
19213 + if( _position == nPos )
19214 + {
19215 + xRange = xCursor->getStart();
19216 + }
19217 + else
19218 + {
19219 + bCanGo = xCursor->goRight( 1, sal_False );
19220 + nPos++;
19221 + }
19222 + }
19223 + }
19224 + return xRange;
19225 +}
19226 +
19227 +
19228 +void SwVbaRangeHelper::insertString( uno::Reference< text::XTextRange >& rTextRange, uno::Reference< text::XText >& rText, const rtl::OUString& rStr, sal_Bool _bAbsorb ) throw ( uno::RuntimeException )
19229 +{
19230 + sal_Int32 nlastIndex = 0;
19231 + sal_Int32 nIndex = 0;
19232 + uno::Reference< text::XTextRange > xRange = rTextRange;
19233 +
19234 + while(( nIndex = rStr.indexOf('\n', nlastIndex)) >= 0 )
19235 + {
19236 + xRange = xRange->getEnd();
19237 + if( nlastIndex < ( nIndex - 1 ) )
19238 + {
19239 + rText->insertString( xRange, rStr.copy( nlastIndex, ( nIndex - 1 - nlastIndex ) ), _bAbsorb );
19240 + xRange = xRange->getEnd();
19241 + }
19242 +
19243 + rText->insertControlCharacter( xRange, text::ControlCharacter::PARAGRAPH_BREAK, _bAbsorb );
19244 + nlastIndex = nIndex + 1;
19245 + }
19246 +
19247 + if( nlastIndex < rStr.getLength() )
19248 + {
19249 + xRange = xRange->getEnd();
19250 +
19251 + rtl::OUString aWatt = rStr.copy( nlastIndex );
19252 + rText->insertString( xRange, aWatt, _bAbsorb );
19253 + }
19254 +}
19255 +
19256 +uno::Reference< text::XTextCursor > SwVbaRangeHelper::initCursor( const uno::Reference< text::XTextRange >& rTextRange, const uno::Reference< text::XText >& rText ) throw ( uno::RuntimeException )
19257 +{
19258 + uno::Reference< text::XTextCursor > xTextCursor;
19259 + sal_Bool bGotTextCursor = sal_False;
19260 +
19261 + try
19262 + {
19263 + xTextCursor = rText->createTextCursorByRange( rTextRange );
19264 + bGotTextCursor = sal_True;
19265 + }
19266 + catch (uno::Exception& e)
19267 + {
19268 + DebugHelper::exception(e);
19269 + }
19270 +
19271 + if( !bGotTextCursor )
19272 + {
19273 + try
19274 + {
19275 + uno::Reference< text::XText > xText = rTextRange->getText();
19276 + xTextCursor = xText->createTextCursor();
19277 + bGotTextCursor = sal_True;
19278 + }
19279 + catch( uno::Exception& e )
19280 + {
19281 + DebugHelper::exception(e);
19282 + }
19283 + }
19284 +
19285 + if( !bGotTextCursor )
19286 + {
19287 + try
19288 + {
19289 + xTextCursor = rText->createTextCursor();
19290 + bGotTextCursor = sal_True;
19291 + }
19292 + catch( uno::Exception& e )
19293 + {
19294 + DebugHelper::exception(e);
19295 + }
19296 + }
19297 + return xTextCursor;
19298 +}
19299 --- sw/source/ui/vba/vbarangehelper.hxx.old 1970-01-01 00:00:00.000000000 +0000
19300 +++ sw/source/ui/vba/vbarangehelper.hxx 2009-04-06 16:42:01.000000000 +0000
19301 @@ -0,0 +1,45 @@
19302 +/*************************************************************************
19303 + *
19304 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
19305 + *
19306 + * Copyright 2008 by Sun Microsystems, Inc.
19307 + *
19308 + * OpenOffice.org - a multi-platform office productivity suite
19309 + *
19310 + * $RCSfile:
19311 + * $Revision:
19312 + *
19313 + * This file is part of OpenOffice.org.
19314 + *
19315 + * OpenOffice.org is free software: you can redistribute it and/or modify
19316 + * it under the terms of the GNU Lesser General Public License version 3
19317 + * only, as published by the Free Software Foundation.
19318 + *
19319 + * OpenOffice.org is distributed in the hope that it will be useful,
19320 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
19321 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19322 + * GNU Lesser General Public License version 3 for more details
19323 + * (a copy is included in the LICENSE file that accompanied this code).
19324 + *
19325 + * You should have received a copy of the GNU Lesser General Public License
19326 + * version 3 along with OpenOffice.org. If not, see
19327 + * <http://www.openoffice.org/license.html>
19328 + * for a copy of the LGPLv3 License.
19329 + *
19330 + ************************************************************************/
19331 +#ifndef SW_VBA_RANGEHELPER_HXX
19332 +#define SW_VBA_RANGEHELPER_HXX
19333 +
19334 +#include <vbahelper/vbahelperinterface.hxx>
19335 +#include <com/sun/star/text/XTextViewCursor.hpp>
19336 +#include <com/sun/star/text/XText.hpp>
19337 +
19338 +class SwVbaRangeHelper
19339 +{
19340 +public:
19341 + static css::uno::Reference< css::text::XTextRange > getRangeByPosition( const css::uno::Reference< css::text::XText >& rText, sal_Int32 _position )throw ( css::uno::RuntimeException );
19342 + static void insertString( css::uno::Reference< css::text::XTextRange >& rTextRange, css::uno::Reference< css::text::XText >& rText, const rtl::OUString& rStr, sal_Bool _bAbsorb ) throw ( css::uno::RuntimeException );
19343 + static css::uno::Reference< css::text::XTextCursor > initCursor( const css::uno::Reference< css::text::XTextRange >& rTextRange, const css::uno::Reference< css::text::XText >& rText ) throw ( css::uno::RuntimeException );
19344 +
19345 +};
19346 +#endif /* SW_VBA_RANGEHELPER_HXX */
19347 --- sw/source/ui/vba/vbaselection.cxx.old 1970-01-01 00:00:00.000000000 +0000
19348 +++ sw/source/ui/vba/vbaselection.cxx 2009-04-06 16:42:01.000000000 +0000
19349 @@ -0,0 +1,75 @@
19350 +/*************************************************************************
19351 + *
19352 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
19353 + *
19354 + * Copyright 2008 by Sun Microsystems, Inc.
19355 + *
19356 + * OpenOffice.org - a multi-platform office productivity suite
19357 + *
19358 + * $RCSfile:
19359 + * $Revision:
19360 + *
19361 + * This file is part of OpenOffice.org.
19362 + *
19363 + * OpenOffice.org is free software: you can redistribute it and/or modify
19364 + * it under the terms of the GNU Lesser General Public License version 3
19365 + * only, as published by the Free Software Foundation.
19366 + *
19367 + * OpenOffice.org is distributed in the hope that it will be useful,
19368 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
19369 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19370 + * GNU Lesser General Public License version 3 for more details
19371 + * (a copy is included in the LICENSE file that accompanied this code).
19372 + *
19373 + * You should have received a copy of the GNU Lesser General Public License
19374 + * version 3 along with OpenOffice.org. If not, see
19375 + * <http://www.openoffice.org/license.html>
19376 + * for a copy of the LGPLv3 License.
19377 + *
19378 + ************************************************************************/
19379 +#include "vbaselection.hxx"
19380 +#include <vbahelper/vbahelper.hxx>
19381 +#include <tools/diagnose_ex.h>
19382 +
19383 +using namespace ::ooo::vba;
19384 +using namespace ::com::sun::star;
19385 +
19386 +SwVbaSelection::SwVbaSelection( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& rModel ) throw ( css::uno::RuntimeException ) : SwVbaSelection_BASE( rParent, rContext ), mxModel( rModel )
19387 +{
19388 +}
19389 +
19390 +SwVbaSelection::~SwVbaSelection()
19391 +{
19392 +}
19393 +
19394 +rtl::OUString SAL_CALL
19395 +SwVbaSelection::getText() throw ( uno::RuntimeException )
19396 +{
19397 + rtl::OUString aText;
19398 + return aText;
19399 +}
19400 +
19401 +void SAL_CALL
19402 +SwVbaSelection::setText( const rtl::OUString& rText ) throw ( uno::RuntimeException )
19403 +{
19404 +}
19405 +
19406 +rtl::OUString&
19407 +SwVbaSelection::getServiceImplName()
19408 +{
19409 + static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaSelection") );
19410 + return sImplName;
19411 +}
19412 +
19413 +uno::Sequence< rtl::OUString >
19414 +SwVbaSelection::getServiceNames()
19415 +{
19416 + static uno::Sequence< rtl::OUString > aServiceNames;
19417 + if ( aServiceNames.getLength() == 0 )
19418 + {
19419 + aServiceNames.realloc( 1 );
19420 + aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Selection" ) );
19421 + }
19422 + return aServiceNames;
19423 +}
19424 +
19425 --- sw/source/ui/vba/vbaselection.hxx.old 1970-01-01 00:00:00.000000000 +0000
19426 +++ sw/source/ui/vba/vbaselection.hxx 2009-04-06 16:42:01.000000000 +0000
19427 @@ -0,0 +1,56 @@
19428 +/*************************************************************************
19429 + *
19430 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
19431 + *
19432 + * Copyright 2008 by Sun Microsystems, Inc.
19433 + *
19434 + * OpenOffice.org - a multi-platform office productivity suite
19435 + *
19436 + * $RCSfile:
19437 + * $Revision:
19438 + *
19439 + * This file is part of OpenOffice.org.
19440 + *
19441 + * OpenOffice.org is free software: you can redistribute it and/or modify
19442 + * it under the terms of the GNU Lesser General Public License version 3
19443 + * only, as published by the Free Software Foundation.
19444 + *
19445 + * OpenOffice.org is distributed in the hope that it will be useful,
19446 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
19447 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19448 + * GNU Lesser General Public License version 3 for more details
19449 + * (a copy is included in the LICENSE file that accompanied this code).
19450 + *
19451 + * You should have received a copy of the GNU Lesser General Public License
19452 + * version 3 along with OpenOffice.org. If not, see
19453 + * <http://www.openoffice.org/license.html>
19454 + * for a copy of the LGPLv3 License.
19455 + *
19456 + ************************************************************************/
19457 +#ifndef SW_VBA_SELECTION_HXX
19458 +#define SW_VBA_SELECTION_HXX
19459 +
19460 +#include <ooo/vba/word/XSelection.hpp>
19461 +#include <vbahelper/vbahelperinterface.hxx>
19462 +
19463 +typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XSelection > SwVbaSelection_BASE;
19464 +
19465 +class SwVbaSelection : public SwVbaSelection_BASE
19466 +{
19467 +private:
19468 + css::uno::Reference< css::frame::XModel > mxModel;
19469 +
19470 +public:
19471 + SwVbaSelection( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& rModel ) throw ( css::uno::RuntimeException );
19472 + virtual ~SwVbaSelection();
19473 +
19474 + // Attribute
19475 + virtual rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException);
19476 + virtual void SAL_CALL setText( const rtl::OUString& rText ) throw (css::uno::RuntimeException);
19477 +
19478 +
19479 + // XHelperInterface
19480 + virtual rtl::OUString& getServiceImplName();
19481 + virtual css::uno::Sequence<rtl::OUString> getServiceNames();
19482 +};
19483 +#endif /* SW_VBA_SELECTION_HXX */
19484 --- sw/source/ui/vba/vbasystem.cxx.old 1970-01-01 00:00:00.000000000 +0000
19485 +++ sw/source/ui/vba/vbasystem.cxx 2009-04-06 16:42:01.000000000 +0000
19486 @@ -0,0 +1,195 @@
19487 +/*************************************************************************
19488 + *
19489 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
19490 + *
19491 + * Copyright 2008 by Sun Microsystems, Inc.
19492 + *
19493 + * OpenOffice.org - a multi-platform office productivity suite
19494 + *
19495 + * $RCSfile:
19496 + * $Revision:
19497 + *
19498 + * This file is part of OpenOffice.org.
19499 + *
19500 + * OpenOffice.org is free software: you can redistribute it and/or modify
19501 + * it under the terms of the GNU Lesser General Public License version 3
19502 + * only, as published by the Free Software Foundation.
19503 + *
19504 + * OpenOffice.org is distributed in the hope that it will be useful,
19505 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
19506 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19507 + * GNU Lesser General Public License version 3 for more details
19508 + * (a copy is included in the LICENSE file that accompanied this code).
19509 + *
19510 + * You should have received a copy of the GNU Lesser General Public License
19511 + * version 3 along with OpenOffice.org. If not, see
19512 + * <http://www.openoffice.org/license.html>
19513 + * for a copy of the LGPLv3 License.
19514 + *
19515 + ************************************************************************/
19516 +#include "vbasystem.hxx"
19517 +#include <vbahelper/vbahelper.hxx>
19518 +#include <ooo/vba/word/WdCursorType.hpp>
19519 +#include <tools/diagnose_ex.h>
19520 +#include <tools/config.hxx>
19521 +#include <tools/string.hxx>
19522 +#include <osl/file.hxx>
19523 +#include <tools/urlobj.hxx>
19524 +#include <tools/string.hxx>
19525 +
19526 +using namespace ::ooo::vba;
19527 +using namespace ::com::sun::star;
19528 +
19529 +PrivateProfileStringListener::PrivateProfileStringListener( const rtl::OUString& rFileName, const ByteString& rGroupName, const ByteString& rKey )
19530 + :maFileName( rFileName ), maGroupName( rGroupName ), maKey( rKey )
19531 +{
19532 +}
19533 +
19534 +PrivateProfileStringListener::~PrivateProfileStringListener()
19535 +{
19536 +}
19537 +
19538 +void PrivateProfileStringListener::Initialize( const rtl::OUString& rFileName, const ByteString& rGroupName, const ByteString& rKey )
19539 +{
19540 + maFileName = rFileName;
19541 + maGroupName = rGroupName;
19542 + maKey = rKey;
19543 +}
19544 +
19545 +uno::Any PrivateProfileStringListener::getValueEvent()
19546 +{
19547 + // get the private profile string
19548 + Config aCfg( maFileName );
19549 + aCfg.SetGroup( maGroupName );
19550 + rtl::OUString sValue = rtl::OUString( String( aCfg.ReadKey( maKey ), RTL_TEXTENCODING_UTF8 ) );
19551 +
19552 + return uno::makeAny( sValue );
19553 +}
19554 +
19555 +void PrivateProfileStringListener::setValueEvent( const css::uno::Any& value )
19556 +{
19557 + // set the private profile string
19558 + Config aCfg( maFileName );
19559 + aCfg.SetGroup( maGroupName );
19560 +
19561 + rtl::OUString aValue;
19562 + value >>= aValue;
19563 + aCfg.WriteKey( maKey, ByteString( aValue.getStr(), RTL_TEXTENCODING_UTF8 ) );
19564 +}
19565 +
19566 +SwVbaSystem::SwVbaSystem( uno::Reference<uno::XComponentContext >& xContext ): SwVbaSystem_BASE( uno::Reference< XHelperInterface >(), xContext )
19567 +{
19568 +}
19569 +
19570 +SwVbaSystem::~SwVbaSystem()
19571 +{
19572 +}
19573 +
19574 +sal_Int32 SAL_CALL
19575 +SwVbaSystem::getCursor() throw (uno::RuntimeException)
19576 +{
19577 + sal_Int32 nPointerStyle = getPointerStyle();
19578 +
19579 + switch( nPointerStyle )
19580 + {
19581 + case POINTER_ARROW:
19582 + return word::WdCursorType::wdCursorNorthwestArrow;
19583 + case POINTER_NULL:
19584 + return word::WdCursorType::wdCursorNormal;
19585 + case POINTER_WAIT:
19586 + return word::WdCursorType::wdCursorWait;
19587 + case POINTER_TEXT:
19588 + return word::WdCursorType::wdCursorIBeam;
19589 + default:
19590 + return word::WdCursorType::wdCursorNormal;
19591 + }
19592 +}
19593 +
19594 +void SAL_CALL
19595 +SwVbaSystem::setCursor( sal_Int32 _cursor ) throw (uno::RuntimeException)
19596 +{
19597 + try
19598 + {
19599 + switch( _cursor )
19600 + {
19601 + case word::WdCursorType::wdCursorNorthwestArrow:
19602 + {
19603 + const Pointer& rPointer( POINTER_ARROW );
19604 + setCursorHelper( rPointer, sal_False );
19605 + break;
19606 + }
19607 + case word::WdCursorType::wdCursorWait:
19608 + {
19609 + const Pointer& rPointer( static_cast< PointerStyle >( POINTER_WAIT ) );
19610 + //It will set the edit window, toobar and statusbar's mouse pointer.
19611 + setCursorHelper( rPointer, sal_True );
19612 + break;
19613 + }
19614 + case word::WdCursorType::wdCursorIBeam:
19615 + {
19616 + const Pointer& rPointer( static_cast< PointerStyle >( POINTER_TEXT ) );
19617 + //It will set the edit window, toobar and statusbar's mouse pointer.
19618 + setCursorHelper( rPointer, sal_True );
19619 + break;
19620 + }
19621 + case word::WdCursorType::wdCursorNormal:
19622 + {
19623 + const Pointer& rPointer( POINTER_NULL );
19624 + setCursorHelper( rPointer, sal_False );
19625 + break;
19626 + }
19627 + default:
19628 + throw uno::RuntimeException( rtl::OUString(
19629 + RTL_CONSTASCII_USTRINGPARAM("Unknown value for Cursor pointer")), uno::Reference< uno::XInterface >() );
19630 + // TODO: isn't this a flaw in the API? It should be allowed to throw an
19631 + // IllegalArgumentException, or so
19632 + }
19633 + }
19634 + catch( const uno::Exception& )
19635 + {
19636 + DBG_UNHANDLED_EXCEPTION();
19637 + }
19638 +}
19639 +
19640 +uno::Any SAL_CALL
19641 +SwVbaSystem::PrivateProfileString( const rtl::OUString& rFilename, const rtl::OUString& rSection, const rtl::OUString& rKey ) throw ( uno::RuntimeException )
19642 +{
19643 + if( rFilename.getLength() == 0 )
19644 + throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Failed to access document from shell" ) ), uno::Reference< uno::XInterface >() );
19645 +
19646 + // FIXME: need to detect whether it is a relative file path
19647 + // we need to detect if this is a URL, if not then assume its a file path
19648 + rtl::OUString sFileUrl;
19649 + INetURLObject aObj;
19650 + aObj.SetURL( rFilename );
19651 + bool bIsURL = aObj.GetProtocol() != INET_PROT_NOT_VALID;
19652 + if ( bIsURL )
19653 + sFileUrl = rFilename;
19654 + else
19655 + osl::FileBase::getFileURLFromSystemPath( rFilename, sFileUrl);
19656 +
19657 + ByteString aGroupName = ByteString( rSection.getStr(), RTL_TEXTENCODING_UTF8);
19658 + ByteString aKey = ByteString( rKey.getStr(), RTL_TEXTENCODING_UTF8);
19659 + maPrivateProfileStringListener.Initialize( sFileUrl, aGroupName, aKey );
19660 +
19661 + return uno::makeAny( uno::Reference< XPropValue > ( new ScVbaPropValue( &maPrivateProfileStringListener ) ) );
19662 +}
19663 +
19664 +rtl::OUString&
19665 +SwVbaSystem::getServiceImplName()
19666 +{
19667 + static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaSystem") );
19668 + return sImplName;
19669 +}
19670 +
19671 +uno::Sequence< rtl::OUString >
19672 +SwVbaSystem::getServiceNames()
19673 +{
19674 + static uno::Sequence< rtl::OUString > aServiceNames;
19675 + if ( aServiceNames.getLength() == 0 )
19676 + {
19677 + aServiceNames.realloc( 1 );
19678 + aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.System" ) );
19679 + }
19680 + return aServiceNames;
19681 +}
19682 --- sw/source/ui/vba/vbasystem.hxx.old 1970-01-01 00:00:00.000000000 +0000
19683 +++ sw/source/ui/vba/vbasystem.hxx 2009-04-06 16:42:01.000000000 +0000
19684 @@ -0,0 +1,75 @@
19685 +/*************************************************************************
19686 + *
19687 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
19688 + *
19689 + * Copyright 2008 by Sun Microsystems, Inc.
19690 + *
19691 + * OpenOffice.org - a multi-platform office productivity suite
19692 + *
19693 + * $RCSfile: vbasystem.hxx,v $
19694 + * $Revision: 1.4 $
19695 + *
19696 + * This file is part of OpenOffice.org.
19697 + *
19698 + * OpenOffice.org is free software: you can redistribute it and/or modify
19699 + * it under the terms of the GNU Lesser General Public License version 3
19700 + * only, as published by the Free Software Foundation.
19701 + *
19702 + * OpenOffice.org is distributed in the hope that it will be useful,
19703 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
19704 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19705 + * GNU Lesser General Public License version 3 for more details
19706 + * (a copy is included in the LICENSE file that accompanied this code).
19707 + *
19708 + * You should have received a copy of the GNU Lesser General Public License
19709 + * version 3 along with OpenOffice.org. If not, see
19710 + * <http://www.openoffice.org/license.html>
19711 + * for a copy of the LGPLv3 License.
19712 + *
19713 + ************************************************************************/
19714 +#ifndef SW_VBA_SYSTEM_HXX
19715 +#define SW_VBA_SYSTEM_HXX
19716 +
19717 +#include <ooo/vba/word/XSystem.hpp>
19718 +#include <vbahelper/vbahelperinterface.hxx>
19719 +#include <cppuhelper/implbase1.hxx>
19720 +#include <vbahelper/vbapropvalue.hxx>
19721 +
19722 +typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XSystem > SwVbaSystem_BASE;
19723 +
19724 +class PrivateProfileStringListener : public PropListener
19725 +{
19726 +private:
19727 + rtl::OUString maFileName;
19728 + ByteString maGroupName;
19729 + ByteString maKey;
19730 +public:
19731 + PrivateProfileStringListener(){};
19732 + PrivateProfileStringListener( const rtl::OUString& rFileName, const ByteString& rGroupName, const ByteString& rKey );
19733 + virtual ~PrivateProfileStringListener();
19734 + void Initialize( const rtl::OUString& rFileName, const ByteString& rGroupName, const ByteString& rKey );
19735 +
19736 + //PropListener
19737 + virtual void setValueEvent( const css::uno::Any& value );
19738 + virtual css::uno::Any getValueEvent();
19739 +};
19740 +
19741 +class SwVbaSystem : public SwVbaSystem_BASE
19742 +{
19743 +private:
19744 + PrivateProfileStringListener maPrivateProfileStringListener;
19745 +
19746 +public:
19747 + SwVbaSystem( css::uno::Reference< css::uno::XComponentContext >& m_xContext );
19748 + virtual ~SwVbaSystem();
19749 +
19750 + // XSystem
19751 + virtual sal_Int32 SAL_CALL getCursor() throw ( css::uno::RuntimeException );
19752 + virtual void SAL_CALL setCursor( sal_Int32 _cursor ) throw ( css::uno::RuntimeException );
19753 + virtual css::uno::Any SAL_CALL PrivateProfileString( const rtl::OUString& rFilename, const rtl::OUString& rSection, const rtl::OUString& rKey ) throw ( css::uno::RuntimeException );
19754 +
19755 + // XHelperInterface
19756 + virtual rtl::OUString& getServiceImplName();
19757 + virtual css::uno::Sequence<rtl::OUString> getServiceNames();
19758 +};
19759 +#endif /* SW_VBA_SYSTEM_HXX */
19760 --- sw/source/ui/vba/vbavariable.cxx.old 1970-01-01 00:00:00.000000000 +0000
19761 +++ sw/source/ui/vba/vbavariable.cxx 2009-04-06 16:42:01.000000000 +0000
19762 @@ -0,0 +1,108 @@
19763 +/*************************************************************************
19764 + *
19765 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
19766 + *
19767 + * Copyright 2008 by Sun Microsystems, Inc.
19768 + *
19769 + * OpenOffice.org - a multi-platform office productivity suite
19770 + *
19771 + * $RCSfile:
19772 + * $Revision:
19773 + *
19774 + * This file is part of OpenOffice.org.
19775 + *
19776 + * OpenOffice.org is free software: you can redistribute it and/or modify
19777 + * it under the terms of the GNU Lesser General Public License version 3
19778 + * only, as published by the Free Software Foundation.
19779 + *
19780 + * OpenOffice.org is distributed in the hope that it will be useful,
19781 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
19782 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19783 + * GNU Lesser General Public License version 3 for more details
19784 + * (a copy is included in the LICENSE file that accompanied this code).
19785 + *
19786 + * You should have received a copy of the GNU Lesser General Public License
19787 + * version 3 along with OpenOffice.org. If not, see
19788 + * <http://www.openoffice.org/license.html>
19789 + * for a copy of the LGPLv3 License.
19790 + *
19791 + ************************************************************************/
19792 +#include "vbavariable.hxx"
19793 +#include <vbahelper/vbahelper.hxx>
19794 +#include <tools/diagnose_ex.h>
19795 +#include <com/sun/star/beans/XPropertySet.hpp>
19796 +#include <com/sun/star/beans/PropertyValue.hpp>
19797 +
19798 +using namespace ::ooo::vba;
19799 +using namespace ::com::sun::star;
19800 +
19801 +SwVbaVariable::SwVbaVariable( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext,
19802 + const uno::Reference< beans::XPropertyAccess >& rUserDefined, const rtl::OUString& rName ) throw ( uno::RuntimeException ) :
19803 + SwVbaVariable_BASE( rParent, rContext ), mxUserDefined( rUserDefined ), maName( rName )
19804 +{
19805 +}
19806 +
19807 +SwVbaVariable::~SwVbaVariable()
19808 +{
19809 +}
19810 +
19811 +rtl::OUString SAL_CALL
19812 +SwVbaVariable::getName() throw ( css::uno::RuntimeException )
19813 +{
19814 + return maName;
19815 +}
19816 +
19817 +void SAL_CALL
19818 +SwVbaVariable::setName( const rtl::OUString& ) throw ( css::uno::RuntimeException )
19819 +{
19820 + throw uno::RuntimeException( rtl::OUString(
19821 + RTL_CONSTASCII_USTRINGPARAM(" Fail to set name")), uno::Reference< uno::XInterface >() );
19822 +}
19823 +
19824 +uno::Any SAL_CALL
19825 +SwVbaVariable::getValue() throw ( css::uno::RuntimeException )
19826 +{
19827 + uno::Reference< beans::XPropertySet > xProp( mxUserDefined, uno::UNO_QUERY_THROW );
19828 + return xProp->getPropertyValue( maName );
19829 +}
19830 +
19831 +void SAL_CALL
19832 +SwVbaVariable::setValue( const uno::Any& rValue ) throw ( css::uno::RuntimeException )
19833 +{
19834 + // FIXME: fail to set the value if the new type of vaue is differenct from the original one.
19835 + uno::Reference< beans::XPropertySet > xProp( mxUserDefined, uno::UNO_QUERY_THROW );
19836 + xProp->setPropertyValue( maName, rValue );
19837 +}
19838 +
19839 +sal_Int32 SAL_CALL
19840 +SwVbaVariable::getIndex() throw ( css::uno::RuntimeException )
19841 +{
19842 + const uno::Sequence< beans::PropertyValue > props = mxUserDefined->getPropertyValues();
19843 + for (sal_Int32 i = 0; i < props.getLength(); ++i)
19844 + {
19845 + if( maName.equals( props[i].Name ) )
19846 + return i+1;
19847 + }
19848 +
19849 + return 0;
19850 +}
19851 +
19852 +rtl::OUString&
19853 +SwVbaVariable::getServiceImplName()
19854 +{
19855 + static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaVariable") );
19856 + return sImplName;
19857 +}
19858 +
19859 +uno::Sequence< rtl::OUString >
19860 +SwVbaVariable::getServiceNames()
19861 +{
19862 + static uno::Sequence< rtl::OUString > aServiceNames;
19863 + if ( aServiceNames.getLength() == 0 )
19864 + {
19865 + aServiceNames.realloc( 1 );
19866 + aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Variable" ) );
19867 + }
19868 + return aServiceNames;
19869 +}
19870 +
19871 --- sw/source/ui/vba/vbavariable.hxx.old 1970-01-01 00:00:00.000000000 +0000
19872 +++ sw/source/ui/vba/vbavariable.hxx 2009-04-06 16:42:01.000000000 +0000
19873 @@ -0,0 +1,62 @@
19874 +/*************************************************************************
19875 + *
19876 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
19877 + *
19878 + * Copyright 2008 by Sun Microsystems, Inc.
19879 + *
19880 + * OpenOffice.org - a multi-platform office productivity suite
19881 + *
19882 + * $RCSfile:
19883 + * $Revision:
19884 + *
19885 + * This file is part of OpenOffice.org.
19886 + *
19887 + * OpenOffice.org is free software: you can redistribute it and/or modify
19888 + * it under the terms of the GNU Lesser General Public License version 3
19889 + * only, as published by the Free Software Foundation.
19890 + *
19891 + * OpenOffice.org is distributed in the hope that it will be useful,
19892 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
19893 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19894 + * GNU Lesser General Public License version 3 for more details
19895 + * (a copy is included in the LICENSE file that accompanied this code).
19896 + *
19897 + * You should have received a copy of the GNU Lesser General Public License
19898 + * version 3 along with OpenOffice.org. If not, see
19899 + * <http://www.openoffice.org/license.html>
19900 + * for a copy of the LGPLv3 License.
19901 + *
19902 + ************************************************************************/
19903 +#ifndef SW_VBA_VARIABLE_HXX
19904 +#define SW_VBA_VARIABLE_HXX
19905 +
19906 +#include <ooo/vba/word/XVariable.hpp>
19907 +#include <vbahelper/vbahelperinterface.hxx>
19908 +#include <cppuhelper/implbase1.hxx>
19909 +#include <com/sun/star/beans/XPropertyAccess.hpp>
19910 +
19911 +typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XVariable > SwVbaVariable_BASE;
19912 +
19913 +class SwVbaVariable : public SwVbaVariable_BASE
19914 +{
19915 +private:
19916 + css::uno::Reference< css::beans::XPropertyAccess > mxUserDefined;
19917 + rtl::OUString maName;
19918 +
19919 +public:
19920 + SwVbaVariable( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext,
19921 + const css::uno::Reference< css::beans::XPropertyAccess >& rUserDefined, const rtl::OUString& rName ) throw ( css::uno::RuntimeException );
19922 + virtual ~SwVbaVariable();
19923 +
19924 + // XVariable
19925 + virtual rtl::OUString SAL_CALL getName() throw ( css::uno::RuntimeException );
19926 + virtual void SAL_CALL setName( const rtl::OUString& ) throw ( css::uno::RuntimeException );
19927 + virtual css::uno::Any SAL_CALL getValue() throw ( css::uno::RuntimeException );
19928 + virtual void SAL_CALL setValue( const css::uno::Any& rValue ) throw ( css::uno::RuntimeException );
19929 + virtual sal_Int32 SAL_CALL getIndex() throw ( css::uno::RuntimeException );
19930 +
19931 + // XHelperInterface
19932 + virtual rtl::OUString& getServiceImplName();
19933 + virtual css::uno::Sequence<rtl::OUString> getServiceNames();
19934 +};
19935 +#endif /* SW_VBA_VARIABLE_HXX */
19936 --- sw/source/ui/vba/vbavariables.cxx.old 1970-01-01 00:00:00.000000000 +0000
19937 +++ sw/source/ui/vba/vbavariables.cxx 2009-04-06 16:42:01.000000000 +0000
19938 @@ -0,0 +1,105 @@
19939 +/*************************************************************************
19940 + *
19941 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
19942 + *
19943 + * Copyright 2008 by Sun Microsystems, Inc.
19944 + *
19945 + * OpenOffice.org - a multi-platform office productivity suite
19946 + *
19947 + * $RCSfile:
19948 + * $Revision:
19949 + *
19950 + * This file is part of OpenOffice.org.
19951 + *
19952 + * OpenOffice.org is free software: you can redistribute it and/or modify
19953 + * it under the terms of the GNU Lesser General Public License version 3
19954 + * only, as published by the Free Software Foundation.
19955 + *
19956 + * OpenOffice.org is distributed in the hope that it will be useful,
19957 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
19958 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19959 + * GNU Lesser General Public License version 3 for more details
19960 + * (a copy is included in the LICENSE file that accompanied this code).
19961 + *
19962 + * You should have received a copy of the GNU Lesser General Public License
19963 + * version 3 along with OpenOffice.org. If not, see
19964 + * <http://www.openoffice.org/license.html>
19965 + * for a copy of the LGPLv3 License.
19966 + *
19967 + ************************************************************************/
19968 +#include "vbavariables.hxx"
19969 +#include "vbavariable.hxx"
19970 +#include <com/sun/star/beans/XPropertyContainer.hpp>
19971 +#include <com/sun/star/beans/PropertyAttribute.hpp>
19972 +
19973 +using namespace ::ooo::vba;
19974 +using namespace ::com::sun::star;
19975 +
19976 +uno::Reference< container::XIndexAccess > createVariablesAccess( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< beans::XPropertyAccess >& xUserDefined ) throw ( uno::RuntimeException )
19977 +{
19978 + // FIXME: the performance is poor?
19979 + XNamedObjectCollectionHelper< word::XVariable >::XNamedVec mVariables;
19980 + const uno::Sequence< beans::PropertyValue > props = xUserDefined->getPropertyValues();
19981 + sal_Int32 nCount = props.getLength();
19982 + mVariables.reserve( nCount );
19983 + for( sal_Int32 i=0; i < nCount; i++ )
19984 + mVariables.push_back( uno::Reference< word::XVariable > ( new SwVbaVariable( xParent, xContext, xUserDefined, props[i].Name ) ) );
19985 +
19986 + uno::Reference< container::XIndexAccess > xVariables( new XNamedObjectCollectionHelper< word::XVariable >( mVariables ) );
19987 + return xVariables;
19988 +}
19989 +
19990 +SwVbaVariables::SwVbaVariables( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertyAccess >& rUserDefined ): SwVbaVariables_BASE( xParent, xContext, createVariablesAccess( xParent, xContext, rUserDefined ) ), mxUserDefined( rUserDefined )
19991 +{
19992 +}
19993 +// XEnumerationAccess
19994 +uno::Type
19995 +SwVbaVariables::getElementType() throw (uno::RuntimeException)
19996 +{
19997 + return word::XVariable::static_type(0);
19998 +}
19999 +uno::Reference< container::XEnumeration >
20000 +SwVbaVariables::createEnumeration() throw (uno::RuntimeException)
20001 +{
20002 + uno::Reference< container::XEnumerationAccess > xEnumerationAccess( m_xIndexAccess, uno::UNO_QUERY_THROW );
20003 + return xEnumerationAccess->createEnumeration();
20004 +}
20005 +
20006 +uno::Any
20007 +SwVbaVariables::createCollectionObject( const css::uno::Any& aSource )
20008 +{
20009 + return aSource;
20010 +}
20011 +
20012 +uno::Any SAL_CALL
20013 +SwVbaVariables::Add( const rtl::OUString& rName, const uno::Any& rValue ) throw (uno::RuntimeException)
20014 +{
20015 + uno::Any aValue;
20016 + if( rValue.hasValue() )
20017 + aValue = rValue;
20018 + else
20019 + aValue <<= rtl::OUString();
20020 + uno::Reference< beans::XPropertyContainer > xPropertyContainer( mxUserDefined, uno::UNO_QUERY_THROW );
20021 + xPropertyContainer->addProperty( rName, beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::REMOVEABLE, aValue );
20022 +
20023 + return uno::makeAny( uno::Reference< word::XVariable >( new SwVbaVariable( getParent(), mxContext, mxUserDefined, rName ) ) );
20024 +}
20025 +
20026 +rtl::OUString&
20027 +SwVbaVariables::getServiceImplName()
20028 +{
20029 + static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaVariables") );
20030 + return sImplName;
20031 +}
20032 +
20033 +css::uno::Sequence<rtl::OUString>
20034 +SwVbaVariables::getServiceNames()
20035 +{
20036 + static uno::Sequence< rtl::OUString > sNames;
20037 + if ( sNames.getLength() == 0 )
20038 + {
20039 + sNames.realloc( 1 );
20040 + sNames[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Variables") );
20041 + }
20042 + return sNames;
20043 +}
20044 --- sw/source/ui/vba/vbavariables.hxx.old 1970-01-01 00:00:00.000000000 +0000
20045 +++ sw/source/ui/vba/vbavariables.hxx 2009-04-06 16:42:01.000000000 +0000
20046 @@ -0,0 +1,64 @@
20047 +/*************************************************************************
20048 + *
20049 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
20050 + *
20051 + * Copyright 2008 by Sun Microsystems, Inc.
20052 + *
20053 + * OpenOffice.org - a multi-platform office productivity suite
20054 + *
20055 + * $RCSfile:
20056 + * $Revision:
20057 + *
20058 + * This file is part of OpenOffice.org.
20059 + *
20060 + * OpenOffice.org is free software: you can redistribute it and/or modify
20061 + * it under the terms of the GNU Lesser General Public License version 3
20062 + * only, as published by the Free Software Foundation.
20063 + *
20064 + * OpenOffice.org is distributed in the hope that it will be useful,
20065 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
20066 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20067 + * GNU Lesser General Public License version 3 for more details
20068 + * (a copy is included in the LICENSE file that accompanied this code).
20069 + *
20070 + * You should have received a copy of the GNU Lesser General Public License
20071 + * version 3 along with OpenOffice.org. If not, see
20072 + * <http://www.openoffice.org/license.html>
20073 + * for a copy of the LGPLv3 License.
20074 + *
20075 + ************************************************************************/
20076 +#ifndef SW_VBA_VARIABLES_HXX
20077 +#define SW_VBA_VARIABLES_HXX
20078 +
20079 +#include <vbahelper/vbacollectionimpl.hxx>
20080 +#include <ooo/vba/word/XVariables.hpp>
20081 +#include <com/sun/star/container/XEnumerationAccess.hpp>
20082 +#include <com/sun/star/container/XIndexAccess.hpp>
20083 +#include <vbahelper/vbahelperinterface.hxx>
20084 +#include <com/sun/star/beans/XPropertyAccess.hpp>
20085 +
20086 +typedef CollTestImplHelper< ooo::vba::word::XVariables > SwVbaVariables_BASE;
20087 +
20088 +class SwVbaVariables : public SwVbaVariables_BASE
20089 +{
20090 +private:
20091 + css::uno::Reference< css::beans::XPropertyAccess > mxUserDefined;
20092 +
20093 +public:
20094 + SwVbaVariables( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::beans::XPropertyAccess >& rUserDefined );
20095 + virtual ~SwVbaVariables() {}
20096 +
20097 + // XEnumerationAccess
20098 + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
20099 + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
20100 +
20101 + // SwVbaVariables_BASE
20102 + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
20103 + virtual rtl::OUString& getServiceImplName();
20104 + virtual css::uno::Sequence<rtl::OUString> getServiceNames();
20105 +
20106 + // XVariables
20107 + virtual css::uno::Any SAL_CALL Add( const rtl::OUString& rName, const css::uno::Any& rValue ) throw (css::uno::RuntimeException);
20108 +};
20109 +
20110 +#endif /* SW_VBA_VARIABLES_HXX */
20111 --- sw/source/ui/vba/vbaview.cxx.old 1970-01-01 00:00:00.000000000 +0000
20112 +++ sw/source/ui/vba/vbaview.cxx 2009-04-06 16:42:01.000000000 +0000
20113 @@ -0,0 +1,384 @@
20114 +/*************************************************************************
20115 + *
20116 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
20117 + *
20118 + * Copyright 2008 by Sun Microsystems, Inc.
20119 + *
20120 + * OpenOffice.org - a multi-platform office productivity suite
20121 + *
20122 + * $RCSfile:
20123 + * $Revision:
20124 + *
20125 + * This file is part of OpenOffice.org.
20126 + *
20127 + * OpenOffice.org is free software: you can redistribute it and/or modify
20128 + * it under the terms of the GNU Lesser General Public License version 3
20129 + * only, as published by the Free Software Foundation.
20130 + *
20131 + * OpenOffice.org is distributed in the hope that it will be useful,
20132 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
20133 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20134 + * GNU Lesser General Public License version 3 for more details
20135 + * (a copy is included in the LICENSE file that accompanied this code).
20136 + *
20137 + * You should have received a copy of the GNU Lesser General Public License
20138 + * version 3 along with OpenOffice.org. If not, see
20139 + * <http://www.openoffice.org/license.html>
20140 + * for a copy of the LGPLv3 License.
20141 + *
20142 + ************************************************************************/
20143 +#include "vbaview.hxx"
20144 +#include <vbahelper/vbahelper.hxx>
20145 +#include <tools/diagnose_ex.h>
20146 +#include <com/sun/star/beans/XPropertySet.hpp>
20147 +#include <com/sun/star/view/XViewSettingsSupplier.hpp>
20148 +#include <com/sun/star/text/XTextViewCursorSupplier.hpp>
20149 +#include <com/sun/star/text/XText.hpp>
20150 +#include <com/sun/star/text/XTextDocument.hpp>
20151 +#include <com/sun/star/text/XFootnotesSupplier.hpp>
20152 +#include <com/sun/star/text/XEndnotesSupplier.hpp>
20153 +#include <com/sun/star/container/XIndexAccess.hpp>
20154 +#include <com/sun/star/frame/XController.hpp>
20155 +#include <com/sun/star/lang/XServiceInfo.hpp>
20156 +#include <ooo/vba/word/WdSpecialPane.hpp>
20157 +#include <ooo/vba/word/WdViewType.hpp>
20158 +#include <ooo/vba/word/WdSeekView.hpp>
20159 +
20160 +#include "wordvbahelper.hxx"
20161 +#include <view.hxx>
20162 +
20163 +using namespace ::ooo::vba;
20164 +using namespace ::com::sun::star;
20165 +
20166 +const sal_Int32 DEFAULT_BODY_DISTANCE = 500;
20167 +
20168 +SwVbaView::SwVbaView( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext,
20169 + const uno::Reference< frame::XModel >& rModel ) throw ( uno::RuntimeException ) :
20170 + SwVbaView_BASE( rParent, rContext ), mxModel( rModel )
20171 +{
20172 + uno::Reference< frame::XController > xController = mxModel->getCurrentController();
20173 +
20174 + uno::Reference< text::XTextViewCursorSupplier > xTextViewCursorSupp( xController, uno::UNO_QUERY_THROW );
20175 + mxViewCursor = xTextViewCursorSupp->getViewCursor();
20176 +
20177 + uno::Reference< view::XViewSettingsSupplier > xViewSettingSupp( xController, uno::UNO_QUERY_THROW );
20178 + mxViewSettings.set( xViewSettingSupp->getViewSettings(), uno::UNO_QUERY_THROW );
20179 +}
20180 +
20181 +SwVbaView::~SwVbaView()
20182 +{
20183 +}
20184 +
20185 +::sal_Int32 SAL_CALL
20186 +SwVbaView::getSeekView() throw (css::uno::RuntimeException)
20187 +{
20188 + uno::Reference< text::XText > xCurrentText = mxViewCursor->getText();
20189 + uno::Reference< lang::XServiceInfo > xServiceInfo( xCurrentText, uno::UNO_QUERY_THROW );
20190 + rtl::OUString aImplName = xServiceInfo->getImplementationName();
20191 + if( aImplName.equalsAscii("SwXBodyText") )
20192 + {
20193 + return word::WdSeekView::wdSeekMainDocument;
20194 + }
20195 + else if( aImplName.equalsAscii("SwXHeadFootText") )
20196 + {
20197 + if( word::HeaderFooterHelper::isHeader( mxModel, xCurrentText ) )
20198 + {
20199 + if( word::HeaderFooterHelper::isFirstPageHeader( mxModel, xCurrentText ) )
20200 + return word::WdSeekView::wdSeekFirstPageHeader;
20201 + else if( word::HeaderFooterHelper::isEvenPagesHeader( mxModel, xCurrentText ) )
20202 + return word::WdSeekView::wdSeekEvenPagesHeader;
20203 + else
20204 + return word::WdSeekView::wdSeekPrimaryHeader;
20205 + }
20206 + else
20207 + {
20208 + if( word::HeaderFooterHelper::isFirstPageFooter( mxModel, xCurrentText ) )
20209 + return word::WdSeekView::wdSeekFirstPageFooter;
20210 + else if( word::HeaderFooterHelper::isEvenPagesFooter( mxModel, xCurrentText ) )
20211 + return word::WdSeekView::wdSeekEvenPagesFooter;
20212 + else
20213 + return word::WdSeekView::wdSeekPrimaryFooter;
20214 + }
20215 + }
20216 + else if( aImplName.equalsAscii("SwXFootnote") )
20217 + {
20218 + if( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.Endnote") ) ) )
20219 + return word::WdSeekView::wdSeekEndnotes;
20220 + else
20221 + return word::WdSeekView::wdSeekFootnotes;
20222 + }
20223 +
20224 + return word::WdSeekView::wdSeekMainDocument;
20225 +}
20226 +
20227 +void SAL_CALL
20228 +SwVbaView::setSeekView( ::sal_Int32 _seekview ) throw (css::uno::RuntimeException)
20229 +{
20230 + if( _seekview == getSeekView() )
20231 + return;
20232 +
20233 + switch( _seekview )
20234 + {
20235 + case word::WdSeekView::wdSeekFirstPageFooter:
20236 + case word::WdSeekView::wdSeekFirstPageHeader:
20237 + case word::WdSeekView::wdSeekCurrentPageFooter:
20238 + case word::WdSeekView::wdSeekCurrentPageHeader:
20239 + case word::WdSeekView::wdSeekPrimaryFooter:
20240 + case word::WdSeekView::wdSeekPrimaryHeader:
20241 + case word::WdSeekView::wdSeekEvenPagesFooter:
20242 + case word::WdSeekView::wdSeekEvenPagesHeader:
20243 + {
20244 + // need to test
20245 + mxViewCursor->gotoRange( getHFTextRange( _seekview ), sal_False );
20246 + break;
20247 + }
20248 + case word::WdSeekView::wdSeekFootnotes:
20249 + {
20250 + uno::Reference< text::XFootnotesSupplier > xFootnotesSupp( mxModel, uno::UNO_QUERY_THROW );
20251 + uno::Reference< container::XIndexAccess > xFootnotes( xFootnotesSupp->getFootnotes(), uno::UNO_QUERY_THROW );
20252 + if( xFootnotes->getCount() > 0 )
20253 + {
20254 + uno::Reference< text::XText > xText( xFootnotes->getByIndex(0), uno::UNO_QUERY_THROW );
20255 + mxViewCursor->gotoRange( xText->getStart(), sal_False );
20256 + }
20257 + else
20258 + {
20259 + DebugHelper::exception( SbERR_NO_ACTIVE_OBJECT, rtl::OUString() );
20260 + }
20261 + break;
20262 + }
20263 + case word::WdSeekView::wdSeekEndnotes:
20264 + {
20265 + uno::Reference< text::XEndnotesSupplier > xEndnotesSupp( mxModel, uno::UNO_QUERY_THROW );
20266 + uno::Reference< container::XIndexAccess > xEndnotes( xEndnotesSupp->getEndnotes(), uno::UNO_QUERY_THROW );
20267 + if( xEndnotes->getCount() > 0 )
20268 + {
20269 + uno::Reference< text::XText > xText( xEndnotes->getByIndex(0), uno::UNO_QUERY_THROW );
20270 + mxViewCursor->gotoRange( xText->getStart(), sal_False );
20271 + }
20272 + else
20273 + {
20274 + DebugHelper::exception( SbERR_NO_ACTIVE_OBJECT, rtl::OUString() );
20275 + }
20276 + break;
20277 + }
20278 + case word::WdSeekView::wdSeekMainDocument:
20279 + {
20280 + uno::Reference< text::XTextDocument > xTextDocument( mxModel, uno::UNO_QUERY_THROW );
20281 + uno::Reference< text::XText > xText = xTextDocument->getText();
20282 + mxViewCursor->gotoRange( xText->getStart(), sal_False );
20283 + break;
20284 + }
20285 + }
20286 +}
20287 +
20288 +::sal_Int32 SAL_CALL
20289 +SwVbaView::getSplitSpecial() throw (css::uno::RuntimeException)
20290 +{
20291 + return word::WdSpecialPane::wdPaneNone;
20292 +}
20293 +
20294 +void SAL_CALL
20295 +SwVbaView::setSplitSpecial( ::sal_Int32/* _splitspecial */) throw (css::uno::RuntimeException)
20296 +{
20297 + // not support in Writer
20298 +}
20299 +
20300 +::sal_Bool SAL_CALL
20301 +SwVbaView::getTableGridLines() throw (css::uno::RuntimeException)
20302 +{
20303 + sal_Bool bShowTableGridLine = sal_False;
20304 + mxViewSettings->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ShowTableBoundaries"))) >>= bShowTableGridLine;
20305 + return bShowTableGridLine;
20306 +}
20307 +
20308 +void SAL_CALL
20309 +SwVbaView::setTableGridLines( ::sal_Bool _tablegridlines ) throw (css::uno::RuntimeException)
20310 +{
20311 + mxViewSettings->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ShowTableBoundaries")), uno::makeAny( _tablegridlines ) );
20312 +}
20313 +
20314 +::sal_Int32 SAL_CALL
20315 +SwVbaView::getType() throw (css::uno::RuntimeException)
20316 +{
20317 + // FIXME: handle wdPrintPreview type
20318 + sal_Bool bOnlineLayout = sal_False;
20319 + mxViewSettings->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ShowOnlineLayout"))) >>= bOnlineLayout;
20320 + return bOnlineLayout ? word::WdViewType::wdWebView : word::WdViewType::wdPrintView;
20321 +}
20322 +
20323 +void SAL_CALL
20324 +SwVbaView::setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException)
20325 +{
20326 + // FIXME: handle wdPrintPreview type
20327 + switch( _type )
20328 + {
20329 + case word::WdViewType::wdPrintView:
20330 + {
20331 + mxViewSettings->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ShowOnlineLayout")), uno::makeAny( sal_False ) );
20332 + break;
20333 + }
20334 + case word::WdViewType::wdWebView:
20335 + {
20336 + mxViewSettings->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ShowOnlineLayout")), uno::makeAny( sal_True ) );
20337 + break;
20338 + }
20339 + case word::WdViewType::wdPrintPreview:
20340 + {
20341 + PrintPreviewHelper( uno::Any(),word::getView( mxModel ) );
20342 + break;
20343 + }
20344 + default:
20345 + DebugHelper::exception( SbERR_NOT_IMPLEMENTED, rtl::OUString() );
20346 +
20347 + }
20348 +}
20349 +
20350 +uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType ) throw (uno::RuntimeException)
20351 +{
20352 + mxModel->lockControllers();
20353 +
20354 + rtl::OUString aPropIsOn;
20355 + rtl::OUString aPropIsShared;
20356 + rtl::OUString aPropBodyDistance;
20357 + rtl::OUString aPropText;
20358 +
20359 + switch( nType )
20360 + {
20361 + case word::WdSeekView::wdSeekCurrentPageFooter:
20362 + case word::WdSeekView::wdSeekFirstPageFooter:
20363 + case word::WdSeekView::wdSeekPrimaryFooter:
20364 + case word::WdSeekView::wdSeekEvenPagesFooter:
20365 + {
20366 + aPropIsOn = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsOn") );
20367 + aPropIsShared = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsShared") );
20368 + aPropBodyDistance = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterBodyDistance") );
20369 + aPropText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterText") );
20370 + break;
20371 + }
20372 + case word::WdSeekView::wdSeekCurrentPageHeader:
20373 + case word::WdSeekView::wdSeekFirstPageHeader:
20374 + case word::WdSeekView::wdSeekPrimaryHeader:
20375 + case word::WdSeekView::wdSeekEvenPagesHeader:
20376 + {
20377 + aPropIsOn = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsOn") );
20378 + aPropIsShared = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsShared") );
20379 + aPropBodyDistance = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderBodyDistance") );
20380 + aPropText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderText") );
20381 + break;
20382 + }
20383 + }
20384 +
20385 + uno::Reference< text::XPageCursor > xPageCursor( mxViewCursor, uno::UNO_QUERY_THROW );
20386 +
20387 + if( nType == word::WdSeekView::wdSeekFirstPageFooter
20388 + || nType == word::WdSeekView::wdSeekFirstPageHeader )
20389 + {
20390 + xPageCursor->jumpToFirstPage();
20391 + }
20392 +
20393 + uno::Reference< style::XStyle > xStyle;
20394 + uno::Reference< text::XText > xText;
20395 + switch( nType )
20396 + {
20397 + case word::WdSeekView::wdSeekPrimaryFooter:
20398 + case word::WdSeekView::wdSeekPrimaryHeader:
20399 + case word::WdSeekView::wdSeekEvenPagesFooter:
20400 + case word::WdSeekView::wdSeekEvenPagesHeader:
20401 + {
20402 + // The primary header is the first header of the section.
20403 + // If the header is not shared between odd and even pages
20404 + // the odd page's header is the primary header. If the
20405 + // first page's header is different from the rest of the
20406 + // document, it is NOT the primary header ( the next primary
20407 + // header would be on page 3 )
20408 + // The even pages' header is only available if the header is
20409 + // not shared and the current style is applied to a page with
20410 + // an even page number
20411 + uno::Reference< beans::XPropertySet > xCursorProps( mxViewCursor, uno::UNO_QUERY_THROW );
20412 + rtl::OUString aPageStyleName;
20413 + xCursorProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PageStyleName"))) >>= aPageStyleName;
20414 + if( aPageStyleName.equalsAscii("First Page") )
20415 + {
20416 + // go to the beginning of where the next style is used
20417 + sal_Bool hasNextPage = sal_False;
20418 + xStyle = word::getCurrentPageStyle( mxModel );
20419 + do
20420 + {
20421 + hasNextPage = xPageCursor->jumpToNextPage();
20422 + }
20423 + while( hasNextPage && ( xStyle == word::getCurrentPageStyle( mxModel ) ) );
20424 +
20425 + if( !hasNextPage )
20426 + DebugHelper::exception( SbERR_BAD_ACTION, rtl::OUString() );
20427 + }
20428 + break;
20429 + }
20430 + default:
20431 + {
20432 + break;
20433 + }
20434 + }
20435 +
20436 + xStyle = word::getCurrentPageStyle( mxModel );
20437 + uno::Reference< beans::XPropertySet > xPageProps( xStyle, uno::UNO_QUERY_THROW );
20438 + sal_Bool isOn = sal_False;
20439 + xPageProps->getPropertyValue( aPropIsOn ) >>= isOn;
20440 + sal_Bool isShared = sal_False;
20441 + xPageProps->getPropertyValue( aPropIsShared ) >>= isShared;
20442 + if( !isOn )
20443 + {
20444 + xPageProps->setPropertyValue( aPropIsOn, uno::makeAny( sal_True ) );
20445 + xPageProps->setPropertyValue( aPropBodyDistance, uno::makeAny( DEFAULT_BODY_DISTANCE ) );
20446 + }
20447 + if( !isShared )
20448 + {
20449 + rtl::OUString aTempPropText = aPropText;
20450 + if( nType == word::WdSeekView::wdSeekEvenPagesFooter
20451 + || nType == word::WdSeekView::wdSeekEvenPagesHeader )
20452 + {
20453 + aTempPropText += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Left") );
20454 + }
20455 + else
20456 + {
20457 + aTempPropText += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Right") );
20458 + }
20459 + xText.set( xPageProps->getPropertyValue( aTempPropText), uno::UNO_QUERY_THROW );
20460 + }
20461 + else
20462 + {
20463 + if( nType == word::WdSeekView::wdSeekEvenPagesFooter
20464 + || nType == word::WdSeekView::wdSeekEvenPagesHeader )
20465 + {
20466 + DebugHelper::exception( SbERR_BAD_ACTION, rtl::OUString() );
20467 + }
20468 + xText.set( xPageProps->getPropertyValue( aPropText ), uno::UNO_QUERY_THROW );
20469 + }
20470 +
20471 + mxModel->unlockControllers();
20472 + if( !xText.is() )
20473 + {
20474 + DebugHelper::exception( SbERR_INTERNAL_ERROR, rtl::OUString() );
20475 + }
20476 + return xText->getStart();
20477 +}
20478 +
20479 +rtl::OUString&
20480 +SwVbaView::getServiceImplName()
20481 +{
20482 + static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaView") );
20483 + return sImplName;
20484 +}
20485 +
20486 +uno::Sequence< rtl::OUString >
20487 +SwVbaView::getServiceNames()
20488 +{
20489 + static uno::Sequence< rtl::OUString > aServiceNames;
20490 + if ( aServiceNames.getLength() == 0 )
20491 + {
20492 + aServiceNames.realloc( 1 );
20493 + aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.View" ) );
20494 + }
20495 + return aServiceNames;
20496 +}
20497 +
20498 --- sw/source/ui/vba/vbaview.hxx.old 1970-01-01 00:00:00.000000000 +0000
20499 +++ sw/source/ui/vba/vbaview.hxx 2009-04-06 16:42:01.000000000 +0000
20500 @@ -0,0 +1,69 @@
20501 +/*************************************************************************
20502 + *
20503 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
20504 + *
20505 + * Copyright 2008 by Sun Microsystems, Inc.
20506 + *
20507 + * OpenOffice.org - a multi-platform office productivity suite
20508 + *
20509 + * $RCSfile:
20510 + * $Revision:
20511 + *
20512 + * This file is part of OpenOffice.org.
20513 + *
20514 + * OpenOffice.org is free software: you can redistribute it and/or modify
20515 + * it under the terms of the GNU Lesser General Public License version 3
20516 + * only, as published by the Free Software Foundation.
20517 + *
20518 + * OpenOffice.org is distributed in the hope that it will be useful,
20519 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
20520 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20521 + * GNU Lesser General Public License version 3 for more details
20522 + * (a copy is included in the LICENSE file that accompanied this code).
20523 + *
20524 + * You should have received a copy of the GNU Lesser General Public License
20525 + * version 3 along with OpenOffice.org. If not, see
20526 + * <http://www.openoffice.org/license.html>
20527 + * for a copy of the LGPLv3 License.
20528 + *
20529 + ************************************************************************/
20530 +#ifndef SW_VBA_VIEW_HXX
20531 +#define SW_VBA_VIEW_HXX
20532 +
20533 +#include <ooo/vba/word/XView.hpp>
20534 +#include <vbahelper/vbahelperinterface.hxx>
20535 +#include <com/sun/star/text/XTextViewCursor.hpp>
20536 +#include <com/sun/star/text/XTextRange.hpp>
20537 +#include <com/sun/star/beans/XPropertySet.hpp>
20538 +
20539 +typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XView > SwVbaView_BASE;
20540 +
20541 +class SwVbaView : public SwVbaView_BASE
20542 +{
20543 +private:
20544 + css::uno::Reference< css::frame::XModel > mxModel;
20545 + css::uno::Reference< css::text::XTextViewCursor > mxViewCursor;
20546 + css::uno::Reference< css::beans::XPropertySet > mxViewSettings;
20547 +
20548 + css::uno::Reference< css::text::XTextRange > getHFTextRange( sal_Int32 nType ) throw (css::uno::RuntimeException);
20549 +
20550 +public:
20551 + SwVbaView( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext,
20552 + const css::uno::Reference< css::frame::XModel >& rModel ) throw ( css::uno::RuntimeException );
20553 + virtual ~SwVbaView();
20554 +
20555 + // XView
20556 + virtual ::sal_Int32 SAL_CALL getSeekView() throw (css::uno::RuntimeException);
20557 + virtual void SAL_CALL setSeekView( ::sal_Int32 _seekview ) throw (css::uno::RuntimeException);
20558 + virtual ::sal_Int32 SAL_CALL getSplitSpecial() throw (css::uno::RuntimeException);
20559 + virtual void SAL_CALL setSplitSpecial( ::sal_Int32 _splitspecial ) throw (css::uno::RuntimeException);
20560 + virtual ::sal_Bool SAL_CALL getTableGridLines() throw (css::uno::RuntimeException);
20561 + virtual void SAL_CALL setTableGridLines( ::sal_Bool _tablegridlines ) throw (css::uno::RuntimeException);
20562 + virtual ::sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException);
20563 + virtual void SAL_CALL setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException);
20564 +
20565 + // XHelperInterface
20566 + virtual rtl::OUString& getServiceImplName();
20567 + virtual css::uno::Sequence<rtl::OUString> getServiceNames();
20568 +};
20569 +#endif /* SW_VBA_VIEW_HXX */
20570 --- sw/source/ui/vba/vbawindow.cxx.old 1970-01-01 00:00:00.000000000 +0000
20571 +++ sw/source/ui/vba/vbawindow.cxx 2009-04-06 16:42:01.000000000 +0000
20572 @@ -0,0 +1,116 @@
20573 +/*************************************************************************
20574 + *
20575 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
20576 + *
20577 + * Copyright 2008 by Sun Microsystems, Inc.
20578 + *
20579 + * OpenOffice.org - a multi-platform office productivity suite
20580 + *
20581 + * $RCSfile: vbawindow.cxx,v $
20582 + * $Revision: 1.5 $
20583 + *
20584 + * This file is part of OpenOffice.org.
20585 + *
20586 + * OpenOffice.org is free software: you can redistribute it and/or modify
20587 + * it under the terms of the GNU Lesser General Public License version 3
20588 + * only, as published by the Free Software Foundation.
20589 + *
20590 + * OpenOffice.org is distributed in the hope that it will be useful,
20591 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
20592 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20593 + * GNU Lesser General Public License version 3 for more details
20594 + * (a copy is included in the LICENSE file that accompanied this code).
20595 + *
20596 + * You should have received a copy of the GNU Lesser General Public License
20597 + * version 3 along with OpenOffice.org. If not, see
20598 + * <http://www.openoffice.org/license.html>
20599 + * for a copy of the LGPLv3 License.
20600 + *
20601 + ************************************************************************/
20602 +#include <vbahelper/helperdecl.hxx>
20603 +#include "vbawindow.hxx"
20604 +#include "vbaglobals.hxx"
20605 +#include "vbadocument.hxx"
20606 +#include "vbaview.hxx"
20607 +#include "vbapanes.hxx"
20608 +#include "vbapane.hxx"
20609 +
20610 +using namespace ::com::sun::star;
20611 +using namespace ::ooo::vba;
20612 +
20613 +SwVbaWindow::SwVbaWindow( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : WindowImpl_BASE( xParent, xContext, xModel )
20614 +{
20615 +}
20616 +
20617 +SwVbaWindow::SwVbaWindow( uno::Sequence< uno::Any > const & args, uno::Reference< uno::XComponentContext > const & xContext )
20618 + : WindowImpl_BASE( args, xContext )
20619 +{
20620 +}
20621 +
20622 +void
20623 +SwVbaWindow::Activate() throw (css::uno::RuntimeException)
20624 +{
20625 + SwVbaDocument document( uno::Reference< XHelperInterface >( Application(), uno::UNO_QUERY_THROW ), mxContext, m_xModel );
20626 +
20627 + document.Activate();
20628 +}
20629 +
20630 +void
20631 +SwVbaWindow::Close( const uno::Any& SaveChanges, const uno::Any& RouteDocument ) throw (uno::RuntimeException)
20632 +{
20633 + // FIXME: it is incorrect when there are more than 1 windows
20634 + SwVbaDocument document( uno::Reference< XHelperInterface >( Application(), uno::UNO_QUERY_THROW ), mxContext, m_xModel );
20635 + uno::Any FileName;
20636 + document.Close(SaveChanges, FileName, RouteDocument );
20637 +}
20638 +
20639 +uno::Any SAL_CALL
20640 +SwVbaWindow::getView() throw (uno::RuntimeException)
20641 +{
20642 + return uno::makeAny( uno::Reference< word::XView >( new SwVbaView( this, mxContext, m_xModel ) ) );
20643 +}
20644 +
20645 +void SAL_CALL SwVbaWindow::setView( const uno::Any& _view ) throw (uno::RuntimeException)
20646 +{
20647 + sal_Int32 nType = 0;
20648 + if( _view >>= nType )
20649 + {
20650 + SwVbaView view( this, mxContext, m_xModel );
20651 + view.setType( nType );
20652 + }
20653 +}
20654 +
20655 +uno::Any SAL_CALL
20656 +SwVbaWindow::Panes( const uno::Any& aIndex ) throw (uno::RuntimeException)
20657 +{
20658 + uno::Reference< XCollection > xPanes( new SwVbaPanes( this, mxContext, m_xModel ) );
20659 + if( aIndex.getValueTypeClass() == uno::TypeClass_VOID )
20660 + return uno::makeAny( xPanes );
20661 +
20662 + return uno::Any( xPanes->Item( aIndex, uno::Any() ) );
20663 +}
20664 +
20665 +uno::Any SAL_CALL
20666 +SwVbaWindow::ActivePane() throw (uno::RuntimeException)
20667 +{
20668 + return uno::makeAny( uno::Reference< word::XPane >( new SwVbaPane( this, mxContext, m_xModel ) ) );
20669 +}
20670 +
20671 +rtl::OUString&
20672 +SwVbaWindow::getServiceImplName()
20673 +{
20674 + static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("SwVbaWindow") );
20675 + return sImplName;
20676 +}
20677 +
20678 +uno::Sequence< rtl::OUString >
20679 +SwVbaWindow::getServiceNames()
20680 +{
20681 + static uno::Sequence< rtl::OUString > aServiceNames;
20682 + if ( aServiceNames.getLength() == 0 )
20683 + {
20684 + aServiceNames.realloc( 1 );
20685 + aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.Window" ) );
20686 + }
20687 + return aServiceNames;
20688 +}
20689 --- sw/source/ui/vba/vbawindow.hxx.old 1970-01-01 00:00:00.000000000 +0000
20690 +++ sw/source/ui/vba/vbawindow.hxx 2009-04-06 16:42:01.000000000 +0000
20691 @@ -0,0 +1,61 @@
20692 +/*************************************************************************
20693 + *
20694 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
20695 + *
20696 + * Copyright 2008 by Sun Microsystems, Inc.
20697 + *
20698 + * OpenOffice.org - a multi-platform office productivity suite
20699 + *
20700 + * $RCSfile: vbawindow.hxx,v $
20701 + * $Revision: 1.4 $
20702 + *
20703 + * This file is part of OpenOffice.org.
20704 + *
20705 + * OpenOffice.org is free software: you can redistribute it and/or modify
20706 + * it under the terms of the GNU Lesser General Public License version 3
20707 + * only, as published by the Free Software Foundation.
20708 + *
20709 + * OpenOffice.org is distributed in the hope that it will be useful,
20710 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
20711 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20712 + * GNU Lesser General Public License version 3 for more details
20713 + * (a copy is included in the LICENSE file that accompanied this code).
20714 + *
20715 + * You should have received a copy of the GNU Lesser General Public License
20716 + * version 3 along with OpenOffice.org. If not, see
20717 + * <http://www.openoffice.org/license.html>
20718 + * for a copy of the LGPLv3 License.
20719 + *
20720 + ************************************************************************/
20721 +#ifndef SW_VBA_WINDOW_HXX
20722 +#define SW_VBA_WINDOW_HXX
20723 +#include <cppuhelper/implbase1.hxx>
20724 +#include <ooo/vba/word/XWindow.hpp>
20725 +#include <com/sun/star/uno/XComponentContext.hpp>
20726 +
20727 +#include <vbahelper/vbahelperinterface.hxx>
20728 +#include <vbahelper/vbawindowbase.hxx>
20729 +
20730 +typedef cppu::ImplInheritanceHelper1< VbaWindowBase, ov::word::XWindow > WindowImpl_BASE;
20731 +
20732 +class SwVbaWindow : public WindowImpl_BASE
20733 +{
20734 +public:
20735 + SwVbaWindow( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::frame::XModel >& xModel );
20736 + SwVbaWindow( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext > const& xContext );
20737 +
20738 +
20739 + // Attributes
20740 + virtual css::uno::Any SAL_CALL getView() throw (css::uno::RuntimeException);
20741 + virtual void SAL_CALL setView( const css::uno::Any& _view ) throw (css::uno::RuntimeException);
20742 + // Methods
20743 + virtual void SAL_CALL Activate( ) throw (css::uno::RuntimeException);
20744 + virtual void SAL_CALL Close( const css::uno::Any& SaveChanges, const css::uno::Any& RouteDocument ) throw (css::uno::RuntimeException);
20745 + virtual css::uno::Any SAL_CALL Panes( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
20746 + virtual css::uno::Any SAL_CALL ActivePane() throw (css::uno::RuntimeException);
20747 + // XHelperInterface
20748 + virtual rtl::OUString& getServiceImplName();
20749 + virtual css::uno::Sequence<rtl::OUString> getServiceNames();
20750 +};
20751 +
20752 +#endif //SW_VBA_WINDOW_HXX
20753 --- sw/source/ui/vba/wordvbahelper.cxx.old 1970-01-01 00:00:00.000000000 +0000
20754 +++ sw/source/ui/vba/wordvbahelper.cxx 2009-04-06 16:42:01.000000000 +0000
20755 @@ -0,0 +1,207 @@
20756 +/*************************************************************************
20757 + *
20758 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
20759 + *
20760 + * Copyright 2008 by Sun Microsystems, Inc.
20761 + *
20762 + * OpenOffice.org - a multi-platform office productivity suite
20763 + *
20764 + * $RCSfile: vbahelper.cxx,v $
20765 + * $Revision: 1.5.32.1 $
20766 + *
20767 + * This file is part of OpenOffice.org.
20768 + *
20769 + * OpenOffice.org is free software: you can redistribute it and/or modify
20770 + * it under the terms of the GNU Lesser General Public License version 3
20771 + * only, as published by the Free Software Foundation.
20772 + *
20773 + * OpenOffice.org is distributed in the hope that it will be useful,
20774 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
20775 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20776 + * GNU Lesser General Public License version 3 for more details
20777 + * (a copy is included in the LICENSE file that accompanied this code).
20778 + *
20779 + * You should have received a copy of the GNU Lesser General Public License
20780 + * version 3 along with OpenOffice.org. If not, see
20781 + * <http://www.openoffice.org/license.html>
20782 + * for a copy of the LGPLv3 License.
20783 + *
20784 + ************************************************************************/
20785 +#include <docsh.hxx>
20786 +#include "wordvbahelper.hxx"
20787 +#include <comphelper/processfactory.hxx>
20788 +#include <com/sun/star/frame/XController.hpp>
20789 +#include <com/sun/star/text/XTextViewCursorSupplier.hpp>
20790 +#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
20791 +#include <com/sun/star/container/XNameAccess.hpp>
20792 +#include <com/sun/star/lang/XUnoTunnel.hpp>
20793 +#include <unotxdoc.hxx>
20794 +
20795 +using namespace ::com::sun::star;
20796 +using namespace ::ooo::vba;
20797 +
20798 +#define FIRST_PAGE 1;
20799 +
20800 +namespace ooo
20801 +{
20802 +namespace vba
20803 +{
20804 +namespace word
20805 +{
20806 +
20807 +SwDocShell* getDocShell( const uno::Reference< frame::XModel>& xModel )
20808 +{
20809 + uno::Reference< lang::XUnoTunnel > xTunnel( xModel, uno::UNO_QUERY_THROW );
20810 + SwXTextDocument* pXDoc = reinterpret_cast< SwXTextDocument * >( sal::static_int_cast< sal_IntPtr >(xTunnel->getSomething(SwXTextDocument::getUnoTunnelId())));
20811 + return pXDoc ? pXDoc->GetDocShell() : 0;
20812 +}
20813 +
20814 +SwView* getView( const uno::Reference< frame::XModel>& xModel )
20815 +{
20816 + SwDocShell* pDocShell = getDocShell( xModel );
20817 + return pDocShell? pDocShell->GetView() : 0;
20818 +}
20819 +
20820 +uno::Reference< text::XTextViewCursor > getXTextViewCursor( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
20821 +{
20822 + uno::Reference< frame::XController > xController = xModel->getCurrentController();
20823 + uno::Reference< text::XTextViewCursorSupplier > xTextViewCursorSupp( xController, uno::UNO_QUERY_THROW );
20824 + uno::Reference< text::XTextViewCursor > xTextViewCursor = xTextViewCursorSupp->getViewCursor();
20825 + return xTextViewCursor;
20826 +}
20827 +
20828 +uno::Reference< style::XStyle > getCurrentPageStyle( const uno::Reference< frame::XModel >& xModel ) throw (uno::RuntimeException)
20829 +{
20830 + uno::Reference< beans::XPropertySet > xCursorProps( getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW );
20831 + rtl::OUString aPageStyleName;
20832 + xCursorProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PageStyleName"))) >>= aPageStyleName;
20833 + uno::Reference< style::XStyleFamiliesSupplier > xSytleFamSupp( xModel, uno::UNO_QUERY_THROW );
20834 + uno::Reference< container::XNameAccess > xSytleFamNames( xSytleFamSupp->getStyleFamilies(), uno::UNO_QUERY_THROW );
20835 + uno::Reference< container::XNameAccess > xPageStyles( xSytleFamNames->getByName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PageStyles") ) ), uno::UNO_QUERY_THROW );
20836 + uno::Reference< style::XStyle > xStyle( xPageStyles->getByName( aPageStyleName ), uno::UNO_QUERY_THROW );
20837 +
20838 + return xStyle;
20839 +}
20840 +
20841 +// Class HeaderFooterHelper
20842 +
20843 +sal_Bool HeaderFooterHelper::isHeader( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XText >& xCurrentText ) throw (uno::RuntimeException)
20844 +{
20845 + uno::Reference< text::XPageCursor > xPageCursor( getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW );
20846 + uno::Reference< beans::XPropertySet > xStyleProps( getCurrentPageStyle( xModel ), uno::UNO_QUERY_THROW );
20847 +
20848 + sal_Bool isOn = sal_False;
20849 + xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsOn"))) >>= isOn;
20850 + if( !isOn )
20851 + return sal_False;
20852 +
20853 + sal_Bool isShared = sal_False;
20854 + xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsShared"))) >>= isShared;
20855 +
20856 + rtl::OUString aPropText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderText") );
20857 + if( !isShared )
20858 + {
20859 + if( 0 == xPageCursor->getPage() % 2 )
20860 + {
20861 + aPropText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderTextLeft") );
20862 + }
20863 + else
20864 + {
20865 + aPropText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderTextRight") );
20866 + }
20867 + }
20868 +
20869 + uno::Reference< text::XText > xText( xStyleProps->getPropertyValue( aPropText ), uno::UNO_QUERY_THROW );
20870 + //FIXME: can not compare in this way?
20871 + return ( xText == xCurrentText );
20872 +}
20873 +
20874 +sal_Bool HeaderFooterHelper::isFirstPageHeader( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XText >& xCurrentText ) throw (uno::RuntimeException)
20875 +{
20876 + if( isHeader( xModel, xCurrentText ) )
20877 + {
20878 + uno::Reference< text::XPageCursor > xPageCursor( getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW );
20879 + // FIXME: getPage allways returns 1
20880 + sal_Int32 nPage = xPageCursor->getPage();
20881 + return nPage == FIRST_PAGE;
20882 + }
20883 + return sal_False;
20884 +}
20885 +
20886 +sal_Bool HeaderFooterHelper::isEvenPagesHeader( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XText >& xCurrentText ) throw (uno::RuntimeException)
20887 +{
20888 + if( isHeader( xModel, xCurrentText ) )
20889 + {
20890 + uno::Reference< beans::XPropertySet > xStyleProps( getCurrentPageStyle( xModel ), uno::UNO_QUERY_THROW );
20891 + sal_Bool isShared = sal_False;
20892 + xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsShared"))) >>= isShared;
20893 + if( !isShared )
20894 + {
20895 + uno::Reference< text::XPageCursor > xPageCursor( getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW );
20896 + return ( 0 == xPageCursor->getPage() % 2 );
20897 + }
20898 + }
20899 + return sal_False;
20900 +}
20901 +
20902 +sal_Bool HeaderFooterHelper::isFooter( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XText >& xCurrentText ) throw (uno::RuntimeException)
20903 +{
20904 + uno::Reference< text::XPageCursor > xPageCursor( getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW );
20905 + uno::Reference< beans::XPropertySet > xStyleProps( getCurrentPageStyle( xModel ), uno::UNO_QUERY_THROW );
20906 +
20907 + sal_Bool isOn = sal_False;
20908 + xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsOn"))) >>= isOn;
20909 + if( !isOn )
20910 + return sal_False;
20911 +
20912 + sal_Bool isShared = sal_False;
20913 + xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsShared"))) >>= isShared;
20914 +
20915 + rtl::OUString aPropText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterText") );
20916 + if( !isShared )
20917 + {
20918 + if( 0 == xPageCursor->getPage() % 2 )
20919 + {
20920 + aPropText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterTextLeft") );
20921 + }
20922 + else
20923 + {
20924 + aPropText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterTextRight") );
20925 + }
20926 + }
20927 +
20928 + uno::Reference< text::XText > xText( xStyleProps->getPropertyValue( aPropText ), uno::UNO_QUERY_THROW );
20929 +
20930 + return ( xText == xCurrentText );
20931 +}
20932 +
20933 +sal_Bool HeaderFooterHelper::isFirstPageFooter( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XText >& xCurrentText ) throw (uno::RuntimeException)
20934 +{
20935 + if( isFooter( xModel, xCurrentText ) )
20936 + {
20937 + uno::Reference< text::XPageCursor > xPageCursor( getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW );
20938 + sal_Int32 nPage = xPageCursor->getPage();
20939 + return nPage == FIRST_PAGE;
20940 + }
20941 + return sal_False;
20942 +}
20943 +
20944 +sal_Bool HeaderFooterHelper::isEvenPagesFooter( const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XText >& xCurrentText ) throw (uno::RuntimeException)
20945 +{
20946 + if( isFooter( xModel, xCurrentText ) )
20947 + {
20948 + uno::Reference< beans::XPropertySet > xStyleProps( getCurrentPageStyle( xModel ), uno::UNO_QUERY_THROW );
20949 + sal_Bool isShared = sal_False;
20950 + xStyleProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsShared"))) >>= isShared;
20951 + if( !isShared )
20952 + {
20953 + uno::Reference< text::XPageCursor > xPageCursor( getXTextViewCursor( xModel ), uno::UNO_QUERY_THROW );
20954 + return ( 0 == xPageCursor->getPage() % 2 );
20955 + }
20956 + }
20957 + return sal_False;
20958 +}
20959 +
20960 +} // word
20961 +} //
20962 +} //
20963 --- sw/source/ui/vba/wordvbahelper.hxx.old 1970-01-01 00:00:00.000000000 +0000
20964 +++ sw/source/ui/vba/wordvbahelper.hxx 2009-04-06 16:42:01.000000000 +0000
20965 @@ -0,0 +1,67 @@
20966 +/*************************************************************************
20967 + *
20968 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
20969 + *
20970 + * Copyright 2008 by Sun Microsystems, Inc.
20971 + *
20972 + * OpenOffice.org - a multi-platform office productivity suite
20973 + *
20974 + * $RCSfile: vbahelper.hxx,v $
20975 + * $Revision: 1.5.32.1 $
20976 + *
20977 + * This file is part of OpenOffice.org.
20978 + *
20979 + * OpenOffice.org is free software: you can redistribute it and/or modify
20980 + * it under the terms of the GNU Lesser General Public License version 3
20981 + * only, as published by the Free Software Foundation.
20982 + *
20983 + * OpenOffice.org is distributed in the hope that it will be useful,
20984 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
20985 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20986 + * GNU Lesser General Public License version 3 for more details
20987 + * (a copy is included in the LICENSE file that accompanied this code).
20988 + *
20989 + * You should have received a copy of the GNU Lesser General Public License
20990 + * version 3 along with OpenOffice.org. If not, see
20991 + * <http://www.openoffice.org/license.html>
20992 + * for a copy of the LGPLv3 License.
20993 + *
20994 + ************************************************************************/
20995 +#ifndef SW_WORD_VBA_HELPER_HXX
20996 +#define SW_WORD_VBA_HELPER_HXX
20997 +
20998 +#include <vbahelper/vbahelper.hxx>
20999 +#include <com/sun/star/text/XText.hpp>
21000 +#include <com/sun/star/text/XTextViewCursor.hpp>
21001 +#include <com/sun/star/text/XPageCursor.hpp>
21002 +#include <com/sun/star/style/XStyle.hpp>
21003 +
21004 +class SwDocShell;
21005 +class SwView;
21006 +namespace ooo
21007 +{
21008 + namespace vba
21009 + {
21010 + namespace word
21011 + {
21012 + //css::uno::Reference< css::frame::XModel > getCurrentDocument() throw (css::uno::RuntimeException);
21013 + SwDocShell* getDocShell( const css::uno::Reference< css::frame::XModel>& xModel );
21014 + SwView* getView( const css::uno::Reference< css::frame::XModel>& xModel );
21015 + css::uno::Reference< css::text::XTextViewCursor > getXTextViewCursor( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
21016 + css::uno::Reference< css::style::XStyle > getCurrentPageStyle( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
21017 +
21018 +class HeaderFooterHelper
21019 +{
21020 +public:
21021 + static sal_Bool isHeader( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XText >& xCurrentText ) throw (css::uno::RuntimeException);
21022 + static sal_Bool isFirstPageHeader( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XText >& xCurrentText ) throw (css::uno::RuntimeException);
21023 + static sal_Bool isEvenPagesHeader( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XText >& xCurrentText ) throw (css::uno::RuntimeException);
21024 + static sal_Bool isFooter( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XText >& xCurrentText ) throw (css::uno::RuntimeException);
21025 + static sal_Bool isFirstPageFooter( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XText >& xCurrentText ) throw (css::uno::RuntimeException);
21026 + static sal_Bool isEvenPagesFooter( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::text::XText >& xCurrentText ) throw (css::uno::RuntimeException);
21027 +};
21028 +
21029 +}; // word
21030 +}; // vba
21031 +}; // ooo
21032 +#endif
21033 --- sw/util/makefile.mk.old 2009-04-06 16:41:40.000000000 +0000
21034 +++ sw/util/makefile.mk 2009-04-06 16:42:01.000000000 +0000
21035 @@ -131,6 +131,7 @@ SHL1STDLIBS+= \
21036 $(SALHELPERLIB) \
21037 $(ICUUCLIB) \
21038 $(I18NUTILLIB) \
21039 + $(VBAHELPERLIB) \
21040 $(AVMEDIALIB)
21042 .IF "$(GUI)"=="WNT"
21043 @@ -343,6 +344,37 @@ SHL4STDLIBS= \
21044 $(CPPUHELPERLIB) \
21045 $(SALLIB) \
21046 $(ICUUCLIB) \
21047 + $(VBAHELPERLIB) \
21048 + $(BASICLIB) \
21049 $(I18NUTILLIB)
21051 +#target vba
21052 +TARGET_VBA=vbaswobj
21053 +SHL5TARGET=$(TARGET_VBA)$(DLLPOSTFIX).uno
21054 +SHL5IMPLIB= i$(TARGET_VBA)
21055 +
21056 +SHL5VERSIONMAP=$(TARGET_VBA).map
21057 +SHL5DEF=$(MISC)$/$(SHL5TARGET).def
21058 +DEF5NAME=$(SHL5TARGET)
21059 +SHL5STDLIBS= \
21060 + $(ISWLIB) \
21061 + $(CPPUHELPERLIB) \
21062 + $(VCLLIB) \
21063 + $(CPPULIB) \
21064 + $(COMPHELPERLIB) \
21065 + $(SVLIB) \
21066 + $(TOOLSLIB) \
21067 + $(SALLIB)\
21068 + $(VBAHELPERLIB) \
21069 + $(BASICLIB) \
21070 + $(SFXLIB) \
21071 + $(SVXLIB) \
21072 + $(SVTOOLLIB) \
21073 + $(SVLLIB) \
21074 + $(VCLLIB) \
21075 + $(TKLIB) \
21076 +
21077 +SHL5DEPN=$(SHL1TARGETN)
21078 +SHL5LIBS=$(SLB)$/$(TARGET_VBA).lib
21079 +
21080 .INCLUDE : target.mk
21081 --- sw/util/vbaswobj.map.old 1970-01-01 00:00:00.000000000 +0000
21082 +++ sw/util/vbaswobj.map 2009-04-06 16:42:01.000000000 +0000
21083 @@ -0,0 +1,9 @@
21084 +OOO_1.1 {
21085 + global:
21086 + component_getImplementationEnvironment;
21087 + component_getFactory;
21088 + component_writeInfo;
21089 +
21090 + local:
21091 + *;
21092 +};
21093 --- vbahelper/inc/vbahelper/helperdecl.hxx.old 1970-01-01 00:00:00.000000000 +0000
21094 +++ vbahelper/inc/vbahelper/helperdecl.hxx 2009-04-06 16:42:01.000000000 +0000
21095 @@ -0,0 +1,58 @@
21096 +/*************************************************************************
21097 + *
21098 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
21099 + *
21100 + * Copyright 2008 by Sun Microsystems, Inc.
21101 + *
21102 + * OpenOffice.org - a multi-platform office productivity suite
21103 + *
21104 + * $RCSfile: helperdecl.hxx,v $
21105 + * $Revision: 1.3 $
21106 + *
21107 + * This file is part of OpenOffice.org.
21108 + *
21109 + * OpenOffice.org is free software: you can redistribute it and/or modify
21110 + * it under the terms of the GNU Lesser General Public License version 3
21111 + * only, as published by the Free Software Foundation.
21112 + *
21113 + * OpenOffice.org is distributed in the hope that it will be useful,
21114 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
21115 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21116 + * GNU Lesser General Public License version 3 for more details
21117 + * (a copy is included in the LICENSE file that accompanied this code).
21118 + *
21119 + * You should have received a copy of the GNU Lesser General Public License
21120 + * version 3 along with OpenOffice.org. If not, see
21121 + * <http://www.openoffice.org/license.html>
21122 + * for a copy of the LGPLv3 License.
21123 + *
21124 + ************************************************************************/
21125 +#ifndef OOVBAAPI_SERV_DECL
21126 +#define OOVBAAPI_SERV_DECL
21127 +#include <comphelper/servicedecl.hxx>
21128 +#include <ooo/vba/XHelperInterface.hpp>
21129 +
21130 +namespace comphelper {
21131 +namespace service_decl {
21132 +template <typename ImplT_, typename WithArgsT = with_args<false> >
21133 +struct vba_service_class_ : public serviceimpl_base< detail::OwnServiceImpl<ImplT_>, WithArgsT >
21134 +{
21135 + typedef serviceimpl_base< detail::OwnServiceImpl<ImplT_>, WithArgsT > baseT;
21136 + /** Default ctor. Implementation class without args, expecting
21137 + component context as single argument.
21138 + */
21139 + vba_service_class_() : baseT() {}
21140 + template <typename PostProcessFuncT>
21141 + /** Ctor to pass a post processing function/functor.
21142 +
21143 + @tpl PostProcessDefaultT let your compiler deduce this
21144 + @param postProcessFunc function/functor that gets the yet unacquired
21145 + ImplT_ pointer returning a
21146 + uno::Reference<uno::XInterface>
21147 + */
21148 + explicit vba_service_class_( PostProcessFuncT const& postProcessFunc ) : baseT( postProcessFunc ) {}
21149 +};
21150 +
21151 +} // namespace service_decl
21152 +} // namespace comphelper
21153 +#endif
21154 --- vbahelper/inc/vbahelper/vbaapplicationbase.hxx.old 1970-01-01 00:00:00.000000000 +0000
21155 +++ vbahelper/inc/vbahelper/vbaapplicationbase.hxx 2009-04-06 16:42:01.000000000 +0000
21156 @@ -0,0 +1,59 @@
21157 +/*************************************************************************
21158 + *
21159 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
21160 + *
21161 + * Copyright 2008 by Sun Microsystems, Inc.
21162 + *
21163 + * OpenOffice.org - a multi-platform office productivity suite
21164 + *
21165 + * $RCSfile: vbaapplicationbase.hxx,v $
21166 + * $Revision: 1.3 $
21167 + *
21168 + * This file is part of OpenOffice.org.
21169 + *
21170 + * OpenOffice.org is free software: you can redistribute it and/or modify
21171 + * it under the terms of the GNU Lesser General Public License version 3
21172 + * only, as published by the Free Software Foundation.
21173 + *
21174 + * OpenOffice.org is distributed in the hope that it will be useful,
21175 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
21176 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21177 + * GNU Lesser General Public License version 3 for more details
21178 + * (a copy is included in the LICENSE file that accompanied this code).
21179 + *
21180 + * You should have received a copy of the GNU Lesser General Public License
21181 + * version 3 along with OpenOffice.org. If not, see
21182 + * <http://www.openoffice.org/license.html>
21183 + * for a copy of the LGPLv3 License.
21184 + *
21185 + ************************************************************************/
21186 +#ifndef VBA_APPLICATION_BASE_HXX
21187 +#define VBA_APPLICATION_BASE_HXX
21188 +
21189 +#include <ooo/vba/XHelperInterface.hpp>
21190 +#include <ooo/vba/XApplicationBase.hpp>
21191 +#include <vbahelper/vbahelperinterface.hxx>
21192 +
21193 +typedef InheritedHelperInterfaceImpl1< ov::XApplicationBase > ApplicationBase_BASE;
21194 +
21195 +class VbaApplicationBase : public ApplicationBase_BASE
21196 +{
21197 +protected:
21198 + VbaApplicationBase( const css::uno::Reference< css::uno::XComponentContext >& xContext );
21199 + virtual ~VbaApplicationBase();
21200 +
21201 +public:
21202 + // XHelperInterface ( parent is itself )
21203 + virtual css::uno::Reference< ov::XHelperInterface > SAL_CALL getParent( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { return this; }
21204 +
21205 + virtual sal_Bool SAL_CALL getScreenUpdating() throw (css::uno::RuntimeException);
21206 + virtual void SAL_CALL setScreenUpdating(sal_Bool bUpdate) throw (css::uno::RuntimeException);
21207 + virtual sal_Bool SAL_CALL getDisplayStatusBar() throw (css::uno::RuntimeException);
21208 + virtual void SAL_CALL setDisplayStatusBar(sal_Bool bDisplayStatusBar) throw (css::uno::RuntimeException);
21209 + virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
21210 +
21211 + // XHelperInterface
21212 + virtual rtl::OUString& getServiceImplName();
21213 + virtual css::uno::Sequence<rtl::OUString> getServiceNames();
21214 +};
21215 +#endif
21216 --- vbahelper/inc/vbahelper/vbacollectionimpl.hxx.old 1970-01-01 00:00:00.000000000 +0000
21217 +++ vbahelper/inc/vbahelper/vbacollectionimpl.hxx 2009-04-06 16:42:01.000000000 +0000
21218 @@ -0,0 +1,257 @@
21219 +/*************************************************************************
21220 + *
21221 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
21222 + *
21223 + * Copyright 2008 by Sun Microsystems, Inc.
21224 + *
21225 + * OpenOffice.org - a multi-platform office productivity suite
21226 + *
21227 + * $RCSfile: vbacollectionimpl.hxx,v $
21228 + * $Revision: 1.5 $
21229 + *
21230 + * This file is part of OpenOffice.org.
21231 + *
21232 + * OpenOffice.org is free software: you can redistribute it and/or modify
21233 + * it under the terms of the GNU Lesser General Public License version 3
21234 + * only, as published by the Free Software Foundation.
21235 + *
21236 + * OpenOffice.org is distributed in the hope that it will be useful,
21237 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
21238 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21239 + * GNU Lesser General Public License version 3 for more details
21240 + * (a copy is included in the LICENSE file that accompanied this code).
21241 + *
21242 + * You should have received a copy of the GNU Lesser General Public License
21243 + * version 3 along with OpenOffice.org. If not, see
21244 + * <http://www.openoffice.org/license.html>
21245 + * for a copy of the LGPLv3 License.
21246 + *
21247 + ************************************************************************/
21248 +#ifndef OOVBAAPI_VBA_COLLECTION_IMPL_HXX
21249 +#define OOVBAAPI_VBA_COLLECTION_IMPL_HXX
21250 +
21251 +#include <ooo/vba/XCollection.hpp>
21252 +#include <com/sun/star/container/XEnumerationAccess.hpp>
21253 +#include <com/sun/star/uno/XComponentContext.hpp>
21254 +#include <com/sun/star/script/XDefaultMethod.hpp>
21255 +#include <com/sun/star/container/XIndexAccess.hpp>
21256 +#include <com/sun/star/container/XNameAccess.hpp>
21257 +#include <com/sun/star/container/XNamed.hpp>
21258 +
21259 +#include <cppuhelper/implbase3.hxx>
21260 +#include <cppuhelper/implbase2.hxx>
21261 +#include <cppuhelper/implbase1.hxx>
21262 +
21263 +#include "vbahelper/vbahelper.hxx"
21264 +#include "vbahelper/vbahelperinterface.hxx"
21265 +
21266 +#include <vector>
21267 +
21268 +typedef ::cppu::WeakImplHelper1< css::container::XEnumeration > EnumerationHelper_BASE;
21269 +
21270 +class EnumerationHelperImpl : public EnumerationHelper_BASE
21271 +{
21272 +protected:
21273 + css::uno::Reference< css::uno::XComponentContext > m_xContext;
21274 + css::uno::Reference< css::container::XEnumeration > m_xEnumeration;
21275 +public:
21276 +
21277 + EnumerationHelperImpl( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XEnumeration >& xEnumeration ) throw ( css::uno::RuntimeException ) : m_xContext( xContext ), m_xEnumeration( xEnumeration ) { }
21278 + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (css::uno::RuntimeException) { return m_xEnumeration->hasMoreElements(); }
21279 +};
21280 +
21281 +// a wrapper class for a providing a XIndexAccess, XNameAccess, XEnumerationAccess impl based on providing a vector of interfaces
21282 +// only requirement is the object needs to implement XName
21283 +
21284 +
21285 +
21286 +typedef ::cppu::WeakImplHelper3< css::container::XNameAccess, css::container::XIndexAccess, css::container::XEnumerationAccess > XNamedCollectionHelper_BASE;
21287 +
21288 +template< typename Ifc1 >
21289 +class XNamedObjectCollectionHelper : public XNamedCollectionHelper_BASE
21290 +{
21291 +public:
21292 +typedef std::vector< css::uno::Reference< Ifc1 > > XNamedVec;
21293 +private:
21294 +
21295 + class XNamedEnumerationHelper : public EnumerationHelper_BASE
21296 + {
21297 + XNamedVec mXNamedVec;
21298 + typename XNamedVec::iterator mIt;
21299 + public:
21300 + XNamedEnumerationHelper( const XNamedVec& sMap ) : mXNamedVec( sMap ), mIt( mXNamedVec.begin() ) {}
21301 +
21302 + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (css::uno::RuntimeException)
21303 + {
21304 + return ( mIt != mXNamedVec.end() );
21305 + }
21306 +
21307 + virtual css::uno::Any SAL_CALL nextElement( ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException)
21308 + {
21309 + if ( hasMoreElements() )
21310 + return css::uno::makeAny( *mIt++ );
21311 + throw css::container::NoSuchElementException();
21312 + }
21313 + };
21314 +
21315 +protected:
21316 + XNamedVec mXNamedVec;
21317 + typename XNamedVec::iterator cachePos;
21318 +public:
21319 + XNamedObjectCollectionHelper( const XNamedVec& sMap ) : mXNamedVec( sMap ), cachePos(mXNamedVec.begin()) {}
21320 + // XElementAccess
21321 + virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException) { return Ifc1::static_type(0); }
21322 + virtual ::sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException) { return ( mXNamedVec.size() > 0 ); }
21323 + // XNameAcess
21324 + virtual css::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException)
21325 + {
21326 + if ( !hasByName(aName) )
21327 + throw css::container::NoSuchElementException();
21328 + return css::uno::makeAny( *cachePos );
21329 + }
21330 + virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (css::uno::RuntimeException)
21331 + {
21332 + css::uno::Sequence< rtl::OUString > sNames( mXNamedVec.size() );
21333 + rtl::OUString* pString = sNames.getArray();
21334 + typename XNamedVec::iterator it = mXNamedVec.begin();
21335 + typename XNamedVec::iterator it_end = mXNamedVec.end();
21336 +
21337 + for ( ; it != it_end; ++it, ++pString )
21338 + {
21339 + css::uno::Reference< css::container::XNamed > xName( *it, css::uno::UNO_QUERY_THROW );
21340 + *pString = xName->getName();
21341 + }
21342 + return sNames;
21343 + }
21344 + virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException)
21345 + {
21346 + cachePos = mXNamedVec.begin();
21347 + typename XNamedVec::iterator it_end = mXNamedVec.end();
21348 + for ( ; cachePos != it_end; ++cachePos )
21349 + {
21350 + css::uno::Reference< css::container::XNamed > xName( *cachePos, css::uno::UNO_QUERY_THROW );
21351 + if ( aName.equals( xName->getName() ) )
21352 + break;
21353 + }
21354 + return ( cachePos != it_end );
21355 + }
21356 +
21357 + // XElementAccess
21358 + virtual ::sal_Int32 SAL_CALL getCount( ) throw (css::uno::RuntimeException) { return mXNamedVec.size(); }
21359 + virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException )
21360 + {
21361 + if ( Index < 0 || Index >= getCount() )
21362 + throw css::lang::IndexOutOfBoundsException();
21363 +
21364 + return css::uno::makeAny( mXNamedVec[ Index ] );
21365 +
21366 + }
21367 + // XEnumerationAccess
21368 + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration( ) throw (css::uno::RuntimeException)
21369 + {
21370 + return new XNamedEnumerationHelper( mXNamedVec );
21371 + }
21372 +};
21373 +
21374 +// including a HelperInterface implementation
21375 +template< typename Ifc1 >
21376 +class ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 >
21377 +{
21378 +typedef InheritedHelperInterfaceImpl< Ifc1 > BaseColBase;
21379 +protected:
21380 + css::uno::Reference< css::container::XIndexAccess > m_xIndexAccess;
21381 + css::uno::Reference< css::container::XNameAccess > m_xNameAccess;
21382 +
21383 + virtual css::uno::Any getItemByStringIndex( const rtl::OUString& sIndex ) throw (css::uno::RuntimeException)
21384 + {
21385 + if ( !m_xNameAccess.is() )
21386 + throw css::uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ScVbaCollectionBase string index access not supported by this object") ), css::uno::Reference< css::uno::XInterface >() );
21387 +
21388 + return createCollectionObject( m_xNameAccess->getByName( sIndex ) );
21389 + }
21390 +
21391 + virtual css::uno::Any getItemByIntIndex( const sal_Int32 nIndex ) throw (css::uno::RuntimeException)
21392 + {
21393 + if ( !m_xIndexAccess.is() )
21394 + throw css::uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ScVbaCollectionBase numeric index access not supported by this object") ), css::uno::Reference< css::uno::XInterface >() );
21395 + if ( nIndex <= 0 )
21396 + {
21397 + throw css::lang::IndexOutOfBoundsException(
21398 + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
21399 + "index is 0 or negative" ) ),
21400 + css::uno::Reference< css::uno::XInterface >() );
21401 + }
21402 + // need to adjust for vba index ( for which first element is 1 )
21403 + return createCollectionObject( m_xIndexAccess->getByIndex( nIndex - 1 ) );
21404 + }
21405 +public:
21406 + ScVbaCollectionBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess ) : BaseColBase( xParent, xContext ), m_xIndexAccess( xIndexAccess ){ m_xNameAccess.set(m_xIndexAccess, css::uno::UNO_QUERY); }
21407 + //XCollection
21408 + virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException)
21409 + {
21410 + return m_xIndexAccess->getCount();
21411 + }
21412 +
21413 + virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& /*not processed in this base class*/ ) throw (css::uno::RuntimeException)
21414 + {
21415 + if ( Index1.getValueTypeClass() != css::uno::TypeClass_STRING )
21416 + {
21417 + sal_Int32 nIndex = 0;
21418 +
21419 + if ( ( Index1 >>= nIndex ) != sal_True )
21420 + {
21421 + rtl::OUString message;
21422 + message = rtl::OUString::createFromAscii(
21423 + "Couldn't convert index to Int32");
21424 + throw css::lang::IndexOutOfBoundsException( message,
21425 + css::uno::Reference< css::uno::XInterface >() );
21426 + }
21427 + return getItemByIntIndex( nIndex );
21428 + }
21429 + rtl::OUString aStringSheet;
21430 +
21431 + Index1 >>= aStringSheet;
21432 + return getItemByStringIndex( aStringSheet );
21433 + }
21434 + // XDefaultMethod
21435 + ::rtl::OUString SAL_CALL getDefaultMethodName( ) throw (css::uno::RuntimeException)
21436 + {
21437 + const static rtl::OUString sName( RTL_CONSTASCII_USTRINGPARAM("Item") );
21438 + return sName;
21439 + }
21440 + // XEnumerationAccess
21441 + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) = 0;
21442 +
21443 + // XElementAccess
21444 + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) = 0;
21445 + // XElementAccess
21446 + virtual ::sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException)
21447 + {
21448 + return ( m_xIndexAccess->getCount() > 0 );
21449 + }
21450 + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) = 0;
21451 +
21452 +};
21453 +
21454 +typedef ::cppu::WeakImplHelper1<ov::XCollection> XCollection_InterfacesBASE;
21455 +
21456 +typedef ScVbaCollectionBase< XCollection_InterfacesBASE > CollImplBase1;
21457 +// compatible with the old collections ( pre XHelperInterface base class ) ( some internal objects still use this )
21458 +class ScVbaCollectionBaseImpl : public CollImplBase1
21459 +{
21460 +public:
21461 + ScVbaCollectionBaseImpl( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess ) throw( css::uno::RuntimeException ) : CollImplBase1( xParent, xContext, xIndexAccess){}
21462 +
21463 +};
21464 +
21465 +template <typename Ifc> // where Ifc must implement XCollectionTest
21466 +class CollTestImplHelper : public ScVbaCollectionBase< ::cppu::WeakImplHelper1< Ifc > >
21467 +{
21468 +typedef ScVbaCollectionBase< ::cppu::WeakImplHelper1< Ifc > > ImplBase1;
21469 +
21470 +public:
21471 + CollTestImplHelper( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess ) throw( css::uno::RuntimeException ) : ImplBase1( xParent, xContext, xIndexAccess ) {}
21472 +};
21473 +
21474 +
21475 +#endif //SC_VBA_COLLECTION_IMPL_HXX
21476 --- vbahelper/inc/vbahelper/vbadllapi.h.old 1970-01-01 00:00:00.000000000 +0000
21477 +++ vbahelper/inc/vbahelper/vbadllapi.h 2009-04-06 16:42:01.000000000 +0000
21478 @@ -0,0 +1,44 @@
21479 +/*************************************************************************
21480 + *
21481 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
21482 + *
21483 + * Copyright 2008 by Sun Microsystems, Inc.
21484 + *
21485 + * OpenOffice.org - a multi-platform office productivity suite
21486 + *
21487 + * $RCSfile: svldllapi.h,v $
21488 + * $Revision: 1.4 $
21489 + *
21490 + * This file is part of OpenOffice.org.
21491 + *
21492 + * OpenOffice.org is free software: you can redistribute it and/or modify
21493 + * it under the terms of the GNU Lesser General Public License version 3
21494 + * only, as published by the Free Software Foundation.
21495 + *
21496 + * OpenOffice.org is distributed in the hope that it will be useful,
21497 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
21498 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21499 + * GNU Lesser General Public License version 3 for more details
21500 + * (a copy is included in the LICENSE file that accompanied this code).
21501 + *
21502 + * You should have received a copy of the GNU Lesser General Public License
21503 + * version 3 along with OpenOffice.org. If not, see
21504 + * <http://www.openoffice.org/license.html>
21505 + * for a copy of the LGPLv3 License.
21506 + *
21507 + ************************************************************************/
21508 +
21509 +#ifndef INCLUDED_VBADLLAPI_H
21510 +#define INCLUDED_VBADLLAPI_H
21511 +
21512 +#include "sal/types.h"
21513 +
21514 +#if defined(VBAHELPER_DLLIMPLEMENTATION)
21515 +#define VBAHELPER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
21516 +#else
21517 +#define VBAHELPER_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
21518 +#endif
21519 +#define VBAHELPER_DLLPRIVATE SAL_DLLPRIVATE
21520 +
21521 +#endif /* INCLUDED_SVLDLLAPI_H */
21522 +
21523 --- vbahelper/inc/vbahelper/vbadocumentbase.hxx.old 1970-01-01 00:00:00.000000000 +0000
21524 +++ vbahelper/inc/vbahelper/vbadocumentbase.hxx 2009-04-06 16:42:01.000000000 +0000
21525 @@ -0,0 +1,73 @@
21526 +/*************************************************************************
21527 + *
21528 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
21529 + *
21530 + * Copyright 2008 by Sun Microsystems, Inc.
21531 + *
21532 + * OpenOffice.org - a multi-platform office productivity suite
21533 + *
21534 + * $RCSfile:
21535 + * $Revision:
21536 + *
21537 + * This file is part of OpenOffice.org.
21538 + *
21539 + * OpenOffice.org is free software: you can redistribute it and/or modify
21540 + * it under the terms of the GNU Lesser General Public License version 3
21541 + * only, as published by the Free Software Foundation.
21542 + *
21543 + * OpenOffice.org is distributed in the hope that it will be useful,
21544 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
21545 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21546 + * GNU Lesser General Public License version 3 for more details
21547 + * (a copy is included in the LICENSE file that accompanied this code).
21548 + *
21549 + * You should have received a copy of the GNU Lesser General Public License
21550 + * version 3 along with OpenOffice.org. If not, see
21551 + * <http://www.openoffice.org/license.html>
21552 + * for a copy of the LGPLv3 License.
21553 + *
21554 + ************************************************************************/
21555 +#ifndef VBA_DOCUMENTBASE_HXX
21556 +#define VBA_DOCUMENTBASE_HXX
21557 +
21558 +#include <com/sun/star/frame/XModel.hpp>
21559 +#include <ooo/vba/XDocumentBase.hpp>
21560 +#include <vbahelper/vbahelperinterface.hxx>
21561 +
21562 +typedef InheritedHelperInterfaceImpl1< ooo::vba::XDocumentBase > VbaDocumentBase_BASE;
21563 +
21564 +class VbaDocumentBase : public VbaDocumentBase_BASE
21565 +{
21566 +protected:
21567 + css::uno::Reference< css::frame::XModel > mxModel;
21568 +protected:
21569 + virtual css::uno::Reference< css::frame::XModel > getModel() { return mxModel; }
21570 + VbaDocumentBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext);
21571 +public:
21572 + VbaDocumentBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext,
21573 + css::uno::Reference< css::frame::XModel > xModel );
21574 + VbaDocumentBase( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext );
21575 + virtual ~VbaDocumentBase() {}
21576 +
21577 + // Attributes
21578 + virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
21579 + virtual ::rtl::OUString SAL_CALL getPath() throw (css::uno::RuntimeException);
21580 + virtual ::rtl::OUString SAL_CALL getFullName() throw (css::uno::RuntimeException);
21581 + virtual sal_Bool SAL_CALL getSaved() throw (css::uno::RuntimeException);
21582 + virtual void SAL_CALL setSaved( sal_Bool bSave ) throw (css::uno::RuntimeException);
21583 +
21584 + // Methods
21585 + virtual void SAL_CALL Close( const css::uno::Any &bSaveChanges,
21586 + const css::uno::Any &aFileName,
21587 + const css::uno::Any &bRouteWorkbook ) throw (css::uno::RuntimeException);
21588 + virtual void SAL_CALL Protect( const css::uno::Any & aPassword ) throw (css::uno::RuntimeException);
21589 + virtual void SAL_CALL Unprotect( const css::uno::Any &aPassword ) throw (css::uno::RuntimeException);
21590 + virtual void SAL_CALL Save() throw (css::uno::RuntimeException);
21591 + virtual void SAL_CALL Activate() throw (css::uno::RuntimeException);
21592 +
21593 + // XHelperInterface
21594 + virtual rtl::OUString& getServiceImplName();
21595 + virtual css::uno::Sequence<rtl::OUString> getServiceNames();
21596 +};
21597 +
21598 +#endif /* VBA_DOCUMENTBASE_HXX */
21599 --- vbahelper/inc/vbahelper/vbaglobalbase.hxx.old 1970-01-01 00:00:00.000000000 +0000
21600 +++ vbahelper/inc/vbahelper/vbaglobalbase.hxx 2009-04-06 16:42:01.000000000 +0000
21601 @@ -0,0 +1,53 @@
21602 +/*************************************************************************
21603 + *
21604 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
21605 + *
21606 + * Copyright 2008 by Sun Microsystems, Inc.
21607 + *
21608 + * OpenOffice.org - a multi-platform office productivity suite
21609 + *
21610 + * $RCSfile: vbaapplicationbase.hxx,v $
21611 + * $Revision: 1.3 $
21612 + *
21613 + * This file is part of OpenOffice.org.
21614 + *
21615 + * OpenOffice.org is free software: you can redistribute it and/or modify
21616 + * it under the terms of the GNU Lesser General Public License version 3
21617 + * only, as published by the Free Software Foundation.
21618 + *
21619 + * OpenOffice.org is distributed in the hope that it will be useful,
21620 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
21621 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21622 + * GNU Lesser General Public License version 3 for more details
21623 + * (a copy is included in the LICENSE file that accompanied this code).
21624 + *
21625 + * You should have received a copy of the GNU Lesser General Public License
21626 + * version 3 along with OpenOffice.org. If not, see
21627 + * <http://www.openoffice.org/license.html>
21628 + * for a copy of the LGPLv3 License.
21629 + *
21630 + ************************************************************************/
21631 +#ifndef VBA_GLOBAL_BASE_HXX
21632 +#define VBA_GLOBAL_BASE_HXX
21633 +
21634 +#include "vbahelperinterface.hxx"
21635 +#include <ooo/vba/XGlobalsBase.hpp>
21636 +
21637 +typedef InheritedHelperInterfaceImpl1< ov::XGlobalsBase > Globals_BASE;
21638 +class VbaGlobalsBase : public Globals_BASE
21639 +
21640 +{
21641 +protected:
21642 +
21643 + bool hasServiceName( const rtl::OUString& serviceName );
21644 + void init( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Any& aApplication );
21645 +
21646 +public:
21647 + VbaGlobalsBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext);
21648 + virtual ~VbaGlobalsBase(){};
21649 + // XMultiServiceFactory
21650 + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier ) throw (css::uno::Exception, css::uno::RuntimeException);
21651 + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) throw (css::uno::Exception, css::uno::RuntimeException);
21652 + virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames( ) throw (css::uno::RuntimeException);
21653 +};
21654 +#endif
21655 --- vbahelper/inc/vbahelper/vbahelper.hxx.old 1970-01-01 00:00:00.000000000 +0000
21656 +++ vbahelper/inc/vbahelper/vbahelper.hxx 2009-04-06 16:42:01.000000000 +0000
21657 @@ -0,0 +1,224 @@
21658 +/*************************************************************************
21659 + *
21660 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
21661 + *
21662 + * Copyright 2008 by Sun Microsystems, Inc.
21663 + *
21664 + * OpenOffice.org - a multi-platform office productivity suite
21665 + *
21666 + * $RCSfile: vbahelper.hxx,v $
21667 + * $Revision: 1.5.32.1 $
21668 + *
21669 + * This file is part of OpenOffice.org.
21670 + *
21671 + * OpenOffice.org is free software: you can redistribute it and/or modify
21672 + * it under the terms of the GNU Lesser General Public License version 3
21673 + * only, as published by the Free Software Foundation.
21674 + *
21675 + * OpenOffice.org is distributed in the hope that it will be useful,
21676 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
21677 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21678 + * GNU Lesser General Public License version 3 for more details
21679 + * (a copy is included in the LICENSE file that accompanied this code).
21680 + *
21681 + * You should have received a copy of the GNU Lesser General Public License
21682 + * version 3 along with OpenOffice.org. If not, see
21683 + * <http://www.openoffice.org/license.html>
21684 + * for a copy of the LGPLv3 License.
21685 + *
21686 + ************************************************************************/
21687 +#ifndef OOVBAAPI_VBA_HELPER_HXX
21688 +#define OOVBAAPI_VBA_HELPER_HXX
21689 +
21690 +#include <com/sun/star/drawing/XShape.hpp>
21691 +#include <com/sun/star/beans/XIntrospectionAccess.hpp>
21692 +#include <com/sun/star/beans/XPropertySet.hpp>
21693 +#include <com/sun/star/script/BasicErrorException.hpp>
21694 +#include <com/sun/star/script/XTypeConverter.hpp>
21695 +#include <com/sun/star/lang/IllegalArgumentException.hpp>
21696 +#include <com/sun/star/awt/XControl.hpp>
21697 +#include <com/sun/star/awt/XDevice.hpp>
21698 +#include <basic/sberrors.hxx>
21699 +#include <cppuhelper/implbase1.hxx>
21700 +#include <com/sun/star/frame/XModel.hpp>
21701 +#include <sfx2/dispatch.hxx>
21702 +//#include <ooo/vba/msforms/XShape.hpp>
21703 +#include <vcl/pointr.hxx>
21704 +#define VBAHELPER_DLLIMPLEMENTATION
21705 +#include <vbahelper/vbadllapi.h>
21706 +namespace css = ::com::sun::star;
21707 +
21708 +namespace ooo
21709 +{
21710 + namespace vba
21711 + {
21712 + template < class T >
21713 + css::uno::Reference< T > getXSomethingFromArgs( css::uno::Sequence< css::uno::Any > const & args, sal_Int32 nPos, bool bCanBeNull = true ) throw (css::lang::IllegalArgumentException)
21714 + {
21715 + if ( args.getLength() < ( nPos + 1) )
21716 + throw css::lang::IllegalArgumentException();
21717 + css::uno::Reference< T > aSomething( args[ nPos ], css::uno::UNO_QUERY );
21718 + if ( !bCanBeNull && !aSomething.is() )
21719 + throw css::lang::IllegalArgumentException();
21720 + return aSomething;
21721 + }
21722 + VBAHELPER_DLLPUBLIC css::uno::Reference< css::uno::XInterface > createVBAUnoAPIService( SfxObjectShell* pShell, const sal_Char* _pAsciiName ) throw (css::uno::RuntimeException);
21723 + VBAHELPER_DLLPUBLIC css::uno::Reference< css::uno::XInterface > createVBAUnoAPIServiceWithArgs( SfxObjectShell* pShell, const sal_Char* _pAsciiName, const css::uno::Sequence< css::uno::Any >& aArgs ) throw (css::uno::RuntimeException);
21724 + VBAHELPER_DLLPUBLIC css::uno::Reference< css::frame::XModel > getCurrentDocument() throw (css::uno::RuntimeException);
21725 + VBAHELPER_DLLPUBLIC css::uno::Reference< css::beans::XIntrospectionAccess > getIntrospectionAccess( const css::uno::Any& aObject ) throw (css::uno::RuntimeException);
21726 + VBAHELPER_DLLPUBLIC css::uno::Reference< css::script::XTypeConverter > getTypeConverter( const css::uno::Reference< css::uno::XComponentContext >& xContext ) throw (css::uno::RuntimeException);
21727 +
21728 + VBAHELPER_DLLPUBLIC void dispatchRequests (css::uno::Reference< css::frame::XModel>& xModel,rtl::OUString & aUrl) ;
21729 + VBAHELPER_DLLPUBLIC void dispatchRequests (css::uno::Reference< css::frame::XModel>& xModel,rtl::OUString & aUrl, css::uno::Sequence< css::beans::PropertyValue >& sProps ) ;
21730 + VBAHELPER_DLLPUBLIC void dispatchExecute(SfxViewShell* pView, USHORT nSlot, SfxCallMode nCall = SFX_CALLMODE_SYNCHRON );
21731 + VBAHELPER_DLLPUBLIC sal_Int32 OORGBToXLRGB( sal_Int32 );
21732 + VBAHELPER_DLLPUBLIC sal_Int32 XLRGBToOORGB( sal_Int32 );
21733 + VBAHELPER_DLLPUBLIC css::uno::Any OORGBToXLRGB( const css::uno::Any& );
21734 + VBAHELPER_DLLPUBLIC css::uno::Any XLRGBToOORGB( const css::uno::Any& );
21735 + // provide a NULL object that can be passed as variant so that
21736 + // the object when passed to IsNull will return true. aNULL
21737 + // contains an empty object reference
21738 + VBAHELPER_DLLPUBLIC const css::uno::Any& aNULL();
21739 + VBAHELPER_DLLPUBLIC void PrintOutHelper( SfxViewShell* pViewShell, 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, sal_Bool bSelection );
21740 + VBAHELPER_DLLPUBLIC void PrintPreviewHelper( const css::uno::Any& EnableChanges, SfxViewShell* );
21741 +
21742 + VBAHELPER_DLLPUBLIC rtl::OUString getAnyAsString( const css::uno::Any& pvargItem ) throw ( css::uno::RuntimeException );
21743 + VBAHELPER_DLLPUBLIC rtl::OUString VBAToRegexp(const rtl::OUString &rIn, bool bForLike = false); // needs to be in an uno service ( already this code is duplicated in basic )
21744 + VBAHELPER_DLLPUBLIC double getPixelTo100thMillimeterConversionFactor( css::uno::Reference< css::awt::XDevice >& xDevice, sal_Bool bVertical);
21745 + VBAHELPER_DLLPUBLIC double PointsToPixels( css::uno::Reference< css::awt::XDevice >& xDevice, double fPoints, sal_Bool bVertical);
21746 + VBAHELPER_DLLPUBLIC double PixelsToPoints( css::uno::Reference< css::awt::XDevice >& xDevice, double fPoints, sal_Bool bVertical);
21747 + VBAHELPER_DLLPUBLIC sal_Int32 getPointerStyle();
21748 + VBAHELPER_DLLPUBLIC void setCursorHelper( const Pointer& rPointer, sal_Bool bOverWrite );
21749 + VBAHELPER_DLLPUBLIC String docMacroExists( SfxObjectShell* pShell, const String& sMod, const String& sMacro );
21750 +
21751 +class VBAHELPER_DLLPUBLIC Millimeter
21752 +{
21753 +//Factor to translate between points and hundredths of millimeters:
21754 +private:
21755 + static const double factor;
21756 +
21757 + double m_nMillimeter;
21758 +
21759 +public:
21760 + Millimeter();
21761 +
21762 + Millimeter(double mm);
21763 +
21764 + void set(double mm);
21765 + void setInPoints(double points) ;
21766 + void setInHundredthsOfOneMillimeter(double hmm);
21767 + double get();
21768 + double getInHundredthsOfOneMillimeter();
21769 + double getInPoints();
21770 + static sal_Int32 getInHundredthsOfOneMillimeter(double points);
21771 + static double getInPoints(int _hmm);
21772 +};
21773 +
21774 +class VBAHELPER_DLLPUBLIC AbstractGeometryAttributes // probably should replace the ShapeHelper below
21775 +{
21776 +public:
21777 + virtual ~AbstractGeometryAttributes() {}
21778 + virtual double getLeft() = 0;
21779 + virtual void setLeft( double ) = 0;
21780 + virtual double getTop() = 0;
21781 + virtual void setTop( double ) = 0;
21782 + virtual double getHeight() = 0;
21783 + virtual void setHeight( double ) = 0;
21784 + virtual double getWidth() = 0;
21785 + virtual void setWidth( double ) = 0;
21786 +};
21787 +
21788 +namespace msforms {
21789 + class XShape;
21790 +}
21791 +
21792 +class VBAHELPER_DLLPUBLIC ConcreteXShapeGeometryAttributes : public AbstractGeometryAttributes
21793 +{
21794 +public:
21795 + css::uno::Reference< ooo::vba::msforms::XShape > m_xShape;
21796 + ConcreteXShapeGeometryAttributes( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape );
21797 + virtual double getLeft();
21798 + virtual void setLeft( double nLeft );
21799 + virtual double getTop();
21800 + virtual void setTop( double nTop );
21801 + virtual double getHeight();
21802 + virtual void setHeight( double nHeight );
21803 + virtual double getWidth();
21804 + virtual void setWidth( double nWidth);
21805 +};
21806 +#define VBA_LEFT "PositionX"
21807 +#define VBA_TOP "PositionY"
21808 +class VBAHELPER_DLLPUBLIC UserFormGeometryHelper : public AbstractGeometryAttributes
21809 +{
21810 +
21811 + css::uno::Reference< css::beans::XPropertySet > mxModel;
21812 +public:
21813 + UserFormGeometryHelper( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::awt::XControl >& xControl );
21814 + virtual double getLeft();
21815 + virtual void setLeft( double nLeft );
21816 + virtual double getTop();
21817 + virtual void setTop( double nTop );
21818 + virtual double getHeight();
21819 + virtual void setHeight( double nHeight );
21820 + virtual double getWidth();
21821 + virtual void setWidth( double nWidth);
21822 +};
21823 +
21824 +class VBAHELPER_DLLPUBLIC ShapeHelper
21825 +{
21826 +protected:
21827 + css::uno::Reference< css::drawing::XShape > xShape;
21828 +public:
21829 + ShapeHelper( const css::uno::Reference< css::drawing::XShape >& _xShape) throw (css::script::BasicErrorException );
21830 +
21831 + double getHeight();
21832 +
21833 + void setHeight(double _fheight) throw ( css::script::BasicErrorException );
21834 +
21835 + double getWidth();
21836 +
21837 + void setWidth(double _fWidth) throw ( css::script::BasicErrorException );
21838 +
21839 + double getLeft();
21840 +
21841 + void setLeft(double _fLeft);
21842 +
21843 + double getTop();
21844 +
21845 + void setTop(double _fTop);
21846 +};
21847 +
21848 +class VBAHELPER_DLLPUBLIC ContainerUtilities
21849 +{
21850 +
21851 +public:
21852 + static rtl::OUString getUniqueName( const css::uno::Sequence< ::rtl::OUString >& _slist, const rtl::OUString& _sElementName, const ::rtl::OUString& _sSuffixSeparator);
21853 + static rtl::OUString getUniqueName( const css::uno::Sequence< rtl::OUString >& _slist, const rtl::OUString _sElementName, const rtl::OUString& _sSuffixSeparator, sal_Int32 _nStartSuffix );
21854 +
21855 + static sal_Int32 FieldInList( const css::uno::Sequence< rtl::OUString >& SearchList, const rtl::OUString& SearchString );
21856 +};
21857 +
21858 +// really just a a place holder to ease the porting pain
21859 +class VBAHELPER_DLLPUBLIC DebugHelper
21860 +{
21861 +public:
21862 + static void exception( const rtl::OUString& DetailedMessage, const css::uno::Exception& ex, int err, const rtl::OUString& /*additionalArgument*/ ) throw( css::script::BasicErrorException );
21863 +
21864 + static void exception( int err, const rtl::OUString& additionalArgument ) throw( css::script::BasicErrorException );
21865 +
21866 + static void exception( css::uno::Exception& ex ) throw( css::script::BasicErrorException );
21867 +};
21868 + } // openoffice
21869 +} // org
21870 +
21871 +namespace ov = ooo::vba;
21872 +
21873 +#ifdef DEBUG
21874 +# define SC_VBA_FIXME(a) OSL_TRACE( a )
21875 +# define SC_VBA_STUB() SC_VBA_FIXME(( "%s - stubbed\n", __FUNCTION__ ))
21876 +#else
21877 +# define SC_VBA_FIXME(a)
21878 +# define SC_VBA_STUB()
21879 +#endif
21880 +
21881 +#endif
21882 --- vbahelper/inc/vbahelper/vbahelperinterface.hxx.old 1970-01-01 00:00:00.000000000 +0000
21883 +++ vbahelper/inc/vbahelper/vbahelperinterface.hxx 2009-04-06 16:42:01.000000000 +0000
21884 @@ -0,0 +1,121 @@
21885 +/*************************************************************************
21886 + *
21887 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
21888 + *
21889 + * Copyright 2008 by Sun Microsystems, Inc.
21890 + *
21891 + * OpenOffice.org - a multi-platform office productivity suite
21892 + *
21893 + * $RCSfile: vbahelperinterface.hxx,v $
21894 + * $Revision: 1.3 $
21895 + *
21896 + * This file is part of OpenOffice.org.
21897 + *
21898 + * OpenOffice.org is free software: you can redistribute it and/or modify
21899 + * it under the terms of the GNU Lesser General Public License version 3
21900 + * only, as published by the Free Software Foundation.
21901 + *
21902 + * OpenOffice.org is distributed in the hope that it will be useful,
21903 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
21904 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21905 + * GNU Lesser General Public License version 3 for more details
21906 + * (a copy is included in the LICENSE file that accompanied this code).
21907 + *
21908 + * You should have received a copy of the GNU Lesser General Public License
21909 + * version 3 along with OpenOffice.org. If not, see
21910 + * <http://www.openoffice.org/license.html>
21911 + * for a copy of the LGPLv3 License.
21912 + *
21913 + ************************************************************************/
21914 +#ifndef OOVBAAPI_VBA_HELPERINTERFACE_HXX
21915 +#define OOVBAAPI_VBA_HELPERINTERFACE_HXX
21916 +
21917 +#include <cppuhelper/implbase1.hxx>
21918 +#include <ooo/vba/XHelperInterface.hpp>
21919 +#include <vbahelper/vbahelper.hxx>
21920 +#include <com/sun/star/container/XNameAccess.hpp>
21921 +
21922 +// use this class when you have an a object like
21923 +// interface XAnInterface which contains XHelperInterface in its inheritance hierarchy
21924 +// interface XAnInterface
21925 +// {
21926 +// interface XHelperInterface;
21927 +// [attribute, string] name;
21928 +// }
21929 +// or
21930 +// interface XAnInterface : XHelperInterface;
21931 +// {
21932 +// [attribute, string] name;
21933 +// }
21934 +//
21935 +// then this class can provide a default implementation of XHelperInterface,
21936 +// you can use it like this
21937 +// typedef InheritedHelperInterfaceImpl< XAnInterface > > AnInterfaceImpl_BASE;
21938 +// class AnInterfaceImpl : public AnInterfaceImpl_BASE
21939 +// {
21940 +// public:
21941 +// AnInterface( const Reference< HelperInterface >& xParent ) : AnInterfaceImpl_BASE( xParent ) {}
21942 +// // implement XAnInterface methods only, no need to implement the XHelperInterface
21943 +// // methods
21944 +// virtual void setName( const OUString& );
21945 +// virtual OUString getName();
21946 +// }
21947 +//
21948 +const ::rtl::OUString sHelperServiceName( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.HelperServiceBase" ) );
21949 +
21950 +template< typename Ifc1 >
21951 +class InheritedHelperInterfaceImpl : public Ifc1
21952 +{
21953 +protected:
21954 + css::uno::WeakReference< ov::XHelperInterface > mxParent;
21955 + css::uno::Reference< css::uno::XComponentContext > mxContext;
21956 +public:
21957 + InheritedHelperInterfaceImpl() {}
21958 + InheritedHelperInterfaceImpl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext ) : mxParent( xParent ), mxContext( xContext ) {}
21959 + virtual rtl::OUString& getServiceImplName() = 0;
21960 + virtual css::uno::Sequence<rtl::OUString> getServiceNames() = 0;
21961 +
21962 + // XHelperInterface Methods
21963 + virtual ::sal_Int32 SAL_CALL getCreator() throw (css::script::BasicErrorException, css::uno::RuntimeException)
21964 + {
21965 + return 0x53756E4F;
21966 + }
21967 + virtual css::uno::Reference< ov::XHelperInterface > SAL_CALL getParent( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { return mxParent; }
21968 +
21969 + virtual css::uno::Any SAL_CALL Application( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) {
21970 + // The application could certainly be passed around in the context - seems
21971 + // to make sense
21972 + css::uno::Reference< css::container::XNameAccess > xNameAccess( mxContext, css::uno::UNO_QUERY_THROW );
21973 + return xNameAccess->getByName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Application" ) ) );
21974 + }
21975 +
21976 +
21977 + // XServiceInfo Methods
21978 + virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException) { return getServiceImplName(); }
21979 + virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (css::uno::RuntimeException)
21980 + {
21981 + css::uno::Sequence< rtl::OUString > sServices = getSupportedServiceNames();
21982 + const rtl::OUString* pStart = sServices.getConstArray();
21983 + const rtl::OUString* pEnd = pStart + sServices.getLength();
21984 + for ( ; pStart != pEnd ; ++pStart )
21985 + if ( (*pStart).equals( ServiceName ) )
21986 + return sal_True;
21987 + return sal_False;
21988 + }
21989 + virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException)
21990 + {
21991 + css::uno::Sequence< rtl::OUString > aNames = getServiceNames();;
21992 + return aNames;
21993 + }
21994 + };
21995 +
21996 +template< typename Ifc1 >
21997 +class InheritedHelperInterfaceImpl1 : public InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper1< Ifc1 > >
21998 +
21999 +{
22000 +typedef InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper1< Ifc1 > > Base;
22001 +public:
22002 + InheritedHelperInterfaceImpl1< Ifc1 > ( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext ) : Base( xParent, xContext ) {}
22003 +
22004 +};
22005 +#endif
22006 --- vbahelper/inc/vbahelper/vbapropvalue.hxx.old 1970-01-01 00:00:00.000000000 +0000
22007 +++ vbahelper/inc/vbahelper/vbapropvalue.hxx 2009-04-06 16:42:01.000000000 +0000
22008 @@ -0,0 +1,60 @@
22009 +/*************************************************************************
22010 + *
22011 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
22012 + *
22013 + * Copyright 2008 by Sun Microsystems, Inc.
22014 + *
22015 + * OpenOffice.org - a multi-platform office productivity suite
22016 + *
22017 + * $RCSfile: vbapropvalue.hxx,v $
22018 + * $Revision: 1.3 $
22019 + *
22020 + * This file is part of OpenOffice.org.
22021 + *
22022 + * OpenOffice.org is free software: you can redistribute it and/or modify
22023 + * it under the terms of the GNU Lesser General Public License version 3
22024 + * only, as published by the Free Software Foundation.
22025 + *
22026 + * OpenOffice.org is distributed in the hope that it will be useful,
22027 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
22028 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22029 + * GNU Lesser General Public License version 3 for more details
22030 + * (a copy is included in the LICENSE file that accompanied this code).
22031 + *
22032 + * You should have received a copy of the GNU Lesser General Public License
22033 + * version 3 along with OpenOffice.org. If not, see
22034 + * <http://www.openoffice.org/license.html>
22035 + * for a copy of the LGPLv3 License.
22036 + *
22037 + ************************************************************************/
22038 +#ifndef SC_VBA_PROPVALULE_HXX
22039 +#define SC_VBA_PROPVALULE_HXX
22040 +#include <ooo/vba/XPropValue.hpp>
22041 +#include <cppuhelper/implbase1.hxx>
22042 +
22043 +#include <vbahelper/vbahelper.hxx>
22044 +
22045 +typedef ::cppu::WeakImplHelper1< ov::XPropValue > PropValueImpl_BASE;
22046 +
22047 +class PropListener
22048 +{
22049 +public:
22050 + virtual void setValueEvent( const css::uno::Any& value ) = 0;
22051 + virtual css::uno::Any getValueEvent() = 0;
22052 +};
22053 +
22054 +
22055 +class ScVbaPropValue : public PropValueImpl_BASE
22056 +{
22057 + PropListener* m_pListener;
22058 +public:
22059 + ScVbaPropValue( PropListener* pListener );
22060 +
22061 + // Attributes
22062 + virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
22063 + virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
22064 +
22065 + rtl::OUString SAL_CALL getDefaultPropertyName() throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
22066 +
22067 +};
22068 +#endif //SC_VBA_PROPVALULE_HXX
22069 --- vbahelper/inc/vbahelper/vbawindowbase.hxx.old 1970-01-01 00:00:00.000000000 +0000
22070 +++ vbahelper/inc/vbahelper/vbawindowbase.hxx 2009-04-06 16:42:01.000000000 +0000
22071 @@ -0,0 +1,66 @@
22072 +/*************************************************************************
22073 + *
22074 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
22075 + *
22076 + * Copyright 2008 by Sun Microsystems, Inc.
22077 + *
22078 + * OpenOffice.org - a multi-platform office productivity suite
22079 + *
22080 + * $RCSfile:
22081 + * $Revision:
22082 + *
22083 + * This file is part of OpenOffice.org.
22084 + *
22085 + * OpenOffice.org is free software: you can redistribute it and/or modify
22086 + * it under the terms of the GNU Lesser General Public License version 3
22087 + * only, as published by the Free Software Foundation.
22088 + *
22089 + * OpenOffice.org is distributed in the hope that it will be useful,
22090 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
22091 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22092 + * GNU Lesser General Public License version 3 for more details
22093 + * (a copy is included in the LICENSE file that accompanied this code).
22094 + *
22095 + * You should have received a copy of the GNU Lesser General Public License
22096 + * version 3 along with OpenOffice.org. If not, see
22097 + * <http://www.openoffice.org/license.html>
22098 + * for a copy of the LGPLv3 License.
22099 + *
22100 + ************************************************************************/
22101 +#ifndef VBA_WINDOWBASE_HXX
22102 +#define VBA_WINDOWBASE_HXX
22103 +#include <cppuhelper/implbase1.hxx>
22104 +#include <ooo/vba/XWindowBase.hpp>
22105 +#include <com/sun/star/frame/XModel.hpp>
22106 +#include <com/sun/star/awt/XDevice.hpp>
22107 +
22108 +#include <vbahelper/vbahelperinterface.hxx>
22109 +
22110 +typedef InheritedHelperInterfaceImpl1<ov::XWindowBase > WindowBaseImpl_BASE;
22111 +
22112 +class VbaWindowBase : public WindowBaseImpl_BASE
22113 +{
22114 +protected:
22115 + css::uno::Reference< css::frame::XModel > m_xModel;
22116 +public:
22117 + VbaWindowBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::frame::XModel >& xModel );
22118 + VbaWindowBase( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext > const& xContext );
22119 +
22120 + // XWindowBase
22121 + virtual sal_Int32 SAL_CALL getHeight() throw (css::uno::RuntimeException) ;
22122 + virtual void SAL_CALL setHeight( sal_Int32 _height ) throw (css::uno::RuntimeException) ;
22123 + virtual sal_Int32 SAL_CALL getLeft() throw (css::uno::RuntimeException) ;
22124 + virtual void SAL_CALL setLeft( sal_Int32 _left ) throw (css::uno::RuntimeException) ;
22125 + virtual sal_Int32 SAL_CALL getTop() throw (css::uno::RuntimeException) ;
22126 + virtual void SAL_CALL setTop( sal_Int32 _top ) throw (css::uno::RuntimeException) ;
22127 + virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
22128 + virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException);
22129 + virtual sal_Int32 SAL_CALL getWidth() throw (css::uno::RuntimeException) ;
22130 + virtual void SAL_CALL setWidth( sal_Int32 _width ) throw (css::uno::RuntimeException) ;
22131 +
22132 + // XHelperInterface
22133 + virtual rtl::OUString& getServiceImplName();
22134 + virtual css::uno::Sequence<rtl::OUString> getServiceNames();
22135 +};
22136 +
22137 +#endif //VBA_WINDOWBASE_HXX
22138 --- vbahelper/prj/build.lst.old 1970-01-01 00:00:00.000000000 +0000
22139 +++ vbahelper/prj/build.lst 2009-04-06 16:42:01.000000000 +0000
22140 @@ -0,0 +1,6 @@
22141 +vba vbahelper : oovbaapi basic sfx2 svx cppuhelper vcl comphelper svtools tools sal NULL
22142 +vba vbahelper usr1 - all vba_mkout NULL
22143 +#vba vbahelper\inc nmake - all vba_inc NULL
22144 +vba vbahelper\source\vbahelper nmake - all vba_vbahelper NULL
22145 +vba vbahelper\source\msforms nmake - all vba_msforms NULL
22146 +vba vbahelper\util nmake - all vba_util vba_vbahelper vba_msforms NULL
22147 --- vbahelper/prj/d.lst.old 1970-01-01 00:00:00.000000000 +0000
22148 +++ vbahelper/prj/d.lst 2009-04-06 16:42:01.000000000 +0000
22149 @@ -0,0 +1,18 @@
22150 +..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
22151 +..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%
22152 +..\%__SRC%\slb\vbahelper.lib %_DEST%\lib%_EXT%\vbahelper.lib
22153 +..\%__SRC%\lib\vbahelp*.* %_DEST%\lib%_EXT%\vba*.*
22154 +..\%__SRC%\bin\vbahelper*.* %_DEST%\bin%_EXT%\vbahelper*.*
22155 +..\%__SRC%\bin\msforms*.* %_DEST%\bin%_EXT%\msforms*.*
22156 +
22157 +mkdir: %_DEST%\inc%_EXT%\basic
22158 +..\inc\vbahelper\vbacollectionimpl.hxx %_DEST%\inc%_EXT%\vbahelper\vbacollectionimpl.hxx
22159 +..\inc\vbahelper\vbahelper.hxx %_DEST%\inc%_EXT%\vbahelper\vbahelper.hxx
22160 +..\inc\vbahelper\helperdecl.hxx %_DEST%\inc%_EXT%\vbahelper\helperdecl.hxx
22161 +..\inc\vbahelper\vbahelperinterface.hxx %_DEST%\inc%_EXT%\vbahelper\vbahelperinterface.hxx
22162 +..\inc\vbahelper\vbaapplicationbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbaapplicationbase.hxx
22163 +..\inc\vbahelper\vbadllapi.h %_DEST%\inc%_EXT%\vbahelper\vbadllapi.h
22164 +..\inc\vbahelper\vbawindowbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbawindowbase.hxx
22165 +..\inc\vbahelper\vbadocumentbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbadocumentbase.hxx
22166 +..\inc\vbahelper\vbapropvalue.hxx %_DEST%\inc%_EXT%\vbahelper\vbapropvalue.hxx
22167 +..\inc\vbahelper\vbaglobalbase.hxx %_DEST%\inc%_EXT%\vbahelper\vbaglobalbase.hxx
22168 --- vbahelper/source/msforms/makefile.mk.old 1970-01-01 00:00:00.000000000 +0000
22169 +++ vbahelper/source/msforms/makefile.mk 2009-04-06 16:42:01.000000000 +0000
22170 @@ -0,0 +1,78 @@
22171 +#*************************************************************************
22172 +#
22173 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
22174 +#
22175 +# Copyright 2008 by Sun Microsystems, Inc.
22176 +#
22177 +# OpenOffice.org - a multi-platform office productivity suite
22178 +#
22179 +# $RCSfile: makefile.mk,v $
22180 +#
22181 +# $Revision: 1.45 $
22182 +#
22183 +# This file is part of OpenOffice.org.
22184 +#
22185 +# OpenOffice.org is free software: you can redistribute it and/or modify
22186 +# it under the terms of the GNU Lesser General Public License version 3
22187 +# only, as published by the Free Software Foundation.
22188 +#
22189 +# OpenOffice.org is distributed in the hope that it will be useful,
22190 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
22191 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22192 +# GNU Lesser General Public License version 3 for more details
22193 +# (a copy is included in the LICENSE file that accompanied this code).
22194 +#
22195 +# You should have received a copy of the GNU Lesser General Public License
22196 +# version 3 along with OpenOffice.org. If not, see
22197 +# <http://www.openoffice.org/license.html>
22198 +# for a copy of the LGPLv3 License.
22199 +#
22200 +#*************************************************************************
22201 +
22202 +PRJ=..$/..
22203 +PRJNAME=vbahelper
22204 +TARGET=msforms
22205 +
22206 +ENABLE_EXCEPTIONS := TRUE
22207 +
22208 +# --- Settings -----------------------------------------------------
22209 +
22210 +.INCLUDE : settings.mk
22211 +
22212 +SLOFILES=\
22213 + $(SLO)$/vbacontrol.obj \
22214 + $(SLO)$/vbacontrols.obj \
22215 + $(SLO)$/vbabutton.obj \
22216 + $(SLO)$/vbacombobox.obj \
22217 + $(SLO)$/vbalabel.obj \
22218 + $(SLO)$/vbatextbox.obj \
22219 + $(SLO)$/vbaradiobutton.obj \
22220 + $(SLO)$/vbalistbox.obj \
22221 + $(SLO)$/vbatogglebutton.obj \
22222 + $(SLO)$/vbacheckbox.obj \
22223 + $(SLO)$/vbaframe.obj \
22224 + $(SLO)$/vbascrollbar.obj \
22225 + $(SLO)$/vbaprogressbar.obj \
22226 + $(SLO)$/vbamultipage.obj \
22227 + $(SLO)$/vbalistcontrolhelper.obj \
22228 + $(SLO)$/vbaspinbutton.obj \
22229 + $(SLO)$/vbaimage.obj \
22230 + $(SLO)$/vbapages.obj \
22231 + $(SLO)$/vbauserform.obj \
22232 + $(SLO)$/service.obj \
22233 +
22234 +# #FIXME vbapropvalue needs to move to vbahelper
22235 +
22236 +# --- Targets -------------------------------------------------------
22237 +
22238 +.INCLUDE : target.mk
22239 +
22240 +ALLTAR : \
22241 + $(MISC)$/$(TARGET).don \
22242 +
22243 +$(SLOFILES) : $(MISC)$/$(TARGET).don
22244 +
22245 +$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
22246 + +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
22247 + echo $@
22248 +
22249 --- vbahelper/source/msforms/service.cxx.old 1970-01-01 00:00:00.000000000 +0000
22250 +++ vbahelper/source/msforms/service.cxx 2009-04-06 16:42:01.000000000 +0000
22251 @@ -0,0 +1,83 @@
22252 +/*************************************************************************
22253 + *
22254 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
22255 + *
22256 + * Copyright 2008 by Sun Microsystems, Inc.
22257 + *
22258 + * OpenOffice.org - a multi-platform office productivity suite
22259 + *
22260 + * $RCSfile: service.cxx,v $
22261 + * $Revision: 1.4 $
22262 + *
22263 + * This file is part of OpenOffice.org.
22264 + *
22265 + * OpenOffice.org is free software: you can redistribute it and/or modify
22266 + * it under the terms of the GNU Lesser General Public License version 3
22267 + * only, as published by the Free Software Foundation.
22268 + *
22269 + * OpenOffice.org is distributed in the hope that it will be useful,
22270 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
22271 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22272 + * GNU Lesser General Public License version 3 for more details
22273 + * (a copy is included in the LICENSE file that accompanied this code).
22274 + *
22275 + * You should have received a copy of the GNU Lesser General Public License
22276 + * version 3 along with OpenOffice.org. If not, see
22277 + * <http://www.openoffice.org/license.html>
22278 + * for a copy of the LGPLv3 License.
22279 + *
22280 + ************************************************************************/
22281 +#include "cppuhelper/implementationentry.hxx"
22282 +#include "com/sun/star/lang/XMultiServiceFactory.hpp"
22283 +#include "com/sun/star/registry/XRegistryKey.hpp"
22284 +#include "comphelper/servicedecl.hxx"
22285 +
22286 +// =============================================================================
22287 +// component exports
22288 +// =============================================================================
22289 +using namespace ::com::sun::star;
22290 +using namespace ::com::sun::star::uno;
22291 +
22292 +namespace sdecl = comphelper::service_decl;
22293 +
22294 +// reference service helper(s)
22295 +namespace controlprovider
22296 +{
22297 +extern sdecl::ServiceDecl const serviceDecl;
22298 +}
22299 +
22300 +namespace userform
22301 +{
22302 +extern sdecl::ServiceDecl const serviceDecl;
22303 +}
22304 +
22305 +extern "C"
22306 +{
22307 + void SAL_CALL component_getImplementationEnvironment(
22308 + const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
22309 + {
22310 + OSL_TRACE("In component_getImplementationEnv");
22311 + *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
22312 + }
22313 +
22314 + sal_Bool SAL_CALL component_writeInfo(
22315 + lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey )
22316 + {
22317 + OSL_TRACE("In component_writeInfo");
22318 +
22319 + // Component registration
22320 + return component_writeInfoHelper( pServiceManager, pRegistryKey,
22321 + controlprovider::serviceDecl, userform::serviceDecl );
22322 + }
22323 +
22324 + void * SAL_CALL component_getFactory(
22325 + const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager,
22326 + registry::XRegistryKey * pRegistryKey )
22327 + {
22328 + OSL_TRACE("In component_getFactory for %s", pImplName );
22329 + void* pRet = component_getFactoryHelper(
22330 + pImplName, pServiceManager, pRegistryKey, controlprovider::serviceDecl, userform::serviceDecl );
22331 + OSL_TRACE("Ret is 0x%x", pRet);
22332 + return pRet;
22333 + }
22334 +}
22335 --- vbahelper/source/msforms/vbabutton.cxx.old 1970-01-01 00:00:00.000000000 +0000
22336 +++ vbahelper/source/msforms/vbabutton.cxx 2009-04-06 16:42:01.000000000 +0000
22337 @@ -0,0 +1,74 @@
22338 +/*************************************************************************
22339 + *
22340 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
22341 + *
22342 + * Copyright 2008 by Sun Microsystems, Inc.
22343 + *
22344 + * OpenOffice.org - a multi-platform office productivity suite
22345 + *
22346 + * $RCSfile: vbabutton.cxx,v $
22347 + * $Revision: 1.3 $
22348 + *
22349 + * This file is part of OpenOffice.org.
22350 + *
22351 + * OpenOffice.org is free software: you can redistribute it and/or modify
22352 + * it under the terms of the GNU Lesser General Public License version 3
22353 + * only, as published by the Free Software Foundation.
22354 + *
22355 + * OpenOffice.org is distributed in the hope that it will be useful,
22356 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
22357 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22358 + * GNU Lesser General Public License version 3 for more details
22359 + * (a copy is included in the LICENSE file that accompanied this code).
22360 + *
22361 + * You should have received a copy of the GNU Lesser General Public License
22362 + * version 3 along with OpenOffice.org. If not, see
22363 + * <http://www.openoffice.org/license.html>
22364 + * for a copy of the LGPLv3 License.
22365 + *
22366 + ************************************************************************/
22367 +#include "vbabutton.hxx"
22368 +#include <vector>
22369 +
22370 +using namespace com::sun::star;
22371 +using namespace ooo::vba;
22372 +
22373 +
22374 +const static rtl::OUString LABEL( RTL_CONSTASCII_USTRINGPARAM("Label") );
22375 +ScVbaButton::ScVbaButton( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : ButtonImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
22376 +{
22377 +}
22378 +
22379 +// Attributes
22380 +rtl::OUString SAL_CALL
22381 +ScVbaButton::getCaption() throw (css::uno::RuntimeException)
22382 +{
22383 + rtl::OUString Label;
22384 + m_xProps->getPropertyValue( LABEL ) >>= Label;
22385 + return Label;
22386 +}
22387 +
22388 +void SAL_CALL
22389 +ScVbaButton::setCaption( const rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException)
22390 +{
22391 + m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) );
22392 +}
22393 +
22394 +rtl::OUString&
22395 +ScVbaButton::getServiceImplName()
22396 +{
22397 + static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaButton") );
22398 + return sImplName;
22399 +}
22400 +
22401 +uno::Sequence< rtl::OUString >
22402 +ScVbaButton::getServiceNames()
22403 +{
22404 + static uno::Sequence< rtl::OUString > aServiceNames;
22405 + if ( aServiceNames.getLength() == 0 )
22406 + {
22407 + aServiceNames.realloc( 1 );
22408 + aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.Button" ) );
22409 + }
22410 + return aServiceNames;
22411 +}
22412 --- vbahelper/source/msforms/vbabutton.hxx.old 1970-01-01 00:00:00.000000000 +0000
22413 +++ vbahelper/source/msforms/vbabutton.hxx 2009-04-06 16:42:01.000000000 +0000
22414 @@ -0,0 +1,51 @@
22415 +/*************************************************************************
22416 + *
22417 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
22418 + *
22419 + * Copyright 2008 by Sun Microsystems, Inc.
22420 + *
22421 + * OpenOffice.org - a multi-platform office productivity suite
22422 + *
22423 + * $RCSfile: vbabutton.hxx,v $
22424 + * $Revision: 1.3 $
22425 + *
22426 + * This file is part of OpenOffice.org.
22427 + *
22428 + * OpenOffice.org is free software: you can redistribute it and/or modify
22429 + * it under the terms of the GNU Lesser General Public License version 3
22430 + * only, as published by the Free Software Foundation.
22431 + *
22432 + * OpenOffice.org is distributed in the hope that it will be useful,
22433 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
22434 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22435 + * GNU Lesser General Public License version 3 for more details
22436 + * (a copy is included in the LICENSE file that accompanied this code).
22437 + *
22438 + * You should have received a copy of the GNU Lesser General Public License
22439 + * version 3 along with OpenOffice.org. If not, see
22440 + * <http://www.openoffice.org/license.html>
22441 + * for a copy of the LGPLv3 License.
22442 + *
22443 + ************************************************************************/
22444 +#ifndef SC_VBA_BUTTON_HXX
22445 +#define SC_VBA_BUTTON_HXX
22446 +#include <cppuhelper/implbase1.hxx>
22447 +#include <ooo/vba/msforms/XButton.hpp>
22448 +
22449 +#include "vbacontrol.hxx"
22450 +#include <vbahelper/vbahelper.hxx>
22451 +
22452 +typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XButton > ButtonImpl_BASE;
22453 +
22454 +class ScVbaButton : public ButtonImpl_BASE
22455 +{
22456 +public:
22457 + ScVbaButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
22458 + // Attributes
22459 + virtual rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
22460 + virtual void SAL_CALL setCaption( const rtl::OUString& _caption ) throw (css::uno::RuntimeException);
22461 + //XHelperInterface
22462 + virtual rtl::OUString& getServiceImplName();
22463 + virtual css::uno::Sequence<rtl::OUString> getServiceNames();
22464 +};
22465 +#endif //SC_VBA_BUTTON_HXX
22466 --- vbahelper/source/msforms/vbacheckbox.cxx.old 1970-01-01 00:00:00.000000000 +0000
22467 +++ vbahelper/source/msforms/vbacheckbox.cxx 2009-04-06 16:42:01.000000000 +0000
22468 @@ -0,0 +1,112 @@
22469 +/*************************************************************************
22470 + *
22471 + * OpenOffice.org - a multi-platform office productivity suite
22472 + *
22473 + * $RCSfile$
22474 + *
22475 + * $Revision$
22476 + *
22477 + * last change: $Author$ $Date$
22478 + *
22479 + * The Contents of this file are made available subject to
22480 + * the terms of GNU Lesser General Public License Version 2.1.
22481 + *
22482 + *
22483 + * GNU Lesser General Public License Version 2.1
22484 + * =============================================
22485 + * Copyright 2005 by Sun Microsystems, Inc.
22486 + * 901 San Antonio Road, Palo Alto, CA 94303, USA
22487 + *
22488 + * This library is free software; you can redistribute it and/or
22489 + * modify it under the terms of the GNU Lesser General Public
22490 + * License version 2.1, as published by the Free Software Foundation.
22491 + *
22492 + * This library is distributed in the hope that it will be useful,
22493 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
22494 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
22495 + * Lesser General Public License for more details.
22496 + *
22497 + * You should have received a copy of the GNU Lesser General Public
22498 + * License along with this library; if not, write to the Free Software
22499 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
22500 + * MA 02111-1307 USA
22501 + *
22502 + ************************************************************************/
22503 +#include "vbacheckbox.hxx"
22504 +#include <vbahelper/helperdecl.hxx>
22505 +#include <vector>
22506 +
22507 +using namespace com::sun::star;
22508 +using namespace ooo::vba;
22509 +
22510 +
22511 +const static rtl::OUString LABEL( RTL_CONSTASCII_USTRINGPARAM("Label") );
22512 +const static rtl::OUString STATE( RTL_CONSTASCII_USTRINGPARAM("State") );
22513 +ScVbaCheckbox::ScVbaCheckbox( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper ) : CheckBoxImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
22514 +{
22515 +}
22516 +
22517 +// Attributes
22518 +rtl::OUString SAL_CALL
22519 +ScVbaCheckbox::getCaption() throw (css::uno::RuntimeException)
22520 +{
22521 + rtl::OUString Label;
22522 + m_xProps->getPropertyValue( LABEL ) >>= Label;
22523 + return Label;
22524 +}
22525 +
22526 +void SAL_CALL
22527 +ScVbaCheckbox::setCaption( const rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException)
22528 +{
22529 + m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) );
22530 +}
22531 +
22532 +uno::Any SAL_CALL
22533 +ScVbaCheckbox::getValue() throw (css::uno::RuntimeException)
22534 +{
22535 + sal_Int16 nValue = -1;
22536 + m_xProps->getPropertyValue( STATE ) >>= nValue;
22537 + if( nValue != 0 )
22538 + nValue = -1;
22539 +// return uno::makeAny( nValue );
22540 +// I must be missing something MSO says value should be -1 if selected, 0 if not
22541 +// selected
22542 + return uno::makeAny( ( nValue == -1 ) ? sal_True : sal_False );
22543 +}
22544 +
22545 +void SAL_CALL
22546 +ScVbaCheckbox::setValue( const uno::Any& _value ) throw (css::uno::RuntimeException)
22547 +{
22548 + sal_Int16 nValue = 0;
22549 + sal_Bool bValue = false;
22550 + if( _value >>= nValue )
22551 + {
22552 + if( nValue == -1)
22553 + nValue = 1;
22554 + }
22555 + else if ( _value >>= bValue )
22556 + {
22557 + if ( bValue )
22558 + nValue = 1;
22559 + }
22560 + m_xProps->setPropertyValue( STATE, uno::makeAny( nValue ) );
22561 +}
22562 +rtl::OUString&
22563 +ScVbaCheckbox::getServiceImplName()
22564 +{
22565 + static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCheckbox") );
22566 + return sImplName;
22567 +}
22568 +
22569 +uno::Sequence< rtl::OUString >
22570 +ScVbaCheckbox::getServiceNames()
22571 +{
22572 + static uno::Sequence< rtl::OUString > aServiceNames;
22573 + if ( aServiceNames.getLength() == 0 )
22574 + {
22575 + aServiceNames.realloc( 1 );
22576 + aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.CheckBox" ) );
22577 + }
22578 + return aServiceNames;
22579 +}
22580 +
22581 --- vbahelper/source/msforms/vbacheckbox.hxx.old 1970-01-01 00:00:00.000000000 +0000
22582 +++ vbahelper/source/msforms/vbacheckbox.hxx 2009-04-06 16:42:01.000000000 +0000
22583 @@ -0,0 +1,61 @@
22584 +/*************************************************************************
22585 + *
22586 + * OpenOffice.org - a multi-platform office productivity suite
22587 + *
22588 + * $RCSfile$
22589 + *
22590 + * $Revision$
22591 + *
22592 + * last change: $Author$ $Date$
22593 + *
22594 + * The Contents of this file are made available subject to
22595 + * the terms of GNU Lesser General Public License Version 2.1.
22596 + *
22597 + *
22598 + * GNU Lesser General Public License Version 2.1
22599 + * =============================================
22600 + * Copyright 2005 by Sun Microsystems, Inc.
22601 + * 901 San Antonio Road, Palo Alto, CA 94303, USA
22602 + *
22603 + * This library is free software; you can redistribute it and/or
22604 + * modify it under the terms of the GNU Lesser General Public
22605 + * License version 2.1, as published by the Free Software Foundation.
22606 + *
22607 + * This library is distributed in the hope that it will be useful,
22608 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
22609 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
22610 + * Lesser General Public License for more details.
22611 + *
22612 + * You should have received a copy of the GNU Lesser General Public
22613 + * License along with this library; if not, write to the Free Software
22614 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
22615 + * MA 02111-1307 USA
22616 + *
22617 + ************************************************************************/
22618 +#ifndef SC_VBA_CHECKBOX_HXX
22619 +#define SC_VBA_CHECKBOX_HXX
22620 +#include <cppuhelper/implbase2.hxx>
22621 +#include <ooo/vba/msforms/XRadioButton.hpp>
22622 +
22623 +#include "vbacontrol.hxx"
22624 +#include <vbahelper/vbahelper.hxx>
22625 +
22626 +typedef cppu::ImplInheritanceHelper2< ScVbaControl, ov::msforms::XRadioButton, css::script::XDefaultProperty > CheckBoxImpl_BASE;
22627 +
22628 +class ScVbaCheckbox : public CheckBoxImpl_BASE
22629 +{
22630 +public:
22631 + ScVbaCheckbox( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
22632 + // Attributes
22633 + virtual rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
22634 + virtual void SAL_CALL setCaption( const rtl::OUString& _caption ) throw (css::uno::RuntimeException);
22635 + virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
22636 + virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
22637 + // XDefaultProperty
22638 + rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
22639 + //XHelperInterface
22640 + virtual rtl::OUString& getServiceImplName();
22641 + virtual css::uno::Sequence<rtl::OUString> getServiceNames();
22642 +};
22643 +
22644 +#endif //SC_VBA_CHECKBOX_HXX
22645 --- vbahelper/source/msforms/vbacombobox.cxx.old 1970-01-01 00:00:00.000000000 +0000
22646 +++ vbahelper/source/msforms/vbacombobox.cxx 2009-04-06 16:42:01.000000000 +0000
22647 @@ -0,0 +1,175 @@
22648 +/*************************************************************************
22649 + *
22650 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
22651 + *
22652 + * Copyright 2008 by Sun Microsystems, Inc.
22653 + *
22654 + * OpenOffice.org - a multi-platform office productivity suite
22655 + *
22656 + * $RCSfile: vbacombobox.cxx,v $
22657 + * $Revision: 1.4 $
22658 + *
22659 + * This file is part of OpenOffice.org.
22660 + *
22661 + * OpenOffice.org is free software: you can redistribute it and/or modify
22662 + * it under the terms of the GNU Lesser General Public License version 3
22663 + * only, as published by the Free Software Foundation.
22664 + *
22665 + * OpenOffice.org is distributed in the hope that it will be useful,
22666 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
22667 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22668 + * GNU Lesser General Public License version 3 for more details
22669 + * (a copy is included in the LICENSE file that accompanied this code).
22670 + *
22671 + * You should have received a copy of the GNU Lesser General Public License
22672 + * version 3 along with OpenOffice.org. If not, see
22673 + * <http://www.openoffice.org/license.html>
22674 + * for a copy of the LGPLv3 License.
22675 + *
22676 + ************************************************************************/
22677 +#include "vbacombobox.hxx"
22678 +#include <vector>
22679 +
22680 +using namespace com::sun::star;
22681 +using namespace ooo::vba;
22682 +
22683 +
22684 +//SelectedItems list of integer indexes
22685 +//StringItemList list of items
22686 +
22687 +const static rtl::OUString TEXT( RTL_CONSTASCII_USTRINGPARAM("Text") );
22688 +const static rtl::OUString SELECTEDITEMS( RTL_CONSTASCII_USTRINGPARAM("SelectedItems") );
22689 +const static rtl::OUString ITEMS( RTL_CONSTASCII_USTRINGPARAM("StringItemList") );
22690 +const static rtl::OUString CONTROLSOURCEPROP( RTL_CONSTASCII_USTRINGPARAM("DataFieldProperty") );
22691 +
22692 +ScVbaComboBox::ScVbaComboBox( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper, bool bDialogType ) : ComboBoxImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper ), mbDialogType( bDialogType )
22693 +{
22694 + mpListHelper.reset( new ListControlHelper( m_xProps ) );
22695 + // grab the default value property name
22696 + m_xProps->getPropertyValue( CONTROLSOURCEPROP ) >>= sSourceName;
22697 +}
22698 +
22699 +// Attributes
22700 +
22701 +
22702 +// Value, [read] e.g. getValue returns the value of ooo Text propery e.g. the value in
22703 +// the drop down
22704 +uno::Any SAL_CALL
22705 +ScVbaComboBox::getValue() throw (uno::RuntimeException)
22706 +{
22707 + return m_xProps->getPropertyValue( sSourceName );
22708 +}
22709 +
22710 +void SAL_CALL
22711 +ScVbaComboBox::setListIndex( const uno::Any& _value ) throw (uno::RuntimeException)
22712 +{
22713 + uno::Sequence< sal_Int16 > sSelection(1);
22714 + _value >>= sSelection[ 0 ];
22715 + m_xProps->setPropertyValue( SELECTEDITEMS, uno::makeAny( sSelection ) );
22716 +}
22717 +
22718 +uno::Any SAL_CALL
22719 +ScVbaComboBox::getListIndex() throw (uno::RuntimeException)
22720 +{
22721 + uno::Sequence< rtl::OUString > sItems;
22722 + m_xProps->getPropertyValue( ITEMS ) >>= sItems;
22723 + // should really return the item that has focus regardless of
22724 + // it been selected
22725 + if ( sItems.getLength() > 0 )
22726 + {
22727 + rtl::OUString sText = getText();
22728 + sal_Int32 nLen = sItems.getLength();
22729 + for ( sal_Int32 index = 0; sText.getLength() && index < nLen; ++index )
22730 + {
22731 + if ( sItems[ index ].equals( sText ) )
22732 + {
22733 + OSL_TRACE("getListIndex returning %d", index );
22734 + return uno::makeAny( index );
22735 + }
22736 +
22737 + }
22738 + }
22739 + OSL_TRACE("getListIndex returning %d", -1 );
22740 + return uno::makeAny( sal_Int32( -1 ) );
22741 +}
22742 +
22743 +// Value, [write]e.g. setValue sets the value in the drop down, and if the value is one
22744 +// of the values in the list then the selection is also set
22745 +void SAL_CALL
22746 +ScVbaComboBox::setValue( const uno::Any& _value ) throw (uno::RuntimeException)
22747 +{
22748 + m_xProps->setPropertyValue( sSourceName, _value );
22749 +}
22750 +
22751 +// see Value
22752 +
22753 +::rtl::OUString SAL_CALL
22754 +ScVbaComboBox::getText() throw (uno::RuntimeException)
22755 +{
22756 + rtl::OUString result;
22757 + getValue() >>= result;
22758 + return result;
22759 +}
22760 +
22761 +void SAL_CALL
22762 +ScVbaComboBox::setText( const ::rtl::OUString& _text ) throw (uno::RuntimeException)
22763 +{
22764 + setValue( uno::makeAny( _text ) ); // seems the same
22765 +}
22766 +
22767 +// Methods
22768 +void SAL_CALL
22769 +ScVbaComboBox::AddItem( const uno::Any& pvargItem, const uno::Any& pvargIndex ) throw (uno::RuntimeException)
22770 +{
22771 + mpListHelper->AddItem( pvargItem, pvargIndex );
22772 +}
22773 +
22774 +void SAL_CALL
22775 +ScVbaComboBox::removeItem( const uno::Any& index ) throw (uno::RuntimeException)
22776 + {
22777 + mpListHelper->removeItem( index );
22778 +}
22779 +
22780 +void SAL_CALL
22781 +ScVbaComboBox::Clear( ) throw (uno::RuntimeException)
22782 + {
22783 + mpListHelper->Clear();
22784 + }
22785 +
22786 +void SAL_CALL
22787 +ScVbaComboBox::setRowSource( const rtl::OUString& _rowsource ) throw (css::uno::RuntimeException)
22788 +{
22789 + ScVbaControl::setRowSource( _rowsource );
22790 + mpListHelper->setRowSource( _rowsource );
22791 + }
22792 +
22793 +sal_Int32 SAL_CALL
22794 +ScVbaComboBox::getListCount() throw (uno::RuntimeException)
22795 +{
22796 + return mpListHelper->getListCount();
22797 +}
22798 +
22799 +uno::Any SAL_CALL
22800 +ScVbaComboBox::List( const ::uno::Any& pvargIndex, const uno::Any& pvarColumn ) throw (uno::RuntimeException)
22801 +{
22802 + return mpListHelper->List( pvargIndex, pvarColumn );
22803 + }
22804 +
22805 +rtl::OUString&
22806 +ScVbaComboBox::getServiceImplName()
22807 +{
22808 + static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaComboBox") );
22809 + return sImplName;
22810 +}
22811 +
22812 +uno::Sequence< rtl::OUString >
22813 +ScVbaComboBox::getServiceNames()
22814 +{
22815 + static uno::Sequence< rtl::OUString > aServiceNames;
22816 + if ( aServiceNames.getLength() == 0 )
22817 + {
22818 + aServiceNames.realloc( 1 );
22819 + aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.ComboBox" ) );
22820 + }
22821 + return aServiceNames;
22822 +}
22823 --- vbahelper/source/msforms/vbacombobox.hxx.old 1970-01-01 00:00:00.000000000 +0000
22824 +++ vbahelper/source/msforms/vbacombobox.hxx 2009-04-06 16:42:01.000000000 +0000
22825 @@ -0,0 +1,80 @@
22826 +/*************************************************************************
22827 + *
22828 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
22829 + *
22830 + * Copyright 2008 by Sun Microsystems, Inc.
22831 + *
22832 + * OpenOffice.org - a multi-platform office productivity suite
22833 + *
22834 + * $RCSfile: vbacombobox.hxx,v $
22835 + * $Revision: 1.4 $
22836 + *
22837 + * This file is part of OpenOffice.org.
22838 + *
22839 + * OpenOffice.org is free software: you can redistribute it and/or modify
22840 + * it under the terms of the GNU Lesser General Public License version 3
22841 + * only, as published by the Free Software Foundation.
22842 + *
22843 + * OpenOffice.org is distributed in the hope that it will be useful,
22844 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
22845 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22846 + * GNU Lesser General Public License version 3 for more details
22847 + * (a copy is included in the LICENSE file that accompanied this code).
22848 + *
22849 + * You should have received a copy of the GNU Lesser General Public License
22850 + * version 3 along with OpenOffice.org. If not, see
22851 + * <http://www.openoffice.org/license.html>
22852 + * for a copy of the LGPLv3 License.
22853 + *
22854 + ************************************************************************/
22855 +#ifndef SC_VBA_COMBOBOX_HXX
22856 +#define SC_VBA_COMBOBOX_HXX
22857 +#include <cppuhelper/implbase2.hxx>
22858 +#include <com/sun/star/uno/XComponentContext.hpp>
22859 +#include <com/sun/star/beans/XPropertySet.hpp>
22860 +#include <com/sun/star/script/XDefaultProperty.hpp>
22861 +#include <ooo/vba/msforms/XComboBox.hpp>
22862 +#include <comphelper/proparrhlp.hxx>
22863 +#include <comphelper/propertycontainer.hxx>
22864 +#include <com/sun/star/beans/PropertyAttribute.hpp>
22865 +
22866 +#include "vbacontrol.hxx"
22867 +#include "vbalistcontrolhelper.hxx"
22868 +#include <vbahelper/vbahelper.hxx>
22869 +
22870 +typedef cppu::ImplInheritanceHelper2<ScVbaControl, ov::msforms::XComboBox, css::script::XDefaultProperty > ComboBoxImpl_BASE;
22871 +class ScVbaComboBox : public ComboBoxImpl_BASE
22872 +{
22873 + std::auto_ptr< ListControlHelper > mpListHelper;
22874 + rtl::OUString sSourceName;
22875 + rtl::OUString msDftPropName;
22876 + bool mbDialogType;
22877 +
22878 +public:
22879 + ScVbaComboBox( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper, bool bDialogType = false );
22880 +
22881 + // Attributes
22882 + virtual css::uno::Any SAL_CALL getListIndex() throw (css::uno::RuntimeException);
22883 + virtual ::sal_Int32 SAL_CALL getListCount() throw (css::uno::RuntimeException);
22884 + virtual void SAL_CALL setListIndex( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
22885 + virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
22886 + virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
22887 + virtual ::rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException);
22888 + virtual void SAL_CALL setText( const ::rtl::OUString& _text ) throw (css::uno::RuntimeException);
22889 +
22890 + // Methods
22891 + virtual void SAL_CALL AddItem( const css::uno::Any& pvargItem, const css::uno::Any& pvargIndex ) throw (css::uno::RuntimeException);
22892 + virtual void SAL_CALL removeItem( const css::uno::Any& index ) throw (css::uno::RuntimeException);
22893 + virtual void SAL_CALL Clear( ) throw (css::uno::RuntimeException);
22894 + virtual css::uno::Any SAL_CALL List( const css::uno::Any& pvargIndex, const css::uno::Any& pvarColumn ) throw (css::uno::RuntimeException);
22895 + // XControl
22896 + virtual void SAL_CALL setRowSource( const rtl::OUString& _rowsource ) throw (css::uno::RuntimeException);
22897 +
22898 + // XDefaultProperty
22899 + ::rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
22900 + //XHelperInterface
22901 + virtual rtl::OUString& getServiceImplName();
22902 + virtual css::uno::Sequence<rtl::OUString> getServiceNames();
22903 +};
22904 +
22905 +#endif //
22906 --- vbahelper/source/msforms/vbacontrol.cxx.old 1970-01-01 00:00:00.000000000 +0000
22907 +++ vbahelper/source/msforms/vbacontrol.cxx 2009-04-06 16:42:01.000000000 +0000
22908 @@ -0,0 +1,520 @@
22909 +/*************************************************************************
22910 + *
22911 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
22912 + *
22913 + * Copyright 2008 by Sun Microsystems, Inc.
22914 + *
22915 + * OpenOffice.org - a multi-platform office productivity suite
22916 + *
22917 + * $RCSfile: vbacontrol.cxx,v $
22918 + * $Revision: 1.3 $
22919 + *
22920 + * This file is part of OpenOffice.org.
22921 + *
22922 + * OpenOffice.org is free software: you can redistribute it and/or modify
22923 + * it under the terms of the GNU Lesser General Public License version 3
22924 + * only, as published by the Free Software Foundation.
22925 + *
22926 + * OpenOffice.org is distributed in the hope that it will be useful,
22927 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
22928 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22929 + * GNU Lesser General Public License version 3 for more details
22930 + * (a copy is included in the LICENSE file that accompanied this code).
22931 + *
22932 + * You should have received a copy of the GNU Lesser General Public License
22933 + * version 3 along with OpenOffice.org. If not, see
22934 + * <http://www.openoffice.org/license.html>
22935 + * for a copy of the LGPLv3 License.
22936 + *
22937 + ************************************************************************/
22938 +#include <com/sun/star/form/FormComponentType.hpp>
22939 +#include <com/sun/star/awt/XControlModel.hpp>
22940 +#include <com/sun/star/awt/XControl.hpp>
22941 +#include <com/sun/star/awt/XWindow2.hpp>
22942 +#include <com/sun/star/lang/XEventListener.hpp>
22943 +#include <com/sun/star/drawing/XShape.hpp>
22944 +#include <com/sun/star/drawing/XControlShape.hpp>
22945 +#include <com/sun/star/awt/XControl.hpp>
22946 +#include <com/sun/star/frame/XModel.hpp>
22947 +#include <com/sun/star/view/XControlAccess.hpp>
22948 +#include <com/sun/star/container/XChild.hpp>
22949 +#include <com/sun/star/form/binding/XBindableValue.hpp>
22950 +#include <com/sun/star/form/binding/XListEntrySink.hpp>
22951 +#include <com/sun/star/table/CellAddress.hpp>
22952 +#include <com/sun/star/table/CellRangeAddress.hpp>
22953 +#include <ooo/vba/XControlProvider.hpp>
22954 +#ifdef VBA_OOBUILD_HACK
22955 +#include <svtools/bindablecontrolhelper.hxx>
22956 +#endif
22957 +#include"vbacontrol.hxx"
22958 +#include"vbacombobox.hxx"
22959 +#include "vbabutton.hxx"
22960 +#include "vbalabel.hxx"
22961 +#include "vbatextbox.hxx"
22962 +#include "vbaradiobutton.hxx"
22963 +#include "vbalistbox.hxx"
22964 +#include "vbatogglebutton.hxx"
22965 +#include "vbacheckbox.hxx"
22966 +#include "vbaframe.hxx"
22967 +#include "vbascrollbar.hxx"
22968 +#include "vbaprogressbar.hxx"
22969 +#include "vbamultipage.hxx"
22970 +#include "vbaspinbutton.hxx"
22971 +#include "vbaimage.hxx"
22972 +#include <vbahelper/helperdecl.hxx>
22973 +
22974 +
22975 +using namespace com::sun::star;
22976 +using namespace ooo::vba;
22977 +
22978 +uno::Reference< css::awt::XWindowPeer >
22979 +ScVbaControl::getWindowPeer() throw (uno::RuntimeException)
22980 +{
22981 + uno::Reference< drawing::XControlShape > xControlShape( m_xControl, uno::UNO_QUERY );
22982 +
22983 + uno::Reference< awt::XControlModel > xControlModel;
22984 + uno::Reference< css::awt::XWindowPeer > xWinPeer;
22985 + if ( !xControlShape.is() )
22986 + {
22987 + // would seem to be a Userform control
22988 + uno::Reference< awt::XControl > xControl( m_xControl, uno::UNO_QUERY_THROW );
22989 + xWinPeer = xControl->getPeer();
22990 + return xWinPeer;
22991 + }
22992 + // form control
22993 + xControlModel.set( xControlShape->getControl(), uno::UNO_QUERY_THROW );
22994 +
22995 + uno::Reference< view::XControlAccess > xControlAccess( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
22996 + try
22997 + {
22998 + uno::Reference< awt::XControl > xControl( xControlAccess->getControl( xControlModel ), uno::UNO_QUERY );
22999 + xWinPeer = xControl->getPeer();
23000 + }
23001 + catch( uno::Exception )
23002 + {
23003 + throw uno::RuntimeException( rtl::OUString::createFromAscii( "The Control does not exsit" ),
23004 + uno::Reference< uno::XInterface >() );
23005 + }
23006 + return xWinPeer;
23007 +}
23008 +
23009 +//ScVbaControlListener
23010 +class ScVbaControlListener: public cppu::WeakImplHelper1< lang::XEventListener >
23011 +{
23012 +private:
23013 + ScVbaControl *pControl;
23014 +public:
23015 + ScVbaControlListener( ScVbaControl *pTmpControl );
23016 + virtual ~ScVbaControlListener();
23017 + virtual void SAL_CALL disposing( const lang::EventObject& rEventObject ) throw( uno::RuntimeException );
23018 +};
23019 +
23020 +ScVbaControlListener::ScVbaControlListener( ScVbaControl *pTmpControl ): pControl( pTmpControl )
23021 +{
23022 +}
23023 +
23024 +ScVbaControlListener::~ScVbaControlListener()
23025 +{
23026 +}
23027 +
23028 +void SAL_CALL
23029 +ScVbaControlListener::disposing( const lang::EventObject& ) throw( uno::RuntimeException )
23030 +{
23031 + if( pControl )
23032 + {
23033 + pControl->removeResouce();
23034 + pControl = NULL;
23035 + }
23036 +}
23037 +
23038 +//ScVbaControl
23039 +
23040 +ScVbaControl::ScVbaControl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< ::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : ControlImpl_BASE( xParent, xContext ), m_xControl( xControl ), m_xModel( xModel )
23041 +{
23042 + //add listener
23043 + m_xEventListener.set( new ScVbaControlListener( this ) );
23044 + setGeometryHelper( pGeomHelper );
23045 + uno::Reference< lang::XComponent > xComponent( m_xControl, uno::UNO_QUERY_THROW );
23046 + xComponent->addEventListener( m_xEventListener );
23047 +
23048 + //init m_xProps
23049 + uno::Reference< drawing::XControlShape > xControlShape( m_xControl, uno::UNO_QUERY ) ;
23050 + uno::Reference< awt::XControl> xUserFormControl( m_xControl, uno::UNO_QUERY ) ;
23051 + if ( xControlShape.is() ) // form control
23052 + m_xProps.set( xControlShape->getControl(), uno::UNO_QUERY_THROW );
23053 + else if ( xUserFormControl.is() ) // userform control
23054 + m_xProps.set( xUserFormControl->getModel(), uno::UNO_QUERY_THROW );
23055 +}
23056 +
23057 +ScVbaControl::~ScVbaControl()
23058 +{
23059 + if( m_xControl.is() )
23060 +{
23061 + uno::Reference< lang::XComponent > xComponent( m_xControl, uno::UNO_QUERY_THROW );
23062 + xComponent->removeEventListener( m_xEventListener );
23063 +}
23064 +}
23065 +
23066 +void
23067 +ScVbaControl::setGeometryHelper( AbstractGeometryAttributes* pHelper )
23068 +{
23069 + mpGeometryHelper.reset( pHelper );
23070 +}
23071 +
23072 +void ScVbaControl::removeResouce() throw( uno::RuntimeException )
23073 +{
23074 + uno::Reference< lang::XComponent > xComponent( m_xControl, uno::UNO_QUERY_THROW );
23075 + xComponent->removeEventListener( m_xEventListener );
23076 + m_xControl= NULL;
23077 + m_xProps = NULL;
23078 +}
23079 +
23080 +//In design model has different behavior
23081 +sal_Bool SAL_CALL ScVbaControl::getEnabled() throw (uno::RuntimeException)
23082 +{
23083 + uno::Any aValue = m_xProps->getPropertyValue
23084 + (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Enabled" ) ) );
23085 + sal_Bool bRet = false;
23086 + aValue >>= bRet;
23087 + return bRet;
23088 +}
23089 +
23090 +void SAL_CALL ScVbaControl::setEnabled( sal_Bool bVisible ) throw (uno::RuntimeException)
23091 +{
23092 + uno::Any aValue( bVisible );
23093 + m_xProps->setPropertyValue
23094 + (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Enabled" ) ), aValue);
23095 +
23096 +}
23097 +
23098 +sal_Bool SAL_CALL ScVbaControl::getVisible() throw (uno::RuntimeException)
23099 +{
23100 + uno::Reference< awt::XWindow2 > xWindow2( getWindowPeer(), uno::UNO_QUERY_THROW );
23101 + return xWindow2->isVisible();
23102 +}
23103 +
23104 +void SAL_CALL ScVbaControl::setVisible( sal_Bool bVisible ) throw (uno::RuntimeException)
23105 +{
23106 + uno::Reference< awt::XWindow2 > xWindow2( getWindowPeer(), uno::UNO_QUERY_THROW );
23107 + xWindow2->setVisible( bVisible );
23108 +}
23109 +double SAL_CALL ScVbaControl::getHeight() throw (uno::RuntimeException)
23110 +{
23111 + return mpGeometryHelper->getHeight();
23112 +}
23113 +void SAL_CALL ScVbaControl::setHeight( double _height ) throw (uno::RuntimeException)
23114 +{
23115 + mpGeometryHelper->setHeight( _height );
23116 +}
23117 +
23118 +double SAL_CALL ScVbaControl::getWidth() throw (uno::RuntimeException)
23119 +{
23120 + return mpGeometryHelper->getWidth();
23121 +}
23122 +void SAL_CALL ScVbaControl::setWidth( double _width ) throw (uno::RuntimeException)
23123 +{
23124 + mpGeometryHelper->setWidth( _width );
23125 +}
23126 +
23127 +double SAL_CALL
23128 +ScVbaControl::getLeft() throw (uno::RuntimeException)
23129 +{
23130 + return mpGeometryHelper->getLeft();
23131 +}
23132 +
23133 +void SAL_CALL
23134 +ScVbaControl::setLeft( double _left ) throw (uno::RuntimeException)
23135 +{
23136 + mpGeometryHelper->setLeft( _left );
23137 +
23138 +}
23139 +
23140 +double SAL_CALL
23141 +ScVbaControl::getTop() throw (uno::RuntimeException)
23142 +{
23143 + return mpGeometryHelper->getTop();
23144 +}
23145 +
23146 +void SAL_CALL
23147 +ScVbaControl::setTop( double _top ) throw (uno::RuntimeException)
23148 +{
23149 + mpGeometryHelper->setTop( _top );
23150 +}
23151 +
23152 +uno::Reference< uno::XInterface > SAL_CALL
23153 +ScVbaControl::getObject() throw (uno::RuntimeException)
23154 +{
23155 + uno::Reference< msforms::XControl > xRet( this );
23156 + return xRet;
23157 +}
23158 +
23159 +void SAL_CALL ScVbaControl::SetFocus() throw (uno::RuntimeException)
23160 +{
23161 + uno::Reference< awt::XWindow > xWin( m_xControl, uno::UNO_QUERY_THROW );
23162 + xWin->setFocus();
23163 +}
23164 +
23165 +rtl::OUString SAL_CALL
23166 +ScVbaControl::getControlSource() throw (uno::RuntimeException)
23167 +{
23168 +// #FIXME I *hate* having these upstream differences
23169 +// but this is necessary until I manage to upstream other
23170 +// dependant parts
23171 +#ifdef VBA_OOBUILD_HACK
23172 + rtl::OUString sControlSource;
23173 + uno::Reference< form::binding::XBindableValue > xBindable( m_xProps, uno::UNO_QUERY );
23174 + if ( xBindable.is() )
23175 + {
23176 + try
23177 + {
23178 + uno::Reference< lang::XMultiServiceFactory > xFac( m_xModel, uno::UNO_QUERY_THROW );
23179 + uno::Reference< beans::XPropertySet > xConvertor( xFac->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.table.CellAddressConversion" ))), uno::UNO_QUERY );
23180 + uno::Reference< beans::XPropertySet > xProps( xBindable->getValueBinding(), uno::UNO_QUERY_THROW );
23181 + table::CellAddress aAddress;
23182 + xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("BoundCell") ) ) >>= aAddress;
23183 + xConvertor->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Address") ), uno::makeAny( aAddress ) );
23184 + xConvertor->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("XL_A1_Representation") ) ) >>= sControlSource;
23185 + }
23186 + catch( uno::Exception& )
23187 + {
23188 + }
23189 + }
23190 + return sControlSource;
23191 +#else
23192 + throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("getControlSource not supported") ), uno::Reference< uno::XInterface >()); // not supported
23193 +#endif
23194 +}
23195 +
23196 +void SAL_CALL
23197 +ScVbaControl::setControlSource( const rtl::OUString& _controlsource ) throw (uno::RuntimeException)
23198 +{
23199 +#ifdef VBA_OOBUILD_HACK
23200 + rtl::OUString sEmpty;
23201 + svt::BindableControlHelper::ApplyListSourceAndBindableData( m_xModel, m_xProps, _controlsource, sEmpty );
23202 +#else
23203 + throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("setControlSource not supported ") ).concat( _controlsource ), uno::Reference< uno::XInterface >()); // not supported
23204 +#endif
23205 +}
23206 +
23207 +rtl::OUString SAL_CALL
23208 +ScVbaControl::getRowSource() throw (uno::RuntimeException)
23209 +{
23210 +#ifdef VBA_OOBUILD_HACK
23211 + rtl::OUString sRowSource;
23212 + uno::Reference< form::binding::XListEntrySink > xListSink( m_xProps, uno::UNO_QUERY );
23213 + if ( xListSink.is() )
23214 + {
23215 + try
23216 + {
23217 + uno::Reference< lang::XMultiServiceFactory > xFac( m_xModel, uno::UNO_QUERY_THROW );
23218 + uno::Reference< beans::XPropertySet > xConvertor( xFac->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.table.CellRangeAddressConversion" ))), uno::UNO_QUERY );
23219 +
23220 + uno::Reference< beans::XPropertySet > xProps( xListSink->getListEntrySource(), uno::UNO_QUERY_THROW );
23221 + table::CellRangeAddress aAddress;
23222 + xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CellRange") ) ) >>= aAddress;
23223 + xConvertor->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Address")), uno::makeAny( aAddress ) );
23224 + xConvertor->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("XL_A1_Representation") ) ) >>= sRowSource;
23225 + }
23226 + catch( uno::Exception& )
23227 + {
23228 + }
23229 + }
23230 + return sRowSource;
23231 +#else
23232 + throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("getRowSource not supported") ), uno::Reference< uno::XInterface >()); // not supported
23233 +#endif
23234 +}
23235 +
23236 +void SAL_CALL
23237 +ScVbaControl::setRowSource( const rtl::OUString& _rowsource ) throw (uno::RuntimeException)
23238 +{
23239 +#ifdef VBA_OOBUILD_HACK
23240 + rtl::OUString sEmpty;
23241 + svt::BindableControlHelper::ApplyListSourceAndBindableData( m_xModel, m_xProps, sEmpty, _rowsource );
23242 +#else
23243 + throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("setRowSource not supported ") ).concat( _rowsource ), uno::Reference< uno::XInterface >()); // not supported
23244 +#endif
23245 +}
23246 +
23247 +rtl::OUString SAL_CALL
23248 +ScVbaControl::getName() throw (uno::RuntimeException)
23249 +{
23250 + rtl::OUString sName;
23251 + m_xProps->getPropertyValue
23252 + (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ) ) >>= sName;
23253 + return sName;
23254 +
23255 +}
23256 +
23257 +void SAL_CALL
23258 +ScVbaControl::setName( const rtl::OUString& _name ) throw (uno::RuntimeException)
23259 +{
23260 + m_xProps->setPropertyValue
23261 + (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ), uno::makeAny( _name ) );
23262 + }
23263 +//ScVbaControlFactory
23264 +
23265 +ScVbaControlFactory::ScVbaControlFactory( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel ): m_xContext( xContext ), m_xControl( xControl ), m_xModel( xModel )
23266 +{
23267 +}
23268 +
23269 +ScVbaControl* ScVbaControlFactory::createControl() throw (uno::RuntimeException)
23270 +{
23271 + return createControl( m_xModel );
23272 +}
23273 +ScVbaControl* ScVbaControlFactory::createControl( const uno::Reference< uno::XInterface >& xParent ) throw (uno::RuntimeException)
23274 +{
23275 + uno::Reference< drawing::XControlShape > xControlShape( m_xControl, uno::UNO_QUERY );
23276 + if ( xControlShape.is() ) // form controls
23277 + return createControl( xControlShape, xParent );
23278 + uno::Reference< awt::XControl > xControl( m_xControl, uno::UNO_QUERY );
23279 + if ( !xControl.is() )
23280 + throw uno::RuntimeException(); // really we should be more informative
23281 + return createControl( xControl, xParent );
23282 +
23283 +}
23284 +
23285 +ScVbaControl* ScVbaControlFactory::createControl(const uno::Reference< drawing::XControlShape >& xControlShape, const uno::Reference< uno::XInterface >& /*xParent*/ ) throw (uno::RuntimeException)
23286 +{
23287 + uno::Reference< beans::XPropertySet > xProps( xControlShape->getControl(), uno::UNO_QUERY_THROW );
23288 + sal_Int32 nClassId = -1;
23289 + const static rtl::OUString sClassId( RTL_CONSTASCII_USTRINGPARAM("ClassId") );
23290 + xProps->getPropertyValue( sClassId ) >>= nClassId;
23291 + uno::Reference< XHelperInterface > xVbaParent; // #FIXME - should be worksheet I guess
23292 + switch( nClassId )
23293 + {
23294 + case form::FormComponentType::COMBOBOX:
23295 + return new ScVbaComboBox( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
23296 + case form::FormComponentType::COMMANDBUTTON:
23297 + return new ScVbaButton( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
23298 + case form::FormComponentType::FIXEDTEXT:
23299 + return new ScVbaLabel( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
23300 + case form::FormComponentType::TEXTFIELD:
23301 + return new ScVbaTextBox( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
23302 + case form::FormComponentType::RADIOBUTTON:
23303 + return new ScVbaRadioButton( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
23304 + case form::FormComponentType::LISTBOX:
23305 + return new ScVbaListBox( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
23306 + case form::FormComponentType::SPINBUTTON:
23307 + return new ScVbaSpinButton( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
23308 + case form::FormComponentType::IMAGECONTROL:
23309 + return new ScVbaImage( xVbaParent, m_xContext, xControlShape, m_xModel, new ConcreteXShapeGeometryAttributes( m_xContext, uno::Reference< drawing::XShape >( xControlShape, uno::UNO_QUERY_THROW ) ) );
23310 + default:
23311 + throw uno::RuntimeException( rtl::OUString::createFromAscii(
23312 + "Donot support this Control Type." ), uno::Reference< uno::XInterface >() );
23313 + }
23314 +}
23315 +
23316 +ScVbaControl* ScVbaControlFactory::createControl( const uno::Reference< awt::XControl >& xControl, const uno::Reference< uno::XInterface >& xParent ) throw (uno::RuntimeException)
23317 +{
23318 + uno::Reference< beans::XPropertySet > xProps( xControl->getModel(), uno::UNO_QUERY_THROW );
23319 + uno::Reference< lang::XServiceInfo > xServiceInfo( xProps, uno::UNO_QUERY_THROW );
23320 + ScVbaControl* pControl = NULL;
23321 + uno::Reference< XHelperInterface > xVbaParent; // #FIXME - should be worksheet I guess
23322 + if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlCheckBoxModel") ) ) )
23323 + pControl = new ScVbaCheckbox( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
23324 + else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlRadioButtonModel") ) ) )
23325 + pControl = new ScVbaRadioButton( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
23326 + else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlEditModel") ) ) )
23327 + pControl = new ScVbaTextBox( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ), true );
23328 + else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlButtonModel") ) ) )
23329 + {
23330 + sal_Bool bToggle = sal_False;
23331 + xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Toggle") ) ) >>= bToggle;
23332 + if ( bToggle )
23333 + pControl = new ScVbaToggleButton( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
23334 + else
23335 + pControl = new ScVbaButton( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
23336 + }
23337 + else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlComboBoxModel") ) ) )
23338 + pControl = new ScVbaComboBox( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ), true );
23339 + else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlListBoxModel") ) ) )
23340 + pControl = new ScVbaListBox( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
23341 + else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFixedTextModel") ) ) )
23342 + pControl = new ScVbaLabel( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
23343 + else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlImageControlModel") ) ) )
23344 + pControl = new ScVbaImage( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
23345 + else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlProgressBarModel") ) ) )
23346 + pControl = new ScVbaProgressBar( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
23347 + else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlGroupBoxModel") ) ) )
23348 + pControl = new ScVbaFrame( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
23349 + else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlScrollBarModel") ) ) )
23350 + pControl = new ScVbaScrollBar( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
23351 + else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoMultiPageModel") ) ) )
23352 + pControl = new ScVbaMultiPage( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ), xParent );
23353 + else if ( xServiceInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlSpinButtonModel") ) ) )
23354 + pControl = new ScVbaSpinButton( xVbaParent, m_xContext, xControl, m_xModel, new UserFormGeometryHelper( m_xContext, xControl ) );
23355 + else
23356 + throw uno::RuntimeException( rtl::OUString::createFromAscii("Unsupported control " ), uno::Reference< uno::XInterface >() );
23357 + return pControl;
23358 +}
23359 +
23360 +rtl::OUString&
23361 +ScVbaControl::getServiceImplName()
23362 +{
23363 + static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaControl") );
23364 + return sImplName;
23365 +}
23366 +
23367 +uno::Sequence< rtl::OUString >
23368 +ScVbaControl::getServiceNames()
23369 +{
23370 + static uno::Sequence< rtl::OUString > aServiceNames;
23371 + if ( aServiceNames.getLength() == 0 )
23372 + {
23373 + aServiceNames.realloc( 1 );
23374 + aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Control" ) );
23375 + }
23376 + return aServiceNames;
23377 +}
23378 +
23379 +
23380 +
23381 +typedef cppu::WeakImplHelper1< XControlProvider > ControlProvider_BASE;
23382 +class ControlProviderImpl : public ControlProvider_BASE
23383 +{
23384 + uno::Reference< uno::XComponentContext > m_xCtx;
23385 +public:
23386 + ControlProviderImpl( const uno::Reference< uno::XComponentContext >& xCtx ) : m_xCtx( xCtx ) {}
23387 + virtual uno::Reference< msforms::XControl > SAL_CALL createControl( const uno::Reference< drawing::XControlShape >& xControl, const uno::Reference< frame::XModel >& xDocOwner ) throw (uno::RuntimeException);
23388 + virtual uno::Reference< msforms::XControl > SAL_CALL createUserformControl( const uno::Reference< awt::XControl >& xControl, const uno::Reference< awt::XControl >& xDialog, const uno::Reference< frame::XModel >& xDocOwner ) throw (uno::RuntimeException);
23389 +};
23390 +
23391 +uno::Reference< msforms::XControl > SAL_CALL
23392 +ControlProviderImpl::createControl( const uno::Reference< drawing::XControlShape >& xControlShape, const uno::Reference< frame::XModel >& xDocOwner ) throw (uno::RuntimeException)
23393 +{
23394 + uno::Reference< msforms::XControl > xControlToReturn;
23395 + if ( xControlShape.is() )
23396 + {
23397 + ScVbaControlFactory controlFactory( m_xCtx, xControlShape, xDocOwner );
23398 + xControlToReturn.set( controlFactory.createControl( xDocOwner ) );
23399 + }
23400 + return xControlToReturn;
23401 +
23402 +}
23403 +uno::Reference< msforms::XControl > SAL_CALL
23404 +ControlProviderImpl::createUserformControl( const uno::Reference< awt::XControl >& xControl, const uno::Reference< awt::XControl >& xDialog, const uno::Reference< frame::XModel >& xDocOwner ) throw (uno::RuntimeException)
23405 +{
23406 + uno::Reference< msforms::XControl > xControlToReturn;
23407 + if ( xControl.is() && xDialog.is() )
23408 + {
23409 +
23410 + ScVbaControlFactory controlFactory( m_xCtx, xControl, xDocOwner );
23411 + xControlToReturn.set( controlFactory.createControl( xDialog->getModel() ) );
23412 + ScVbaControl* pControl = dynamic_cast< ScVbaControl* >( xControlToReturn.get() );
23413 + pControl->setGeometryHelper( new UserFormGeometryHelper( m_xCtx, xControl ) );
23414 + }
23415 + return xControlToReturn;
23416 +}
23417 +
23418 +namespace controlprovider
23419 +{
23420 +namespace sdecl = comphelper::service_decl;
23421 +sdecl::class_<ControlProviderImpl, sdecl::with_args<false> > serviceImpl;
23422 +extern sdecl::ServiceDecl const serviceDecl(
23423 + serviceImpl,
23424 + "ControlProviderImpl",
23425 + "ooo.vba.ControlProvider" );
23426 +}
23427 +
23428 +
23429 --- vbahelper/source/msforms/vbacontrol.hxx.old 1970-01-01 00:00:00.000000000 +0000
23430 +++ vbahelper/source/msforms/vbacontrol.hxx 2009-04-06 16:42:01.000000000 +0000
23431 @@ -0,0 +1,112 @@
23432 +/*************************************************************************
23433 + *
23434 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
23435 + *
23436 + * Copyright 2008 by Sun Microsystems, Inc.
23437 + *
23438 + * OpenOffice.org - a multi-platform office productivity suite
23439 + *
23440 + * $RCSfile: vbacontrol.hxx,v $
23441 + * $Revision: 1.3 $
23442 + *
23443 + * This file is part of OpenOffice.org.
23444 + *
23445 + * OpenOffice.org is free software: you can redistribute it and/or modify
23446 + * it under the terms of the GNU Lesser General Public License version 3
23447 + * only, as published by the Free Software Foundation.
23448 + *
23449 + * OpenOffice.org is distributed in the hope that it will be useful,
23450 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
23451 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
23452 + * GNU Lesser General Public License version 3 for more details
23453 + * (a copy is included in the LICENSE file that accompanied this code).
23454 + *
23455 + * You should have received a copy of the GNU Lesser General Public License
23456 + * version 3 along with OpenOffice.org. If not, see
23457 + * <http://www.openoffice.org/license.html>
23458 + * for a copy of the LGPLv3 License.
23459 + *
23460 + ************************************************************************/
23461 +#ifndef SC_VBA_CONTROL_HXX
23462 +#define SC_VBA_CONTROL_HXX
23463 +
23464 +#include <cppuhelper/implbase1.hxx>
23465 +#include <com/sun/star/beans/XPropertySet.hpp>
23466 +#include <com/sun/star/uno/XComponentContext.hpp>
23467 +#include <com/sun/star/script/XDefaultProperty.hpp>
23468 +#include <com/sun/star/drawing/XControlShape.hpp>
23469 +#include <com/sun/star/awt/XControl.hpp>
23470 +#include <com/sun/star/awt/XWindowPeer.hpp>
23471 +#include <ooo/vba/msforms/XControl.hpp>
23472 +
23473 +#include <vbahelper/vbahelper.hxx>
23474 +#include <vbahelper/vbahelperinterface.hxx>
23475 +#include <memory>
23476 +
23477 +//typedef ::cppu::WeakImplHelper1< ov::msforms::XControl > ControlImpl_BASE;
23478 +typedef InheritedHelperInterfaceImpl1< ov::msforms::XControl > ControlImpl_BASE;
23479 +
23480 +class ScVbaControl : public ControlImpl_BASE
23481 +{
23482 +private:
23483 + com::sun::star::uno::Reference< com::sun::star::lang::XEventListener > m_xEventListener;
23484 +protected:
23485 + std::auto_ptr< ov::AbstractGeometryAttributes > mpGeometryHelper;
23486 + css::uno::Reference< css::beans::XPropertySet > m_xProps;
23487 + css::uno::Reference< css::uno::XInterface > m_xControl;
23488 + css::uno::Reference< css::frame::XModel > m_xModel;
23489 +
23490 + virtual css::uno::Reference< css::awt::XWindowPeer > getWindowPeer() throw (css::uno::RuntimeException);
23491 +public:
23492 + ScVbaControl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext,
23493 + const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pHelper );
23494 + virtual ~ScVbaControl();
23495 + // This class will own the helper, so make sure it is allocated from
23496 + // the heap
23497 + void setGeometryHelper( ov::AbstractGeometryAttributes* pHelper );
23498 + // XControl
23499 + virtual sal_Bool SAL_CALL getEnabled() throw (css::uno::RuntimeException);
23500 + virtual void SAL_CALL setEnabled( sal_Bool _enabled ) throw (css::uno::RuntimeException);
23501 + virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
23502 + virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException);
23503 + virtual double SAL_CALL getHeight() throw (css::uno::RuntimeException);
23504 + virtual void SAL_CALL setHeight( double _height ) throw (css::uno::RuntimeException);
23505 + virtual double SAL_CALL getWidth() throw (css::uno::RuntimeException);
23506 + virtual void SAL_CALL setWidth( double _width ) throw (css::uno::RuntimeException);
23507 + virtual double SAL_CALL getLeft() throw (css::uno::RuntimeException);
23508 + virtual void SAL_CALL setLeft( double _left ) throw (css::uno::RuntimeException);
23509 + virtual double SAL_CALL getTop() throw (css::uno::RuntimeException);
23510 + virtual void SAL_CALL setTop( double _top ) throw (css::uno::RuntimeException);
23511 + virtual void SAL_CALL SetFocus( ) throw (css::uno::RuntimeException);
23512 +
23513 + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getObject() throw (css::uno::RuntimeException);
23514 + virtual rtl::OUString SAL_CALL getControlSource() throw (css::uno::RuntimeException);
23515 + virtual void SAL_CALL setControlSource( const rtl::OUString& _controlsource ) throw (css::uno::RuntimeException);
23516 + virtual rtl::OUString SAL_CALL getRowSource() throw (css::uno::RuntimeException);
23517 + virtual void SAL_CALL setRowSource( const rtl::OUString& _rowsource ) throw (css::uno::RuntimeException);
23518 + virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
23519 + virtual void SAL_CALL setName( const rtl::OUString& _name ) throw (css::uno::RuntimeException);
23520 + //remove resouce because ooo.vba.excel.XControl is a wrapper of com.sun.star.drawing.XControlShape
23521 + virtual void removeResouce() throw( css::uno::RuntimeException );
23522 + //XHelperInterface
23523 + virtual rtl::OUString& getServiceImplName();
23524 + virtual css::uno::Sequence<rtl::OUString> getServiceNames();
23525 +};
23526 +
23527 +
23528 +class ScVbaControlFactory
23529 +{
23530 +public:
23531 + ScVbaControlFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext,
23532 + const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel );
23533 + ScVbaControl* createControl() throw ( css::uno::RuntimeException );
23534 + ScVbaControl* createControl( const css::uno::Reference< css::uno::XInterface >& xParent ) throw ( css::uno::RuntimeException );
23535 +private:
23536 + ScVbaControl* createControl( const css::uno::Reference< css::awt::XControl >&, const css::uno::Reference< css::uno::XInterface >& ) throw ( css::uno::RuntimeException );
23537 + ScVbaControl* createControl( const css::uno::Reference< css::drawing::XControlShape >&, const css::uno::Reference< css::uno::XInterface >& ) throw ( css::uno::RuntimeException );
23538 + css::uno::Reference< css::uno::XComponentContext > m_xContext;
23539 + css::uno::Reference< css::uno::XInterface > m_xControl;
23540 + css::uno::Reference< css::frame::XModel > m_xModel;
23541 +};
23542 +
23543 +#endif//SC_VBA_CONTROL_HXX
23544 --- vbahelper/source/msforms/vbacontrols.cxx.old 1970-01-01 00:00:00.000000000 +0000
23545 +++ vbahelper/source/msforms/vbacontrols.cxx 2009-04-06 16:42:01.000000000 +0000
23546 @@ -0,0 +1,232 @@
23547 +/*************************************************************************
23548 + *
23549 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
23550 + *
23551 + * Copyright 2008 by Sun Microsystems, Inc.
23552 + *
23553 + * OpenOffice.org - a multi-platform office productivity suite
23554 + *
23555 + * $RCSfile$
23556 + * $Revision$
23557 + *
23558 + * This file is part of OpenOffice.org.
23559 + *
23560 + * OpenOffice.org is free software: you can redistribute it and/or modify
23561 + * it under the terms of the GNU Lesser General Public License version 3
23562 + * only, as published by the Free Software Foundation.
23563 + *
23564 + * OpenOffice.org is distributed in the hope that it will be useful,
23565 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
23566 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
23567 + * GNU Lesser General Public License version 3 for more details
23568 + * (a copy is included in the LICENSE file that accompanied this code).
23569 + *
23570 + * You should have received a copy of the GNU Lesser General Public License
23571 + * version 3 along with OpenOffice.org. If not, see
23572 + * <http://www.openoffice.org/license.html>
23573 + * for a copy of the LGPLv3 License.
23574 + *
23575 + ************************************************************************/
23576 +
23577 +#include "vbacontrols.hxx"
23578 +#include <cppuhelper/implbase2.hxx>
23579 +#include <com/sun/star/awt/XControlContainer.hpp>
23580 +#include <ooo/vba//XControlProvider.hpp>
23581 +#include <hash_map>
23582 +
23583 +using namespace com::sun::star;
23584 +using namespace ooo::vba;
23585 +
23586 +
23587 +typedef ::cppu::WeakImplHelper2< container::XNameAccess, container::XIndexAccess > ArrayWrapImpl;
23588 +
23589 +typedef std::hash_map< rtl::OUString, sal_Int32, ::rtl::OUStringHash,
23590 + ::std::equal_to< ::rtl::OUString > > ControlIndexMap;
23591 +typedef std::vector< uno::Reference< awt::XControl > > ControlVec;
23592 +
23593 +class ControlArrayWrapper : public ArrayWrapImpl
23594 +{
23595 + uno::Reference< awt::XControlContainer > mxDialog;
23596 + uno::Sequence< ::rtl::OUString > msNames;
23597 + ControlVec mControls;
23598 + ControlIndexMap mIndices;
23599 +
23600 + rtl::OUString getControlName( const uno::Reference< awt::XControl >& xCtrl )
23601 + {
23602 + uno::Reference< beans::XPropertySet > xProp( xCtrl->getModel(), uno::UNO_QUERY );
23603 + rtl::OUString sName;
23604 + xProp->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ) ) >>= sName;
23605 + return sName;
23606 + }
23607 +
23608 +public:
23609 +
23610 + ControlArrayWrapper( const uno::Reference< awt::XControl >& xDialog )
23611 + {
23612 + mxDialog.set( xDialog, uno::UNO_QUERY_THROW );
23613 + uno::Sequence< uno::Reference< awt::XControl > > sXControls = mxDialog->getControls();
23614 +
23615 + msNames.realloc( sXControls.getLength() );
23616 + for ( sal_Int32 i = 0; i < sXControls.getLength(); ++i )
23617 + {
23618 + uno::Reference< awt::XControl > xCtrl = sXControls[ i ];
23619 + msNames[ i ] = getControlName( xCtrl );
23620 + mControls.push_back( xCtrl );
23621 + mIndices[ msNames[ i ] ] = i;
23622 + }
23623 + }
23624 +
23625 + // XElementAccess
23626 + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException)
23627 + {
23628 + return awt::XControl::static_type(0);
23629 + }
23630 +
23631 + virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException)
23632 + {
23633 + return ( mControls.size() > 0 );
23634 + }
23635 +
23636 + // XNameAcess
23637 + virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
23638 + {
23639 + if ( !hasByName( aName ) )
23640 + throw container::NoSuchElementException();
23641 + return getByIndex( mIndices[ aName ] );
23642 + }
23643 +
23644 + virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException)
23645 + {
23646 + return msNames;
23647 + }
23648 +
23649 + virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException)
23650 + {
23651 + ControlIndexMap::iterator it = mIndices.find( aName );
23652 + return it != mIndices.end();
23653 + }
23654 +
23655 + // XElementAccess
23656 + virtual ::sal_Int32 SAL_CALL getCount( ) throw (css::uno::RuntimeException)
23657 + {
23658 + return mControls.size();
23659 + }
23660 +
23661 + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException )
23662 + {
23663 + if ( Index < 0 || Index >= static_cast< sal_Int32 >( mControls.size() ) )
23664 + throw lang::IndexOutOfBoundsException();
23665 + return uno::makeAny( mControls[ Index ] );
23666 + }
23667 +};
23668 +
23669 +
23670 +class ControlsEnumWrapper : public EnumerationHelper_BASE
23671 +{
23672 + uno::Reference<XHelperInterface > m_xParent;
23673 + uno::Reference<uno::XComponentContext > m_xContext;
23674 + uno::Reference<container::XIndexAccess > m_xIndexAccess;
23675 + uno::Reference<awt::XControl > m_xDlg;
23676 + sal_Int32 nIndex;
23677 +
23678 +public:
23679 +
23680 + ControlsEnumWrapper( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess, const uno::Reference< awt::XControl >& xDlg ) : m_xParent( xParent ), m_xContext( xContext), m_xIndexAccess( xIndexAccess ), m_xDlg( xDlg ), nIndex( 0 ) {}
23681 +
23682 + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException)
23683 + {
23684 + return ( nIndex < m_xIndexAccess->getCount() );
23685 + }
23686 +
23687 + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
23688 + {
23689 + if ( nIndex < m_xIndexAccess->getCount() )
23690 + {
23691 + uno::Reference< frame::XModel > xModel;
23692 + uno::Reference< awt::XControl > xControl;
23693 + m_xIndexAccess->getByIndex( nIndex++ ) >>= xControl;
23694 +
23695 + uno::Reference<lang::XMultiComponentFactory > xServiceManager( m_xContext->getServiceManager(), uno::UNO_QUERY_THROW );
23696 + uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.ControlProvider" ) ), m_xContext ), uno::UNO_QUERY_THROW );
23697 +
23698 + uno::Reference< msforms::XControl > xVBAControl( xControlProvider->createUserformControl( xControl, m_xDlg, xModel ) );
23699 + return uno::makeAny( xVBAControl );
23700 + }
23701 + throw container::NoSuchElementException();
23702 + }
23703 +
23704 +};
23705 +
23706 +
23707 +uno::Reference<container::XIndexAccess >
23708 +lcl_controlsWrapper( const uno::Reference< awt::XControl >& xDlg )
23709 +{
23710 + return new ControlArrayWrapper( xDlg );
23711 +}
23712 +
23713 +ScVbaControls::ScVbaControls( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext,
23714 + const css::uno::Reference< awt::XControl >& xDialog )
23715 + : ControlsImpl_BASE( xParent, xContext, lcl_controlsWrapper( xDialog ) )
23716 +{
23717 + mxDialog.set( xDialog, uno::UNO_QUERY_THROW );
23718 +}
23719 +
23720 +uno::Reference< container::XEnumeration >
23721 +ScVbaControls::createEnumeration() throw (uno::RuntimeException)
23722 +{
23723 + uno::Reference< container::XEnumeration > xEnum( new ControlsEnumWrapper( mxParent, mxContext, m_xIndexAccess, mxDialog ) );
23724 + if ( !xEnum.is() )
23725 + throw uno::RuntimeException();
23726 + return xEnum;
23727 +}
23728 +
23729 +uno::Any
23730 +ScVbaControls::createCollectionObject( const css::uno::Any& aSource )
23731 +{
23732 + // Create control from awt::XControl
23733 + uno::Reference< awt::XControl > xControl;
23734 + aSource >>= xControl;
23735 + uno::Reference< frame::XModel > xModel;
23736 + uno::Reference<lang::XMultiComponentFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
23737 + uno::Reference< XControlProvider > xControlProvider( xServiceManager->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.ControlProvider" ) ), mxContext ), uno::UNO_QUERY_THROW );
23738 +
23739 + uno::Reference< msforms::XControl > xVBAControl( xControlProvider->createUserformControl( xControl, mxDialog, xModel ) );
23740 +
23741 + return uno::makeAny( xVBAControl );
23742 +}
23743 +
23744 +void SAL_CALL
23745 +ScVbaControls::Move( double cx, double cy ) throw (uno::RuntimeException)
23746 +{
23747 + uno::Reference< container::XEnumeration > xEnum( createEnumeration() );
23748 + while ( xEnum->hasMoreElements() )
23749 + {
23750 + uno::Reference< msforms::XControl > xControl( xEnum->nextElement(), uno::UNO_QUERY_THROW );
23751 + xControl->setLeft( xControl->getLeft() + cx );
23752 + xControl->setTop( xControl->getTop() + cy );
23753 + }
23754 +}
23755 +
23756 +uno::Type
23757 +ScVbaControls::getElementType() throw (uno::RuntimeException)
23758 +{
23759 + return ooo::vba::msforms::XControl::static_type(0);
23760 +}
23761 +rtl::OUString&
23762 +ScVbaControls::getServiceImplName()
23763 +{
23764 + static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaControls") );
23765 + return sImplName;
23766 +}
23767 +
23768 +uno::Sequence< rtl::OUString >
23769 +ScVbaControls::getServiceNames()
23770 +{
23771 + static uno::Sequence< rtl::OUString > aServiceNames;
23772 + if ( aServiceNames.getLength() == 0 )
23773 + {
23774 + aServiceNames.realloc( 1 );
23775 + aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.Controls" ) );
23776 + }
23777 + return aServiceNames;
23778 +}
23779 --- vbahelper/source/msforms/vbacontrols.hxx.old 1970-01-01 00:00:00.000000000 +0000
23780 +++ vbahelper/source/msforms/vbacontrols.hxx 2009-04-06 16:42:01.000000000 +0000
23781 @@ -0,0 +1,62 @@
23782 +/*************************************************************************
23783 + *
23784 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
23785 + *
23786 + * Copyright 2008 by Sun Microsystems, Inc.
23787 + *
23788 + * OpenOffice.org - a multi-platform office productivity suite
23789 + *
23790 + * $RCSfile$
23791 + * $Revision$
23792 + *
23793 + * This file is part of OpenOffice.org.
23794 + *
23795 + * OpenOffice.org is free software: you can redistribute it and/or modify
23796 + * it under the terms of the GNU Lesser General Public License version 3
23797 + * only, as published by the Free Software Foundation.
23798 + *
23799 + * OpenOffice.org is distributed in the hope that it will be useful,
23800 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
23801 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
23802 + * GNU Lesser General Public License version 3 for more details
23803 + * (a copy is included in the LICENSE file that accompanied this code).
23804 + *
23805 + * You should have received a copy of the GNU Lesser General Public License
23806 + * version 3 along with OpenOffice.org. If not, see
23807 + * <http://www.openoffice.org/license.html>
23808 + * for a copy of the LGPLv3 License.
23809 + *
23810 + ************************************************************************/
23811 +#ifndef SC_VBA_CONTROLS_HXX
23812 +#define SC_VBA_CONTROLS_HXX
23813 +
23814 +#include <cppuhelper/implbase1.hxx>
23815 +#include <ooo/vba/msforms/XControls.hpp>
23816 +#include <com/sun/star/awt/XControl.hpp>
23817 +
23818 +#include <vbahelper/vbacollectionimpl.hxx>
23819 +#include <vbahelper/vbahelper.hxx>
23820 +
23821 +typedef CollTestImplHelper< ov::msforms::XControls > ControlsImpl_BASE;
23822 +
23823 +class ScVbaControls : public ControlsImpl_BASE
23824 +{
23825 + css::uno::Reference< css::awt::XControl > mxDialog;
23826 +protected:
23827 + virtual rtl::OUString& getServiceImplName();
23828 + virtual css::uno::Sequence<rtl::OUString> getServiceNames();
23829 +public:
23830 + ScVbaControls( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext,
23831 + const css::uno::Reference< css::awt::XControl >& xDialog );
23832 + // XControls
23833 + virtual void SAL_CALL Move( double cx, double cy ) throw (css::uno::RuntimeException);
23834 + // XEnumerationAccess
23835 + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
23836 + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
23837 +
23838 + // ScVbaCollectionBaseImpl
23839 + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
23840 +
23841 +};
23842 +#endif //SC_VBA_OLEOBJECTS_HXX
23843 +
23844 --- vbahelper/source/msforms/vbaframe.cxx.old 1970-01-01 00:00:00.000000000 +0000
23845 +++ vbahelper/source/msforms/vbaframe.cxx 2009-04-06 16:42:01.000000000 +0000
23846 @@ -0,0 +1,93 @@
23847 +/*************************************************************************
23848 + *
23849 + * OpenOffice.org - a multi-platform office productivity suite
23850 + *
23851 + * $RCSfile$
23852 + *
23853 + * $Revision$
23854 + *
23855 + * last change: $Author$ $Date$
23856 + *
23857 + * The Contents of this file are made available subject to
23858 + * the terms of GNU Lesser General Public License Version 2.1.
23859 + *
23860 + *
23861 + * GNU Lesser General Public License Version 2.1
23862 + * =============================================
23863 + * Copyright 2005 by Sun Microsystems, Inc.
23864 + * 901 San Antonio Road, Palo Alto, CA 94303, USA
23865 + *
23866 + * This library is free software; you can redistribute it and/or
23867 + * modify it under the terms of the GNU Lesser General Public
23868 + * License version 2.1, as published by the Free Software Foundation.
23869 + *
23870 + * This library is distributed in the hope that it will be useful,
23871 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
23872 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
23873 + * Lesser General Public License for more details.
23874 + *
23875 + * You should have received a copy of the GNU Lesser General Public
23876 + * License along with this library; if not, write to the Free Software
23877 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
23878 + * MA 02111-1307 USA
23879 + *
23880 + ************************************************************************/
23881 +#include "vbaframe.hxx"
23882 +#include <vector>
23883 +
23884 +using namespace com::sun::star;
23885 +using namespace ooo::vba;
23886 +
23887 +
23888 +const static rtl::OUString LABEL( RTL_CONSTASCII_USTRINGPARAM("Label") );
23889 +ScVbaFrame::ScVbaFrame( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper ) : FrameImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
23890 +{
23891 +}
23892 +
23893 +// Attributes
23894 +rtl::OUString SAL_CALL
23895 +ScVbaFrame::getCaption() throw (css::uno::RuntimeException)
23896 +{
23897 + rtl::OUString Label;
23898 + m_xProps->getPropertyValue( LABEL ) >>= Label;
23899 + return Label;
23900 +}
23901 +
23902 +void SAL_CALL
23903 +ScVbaFrame::setCaption( const rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException)
23904 +{
23905 + m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) );
23906 +}
23907 +
23908 +uno::Any SAL_CALL
23909 +ScVbaFrame::getValue() throw (css::uno::RuntimeException)
23910 +{
23911 + return uno::makeAny( getCaption() );
23912 +}
23913 +
23914 +void SAL_CALL
23915 +ScVbaFrame::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException)
23916 +{
23917 + rtl::OUString sCaption;
23918 + _value >>= sCaption;
23919 + setCaption( sCaption );
23920 +}
23921 +
23922 +rtl::OUString&
23923 +ScVbaFrame::getServiceImplName()
23924 +{
23925 + static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaFrame") );
23926 + return sImplName;
23927 +}
23928 +
23929 +uno::Sequence< rtl::OUString >
23930 +ScVbaFrame::getServiceNames()
23931 +{
23932 + static uno::Sequence< rtl::OUString > aServiceNames;
23933 + if ( aServiceNames.getLength() == 0 )
23934 + {
23935 + aServiceNames.realloc( 1 );
23936 + aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.Frame" ) );
23937 + }
23938 + return aServiceNames;
23939 +}
23940 --- vbahelper/source/msforms/vbaframe.hxx.old 1970-01-01 00:00:00.000000000 +0000
23941 +++ vbahelper/source/msforms/vbaframe.hxx 2009-04-06 16:42:01.000000000 +0000
23942 @@ -0,0 +1,58 @@
23943 +/*************************************************************************
23944 + *
23945 + * OpenOffice.org - a multi-platform office productivity suite
23946 + *
23947 + * $RCSfile$
23948 + *
23949 + * $Revision$
23950 + *
23951 + * last change: $Author$ $Date$
23952 + *
23953 + * The Contents of this file are made available subject to
23954 + * the terms of GNU Lesser General Public License Version 2.1.
23955 + *
23956 + *
23957 + * GNU Lesser General Public License Version 2.1
23958 + * =============================================
23959 + * Copyright 2005 by Sun Microsystems, Inc.
23960 + * 901 San Antonio Road, Palo Alto, CA 94303, USA
23961 + *
23962 + * This library is free software; you can redistribute it and/or
23963 + * modify it under the terms of the GNU Lesser General Public
23964 + * License version 2.1, as published by the Free Software Foundation.
23965 + *
23966 + * This library is distributed in the hope that it will be useful,
23967 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
23968 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
23969 + * Lesser General Public License for more details.
23970 + *
23971 + * You should have received a copy of the GNU Lesser General Public
23972 + * License along with this library; if not, write to the Free Software
23973 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
23974 + * MA 02111-1307 USA
23975 + *
23976 + ************************************************************************/
23977 +#ifndef SC_VBA_FRAME_HXX
23978 +#define SC_VBA_FRAME_HXX
23979 +#include <cppuhelper/implbase1.hxx>
23980 +#include <ooo/vba/msforms/XLabel.hpp>
23981 +
23982 +#include "vbacontrol.hxx"
23983 +#include <vbahelper/vbahelper.hxx>
23984 +
23985 +typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XLabel > FrameImpl_BASE;
23986 +
23987 +class ScVbaFrame : public FrameImpl_BASE
23988 +{
23989 +public:
23990 + ScVbaFrame( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
23991 + // Attributes
23992 + virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
23993 + virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
23994 + virtual rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
23995 + virtual void SAL_CALL setCaption( const rtl::OUString& _caption ) throw (css::uno::RuntimeException);
23996 + //XHelperInterface
23997 + virtual rtl::OUString& getServiceImplName();
23998 + virtual css::uno::Sequence<rtl::OUString> getServiceNames();
23999 +};
24000 +#endif //SC_VBA_LABEL_HXX
24001 --- vbahelper/source/msforms/vbaimage.cxx.old 1970-01-01 00:00:00.000000000 +0000
24002 +++ vbahelper/source/msforms/vbaimage.cxx 2009-04-06 16:42:01.000000000 +0000
24003 @@ -0,0 +1,59 @@
24004 +/*************************************************************************
24005 + *
24006 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
24007 + *
24008 + * Copyright 2008 by Sun Microsystems, Inc.
24009 + *
24010 + * OpenOffice.org - a multi-platform office productivity suite
24011 + *
24012 + * $RCSfile$
24013 + * $Revision$
24014 + *
24015 + * This file is part of OpenOffice.org.
24016 + *
24017 + * OpenOffice.org is free software: you can redistribute it and/or modify
24018 + * it under the terms of the GNU Lesser General Public License version 3
24019 + * only, as published by the Free Software Foundation.
24020 + *
24021 + * OpenOffice.org is distributed in the hope that it will be useful,
24022 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
24023 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
24024 + * GNU Lesser General Public License version 3 for more details
24025 + * (a copy is included in the LICENSE file that accompanied this code).
24026 + *
24027 + * You should have received a copy of the GNU Lesser General Public License
24028 + * version 3 along with OpenOffice.org. If not, see
24029 + * <http://www.openoffice.org/license.html>
24030 + * for a copy of the LGPLv3 License.
24031 + *
24032 + ************************************************************************/
24033 +#include "vbaimage.hxx"
24034 +#include <vector>
24035 +
24036 +using namespace com::sun::star;
24037 +using namespace ooo::vba;
24038 +
24039 +
24040 +const static rtl::OUString LABEL( RTL_CONSTASCII_USTRINGPARAM("Label") );
24041 +ScVbaImage::ScVbaImage( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : ImageImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
24042 +{
24043 +}
24044 +
24045 +rtl::OUString&
24046 +ScVbaImage::getServiceImplName()
24047 +{
24048 + static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaImage") );
24049 + return sImplName;
24050 +}
24051 +
24052 +uno::Sequence< rtl::OUString >
24053 +ScVbaImage::getServiceNames()
24054 +{
24055 + static uno::Sequence< rtl::OUString > aServiceNames;
24056 + if ( aServiceNames.getLength() == 0 )
24057 + {
24058 + aServiceNames.realloc( 1 );
24059 + aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.Image" ) );
24060 + }
24061 + return aServiceNames;
24062 +}
24063 --- vbahelper/source/msforms/vbaimage.hxx.old 1970-01-01 00:00:00.000000000 +0000
24064 +++ vbahelper/source/msforms/vbaimage.hxx 2009-04-06 16:42:01.000000000 +0000
24065 @@ -0,0 +1,48 @@
24066 +/*************************************************************************
24067 + *
24068 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
24069 + *
24070 + * Copyright 2008 by Sun Microsystems, Inc.
24071 + *
24072 + * OpenOffice.org - a multi-platform office productivity suite
24073 + *
24074 + * $RCSfile$
24075 + * $Revision$
24076 + *
24077 + * This file is part of OpenOffice.org.
24078 + *
24079 + * OpenOffice.org is free software: you can redistribute it and/or modify
24080 + * it under the terms of the GNU Lesser General Public License version 3
24081 + * only, as published by the Free Software Foundation.
24082 + *
24083 + * OpenOffice.org is distributed in the hope that it will be useful,
24084 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
24085 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
24086 + * GNU Lesser General Public License version 3 for more details
24087 + * (a copy is included in the LICENSE file that accompanied this code).
24088 + *
24089 + * You should have received a copy of the GNU Lesser General Public License
24090 + * version 3 along with OpenOffice.org. If not, see
24091 + * <http://www.openoffice.org/license.html>
24092 + * for a copy of the LGPLv3 License.
24093 + *
24094 + ************************************************************************/
24095 +#ifndef SC_VBA_IMAGE_HXX
24096 +#define SC_VBA_IMAGE_HXX
24097 +#include <cppuhelper/implbase1.hxx>
24098 +#include <ooo/vba/msforms/XImage.hpp>
24099 +
24100 +#include "vbacontrol.hxx"
24101 +#include <vbahelper/vbahelper.hxx>
24102 +
24103 +typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XImage > ImageImpl_BASE;
24104 +
24105 +class ScVbaImage : public ImageImpl_BASE
24106 +{
24107 +public:
24108 + ScVbaImage( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
24109 + //XHelperInterface
24110 + virtual rtl::OUString& getServiceImplName();
24111 + virtual css::uno::Sequence<rtl::OUString> getServiceNames();
24112 +};
24113 +#endif //SC_VBA_IMAGE_HXX
24114 --- vbahelper/source/msforms/vbalabel.cxx.old 1970-01-01 00:00:00.000000000 +0000
24115 +++ vbahelper/source/msforms/vbalabel.cxx 2009-04-06 16:42:01.000000000 +0000
24116 @@ -0,0 +1,88 @@
24117 +/*************************************************************************
24118 + *
24119 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
24120 + *
24121 + * Copyright 2008 by Sun Microsystems, Inc.
24122 + *
24123 + * OpenOffice.org - a multi-platform office productivity suite
24124 + *
24125 + * $RCSfile: vbalabel.cxx,v $
24126 + * $Revision: 1.3 $
24127 + *
24128 + * This file is part of OpenOffice.org.
24129 + *
24130 + * OpenOffice.org is free software: you can redistribute it and/or modify
24131 + * it under the terms of the GNU Lesser General Public License version 3
24132 + * only, as published by the Free Software Foundation.
24133 + *
24134 + * OpenOffice.org is distributed in the hope that it will be useful,
24135 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
24136 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
24137 + * GNU Lesser General Public License version 3 for more details
24138 + * (a copy is included in the LICENSE file that accompanied this code).
24139 + *
24140 + * You should have received a copy of the GNU Lesser General Public License
24141 + * version 3 along with OpenOffice.org. If not, see
24142 + * <http://www.openoffice.org/license.html>
24143 + * for a copy of the LGPLv3 License.
24144 + *
24145 + ************************************************************************/
24146 +#include "vbalabel.hxx"
24147 +#include <vector>
24148 +
24149 +using namespace com::sun::star;
24150 +using namespace ooo::vba;
24151 +
24152 +
24153 +const static rtl::OUString LABEL( RTL_CONSTASCII_USTRINGPARAM("Label") );
24154 +ScVbaLabel::ScVbaLabel( const css::uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper ) : LabelImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
24155 +{
24156 +}
24157 +
24158 +// Attributes
24159 +rtl::OUString SAL_CALL
24160 +ScVbaLabel::getCaption() throw (css::uno::RuntimeException)
24161 +{
24162 + rtl::OUString Label;
24163 + m_xProps->getPropertyValue( LABEL ) >>= Label;
24164 + return Label;
24165 +}
24166 +
24167 +void SAL_CALL
24168 +ScVbaLabel::setCaption( const rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException)
24169 +{
24170 + m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) );
24171 +}
24172 +uno::Any SAL_CALL
24173 +ScVbaLabel::getValue() throw (css::uno::RuntimeException)
24174 +{
24175 + return uno::makeAny( getCaption() );
24176 +}
24177 +
24178 +void SAL_CALL
24179 +ScVbaLabel::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException)
24180 +{
24181 + rtl::OUString sCaption;
24182 + _value >>= sCaption;
24183 + setCaption( sCaption );
24184 +}
24185 +
24186 +
24187 +rtl::OUString&
24188 +ScVbaLabel::getServiceImplName()
24189 +{
24190 + static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaLabel") );
24191 + return sImplName;
24192 +}
24193 +
24194 +uno::Sequence< rtl::OUString >
24195 +ScVbaLabel::getServiceNames()
24196 +{
24197 + static uno::Sequence< rtl::OUString > aServiceNames;
24198 + if ( aServiceNames.getLength() == 0 )
24199 + {
24200 + aServiceNames.realloc( 1 );
24201 + aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.Label" ) );
24202 + }
24203 + return aServiceNames;
24204 +}
24205 --- vbahelper/source/msforms/vbalabel.hxx.old 1970-01-01 00:00:00.000000000 +0000
24206 +++ vbahelper/source/msforms/vbalabel.hxx 2009-04-06 16:42:01.000000000 +0000
24207 @@ -0,0 +1,56 @@
24208 +/*************************************************************************
24209 + *
24210 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
24211 + *
24212 + * Copyright 2008 by Sun Microsystems, Inc.
24213 + *
24214 + * OpenOffice.org - a multi-platform office productivity suite
24215 + *
24216 + * $RCSfile: vbalabel.hxx,v $
24217 + * $Revision: 1.3 $
24218 + *
24219 + * This file is part of OpenOffice.org.
24220 + *
24221 + * OpenOffice.org is free software: you can redistribute it and/or modify
24222 + * it under the terms of the GNU Lesser General Public License version 3
24223 + * only, as published by the Free Software Foundation.
24224 + *
24225 + * OpenOffice.org is distributed in the hope that it will be useful,
24226 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
24227 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
24228 + * GNU Lesser General Public License version 3 for more details
24229 + * (a copy is included in the LICENSE file that accompanied this code).
24230 + *
24231 + * You should have received a copy of the GNU Lesser General Public License
24232 + * version 3 along with OpenOffice.org. If not, see
24233 + * <http://www.openoffice.org/license.html>
24234 + * for a copy of the LGPLv3 License.
24235 + *
24236 + ************************************************************************/
24237 +#ifndef SC_VBA_LABEL_HXX
24238 +#define SC_VBA_LABEL_HXX
24239 +#include <cppuhelper/implbase1.hxx>
24240 +#include <ooo/vba/msforms/XLabel.hpp>
24241 +
24242 +#include "vbacontrol.hxx"
24243 +#include <vbahelper/vbahelper.hxx>
24244 +#include <cppuhelper/implbase2.hxx>
24245 +
24246 +typedef cppu::ImplInheritanceHelper2< ScVbaControl, ov::msforms::XLabel, css::script::XDefaultProperty > LabelImpl_BASE;
24247 +
24248 +class ScVbaLabel : public LabelImpl_BASE
24249 +{
24250 +public:
24251 + ScVbaLabel( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
24252 + // Attributes
24253 + virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
24254 + virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
24255 + virtual rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
24256 + virtual void SAL_CALL setCaption( const rtl::OUString& _caption ) throw (css::uno::RuntimeException);
24257 + //XHelperInterface
24258 + virtual rtl::OUString& getServiceImplName();
24259 + virtual css::uno::Sequence<rtl::OUString> getServiceNames();
24260 + // XDefaultProperty
24261 + rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
24262 +};
24263 +#endif //SC_VBA_LABEL_HXX
24264 --- vbahelper/source/msforms/vbalistbox.cxx.old 1970-01-01 00:00:00.000000000 +0000
24265 +++ vbahelper/source/msforms/vbalistbox.cxx 2009-04-06 16:42:01.000000000 +0000
24266 @@ -0,0 +1,288 @@
24267 +/*************************************************************************
24268 + *
24269 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
24270 + *
24271 + * Copyright 2008 by Sun Microsystems, Inc.
24272 + *
24273 + * OpenOffice.org - a multi-platform office productivity suite
24274 + *
24275 + * $RCSfile: vbalistbox.cxx,v $
24276 + * $Revision: 1.4 $
24277 + *
24278 + * This file is part of OpenOffice.org.
24279 + *
24280 + * OpenOffice.org is free software: you can redistribute it and/or modify
24281 + * it under the terms of the GNU Lesser General Public License version 3
24282 + * only, as published by the Free Software Foundation.
24283 + *
24284 + * OpenOffice.org is distributed in the hope that it will be useful,
24285 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
24286 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
24287 + * GNU Lesser General Public License version 3 for more details
24288 + * (a copy is included in the LICENSE file that accompanied this code).
24289 + *
24290 + * You should have received a copy of the GNU Lesser General Public License
24291 + * version 3 along with OpenOffice.org. If not, see
24292 + * <http://www.openoffice.org/license.html>
24293 + * for a copy of the LGPLv3 License.
24294 + *
24295 + ************************************************************************/
24296 +#include <com/sun/star/form/validation/XValidatableFormComponent.hpp>
24297 +
24298 +#include "vbalistbox.hxx"
24299 +#include <vector>
24300 +#include <comphelper/anytostring.hxx>
24301 +#include <com/sun/star/script/ArrayWrapper.hpp>
24302 +
24303 +using namespace com::sun::star;
24304 +using namespace ooo::vba;
24305 +
24306 +const static rtl::OUString TEXT( RTL_CONSTASCII_USTRINGPARAM("Text") );
24307 +const static rtl::OUString SELECTEDITEMS( RTL_CONSTASCII_USTRINGPARAM("SelectedItems") );
24308 +const static rtl::OUString ITEMS( RTL_CONSTASCII_USTRINGPARAM("StringItemList") );
24309 +
24310 +
24311 +ScVbaListBox::ScVbaListBox( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< css::uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : ListBoxImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
24312 +{
24313 + mpListHelper.reset( new ListControlHelper( m_xProps ) );
24314 +}
24315 +
24316 +// Attributes
24317 +void SAL_CALL
24318 +ScVbaListBox::setListIndex( const uno::Any& _value ) throw (uno::RuntimeException)
24319 +{
24320 + sal_Int32 nIndex = 0;
24321 + _value >>= nIndex;
24322 + Selected( nIndex );
24323 +}
24324 +
24325 +uno::Any SAL_CALL
24326 +ScVbaListBox::getListIndex() throw (uno::RuntimeException)
24327 +{
24328 + uno::Sequence< sal_Int16 > sSelection;
24329 + m_xProps->getPropertyValue( SELECTEDITEMS ) >>= sSelection;
24330 + if ( sSelection.getLength() == 0 )
24331 + return uno::Any( sal_Int32( -1 ) );
24332 + return uno::Any( sSelection[ 0 ] );
24333 +}
24334 +
24335 +uno::Any SAL_CALL
24336 +ScVbaListBox::getValue() throw (uno::RuntimeException)
24337 +{
24338 + uno::Sequence< sal_Int16 > sSelection;
24339 + uno::Sequence< rtl::OUString > sItems;
24340 + m_xProps->getPropertyValue( SELECTEDITEMS ) >>= sSelection;
24341 + m_xProps->getPropertyValue( ITEMS ) >>= sItems;
24342 + if( getMultiSelect() )
24343 + throw uno::RuntimeException( rtl::OUString::createFromAscii(
24344 + "Attribute use invalid." ), uno::Reference< uno::XInterface >() );
24345 + uno::Any aRet;
24346 + if ( sSelection.getLength() )
24347 + aRet = uno::makeAny( sItems[ sSelection[ 0 ] ] );
24348 + return aRet;
24349 +}
24350 +
24351 +void SAL_CALL
24352 +ScVbaListBox::setValue( const uno::Any& _value ) throw (uno::RuntimeException)
24353 +{
24354 + if( getMultiSelect() )
24355 + {
24356 + throw uno::RuntimeException( rtl::OUString::createFromAscii(
24357 + "Attribute use invalid." ), uno::Reference< uno::XInterface >() );
24358 + }
24359 + rtl::OUString sValue = getAnyAsString( _value );
24360 + uno::Sequence< rtl::OUString > sList;
24361 + m_xProps->getPropertyValue( ITEMS ) >>= sList;
24362 + uno::Sequence< sal_Int16 > nList;
24363 + sal_Int16 nLength = static_cast<sal_Int16>( sList.getLength() );
24364 + sal_Int16 nValue = -1;
24365 + sal_Int16 i = 0;
24366 + for( i = 0; i < nLength; i++ )
24367 + {
24368 + if( sList[i].equals( sValue ) )
24369 + {
24370 + nValue = i;
24371 + break;
24372 + }
24373 + }
24374 + if( nValue == -1 )
24375 + throw uno::RuntimeException( rtl::OUString::createFromAscii(
24376 + "Attribute use invalid." ), uno::Reference< uno::XInterface >() );
24377 +
24378 + uno::Sequence< sal_Int16 > nSelectedIndices(1);
24379 + nSelectedIndices[ 0 ] = nValue;
24380 + m_xProps->setPropertyValue( SELECTEDITEMS, uno::makeAny( nSelectedIndices ) );
24381 + m_xProps->setPropertyValue( TEXT, uno::makeAny( sValue ) );
24382 +}
24383 +
24384 +::rtl::OUString SAL_CALL
24385 +ScVbaListBox::getText() throw (uno::RuntimeException)
24386 +{
24387 + rtl::OUString result;
24388 + getValue() >>= result;
24389 + return result;
24390 +}
24391 +
24392 +void SAL_CALL
24393 +ScVbaListBox::setText( const ::rtl::OUString& _text ) throw (uno::RuntimeException)
24394 +{
24395 + setValue( uno::makeAny( _text ) ); // seems the same
24396 +}
24397 +
24398 +sal_Bool SAL_CALL
24399 +ScVbaListBox::getMultiSelect() throw (css::uno::RuntimeException)
24400 +{
24401 + sal_Bool bMultiSelect = sal_False;
24402 + m_xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MultiSelection" ) ) ) >>= bMultiSelect;
24403 + return bMultiSelect;
24404 +}
24405 +
24406 +void SAL_CALL
24407 +ScVbaListBox::setMultiSelect( sal_Bool _multiselect ) throw (css::uno::RuntimeException)
24408 +{
24409 + m_xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MultiSelection" ) ), uno::makeAny( _multiselect ) );
24410 +}
24411 +
24412 +css::uno::Any SAL_CALL
24413 +ScVbaListBox::Selected( sal_Int32 index ) throw (css::uno::RuntimeException)
24414 +{
24415 + uno::Sequence< rtl::OUString > sList;
24416 + m_xProps->getPropertyValue( ITEMS ) >>= sList;
24417 + sal_Int16 nLength = static_cast< sal_Int16 >( sList.getLength() );
24418 + // no choice but to do a horror cast as internally
24419 + // the indices are but sal_Int16
24420 + sal_Int16 nIndex = static_cast< sal_Int16 >( index );
24421 + if( nIndex < 0 || nIndex >= nLength )
24422 + throw uno::RuntimeException( rtl::OUString::createFromAscii(
24423 + "Error Number." ), uno::Reference< uno::XInterface >() );
24424 + m_nIndex = nIndex;
24425 + return uno::makeAny( uno::Reference< XPropValue > ( new ScVbaPropValue( this ) ) );
24426 +}
24427 +
24428 +// Methods
24429 +void SAL_CALL
24430 +ScVbaListBox::AddItem( const uno::Any& pvargItem, const uno::Any& pvargIndex ) throw (uno::RuntimeException)
24431 +{
24432 + mpListHelper->AddItem( pvargItem, pvargIndex );
24433 + }
24434 +
24435 +void SAL_CALL
24436 +ScVbaListBox::removeItem( const uno::Any& index ) throw (uno::RuntimeException)
24437 +{
24438 + mpListHelper->removeItem( index );
24439 +}
24440 +
24441 +void SAL_CALL
24442 +ScVbaListBox::Clear( ) throw (uno::RuntimeException)
24443 +{
24444 + mpListHelper->Clear();
24445 +}
24446 +
24447 +// this is called when something like the following vba code is used
24448 +// to set the selected state of particular entries in the Listbox
24449 +// ListBox1.Selected( 3 ) = false
24450 +//PropListener
24451 +void
24452 +ScVbaListBox::setValueEvent( const uno::Any& value )
24453 +{
24454 + sal_Bool bValue = sal_False;
24455 + if( !(value >>= bValue) )
24456 + throw uno::RuntimeException( rtl::OUString::createFromAscii(
24457 + "Invalid type\n. need boolean." ), uno::Reference< uno::XInterface >() );
24458 + uno::Sequence< sal_Int16 > nList;
24459 + m_xProps->getPropertyValue( SELECTEDITEMS ) >>= nList;
24460 + sal_Int16 nLength = static_cast<sal_Int16>( nList.getLength() );
24461 + sal_Int16 nIndex = m_nIndex;
24462 + for( sal_Int16 i = 0; i < nLength; i++ )
24463 + {
24464 + if( nList[i] == nIndex )
24465 + {
24466 + if( bValue )
24467 + return;
24468 + else
24469 + {
24470 + for( ; i < nLength - 1; i++ )
24471 + {
24472 + nList[i] = nList[i + 1];
24473 + }
24474 + nList.realloc( nLength - 1 );
24475 + //m_xProps->setPropertyValue( sSourceName, uno::makeAny( nList ) );
24476 + m_xProps->setPropertyValue( SELECTEDITEMS, uno::makeAny( nList ) );
24477 + return;
24478 + }
24479 + }
24480 + }
24481 + if( bValue )
24482 + {
24483 + if( getMultiSelect() )
24484 + {
24485 + nList.realloc( nLength + 1 );
24486 + nList[nLength] = nIndex;
24487 + }
24488 + else
24489 + {
24490 + nList.realloc( 1 );
24491 + nList[0] = nIndex;
24492 + }
24493 + m_xProps->setPropertyValue( sSourceName, uno::makeAny( nList ) );
24494 + }
24495 +}
24496 +
24497 +// this is called when something like the following vba code is used
24498 +// to determine the selected state of particular entries in the Listbox
24499 +// msgbox ListBox1.Selected( 3 )
24500 +
24501 +css::uno::Any
24502 +ScVbaListBox::getValueEvent()
24503 +{
24504 + uno::Sequence< sal_Int16 > nList;
24505 + m_xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SelectedItems" ) ) ) >>= nList;
24506 + sal_Int32 nLength = nList.getLength();
24507 + sal_Int32 nIndex = m_nIndex;
24508 +
24509 + for( sal_Int32 i = 0; i < nLength; i++ )
24510 + {
24511 + if( nList[i] == nIndex )
24512 + return uno::makeAny( sal_True );
24513 + }
24514 +
24515 + return uno::makeAny( sal_False );
24516 +}
24517 +
24518 +void SAL_CALL
24519 +ScVbaListBox::setRowSource( const rtl::OUString& _rowsource ) throw (uno::RuntimeException)
24520 +{
24521 + ScVbaControl::setRowSource( _rowsource );
24522 + mpListHelper->setRowSource( _rowsource );
24523 +}
24524 +
24525 +sal_Int32 SAL_CALL
24526 +ScVbaListBox::getListCount() throw (uno::RuntimeException)
24527 +{
24528 + return mpListHelper->getListCount();
24529 +}
24530 +
24531 +uno::Any SAL_CALL
24532 +ScVbaListBox::List( const ::uno::Any& pvargIndex, const uno::Any& pvarColumn ) throw (uno::RuntimeException)
24533 +{
24534 + return mpListHelper->List( pvargIndex, pvarColumn );
24535 +}
24536 +
24537 +rtl::OUString&
24538 +ScVbaListBox::getServiceImplName()
24539 +{
24540 + static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaListBox") );
24541 + return sImplName;
24542 +}
24543 +
24544 +uno::Sequence< rtl::OUString >
24545 +ScVbaListBox::getServiceNames()
24546 +{
24547 + static uno::Sequence< rtl::OUString > aServiceNames;
24548 + if ( aServiceNames.getLength() == 0 )
24549 + {
24550 + aServiceNames.realloc( 1 );
24551 + aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.ScVbaListBox" ) );
24552 + }
24553 + return aServiceNames;
24554 +}
24555 --- vbahelper/source/msforms/vbalistbox.hxx.old 1970-01-01 00:00:00.000000000 +0000
24556 +++ vbahelper/source/msforms/vbalistbox.hxx 2009-04-06 16:42:01.000000000 +0000
24557 @@ -0,0 +1,90 @@
24558 +/*************************************************************************
24559 + *
24560 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
24561 + *
24562 + * Copyright 2008 by Sun Microsystems, Inc.
24563 + *
24564 + * OpenOffice.org - a multi-platform office productivity suite
24565 + *
24566 + * $RCSfile: vbalistbox.hxx,v $
24567 + * $Revision: 1.3 $
24568 + *
24569 + * This file is part of OpenOffice.org.
24570 + *
24571 + * OpenOffice.org is free software: you can redistribute it and/or modify
24572 + * it under the terms of the GNU Lesser General Public License version 3
24573 + * only, as published by the Free Software Foundation.
24574 + *
24575 + * OpenOffice.org is distributed in the hope that it will be useful,
24576 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
24577 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
24578 + * GNU Lesser General Public License version 3 for more details
24579 + * (a copy is included in the LICENSE file that accompanied this code).
24580 + *
24581 + * You should have received a copy of the GNU Lesser General Public License
24582 + * version 3 along with OpenOffice.org. If not, see
24583 + * <http://www.openoffice.org/license.html>
24584 + * for a copy of the LGPLv3 License.
24585 + *
24586 + ************************************************************************/
24587 +#ifndef SC_VBA_LISTBOX_HXX
24588 +#define SC_VBA_LISTBOX_HXX
24589 +#include <cppuhelper/implbase2.hxx>
24590 +#include <com/sun/star/uno/XComponentContext.hpp>
24591 +#include <com/sun/star/script/XDefaultProperty.hpp>
24592 +#include <ooo/vba/msforms/XListBox.hpp>
24593 +#include <com/sun/star/beans/PropertyAttribute.hpp>
24594 +
24595 +#include "vbacontrol.hxx"
24596 +#include <vbahelper/vbapropvalue.hxx>
24597 +#include "vbalistcontrolhelper.hxx"
24598 +#include <vbahelper/vbahelper.hxx>
24599 +
24600 +typedef cppu::ImplInheritanceHelper2<ScVbaControl, ov::msforms::XListBox, css::script::XDefaultProperty > ListBoxImpl_BASE;
24601 +class ScVbaListBox : public ListBoxImpl_BASE
24602 + ,public PropListener
24603 +{
24604 + std::auto_ptr< ListControlHelper > mpListHelper;
24605 + rtl::OUString sSourceName;
24606 + rtl::OUString msDftPropName;
24607 +
24608 + sal_Int16 m_nIndex;
24609 +
24610 +public:
24611 + ScVbaListBox( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
24612 +
24613 + // Attributes
24614 + virtual css::uno::Any SAL_CALL getListIndex() throw (css::uno::RuntimeException);
24615 + virtual void SAL_CALL setListIndex( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
24616 + virtual ::sal_Int32 SAL_CALL getListCount() throw (css::uno::RuntimeException);
24617 + virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
24618 + virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
24619 + virtual rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException);
24620 + virtual void SAL_CALL setText( const ::rtl::OUString& _text ) throw (css::uno::RuntimeException);
24621 + virtual sal_Bool SAL_CALL getMultiSelect() throw (css::uno::RuntimeException);
24622 + virtual void SAL_CALL setMultiSelect( sal_Bool _multiselect ) throw (css::uno::RuntimeException);
24623 + virtual css::uno::Any SAL_CALL Selected( ::sal_Int32 index ) throw (css::uno::RuntimeException);
24624 +
24625 + // Methods
24626 + virtual void SAL_CALL AddItem( const css::uno::Any& pvargItem, const css::uno::Any& pvargIndex ) throw (css::uno::RuntimeException);
24627 + virtual void SAL_CALL removeItem( const css::uno::Any& index ) throw (css::uno::RuntimeException);
24628 + virtual void SAL_CALL Clear( ) throw (css::uno::RuntimeException);
24629 + virtual css::uno::Any SAL_CALL List( const css::uno::Any& pvargIndex, const css::uno::Any& pvarColumn ) throw (css::uno::RuntimeException);
24630 + // XControl
24631 + virtual void SAL_CALL setRowSource( const rtl::OUString& _rowsource ) throw (css::uno::RuntimeException);
24632 +
24633 + // XDefaultProperty
24634 + rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
24635 +
24636 + //XHelperInterface
24637 + virtual rtl::OUString& getServiceImplName();
24638 + virtual css::uno::Sequence<rtl::OUString> getServiceNames();
24639 +
24640 + //PropListener
24641 + virtual void setValueEvent( const css::uno::Any& value );
24642 + virtual css::uno::Any getValueEvent();
24643 +
24644 +
24645 +};
24646 +
24647 +#endif //
24648 --- vbahelper/source/msforms/vbalistcontrolhelper.cxx.old 1970-01-01 00:00:00.000000000 +0000
24649 +++ vbahelper/source/msforms/vbalistcontrolhelper.cxx 2009-04-06 16:42:01.000000000 +0000
24650 @@ -0,0 +1,146 @@
24651 +#include <vbalistcontrolhelper.hxx>
24652 +#include <vector>
24653 +
24654 +using namespace com::sun::star;
24655 +using namespace ooo::vba;
24656 +
24657 +const static rtl::OUString ITEMS( RTL_CONSTASCII_USTRINGPARAM("StringItemList") );
24658 +
24659 +void SAL_CALL
24660 +ListControlHelper::AddItem( const uno::Any& pvargItem, const uno::Any& pvargIndex ) throw (uno::RuntimeException)
24661 +{
24662 + if ( pvargItem.hasValue() )
24663 + {
24664 + uno::Sequence< rtl::OUString > sList;
24665 + m_xProps->getPropertyValue( ITEMS ) >>= sList;
24666 +
24667 + sal_Int32 nIndex = sList.getLength();
24668 +
24669 + if ( pvargIndex.hasValue() )
24670 + pvargIndex >>= nIndex;
24671 +
24672 + rtl::OUString sString = getAnyAsString( pvargItem );
24673 +
24674 + // if no index specified or item is to be appended to end of
24675 + // list just realloc the array and set the last item
24676 + if ( nIndex == sList.getLength() )
24677 + {
24678 + sal_Int32 nOldSize = sList.getLength();
24679 + sList.realloc( nOldSize + 1 );
24680 + sList[ nOldSize ] = sString;
24681 + }
24682 + else
24683 + {
24684 + // just copy those elements above the one to be inserted
24685 + std::vector< rtl::OUString > sVec;
24686 + // reserve just the amount we need to copy
24687 + sVec.reserve( sList.getLength() - nIndex );
24688 +
24689 + // point at first element to copy
24690 + rtl::OUString* pString = sList.getArray() + nIndex;
24691 + const rtl::OUString* pEndString = sList.getArray() + sList.getLength();
24692 + // insert the new element
24693 + sVec.push_back( sString );
24694 + // copy elements
24695 + for ( ; pString != pEndString; ++pString )
24696 + sVec.push_back( *pString );
24697 +
24698 + sList.realloc( sList.getLength() + 1 );
24699 +
24700 + // point at first element to be overwritten
24701 + pString = sList.getArray() + nIndex;
24702 + pEndString = sList.getArray() + sList.getLength();
24703 + std::vector< rtl::OUString >::iterator it = sVec.begin();
24704 + for ( ; pString != pEndString; ++pString, ++it)
24705 + *pString = *it;
24706 + //
24707 + }
24708 +
24709 + m_xProps->setPropertyValue( ITEMS, uno::makeAny( sList ) );
24710 +
24711 + }
24712 +}
24713 +
24714 +void SAL_CALL
24715 +ListControlHelper::removeItem( const uno::Any& index ) throw (uno::RuntimeException)
24716 +{
24717 + sal_Int32 nIndex = 0;
24718 + // for int index
24719 + if ( index >>= nIndex )
24720 + {
24721 + uno::Sequence< rtl::OUString > sList;
24722 + m_xProps->getPropertyValue( ITEMS ) >>= sList;
24723 + if( nIndex < 0 || nIndex > ( sList.getLength() - 1 ) )
24724 + throw uno::RuntimeException( rtl::OUString::createFromAscii( "Invalid index" ), uno::Reference< uno::XInterface > () );
24725 + if( sList.hasElements() )
24726 + {
24727 + if( sList.getLength() == 1 )
24728 + {
24729 + Clear();
24730 + return;
24731 + }
24732 + for( sal_Int32 i = nIndex; i < ( sList.getLength()-1 ); i++ )
24733 + {
24734 + sList[i] = sList[i+1];
24735 + }
24736 + sList.realloc( sList.getLength() - 1 );
24737 + }
24738 +
24739 + m_xProps->setPropertyValue( ITEMS, uno::makeAny( sList ) );
24740 + }
24741 +}
24742 +
24743 +void SAL_CALL
24744 +ListControlHelper::Clear( ) throw (uno::RuntimeException)
24745 +{
24746 + // urk, setValue doesn't seem to work !!
24747 + //setValue( uno::makeAny( sal_Int16() ) );
24748 + m_xProps->setPropertyValue( ITEMS, uno::makeAny( uno::Sequence< rtl::OUString >() ) );
24749 +}
24750 +
24751 +void SAL_CALL
24752 +ListControlHelper::setRowSource( const rtl::OUString& _rowsource ) throw (uno::RuntimeException)
24753 +{
24754 + if ( _rowsource.getLength() == 0 )
24755 + Clear();
24756 +}
24757 +
24758 +sal_Int32 SAL_CALL
24759 +ListControlHelper::getListCount() throw (uno::RuntimeException)
24760 +{
24761 + uno::Sequence< rtl::OUString > sList;
24762 + m_xProps->getPropertyValue( ITEMS ) >>= sList;
24763 + return sList.getLength();
24764 +}
24765 +
24766 +uno::Any SAL_CALL
24767 +ListControlHelper::List( const ::uno::Any& pvargIndex, const uno::Any& pvarColumn ) throw (uno::RuntimeException)
24768 +{
24769 + uno::Sequence< rtl::OUString > sList;
24770 + m_xProps->getPropertyValue( ITEMS ) >>= sList;
24771 + sal_Int16 nLength = static_cast< sal_Int16 >( sList.getLength() );
24772 + uno::Any aRet;
24773 + if ( pvargIndex.hasValue() )
24774 + {
24775 + sal_Int16 nIndex = -1;
24776 + pvargIndex >>= nIndex;
24777 + if( nIndex < 0 || nIndex >= nLength )
24778 + throw uno::RuntimeException( rtl::OUString::createFromAscii(
24779 + "Bad row Index" ), uno::Reference< uno::XInterface >() );
24780 + aRet <<= sList[ nIndex ];
24781 + }
24782 + else if ( pvarColumn.hasValue() ) // pvarColumn on its own would be bad
24783 + throw uno::RuntimeException( rtl::OUString::createFromAscii(
24784 + "Bad column Index" ), uno::Reference< uno::XInterface >() );
24785 + else // List() ( e.g. no args )
24786 + {
24787 + uno::Sequence< uno::Sequence< rtl::OUString > > sReturnArray( nLength );
24788 + for ( sal_Int32 i = 0; i < nLength; ++i )
24789 + {
24790 + sReturnArray[ i ].realloc( 10 );
24791 + sReturnArray[ i ][ 0 ] = sList[ i ];
24792 + }
24793 + aRet = uno::makeAny( sReturnArray );
24794 + }
24795 + return aRet;
24796 +}
24797 --- vbahelper/source/msforms/vbalistcontrolhelper.hxx.old 1970-01-01 00:00:00.000000000 +0000
24798 +++ vbahelper/source/msforms/vbalistcontrolhelper.hxx 2009-04-06 16:42:01.000000000 +0000
24799 @@ -0,0 +1,20 @@
24800 +#ifndef SC_VBA_LISTCONTROLHELPER
24801 +#define SC_VBA_LISTCONTROLHELPER
24802 +
24803 +#include <vbahelper/vbahelper.hxx>
24804 +
24805 +class ListControlHelper
24806 +{
24807 + css::uno::Reference< css::beans::XPropertySet > m_xProps;
24808 +
24809 +public:
24810 + ListControlHelper( const css::uno::Reference< css::beans::XPropertySet >& rxControl ) : m_xProps( rxControl ){}
24811 + virtual ~ListControlHelper() {}
24812 + virtual void SAL_CALL AddItem( const css::uno::Any& pvargItem, const css::uno::Any& pvargIndex ) throw (css::uno::RuntimeException);
24813 + virtual void SAL_CALL removeItem( const css::uno::Any& index ) throw (css::uno::RuntimeException);
24814 + virtual void SAL_CALL setRowSource( const rtl::OUString& _rowsource ) throw (css::uno::RuntimeException);
24815 + virtual ::sal_Int32 SAL_CALL getListCount() throw (css::uno::RuntimeException);
24816 + virtual css::uno::Any SAL_CALL List( const css::uno::Any& pvargIndex, const css::uno::Any& pvarColumn ) throw (css::uno::RuntimeException);
24817 + virtual void SAL_CALL Clear( ) throw (css::uno::RuntimeException);
24818 +};
24819 +#endif
24820 --- vbahelper/source/msforms/vbamultipage.cxx.old 1970-01-01 00:00:00.000000000 +0000
24821 +++ vbahelper/source/msforms/vbamultipage.cxx 2009-04-06 16:42:01.000000000 +0000
24822 @@ -0,0 +1,132 @@
24823 +/*************************************************************************
24824 + *
24825 + * OpenOffice.org - a multi-platform office productivity suite
24826 + *
24827 + * $RCSfile$
24828 + *
24829 + * $Revision$
24830 + *
24831 + * last change: $Author$ $Date$
24832 + *
24833 + * The Contents of this file are made available subject to
24834 + * the terms of GNU Lesser General Public License Version 2.1.
24835 + *
24836 + *
24837 + * GNU Lesser General Public License Version 2.1
24838 + * =============================================
24839 + * Copyright 2005 by Sun Microsystems, Inc.
24840 + * 901 San Antonio Road, Palo Alto, CA 94303, USA
24841 + *
24842 + * This library is free software; you can redistribute it and/or
24843 + * modify it under the terms of the GNU Lesser General Public
24844 + * License version 2.1, as published by the Free Software Foundation.
24845 + *
24846 + * This library is distributed in the hope that it will be useful,
24847 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
24848 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
24849 + * Lesser General Public License for more details.
24850 + *
24851 + * You should have received a copy of the GNU Lesser General Public
24852 + * License along with this library; if not, write to the Free Software
24853 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
24854 + * MA 02111-1307 USA
24855 + *
24856 + ************************************************************************/
24857 +#include "vbamultipage.hxx"
24858 +#include <ooo/vba/XCollection.hpp>
24859 +#include "vbapages.hxx"
24860 +#include <vector>
24861 +
24862 +using namespace com::sun::star;
24863 +using namespace ooo::vba;
24864 +
24865 +// uno servicename com.sun.star.awt.UnoControlProgressBarMode
24866 +const rtl::OUString SVALUE( RTL_CONSTASCII_USTRINGPARAM("ProgressValue") );
24867 +const rtl::OUString SVALUEMAX( RTL_CONSTASCII_USTRINGPARAM("ProgressValueMax") );
24868 +const rtl::OUString SSTEP( RTL_CONSTASCII_USTRINGPARAM("Step") );
24869 +
24870 +typedef cppu::WeakImplHelper1< container::XIndexAccess > PagesImpl_Base;
24871 +class PagesImpl : public PagesImpl_Base
24872 +{
24873 + sal_Int32 mnPages;
24874 +public:
24875 + PagesImpl( sal_Int32 nPages ) : mnPages( nPages ) {}
24876 + virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException) { return mnPages; }
24877 + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, ::uno::RuntimeException)
24878 + {
24879 + if ( Index < 0 || Index > mnPages )
24880 + throw lang::IndexOutOfBoundsException();
24881 + return uno::makeAny( uno::Reference< uno::XInterface >() );
24882 + }
24883 + // XElementAccess
24884 + virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException)
24885 + {
24886 + // no Pages object yet #FIXME
24887 + //return msforms::XPage::static_type(0);
24888 + return uno::XInterface::static_type(0);
24889 + }
24890 + virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException)
24891 + {
24892 + return ( mnPages > 0 );
24893 + }
24894 +};
24895 +uno::Reference< container::XIndexAccess >
24896 +ScVbaMultiPage::getPages( sal_Int32 nPages )
24897 +{
24898 + return new PagesImpl( nPages );
24899 +}
24900 +
24901 +ScVbaMultiPage::ScVbaMultiPage( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper, const uno::Reference< uno::XInterface >& xDialog ) : MultiPageImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
24902 +{
24903 + mxDialogProps.set( xDialog, uno::UNO_QUERY_THROW );
24904 + // set dialog step to value of multipage pseudo model
24905 + setValue(getValue());
24906 +}
24907 +
24908 +// Attributes
24909 +sal_Int32 SAL_CALL
24910 +ScVbaMultiPage::getValue() throw (css::uno::RuntimeException)
24911 +{
24912 + sal_Int32 nValue = 0;
24913 + m_xProps->getPropertyValue( SVALUE ) >>= nValue;
24914 + return nValue;
24915 +}
24916 +
24917 +void SAL_CALL
24918 +ScVbaMultiPage::setValue( const sal_Int32 _value ) throw (::com::sun::star::uno::RuntimeException)
24919 +{
24920 + // track change in dialog ( dialog value is 1 based, 0 is a special value )
24921 + m_xProps->setPropertyValue( SVALUE, uno::makeAny( _value ) );
24922 + mxDialogProps->setPropertyValue( SSTEP, uno::makeAny( _value + 1) );
24923 +}
24924 +
24925 +
24926 +rtl::OUString&
24927 +ScVbaMultiPage::getServiceImplName()
24928 +{
24929 + static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaMultiPage") );
24930 + return sImplName;
24931 +}
24932 +
24933 +uno::Any SAL_CALL
24934 +ScVbaMultiPage::Pages( const uno::Any& index ) throw (uno::RuntimeException)
24935 +{
24936 + sal_Int32 nValue = 0;
24937 + m_xProps->getPropertyValue( SVALUEMAX ) >>= nValue;
24938 + uno::Reference< XCollection > xColl( new ScVbaPages( this, mxContext, getPages( nValue ) ) );
24939 + if ( !index.hasValue() )
24940 + return uno::makeAny( xColl );
24941 + return xColl->Item( uno::makeAny( index ), uno::Any() );
24942 +}
24943 +
24944 +uno::Sequence< rtl::OUString >
24945 +ScVbaMultiPage::getServiceNames()
24946 +{
24947 + static uno::Sequence< rtl::OUString > aServiceNames;
24948 + if ( aServiceNames.getLength() == 0 )
24949 + {
24950 + aServiceNames.realloc( 1 );
24951 + aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.MultiPage" ) );
24952 + }
24953 + return aServiceNames;
24954 +}
24955 --- vbahelper/source/msforms/vbamultipage.hxx.old 1970-01-01 00:00:00.000000000 +0000
24956 +++ vbahelper/source/msforms/vbamultipage.hxx 2009-04-06 16:42:01.000000000 +0000
24957 @@ -0,0 +1,65 @@
24958 +/*************************************************************************
24959 + *
24960 + * OpenOffice.org - a multi-platform office productivity suite
24961 + *
24962 + * $RCSfile$
24963 + *
24964 + * $Revision$
24965 + *
24966 + * last change: $Author$ $Date$
24967 + *
24968 + * The Contents of this file are made available subject to
24969 + * the terms of GNU Lesser General Public License Version 2.1.
24970 + *
24971 + *
24972 + * GNU Lesser General Public License Version 2.1
24973 + * =============================================
24974 + * Copyright 2005 by Sun Microsystems, Inc.
24975 + * 901 San Antonio Road, Palo Alto, CA 94303, USA
24976 + *
24977 + * This library is free software; you can redistribute it and/or
24978 + * modify it under the terms of the GNU Lesser General Public
24979 + * License version 2.1, as published by the Free Software Foundation.
24980 + *
24981 + * This library is distributed in the hope that it will be useful,
24982 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
24983 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
24984 + * Lesser General Public License for more details.
24985 + *
24986 + * You should have received a copy of the GNU Lesser General Public
24987 + * License along with this library; if not, write to the Free Software
24988 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
24989 + * MA 02111-1307 USA
24990 + *
24991 + ************************************************************************/
24992 +#ifndef SC_VBA_MULTIPAGE_HXX
24993 +#define SC_VBA_MULTIPAGE_HXX
24994 +#include <cppuhelper/implbase1.hxx>
24995 +#include <ooo/vba/msforms/XMultiPage.hpp>
24996 +#include <com/sun/star/container/XIndexAccess.hpp>
24997 +
24998 +#include "vbacontrol.hxx"
24999 +#include <vbahelper/vbahelper.hxx>
25000 +//#include <cppuhelper/implbase2.hxx>
25001 +#include <cppuhelper/implbase1.hxx>
25002 +
25003 +typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XMultiPage > MultiPageImpl_BASE;
25004 +
25005 +class ScVbaMultiPage : public MultiPageImpl_BASE
25006 +{
25007 + css::uno::Reference< css::container::XIndexAccess > getPages( sal_Int32 nPages );
25008 + css::uno::Reference< css::beans::XPropertySet > mxDialogProps;
25009 +public:
25010 + ScVbaMultiPage( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper, const css::uno::Reference< css::uno::XInterface >& xDialog );
25011 + // Attributes
25012 + virtual sal_Int32 SAL_CALL getValue() throw (css::uno::RuntimeException);
25013 + virtual void SAL_CALL setValue( sal_Int32 _value ) throw (css::uno::RuntimeException);
25014 + virtual css::uno::Any SAL_CALL Pages( const css::uno::Any& index ) throw (css::uno::RuntimeException);
25015 +
25016 + //XHelperInterface
25017 + virtual rtl::OUString& getServiceImplName();
25018 + virtual css::uno::Sequence<rtl::OUString> getServiceNames();
25019 + // XDefaultProperty
25020 + rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
25021 +};
25022 +#endif //SC_VBA_LABEL_HXX
25023 --- vbahelper/source/msforms/vbapages.cxx.old 1970-01-01 00:00:00.000000000 +0000
25024 +++ vbahelper/source/msforms/vbapages.cxx 2009-04-06 16:42:01.000000000 +0000
25025 @@ -0,0 +1,80 @@
25026 +/*************************************************************************
25027 + *
25028 + * OpenOffice.org - a multi-platform office productivity suite
25029 + *
25030 + * $RCSfile$
25031 + *
25032 + * $Revision$
25033 + *
25034 + * last change: $Author$ $Date$
25035 + *
25036 + * The Contents of this file are made available subject to
25037 + * the terms of GNU Lesser General Public License Version 2.1.
25038 + *
25039 + *
25040 + * GNU Lesser General Public License Version 2.1
25041 + * =============================================
25042 + * Copyright 2005 by Sun Microsystems, Inc.
25043 + * 901 San Antonio Road, Palo Alto, CA 94303, USA
25044 + *
25045 + * This library is free software; you can redistribute it and/or
25046 + * modify it under the terms of the GNU Lesser General Public
25047 + * License version 2.1, as published by the Free Software Foundation.
25048 + *
25049 + * This library is distributed in the hope that it will be useful,
25050 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
25051 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
25052 + * Lesser General Public License for more details.
25053 + *
25054 + * You should have received a copy of the GNU Lesser General Public
25055 + * License along with this library; if not, write to the Free Software
25056 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
25057 + * MA 02111-1307 USA
25058 + *
25059 + ************************************************************************/
25060 +#include "vbapages.hxx"
25061 +
25062 +using namespace ::ooo::vba;
25063 +using namespace ::com::sun::star;
25064 +
25065 +ScVbaPages::ScVbaPages( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xPages ) throw( lang::IllegalArgumentException ) : ScVbaPages_BASE( xParent, xContext, xPages )
25066 +{
25067 +}
25068 +
25069 +uno::Type SAL_CALL
25070 +ScVbaPages::getElementType() throw (uno::RuntimeException)
25071 +{
25072 + // return msforms::XPage::static_type(0);
25073 + return uno::XInterface::static_type(0);
25074 +}
25075 +
25076 +uno::Any
25077 +ScVbaPages::createCollectionObject( const css::uno::Any& aSource )
25078 +{
25079 + return aSource;
25080 +}
25081 +
25082 +rtl::OUString&
25083 +ScVbaPages::getServiceImplName()
25084 +{
25085 + static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaPages") );
25086 + return sImplName;
25087 +}
25088 +
25089 +uno::Reference< container::XEnumeration > SAL_CALL
25090 +ScVbaPages::createEnumeration() throw (uno::RuntimeException)
25091 +{
25092 + return uno::Reference< container::XEnumeration >();
25093 +}
25094 +
25095 +uno::Sequence< rtl::OUString >
25096 +ScVbaPages::getServiceNames()
25097 +{
25098 + static uno::Sequence< rtl::OUString > aServiceNames;
25099 + if ( aServiceNames.getLength() == 0 )
25100 + {
25101 + aServiceNames.realloc( 1 );
25102 + aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msform.Pages" ) );
25103 + }
25104 + return aServiceNames;
25105 +}
25106 --- vbahelper/source/msforms/vbapages.hxx.old 1970-01-01 00:00:00.000000000 +0000
25107 +++ vbahelper/source/msforms/vbapages.hxx 2009-04-06 16:42:01.000000000 +0000
25108 @@ -0,0 +1,64 @@
25109 +/*************************************************************************
25110 + *
25111 + * OpenOffice.org - a multi-platform office productivity suite
25112 + *
25113 + * $RCSfile$
25114 + *
25115 + * $Revision$
25116 + *
25117 + * last change: $Author$ $Date$
25118 + *
25119 + * The Contents of this file are made available subject to
25120 + * the terms of GNU Lesser General Public License Version 2.1.
25121 + *
25122 + *
25123 + * GNU Lesser General Public License Version 2.1
25124 + * =============================================
25125 + * Copyright 2005 by Sun Microsystems, Inc.
25126 + * 901 San Antonio Road, Palo Alto, CA 94303, USA
25127 + *
25128 + * This library is free software; you can redistribute it and/or
25129 + * modify it under the terms of the GNU Lesser General Public
25130 + * License version 2.1, as published by the Free Software Foundation.
25131 + *
25132 + * This library is distributed in the hope that it will be useful,
25133 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
25134 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
25135 + * Lesser General Public License for more details.
25136 + *
25137 + * You should have received a copy of the GNU Lesser General Public
25138 + * License along with this library; if not, write to the Free Software
25139 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
25140 + * MA 02111-1307 USA
25141 + *
25142 + ************************************************************************/
25143 +#ifndef SC_VBA_PAGES_HXX
25144 +#define SC_VBA_PAGES_HXX
25145 +
25146 +#include <ooo/vba/office/MsoShapeType.hpp>
25147 +#include <com/sun/star/lang/XEventListener.hpp>
25148 +#include <com/sun/star/beans/XPropertySet.hpp>
25149 +#include <ooo/vba/msforms/XPages.hpp>
25150 +#include <cppuhelper/implbase2.hxx>
25151 +#include <cppuhelper/implbase1.hxx>
25152 +
25153 +#include <vbahelper/vbacollectionimpl.hxx>
25154 +typedef CollTestImplHelper<
25155 +ov::msforms::XPages > ScVbaPages_BASE;
25156 +
25157 +class ScVbaPages : public ScVbaPages_BASE
25158 +{
25159 +protected:
25160 + virtual rtl::OUString& getServiceImplName();
25161 + virtual css::uno::Sequence<rtl::OUString> getServiceNames();
25162 +public:
25163 + ScVbaPages( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xPages ) throw ( css::lang::IllegalArgumentException );
25164 + virtual ~ScVbaPages() {}
25165 + // XEnumerationAccess
25166 + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
25167 + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
25168 + // ScVbaPages_BASE
25169 + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
25170 +
25171 +};
25172 +#endif//SC_VBA_SHAPE_HXX
25173 --- vbahelper/source/msforms/vbaprogressbar.cxx.old 1970-01-01 00:00:00.000000000 +0000
25174 +++ vbahelper/source/msforms/vbaprogressbar.cxx 2009-04-06 16:42:01.000000000 +0000
25175 @@ -0,0 +1,78 @@
25176 +/*************************************************************************
25177 + *
25178 + * OpenOffice.org - a multi-platform office productivity suite
25179 + *
25180 + * $RCSfile$
25181 + *
25182 + * $Revision$
25183 + *
25184 + * last change: $Author$ $Date$
25185 + *
25186 + * The Contents of this file are made available subject to
25187 + * the terms of GNU Lesser General Public License Version 2.1.
25188 + *
25189 + *
25190 + * GNU Lesser General Public License Version 2.1
25191 + * =============================================
25192 + * Copyright 2005 by Sun Microsystems, Inc.
25193 + * 901 San Antonio Road, Palo Alto, CA 94303, USA
25194 + *
25195 + * This library is free software; you can redistribute it and/or
25196 + * modify it under the terms of the GNU Lesser General Public
25197 + * License version 2.1, as published by the Free Software Foundation.
25198 + *
25199 + * This library is distributed in the hope that it will be useful,
25200 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
25201 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
25202 + * Lesser General Public License for more details.
25203 + *
25204 + * You should have received a copy of the GNU Lesser General Public
25205 + * License along with this library; if not, write to the Free Software
25206 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
25207 + * MA 02111-1307 USA
25208 + *
25209 + ************************************************************************/
25210 +#include "vbaprogressbar.hxx"
25211 +#include <vector>
25212 +
25213 +using namespace com::sun::star;
25214 +using namespace ooo::vba;
25215 +
25216 +// uno servicename com.sun.star.awt.UnoControlProgressBarMode
25217 +const rtl::OUString SVALUE( RTL_CONSTASCII_USTRINGPARAM("ProgressValue") );
25218 +
25219 +ScVbaProgressBar::ScVbaProgressBar( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : ProgressBarImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
25220 +{
25221 +}
25222 +
25223 +// Attributes
25224 +uno::Any SAL_CALL
25225 +ScVbaProgressBar::getValue() throw (css::uno::RuntimeException)
25226 +{
25227 + return m_xProps->getPropertyValue( SVALUE );
25228 +}
25229 +
25230 +void SAL_CALL
25231 +ScVbaProgressBar::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException)
25232 +{
25233 + m_xProps->setPropertyValue( SVALUE, _value );
25234 +}
25235 +
25236 +rtl::OUString&
25237 +ScVbaProgressBar::getServiceImplName()
25238 +{
25239 + static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaProgressBar") );
25240 + return sImplName;
25241 +}
25242 +
25243 +uno::Sequence< rtl::OUString >
25244 +ScVbaProgressBar::getServiceNames()
25245 +{
25246 + static uno::Sequence< rtl::OUString > aServiceNames;
25247 + if ( aServiceNames.getLength() == 0 )
25248 + {
25249 + aServiceNames.realloc( 1 );
25250 + aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.Label" ) );
25251 + }
25252 + return aServiceNames;
25253 +}
25254 --- vbahelper/source/msforms/vbaprogressbar.hxx.old 1970-01-01 00:00:00.000000000 +0000
25255 +++ vbahelper/source/msforms/vbaprogressbar.hxx 2009-04-06 16:42:01.000000000 +0000
25256 @@ -0,0 +1,59 @@
25257 +/*************************************************************************
25258 + *
25259 + * OpenOffice.org - a multi-platform office productivity suite
25260 + *
25261 + * $RCSfile$
25262 + *
25263 + * $Revision$
25264 + *
25265 + * last change: $Author$ $Date$
25266 + *
25267 + * The Contents of this file are made available subject to
25268 + * the terms of GNU Lesser General Public License Version 2.1.
25269 + *
25270 + *
25271 + * GNU Lesser General Public License Version 2.1
25272 + * =============================================
25273 + * Copyright 2005 by Sun Microsystems, Inc.
25274 + * 901 San Antonio Road, Palo Alto, CA 94303, USA
25275 + *
25276 + * This library is free software; you can redistribute it and/or
25277 + * modify it under the terms of the GNU Lesser General Public
25278 + * License version 2.1, as published by the Free Software Foundation.
25279 + *
25280 + * This library is distributed in the hope that it will be useful,
25281 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
25282 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
25283 + * Lesser General Public License for more details.
25284 + *
25285 + * You should have received a copy of the GNU Lesser General Public
25286 + * License along with this library; if not, write to the Free Software
25287 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
25288 + * MA 02111-1307 USA
25289 + *
25290 + ************************************************************************/
25291 +#ifndef SC_VBA_PROGRESSBAR_HXX
25292 +#define SC_VBA_PROGRESSBAR_HXX
25293 +#include <cppuhelper/implbase1.hxx>
25294 +#include <ooo/vba/msforms/XProgressBar.hpp>
25295 +
25296 +#include "vbacontrol.hxx"
25297 +#include <vbahelper/vbahelper.hxx>
25298 +#include <cppuhelper/implbase2.hxx>
25299 +
25300 +typedef cppu::ImplInheritanceHelper2< ScVbaControl, ov::msforms::XProgressBar, css::script::XDefaultProperty > ProgressBarImpl_BASE;
25301 +
25302 +class ScVbaProgressBar : public ProgressBarImpl_BASE
25303 +{
25304 +public:
25305 + ScVbaProgressBar( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
25306 + // Attributes
25307 + virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
25308 + virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
25309 + //XHelperInterface
25310 + virtual rtl::OUString& getServiceImplName();
25311 + virtual css::uno::Sequence<rtl::OUString> getServiceNames();
25312 + // XDefaultProperty
25313 + rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
25314 +};
25315 +#endif //SC_VBA_LABEL_HXX
25316 --- vbahelper/source/msforms/vbaradiobutton.cxx.old 1970-01-01 00:00:00.000000000 +0000
25317 +++ vbahelper/source/msforms/vbaradiobutton.cxx 2009-04-06 16:42:01.000000000 +0000
25318 @@ -0,0 +1,107 @@
25319 +/*************************************************************************
25320 + *
25321 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
25322 + *
25323 + * Copyright 2008 by Sun Microsystems, Inc.
25324 + *
25325 + * OpenOffice.org - a multi-platform office productivity suite
25326 + *
25327 + * $RCSfile: vbaradiobutton.cxx,v $
25328 + * $Revision: 1.3 $
25329 + *
25330 + * This file is part of OpenOffice.org.
25331 + *
25332 + * OpenOffice.org is free software: you can redistribute it and/or modify
25333 + * it under the terms of the GNU Lesser General Public License version 3
25334 + * only, as published by the Free Software Foundation.
25335 + *
25336 + * OpenOffice.org is distributed in the hope that it will be useful,
25337 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
25338 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
25339 + * GNU Lesser General Public License version 3 for more details
25340 + * (a copy is included in the LICENSE file that accompanied this code).
25341 + *
25342 + * You should have received a copy of the GNU Lesser General Public License
25343 + * version 3 along with OpenOffice.org. If not, see
25344 + * <http://www.openoffice.org/license.html>
25345 + * for a copy of the LGPLv3 License.
25346 + *
25347 + ************************************************************************/
25348 +#include "vbaradiobutton.hxx"
25349 +#include <vector>
25350 +
25351 +using namespace com::sun::star;
25352 +using namespace ooo::vba;
25353 +
25354 +
25355 +const static rtl::OUString LABEL( RTL_CONSTASCII_USTRINGPARAM("Label") );
25356 +const static rtl::OUString STATE( RTL_CONSTASCII_USTRINGPARAM("State") );
25357 +ScVbaRadioButton::ScVbaRadioButton( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : RadioButtonImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
25358 +{
25359 +}
25360 +
25361 +// Attributes
25362 +rtl::OUString SAL_CALL
25363 +ScVbaRadioButton::getCaption() throw (css::uno::RuntimeException)
25364 +{
25365 + rtl::OUString Label;
25366 + m_xProps->getPropertyValue( LABEL ) >>= Label;
25367 + return Label;
25368 +}
25369 +
25370 +void SAL_CALL
25371 +ScVbaRadioButton::setCaption( const rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException)
25372 +{
25373 + m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) );
25374 +}
25375 +
25376 +uno::Any SAL_CALL
25377 +ScVbaRadioButton::getValue() throw (css::uno::RuntimeException)
25378 +{
25379 + sal_Int16 nValue = -1;
25380 + m_xProps->getPropertyValue( STATE ) >>= nValue;
25381 + if( nValue != 0 )
25382 + nValue = -1;
25383 +// return uno::makeAny( nValue );
25384 +// I must be missing something MSO says value should be -1 if selected, 0 if not
25385 +// selected
25386 + return uno::makeAny( ( nValue == -1 ) ? sal_True : sal_False );
25387 +
25388 +}
25389 +
25390 +void SAL_CALL
25391 +ScVbaRadioButton::setValue( const uno::Any& _value ) throw (uno::RuntimeException)
25392 +{
25393 + sal_Int16 nValue = 0;
25394 + sal_Bool bValue = sal_False;
25395 + if( _value >>= nValue )
25396 + {
25397 + if( nValue == -1)
25398 + nValue = 1;
25399 + }
25400 + else if ( _value >>= bValue )
25401 + {
25402 + if ( bValue )
25403 + nValue = 1;
25404 + }
25405 + m_xProps->setPropertyValue( STATE, uno::makeAny( nValue ) );
25406 +}
25407 +
25408 +rtl::OUString&
25409 +ScVbaRadioButton::getServiceImplName()
25410 +{
25411 + static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaRadioButton") );
25412 + return sImplName;
25413 +}
25414 +
25415 +uno::Sequence< rtl::OUString >
25416 +ScVbaRadioButton::getServiceNames()
25417 +{
25418 + static uno::Sequence< rtl::OUString > aServiceNames;
25419 + if ( aServiceNames.getLength() == 0 )
25420 + {
25421 + aServiceNames.realloc( 1 );
25422 + aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.RadioButton" ) );
25423 + }
25424 + return aServiceNames;
25425 +}
25426 --- vbahelper/source/msforms/vbaradiobutton.hxx.old 1970-01-01 00:00:00.000000000 +0000
25427 +++ vbahelper/source/msforms/vbaradiobutton.hxx 2009-04-06 16:42:01.000000000 +0000
25428 @@ -0,0 +1,55 @@
25429 +/*************************************************************************
25430 + *
25431 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
25432 + *
25433 + * Copyright 2008 by Sun Microsystems, Inc.
25434 + *
25435 + * OpenOffice.org - a multi-platform office productivity suite
25436 + *
25437 + * $RCSfile: vbaradiobutton.hxx,v $
25438 + * $Revision: 1.3 $
25439 + *
25440 + * This file is part of OpenOffice.org.
25441 + *
25442 + * OpenOffice.org is free software: you can redistribute it and/or modify
25443 + * it under the terms of the GNU Lesser General Public License version 3
25444 + * only, as published by the Free Software Foundation.
25445 + *
25446 + * OpenOffice.org is distributed in the hope that it will be useful,
25447 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
25448 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
25449 + * GNU Lesser General Public License version 3 for more details
25450 + * (a copy is included in the LICENSE file that accompanied this code).
25451 + *
25452 + * You should have received a copy of the GNU Lesser General Public License
25453 + * version 3 along with OpenOffice.org. If not, see
25454 + * <http://www.openoffice.org/license.html>
25455 + * for a copy of the LGPLv3 License.
25456 + *
25457 + ************************************************************************/
25458 +#ifndef SC_VBA_RADIOBUTTON_HXX
25459 +#define SC_VBA_RADIOBUTTON_HXX
25460 +#include <ooo/vba/msforms/XRadioButton.hpp>
25461 +#include "vbacontrol.hxx"
25462 +#include <vbahelper/vbahelper.hxx>
25463 +#include <cppuhelper/implbase2.hxx>
25464 +
25465 +typedef cppu::ImplInheritanceHelper2< ScVbaControl, ov::msforms::XRadioButton, css::script::XDefaultProperty > RadioButtonImpl_BASE;
25466 +
25467 +class ScVbaRadioButton : public RadioButtonImpl_BASE
25468 +{
25469 +public:
25470 + ScVbaRadioButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
25471 + // Attributes
25472 + virtual rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
25473 + virtual void SAL_CALL setCaption( const rtl::OUString& _caption ) throw (css::uno::RuntimeException);
25474 + virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
25475 + virtual void SAL_CALL setValue(const com::sun::star::uno::Any&) throw (css::uno::RuntimeException);
25476 + //XHelperInterface
25477 + virtual rtl::OUString& getServiceImplName();
25478 + virtual css::uno::Sequence<rtl::OUString> getServiceNames();
25479 + // XDefaultProperty
25480 + rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
25481 +
25482 +};
25483 +#endif //SC_VBA_RADIOBUTTON_HXX
25484 --- vbahelper/source/msforms/vbascrollbar.cxx.old 1970-01-01 00:00:00.000000000 +0000
25485 +++ vbahelper/source/msforms/vbascrollbar.cxx 2009-04-06 16:42:01.000000000 +0000
25486 @@ -0,0 +1,139 @@
25487 +/*************************************************************************
25488 + *
25489 + * OpenOffice.org - a multi-platform office productivity suite
25490 + *
25491 + * $RCSfile$
25492 + *
25493 + * $Revision$
25494 + *
25495 + * last change: $Author$ $Date$
25496 + *
25497 + * The Contents of this file are made available subject to
25498 + * the terms of GNU Lesser General Public License Version 2.1.
25499 + *
25500 + *
25501 + * GNU Lesser General Public License Version 2.1
25502 + * =============================================
25503 + * Copyright 2005 by Sun Microsystems, Inc.
25504 + * 901 San Antonio Road, Palo Alto, CA 94303, USA
25505 + *
25506 + * This library is free software; you can redistribute it and/or
25507 + * modify it under the terms of the GNU Lesser General Public
25508 + * License version 2.1, as published by the Free Software Foundation.
25509 + *
25510 + * This library is distributed in the hope that it will be useful,
25511 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
25512 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
25513 + * Lesser General Public License for more details.
25514 + *
25515 + * You should have received a copy of the GNU Lesser General Public
25516 + * License along with this library; if not, write to the Free Software
25517 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
25518 + * MA 02111-1307 USA
25519 + *
25520 + ************************************************************************/
25521 +#include "vbascrollbar.hxx"
25522 +#include <vector>
25523 +
25524 +using namespace com::sun::star;
25525 +using namespace ooo::vba;
25526 +
25527 +
25528 +const static rtl::OUString LARGECHANGE( RTL_CONSTASCII_USTRINGPARAM("BlockIncrement") );
25529 +const static rtl::OUString SMALLCHANGE( RTL_CONSTASCII_USTRINGPARAM("LineIncrement") );
25530 +const static rtl::OUString ORIENTATION( RTL_CONSTASCII_USTRINGPARAM("Orientation") );
25531 +const static rtl::OUString SCROLLVALUE( RTL_CONSTASCII_USTRINGPARAM("ScrollValue") );
25532 +const static rtl::OUString SCROLLMAX( RTL_CONSTASCII_USTRINGPARAM("ScrollValueMax") );
25533 +const static rtl::OUString SCROLLMIN( RTL_CONSTASCII_USTRINGPARAM("ScrollValueMin") );
25534 +
25535 +ScVbaScrollBar::ScVbaScrollBar( const css::uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : ScrollBarImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
25536 +{
25537 +}
25538 +
25539 +// Attributes
25540 +uno::Any SAL_CALL
25541 +ScVbaScrollBar::getValue() throw (css::uno::RuntimeException)
25542 +{
25543 + return m_xProps->getPropertyValue( SCROLLVALUE );
25544 +}
25545 +
25546 +void SAL_CALL
25547 +ScVbaScrollBar::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException)
25548 +{
25549 + m_xProps->setPropertyValue( SCROLLVALUE, _value );
25550 +}
25551 +
25552 +::sal_Int32 SAL_CALL
25553 +ScVbaScrollBar::getMax() throw (uno::RuntimeException)
25554 +{
25555 + sal_Int32 nMax = 0;
25556 + m_xProps->getPropertyValue( SCROLLMAX ) >>= nMax;
25557 + return nMax;
25558 +}
25559 +
25560 +void SAL_CALL
25561 +ScVbaScrollBar::setMax( sal_Int32 nVal ) throw (uno::RuntimeException)
25562 +{
25563 + m_xProps->setPropertyValue( SCROLLMAX, uno::makeAny( nVal ) );
25564 +}
25565 +
25566 +::sal_Int32 SAL_CALL
25567 +ScVbaScrollBar::getMin() throw (uno::RuntimeException)
25568 +{
25569 + sal_Int32 nVal = 0;
25570 + m_xProps->getPropertyValue( SCROLLMIN ) >>= nVal;
25571 + return nVal;
25572 +}
25573 +
25574 +void SAL_CALL
25575 +ScVbaScrollBar::setMin( sal_Int32 nVal ) throw (uno::RuntimeException)
25576 +{
25577 + m_xProps->setPropertyValue( SCROLLMIN, uno::makeAny( nVal ) );
25578 +}
25579 +
25580 +void SAL_CALL
25581 +ScVbaScrollBar::setLargeChange( ::sal_Int32 _largechange ) throw (uno::RuntimeException)
25582 +{
25583 + m_xProps->setPropertyValue( LARGECHANGE, uno::makeAny( _largechange ) );
25584 +}
25585 +
25586 +::sal_Int32 SAL_CALL
25587 +ScVbaScrollBar::getLargeChange() throw (uno::RuntimeException)
25588 +{
25589 + sal_Int32 nVal = 0;
25590 + m_xProps->getPropertyValue( LARGECHANGE ) >>= nVal;
25591 + return nVal;
25592 +}
25593 +
25594 +::sal_Int32 SAL_CALL
25595 +ScVbaScrollBar::getSmallChange() throw (uno::RuntimeException)
25596 +{
25597 + sal_Int32 nSmallChange = 0;
25598 + m_xProps->getPropertyValue( SMALLCHANGE ) >>= nSmallChange;
25599 + return nSmallChange;
25600 +}
25601 +
25602 +void SAL_CALL
25603 +ScVbaScrollBar::setSmallChange( ::sal_Int32 _smallchange ) throw (uno::RuntimeException)
25604 +{
25605 + m_xProps->setPropertyValue( SMALLCHANGE, uno::makeAny( _smallchange ) );
25606 +}
25607 +
25608 +rtl::OUString&
25609 +ScVbaScrollBar::getServiceImplName()
25610 +{
25611 + static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaScrollBar") );
25612 + return sImplName;
25613 +}
25614 +
25615 +uno::Sequence< rtl::OUString >
25616 +ScVbaScrollBar::getServiceNames()
25617 +{
25618 + static uno::Sequence< rtl::OUString > aServiceNames;
25619 + if ( aServiceNames.getLength() == 0 )
25620 + {
25621 + aServiceNames.realloc( 1 );
25622 + aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.Frame" ) );
25623 + }
25624 + return aServiceNames;
25625 +}
25626 --- vbahelper/source/msforms/vbascrollbar.hxx.old 1970-01-01 00:00:00.000000000 +0000
25627 +++ vbahelper/source/msforms/vbascrollbar.hxx 2009-04-06 16:42:01.000000000 +0000
25628 @@ -0,0 +1,66 @@
25629 +/*************************************************************************
25630 + *
25631 + * OpenOffice.org - a multi-platform office productivity suite
25632 + *
25633 + * $RCSfile$
25634 + *
25635 + * $Revision$
25636 + *
25637 + * last change: $Author$ $Date$
25638 + *
25639 + * The Contents of this file are made available subject to
25640 + * the terms of GNU Lesser General Public License Version 2.1.
25641 + *
25642 + *
25643 + * GNU Lesser General Public License Version 2.1
25644 + * =============================================
25645 + * Copyright 2005 by Sun Microsystems, Inc.
25646 + * 901 San Antonio Road, Palo Alto, CA 94303, USA
25647 + *
25648 + * This library is free software; you can redistribute it and/or
25649 + * modify it under the terms of the GNU Lesser General Public
25650 + * License version 2.1, as published by the Free Software Foundation.
25651 + *
25652 + * This library is distributed in the hope that it will be useful,
25653 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
25654 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
25655 + * Lesser General Public License for more details.
25656 + *
25657 + * You should have received a copy of the GNU Lesser General Public
25658 + * License along with this library; if not, write to the Free Software
25659 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
25660 + * MA 02111-1307 USA
25661 + *
25662 + ************************************************************************/
25663 +#ifndef SC_VBA_SCROLLBAR_HXX
25664 +#define SC_VBA_SCROLLBAR_HXX
25665 +#include <cppuhelper/implbase1.hxx>
25666 +#include <ooo/vba/msforms/XScrollBar.hpp>
25667 +
25668 +#include "vbacontrol.hxx"
25669 +#include <vbahelper/vbahelper.hxx>
25670 +
25671 +typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XScrollBar > ScrollBarImpl_BASE;
25672 +
25673 +class ScVbaScrollBar : public ScrollBarImpl_BASE
25674 +{
25675 +public:
25676 + ScVbaScrollBar( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
25677 + // Attributes
25678 + virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
25679 + virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
25680 + virtual ::sal_Int32 SAL_CALL getMax() throw (css::uno::RuntimeException);
25681 + virtual void SAL_CALL setMax( ::sal_Int32 _max ) throw (css::uno::RuntimeException);
25682 + virtual ::sal_Int32 SAL_CALL getMin() throw (css::uno::RuntimeException);
25683 + virtual void SAL_CALL setMin( ::sal_Int32 _min ) throw (css::uno::RuntimeException);
25684 + virtual ::sal_Int32 SAL_CALL getLargeChange() throw (css::uno::RuntimeException);
25685 + virtual void SAL_CALL setLargeChange( ::sal_Int32 _largechange ) throw (css::uno::RuntimeException);
25686 + virtual ::sal_Int32 SAL_CALL getSmallChange() throw (css::uno::RuntimeException);
25687 + virtual void SAL_CALL setSmallChange( ::sal_Int32 _smallchange ) throw (css::uno::RuntimeException);
25688 +
25689 +
25690 + //XHelperInterface
25691 + virtual rtl::OUString& getServiceImplName();
25692 + virtual css::uno::Sequence<rtl::OUString> getServiceNames();
25693 +};
25694 +#endif //SC_VBA_LABEL_HXX
25695 --- vbahelper/source/msforms/vbaspinbutton.cxx.old 1970-01-01 00:00:00.000000000 +0000
25696 +++ vbahelper/source/msforms/vbaspinbutton.cxx 2009-04-06 16:42:01.000000000 +0000
25697 @@ -0,0 +1,109 @@
25698 +/*************************************************************************
25699 + *
25700 + * OpenOffice.org - a multi-platform office productivity suite
25701 + *
25702 + * $RCSfile$
25703 + *
25704 + * $Revision$
25705 + *
25706 + * last change: $Author$ $Date$
25707 + *
25708 + * The Contents of this file are made available subject to
25709 + * the terms of GNU Lesser General Public License Version 2.1.
25710 + *
25711 + *
25712 + * GNU Lesser General Public License Version 2.1
25713 + * =============================================
25714 + * Copyright 2005 by Sun Microsystems, Inc.
25715 + * 901 San Antonio Road, Palo Alto, CA 94303, USA
25716 + *
25717 + * This library is free software; you can redistribute it and/or
25718 + * modify it under the terms of the GNU Lesser General Public
25719 + * License version 2.1, as published by the Free Software Foundation.
25720 + *
25721 + * This library is distributed in the hope that it will be useful,
25722 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
25723 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
25724 + * Lesser General Public License for more details.
25725 + *
25726 + * You should have received a copy of the GNU Lesser General Public
25727 + * License along with this library; if not, write to the Free Software
25728 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
25729 + * MA 02111-1307 USA
25730 + *
25731 + ************************************************************************/
25732 +#include "vbaspinbutton.hxx"
25733 +#include <vector>
25734 +
25735 +using namespace com::sun::star;
25736 +using namespace ooo::vba;
25737 +
25738 +
25739 +const static rtl::OUString ORIENTATION( RTL_CONSTASCII_USTRINGPARAM("Orientation") );
25740 +const static rtl::OUString SPINVALUE( RTL_CONSTASCII_USTRINGPARAM("SpinValue") );
25741 +const static rtl::OUString SPINMAX( RTL_CONSTASCII_USTRINGPARAM("SpinValueMax") );
25742 +const static rtl::OUString SPINMIN( RTL_CONSTASCII_USTRINGPARAM("SpinValueMin") );
25743 +
25744 +ScVbaSpinButton::ScVbaSpinButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper ) : SpinButtonImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
25745 +{
25746 +}
25747 +
25748 +// Attributes
25749 +uno::Any SAL_CALL
25750 +ScVbaSpinButton::getValue() throw (css::uno::RuntimeException)
25751 +{
25752 + return m_xProps->getPropertyValue( SPINVALUE );
25753 +}
25754 +
25755 +void SAL_CALL
25756 +ScVbaSpinButton::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException)
25757 +{
25758 + m_xProps->setPropertyValue( SPINVALUE, _value );
25759 +}
25760 +
25761 +::sal_Int32 SAL_CALL
25762 +ScVbaSpinButton::getMax() throw (uno::RuntimeException)
25763 +{
25764 + sal_Int32 nMax = 0;
25765 + m_xProps->getPropertyValue( SPINMAX ) >>= nMax;
25766 + return nMax;
25767 +}
25768 +
25769 +void SAL_CALL
25770 +ScVbaSpinButton::setMax( sal_Int32 nVal ) throw (uno::RuntimeException)
25771 +{
25772 + m_xProps->setPropertyValue( SPINMAX, uno::makeAny( nVal ) );
25773 +}
25774 +
25775 +::sal_Int32 SAL_CALL
25776 +ScVbaSpinButton::getMin() throw (uno::RuntimeException)
25777 +{
25778 + sal_Int32 nVal = 0;
25779 + m_xProps->getPropertyValue( SPINMIN ) >>= nVal;
25780 + return nVal;
25781 +}
25782 +
25783 +void SAL_CALL
25784 +ScVbaSpinButton::setMin( sal_Int32 nVal ) throw (uno::RuntimeException)
25785 +{
25786 + m_xProps->setPropertyValue( SPINMIN, uno::makeAny( nVal ) );
25787 +}
25788 +
25789 +rtl::OUString&
25790 +ScVbaSpinButton::getServiceImplName()
25791 +{
25792 + static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaSpinButton") );
25793 + return sImplName;
25794 +}
25795 +
25796 +uno::Sequence< rtl::OUString >
25797 +ScVbaSpinButton::getServiceNames()
25798 +{
25799 + static uno::Sequence< rtl::OUString > aServiceNames;
25800 + if ( aServiceNames.getLength() == 0 )
25801 + {
25802 + aServiceNames.realloc( 1 );
25803 + aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.Frame" ) );
25804 + }
25805 + return aServiceNames;
25806 +}
25807 --- vbahelper/source/msforms/vbaspinbutton.hxx.old 1970-01-01 00:00:00.000000000 +0000
25808 +++ vbahelper/source/msforms/vbaspinbutton.hxx 2009-04-06 16:42:01.000000000 +0000
25809 @@ -0,0 +1,61 @@
25810 +/*************************************************************************
25811 + *
25812 + * OpenOffice.org - a multi-platform office productivity suite
25813 + *
25814 + * $RCSfile$
25815 + *
25816 + * $Revision$
25817 + *
25818 + * last change: $Author$ $Date$
25819 + *
25820 + * The Contents of this file are made available subject to
25821 + * the terms of GNU Lesser General Public License Version 2.1.
25822 + *
25823 + *
25824 + * GNU Lesser General Public License Version 2.1
25825 + * =============================================
25826 + * Copyright 2005 by Sun Microsystems, Inc.
25827 + * 901 San Antonio Road, Palo Alto, CA 94303, USA
25828 + *
25829 + * This library is free software; you can redistribute it and/or
25830 + * modify it under the terms of the GNU Lesser General Public
25831 + * License version 2.1, as published by the Free Software Foundation.
25832 + *
25833 + * This library is distributed in the hope that it will be useful,
25834 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
25835 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
25836 + * Lesser General Public License for more details.
25837 + *
25838 + * You should have received a copy of the GNU Lesser General Public
25839 + * License along with this library; if not, write to the Free Software
25840 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
25841 + * MA 02111-1307 USA
25842 + *
25843 + ************************************************************************/
25844 +#ifndef SC_VBA_SPINBUTTON_HXX
25845 +#define SC_VBA_SPINBUTTON_HXX
25846 +#include <cppuhelper/implbase1.hxx>
25847 +#include <ooo/vba/msforms/XSpinButton.hpp>
25848 +
25849 +#include "vbacontrol.hxx"
25850 +#include <vbahelper/vbahelper.hxx>
25851 +
25852 +typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XSpinButton > SpinButtonImpl_BASE;
25853 +
25854 +class ScVbaSpinButton : public SpinButtonImpl_BASE
25855 +{
25856 +public:
25857 + ScVbaSpinButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
25858 + // Attributes
25859 + virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
25860 + virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
25861 + virtual ::sal_Int32 SAL_CALL getMax() throw (css::uno::RuntimeException);
25862 + virtual void SAL_CALL setMax( ::sal_Int32 _max ) throw (css::uno::RuntimeException);
25863 + virtual ::sal_Int32 SAL_CALL getMin() throw (css::uno::RuntimeException);
25864 + virtual void SAL_CALL setMin( ::sal_Int32 _min ) throw (css::uno::RuntimeException);
25865 +
25866 + //XHelperInterface
25867 + virtual rtl::OUString& getServiceImplName();
25868 + virtual css::uno::Sequence<rtl::OUString> getServiceNames();
25869 +};
25870 +#endif //SC_VBA_SPINBUTTON_HXX
25871 --- vbahelper/source/msforms/vbatextbox.cxx.old 1970-01-01 00:00:00.000000000 +0000
25872 +++ vbahelper/source/msforms/vbatextbox.cxx 2009-04-06 16:42:01.000000000 +0000
25873 @@ -0,0 +1,137 @@
25874 +/*************************************************************************
25875 + *
25876 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
25877 + *
25878 + * Copyright 2008 by Sun Microsystems, Inc.
25879 + *
25880 + * OpenOffice.org - a multi-platform office productivity suite
25881 + *
25882 + * $RCSfile: vbatextbox.cxx,v $
25883 + * $Revision: 1.3 $
25884 + *
25885 + * This file is part of OpenOffice.org.
25886 + *
25887 + * OpenOffice.org is free software: you can redistribute it and/or modify
25888 + * it under the terms of the GNU Lesser General Public License version 3
25889 + * only, as published by the Free Software Foundation.
25890 + *
25891 + * OpenOffice.org is distributed in the hope that it will be useful,
25892 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
25893 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
25894 + * GNU Lesser General Public License version 3 for more details
25895 + * (a copy is included in the LICENSE file that accompanied this code).
25896 + *
25897 + * You should have received a copy of the GNU Lesser General Public License
25898 + * version 3 along with OpenOffice.org. If not, see
25899 + * <http://www.openoffice.org/license.html>
25900 + * for a copy of the LGPLv3 License.
25901 + *
25902 + ************************************************************************/
25903 +#include <com/sun/star/text/XTextRange.hpp>
25904 +
25905 +#include "vbatextbox.hxx"
25906 +#include <vector>
25907 +
25908 +using namespace com::sun::star;
25909 +using namespace ooo::vba;
25910 +
25911 +
25912 +
25913 +ScVbaTextBox::ScVbaTextBox( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper, bool bDialog ) : TextBoxImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper ), mbDialog( bDialog )
25914 +{
25915 +}
25916 +
25917 +// Attributes
25918 +uno::Any SAL_CALL
25919 +ScVbaTextBox::getValue() throw (css::uno::RuntimeException)
25920 +{
25921 + return uno::makeAny( getText() );
25922 +}
25923 +
25924 +void SAL_CALL
25925 +ScVbaTextBox::setValue( const uno::Any& _value ) throw (css::uno::RuntimeException)
25926 +{
25927 + rtl::OUString sVal = getAnyAsString( _value );
25928 + setText( sVal );
25929 +}
25930 +
25931 +//getString() will cause some imfo lose.
25932 +rtl::OUString SAL_CALL
25933 +ScVbaTextBox::getText() throw (css::uno::RuntimeException)
25934 +{
25935 + uno::Any aValue;
25936 + aValue = m_xProps->getPropertyValue
25937 + (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Text" ) ) );
25938 + rtl::OUString sString;
25939 + aValue >>= sString;
25940 + return sString;
25941 +}
25942 +
25943 +void SAL_CALL
25944 +ScVbaTextBox::setText( const rtl::OUString& _text ) throw (css::uno::RuntimeException)
25945 +{
25946 + if ( !mbDialog )
25947 + {
25948 + uno::Reference< text::XTextRange > xTextRange( m_xProps, uno::UNO_QUERY_THROW );
25949 + xTextRange->setString( _text );
25950 +}
25951 + else
25952 + m_xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Text") ), uno::makeAny( _text ) );
25953 +}
25954 +
25955 +sal_Int32 SAL_CALL
25956 +ScVbaTextBox::getMaxLength() throw (css::uno::RuntimeException)
25957 +{
25958 + uno::Any aValue;
25959 + aValue = m_xProps->getPropertyValue
25960 + (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MaxTextLen" ) ) );
25961 + sal_Int32 nMaxLength = 0;
25962 + aValue >>= nMaxLength;
25963 + return nMaxLength;
25964 +}
25965 +
25966 +void SAL_CALL
25967 +ScVbaTextBox::setMaxLength( sal_Int32 _maxlength ) throw (css::uno::RuntimeException)
25968 +{
25969 + uno::Any aValue( _maxlength );
25970 + m_xProps->setPropertyValue
25971 + (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MaxTextLen" ) ), aValue);
25972 +}
25973 +
25974 +sal_Bool SAL_CALL
25975 +ScVbaTextBox::getMultiline() throw (css::uno::RuntimeException)
25976 +{
25977 + uno::Any aValue;
25978 + aValue = m_xProps->getPropertyValue
25979 + (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MultiLine" ) ) );
25980 + sal_Bool bRet = false;
25981 + aValue >>= bRet;
25982 + return bRet;
25983 +}
25984 +
25985 +void SAL_CALL
25986 +ScVbaTextBox::setMultiline( sal_Bool _multiline ) throw (css::uno::RuntimeException)
25987 +{
25988 + uno::Any aValue( _multiline );
25989 + m_xProps->setPropertyValue
25990 + (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MultiLine" ) ), aValue);
25991 +}
25992 +
25993 +rtl::OUString&
25994 +ScVbaTextBox::getServiceImplName()
25995 +{
25996 + static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaTextBox") );
25997 + return sImplName;
25998 +}
25999 +
26000 +uno::Sequence< rtl::OUString >
26001 +ScVbaTextBox::getServiceNames()
26002 +{
26003 + static uno::Sequence< rtl::OUString > aServiceNames;
26004 + if ( aServiceNames.getLength() == 0 )
26005 + {
26006 + aServiceNames.realloc( 1 );
26007 + aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.TextBox" ) );
26008 + }
26009 + return aServiceNames;
26010 +}
26011 --- vbahelper/source/msforms/vbatextbox.hxx.old 1970-01-01 00:00:00.000000000 +0000
26012 +++ vbahelper/source/msforms/vbatextbox.hxx 2009-04-06 16:42:01.000000000 +0000
26013 @@ -0,0 +1,57 @@
26014 +/*************************************************************************
26015 + *
26016 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
26017 + *
26018 + * Copyright 2008 by Sun Microsystems, Inc.
26019 + *
26020 + * OpenOffice.org - a multi-platform office productivity suite
26021 + *
26022 + * $RCSfile: vbatextbox.hxx,v $
26023 + * $Revision: 1.3 $
26024 + *
26025 + * This file is part of OpenOffice.org.
26026 + *
26027 + * OpenOffice.org is free software: you can redistribute it and/or modify
26028 + * it under the terms of the GNU Lesser General Public License version 3
26029 + * only, as published by the Free Software Foundation.
26030 + *
26031 + * OpenOffice.org is distributed in the hope that it will be useful,
26032 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
26033 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
26034 + * GNU Lesser General Public License version 3 for more details
26035 + * (a copy is included in the LICENSE file that accompanied this code).
26036 + *
26037 + * You should have received a copy of the GNU Lesser General Public License
26038 + * version 3 along with OpenOffice.org. If not, see
26039 + * <http://www.openoffice.org/license.html>
26040 + * for a copy of the LGPLv3 License.
26041 + *
26042 + ************************************************************************/
26043 +#ifndef SC_VBA_TEXTBOX_HXX
26044 +#define SC_VBA_TEXTBOX_HXX
26045 +#include <cppuhelper/implbase1.hxx>
26046 +#include <ooo/vba/msforms/XTextBox.hpp>
26047 +#include "vbacontrol.hxx"
26048 +#include <vbahelper/vbahelper.hxx>
26049 +
26050 +typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XTextBox > TextBoxImpl_BASE;
26051 +
26052 +class ScVbaTextBox : public TextBoxImpl_BASE
26053 +{
26054 + bool mbDialog;
26055 +public:
26056 + ScVbaTextBox( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper, bool bDialog = false );
26057 + // Attributes
26058 + virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
26059 + virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
26060 + virtual rtl::OUString SAL_CALL getText() throw (css::uno::RuntimeException);
26061 + virtual void SAL_CALL setText( const rtl::OUString& _text ) throw (css::uno::RuntimeException);
26062 + virtual sal_Int32 SAL_CALL getMaxLength() throw (css::uno::RuntimeException);
26063 + virtual void SAL_CALL setMaxLength( sal_Int32 _maxlength ) throw (css::uno::RuntimeException);
26064 + virtual sal_Bool SAL_CALL getMultiline() throw (css::uno::RuntimeException);
26065 + virtual void SAL_CALL setMultiline( sal_Bool _multiline ) throw (css::uno::RuntimeException);
26066 + //XHelperInterface
26067 + virtual rtl::OUString& getServiceImplName();
26068 + virtual css::uno::Sequence<rtl::OUString> getServiceNames();
26069 +};
26070 +#endif //SC_VBA_TEXTBOX_HXX
26071 --- vbahelper/source/msforms/vbatogglebutton.cxx.old 1970-01-01 00:00:00.000000000 +0000
26072 +++ vbahelper/source/msforms/vbatogglebutton.cxx 2009-04-06 16:42:01.000000000 +0000
26073 @@ -0,0 +1,108 @@
26074 +/*************************************************************************
26075 + *
26076 + * OpenOffice.org - a multi-platform office productivity suite
26077 + *
26078 + * $RCSfile$
26079 + *
26080 + * $Revision$
26081 + *
26082 + * last change: $Author$ $Date$
26083 + *
26084 + * The Contents of this file are made available subject to
26085 + * the terms of GNU Lesser General Public License Version 2.1.
26086 + *
26087 + *
26088 + * GNU Lesser General Public License Version 2.1
26089 + * =============================================
26090 + * Copyright 2005 by Sun Microsystems, Inc.
26091 + * 901 San Antonio Road, Palo Alto, CA 94303, USA
26092 + *
26093 + * This library is free software; you can redistribute it and/or
26094 + * modify it under the terms of the GNU Lesser General Public
26095 + * License version 2.1, as published by the Free Software Foundation.
26096 + *
26097 + * This library is distributed in the hope that it will be useful,
26098 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
26099 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
26100 + * Lesser General Public License for more details.
26101 + *
26102 + * You should have received a copy of the GNU Lesser General Public
26103 + * License along with this library; if not, write to the Free Software
26104 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
26105 + * MA 02111-1307 USA
26106 + *
26107 + ************************************************************************/
26108 +#include "vbatogglebutton.hxx"
26109 +#include <vector>
26110 +
26111 +using namespace com::sun::star;
26112 +using namespace ooo::vba;
26113 +
26114 +
26115 +const static rtl::OUString LABEL( RTL_CONSTASCII_USTRINGPARAM("Label") );
26116 +const static rtl::OUString TOGGLE( RTL_CONSTASCII_USTRINGPARAM("Toggle") );
26117 +const static rtl::OUString STATE( RTL_CONSTASCII_USTRINGPARAM("State") );
26118 +ScVbaToggleButton::ScVbaToggleButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper ) : ToggleButtonImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
26119 +{
26120 + OSL_TRACE("ScVbaToggleButton(ctor)");
26121 + m_xProps->setPropertyValue( TOGGLE, uno::makeAny( sal_True ) );
26122 +}
26123 +
26124 +ScVbaToggleButton::~ScVbaToggleButton()
26125 +{
26126 + OSL_TRACE("~ScVbaToggleButton(dtor)");
26127 +}
26128 +
26129 +// Attributes
26130 +rtl::OUString SAL_CALL
26131 +ScVbaToggleButton::getCaption() throw (css::uno::RuntimeException)
26132 +{
26133 + rtl::OUString Label;
26134 + m_xProps->getPropertyValue( LABEL ) >>= Label;
26135 + return Label;
26136 +}
26137 +
26138 +void SAL_CALL
26139 +ScVbaToggleButton::setCaption( const rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException)
26140 +{
26141 + m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) );
26142 +}
26143 +
26144 +uno::Any SAL_CALL
26145 +ScVbaToggleButton::getValue() throw (uno::RuntimeException)
26146 +{
26147 + sal_Int16 nState = 0;
26148 + m_xProps->getPropertyValue( STATE ) >>= nState;
26149 + return uno::makeAny( nState ? sal_Int16( -1 ) : sal_Int16( 0 ) );
26150 +}
26151 +
26152 +void SAL_CALL
26153 +ScVbaToggleButton::setValue( const uno::Any& _value ) throw (uno::RuntimeException)
26154 +{
26155 + sal_Int16 nState = 0;
26156 + _value >>= nState;
26157 + OSL_TRACE( "nState - %d", nState );
26158 + nState = ( nState == -1 ) ? 1 : 0;
26159 + OSL_TRACE( "nState - %d", nState );
26160 + m_xProps->setPropertyValue( STATE, uno::makeAny( nState ) );
26161 +}
26162 +
26163 +rtl::OUString&
26164 +ScVbaToggleButton::getServiceImplName()
26165 +{
26166 + static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaToggleButton") );
26167 + return sImplName;
26168 +}
26169 +
26170 +uno::Sequence< rtl::OUString >
26171 +ScVbaToggleButton::getServiceNames()
26172 +{
26173 + static uno::Sequence< rtl::OUString > aServiceNames;
26174 + if ( aServiceNames.getLength() == 0 )
26175 + {
26176 + aServiceNames.realloc( 1 );
26177 + aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.msforms.ToggleButton" ) );
26178 + }
26179 + return aServiceNames;
26180 +}
26181 +
26182 --- vbahelper/source/msforms/vbatogglebutton.hxx.old 1970-01-01 00:00:00.000000000 +0000
26183 +++ vbahelper/source/msforms/vbatogglebutton.hxx 2009-04-06 16:42:01.000000000 +0000
26184 @@ -0,0 +1,63 @@
26185 +/*************************************************************************
26186 + *
26187 + * OpenOffice.org - a multi-platform office productivity suite
26188 + *
26189 + * $RCSfile$
26190 + *
26191 + * $Revision$
26192 + *
26193 + * last change: $Author$ $Date$
26194 + *
26195 + * The Contents of this file are made available subject to
26196 + * the terms of GNU Lesser General Public License Version 2.1.
26197 + *
26198 + *
26199 + * GNU Lesser General Public License Version 2.1
26200 + * =============================================
26201 + * Copyright 2005 by Sun Microsystems, Inc.
26202 + * 901 San Antonio Road, Palo Alto, CA 94303, USA
26203 + *
26204 + * This library is free software; you can redistribute it and/or
26205 + * modify it under the terms of the GNU Lesser General Public
26206 + * License version 2.1, as published by the Free Software Foundation.
26207 + *
26208 + * This library is distributed in the hope that it will be useful,
26209 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
26210 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
26211 + * Lesser General Public License for more details.
26212 + *
26213 + * You should have received a copy of the GNU Lesser General Public
26214 + * License along with this library; if not, write to the Free Software
26215 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
26216 + * MA 02111-1307 USA
26217 + *
26218 + ************************************************************************/
26219 +#ifndef SC_VBA_TOGGLEBUTTON_HXX
26220 +#define SC_VBA_TOGGLEBUTTON_HXX
26221 +#include <cppuhelper/implbase2.hxx>
26222 +#include <ooo/vba/msforms/XToggleButton.hpp>
26223 +
26224 +#include "vbacontrol.hxx"
26225 +#include <vbahelper/vbahelper.hxx>
26226 +
26227 +typedef cppu::ImplInheritanceHelper2< ScVbaControl, ov::msforms::XToggleButton, css::script::XDefaultProperty > ToggleButtonImpl_BASE;
26228 +
26229 +class ScVbaToggleButton : public ToggleButtonImpl_BASE
26230 +{
26231 + rtl::OUString msDftPropName;
26232 +public:
26233 + ScVbaToggleButton( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper );
26234 + ~ScVbaToggleButton();
26235 + // Attributes
26236 + virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);
26237 + virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException);
26238 +
26239 + virtual rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
26240 + virtual void SAL_CALL setCaption( const rtl::OUString& _caption ) throw (css::uno::RuntimeException);
26241 + //XHelperInterface
26242 + virtual rtl::OUString& getServiceImplName();
26243 + virtual css::uno::Sequence<rtl::OUString> getServiceNames();
26244 + // XDefaultProperty
26245 + rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); }
26246 +};
26247 +#endif //SC_VBA_TOGGLEBUTTON_HXX
26248 --- vbahelper/source/msforms/vbauserform.cxx.old 1970-01-01 00:00:00.000000000 +0000
26249 +++ vbahelper/source/msforms/vbauserform.cxx 2009-04-06 16:42:01.000000000 +0000
26250 @@ -0,0 +1,226 @@
26251 +/*************************************************************************
26252 + *
26253 + * OpenOffice.org - a multi-platform office productivity suite
26254 + *
26255 + * $RCSfile$
26256 + *
26257 + * $Revision$
26258 + *
26259 + * last change: $Author$ $Date$
26260 + *
26261 + * The Contents of this file are made available subject to
26262 + * the terms of GNU Lesser General Public License Version 2.1.
26263 + *
26264 + *
26265 + * GNU Lesser General Public License Version 2.1
26266 + * =============================================
26267 + * Copyright 2005 by Sun Microsystems, Inc.
26268 + * 901 San Antonio Road, Palo Alto, CA 94303, USA
26269 + *
26270 + * This library is free software; you can redistribute it and/or
26271 + * modify it under the terms of the GNU Lesser General Public
26272 + * License version 2.1, as published by the Free Software Foundation.
26273 + *
26274 + * This library is distributed in the hope that it will be useful,
26275 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
26276 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
26277 + * Lesser General Public License for more details.
26278 + *
26279 + * You should have received a copy of the GNU Lesser General Public
26280 + * License along with this library; if not, write to the Free Software
26281 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
26282 + * MA 02111-1307 USA
26283 + *
26284 + ************************************************************************/
26285 +#include <vbahelper/helperdecl.hxx>
26286 +#include "vbauserform.hxx"
26287 +#include <com/sun/star/awt/XControl.hpp>
26288 +#include <com/sun/star/awt/XControlContainer.hpp>
26289 +#include <com/sun/star/beans/PropertyConcept.hpp>
26290 +#include <basic/sbx.hxx>
26291 +#include <basic/sbstar.hxx>
26292 +#include <basic/sbmeth.hxx>
26293 +#include "vbacontrols.hxx"
26294 +
26295 +using namespace ::ooo::vba;
26296 +using namespace ::com::sun::star;
26297 +
26298 +// some little notes
26299 +// XDialog implementation has the following interesting bits
26300 +// a Controls property ( which is an array of the container controls )
26301 +// each item in the controls array is a XControl, where the model is
26302 +// basically a property bag
26303 +// additionally the XDialog instance has itself a model
26304 +// this model has a ControlModels ( array of models ) property
26305 +// the models in ControlModels can be accessed by name
26306 +// also the XDialog is a XControl ( to access the model above
26307 +
26308 +ScVbaUserForm::ScVbaUserForm( uno::Sequence< uno::Any > const& aArgs, uno::Reference< uno::XComponentContext >const& xContext ) throw ( lang::IllegalArgumentException ) : ScVbaUserForm_BASE( getXSomethingFromArgs< XHelperInterface >( aArgs, 0 ), xContext, getXSomethingFromArgs< uno::XInterface >( aArgs, 1 ), getXSomethingFromArgs< frame::XModel >( aArgs, 2 ), static_cast< ooo::vba::AbstractGeometryAttributes* >(0) ), mbDispose( true )
26309 +{
26310 + m_xDialog.set( m_xControl, uno::UNO_QUERY_THROW );
26311 + uno::Reference< awt::XControl > xControl( m_xDialog, uno::UNO_QUERY_THROW );
26312 + m_xProps.set( xControl->getModel(), uno::UNO_QUERY_THROW );
26313 + setGeometryHelper( new UserFormGeometryHelper( xContext, xControl ) );
26314 +}
26315 +
26316 +ScVbaUserForm::~ScVbaUserForm()
26317 +{
26318 +}
26319 +
26320 +void SAL_CALL
26321 +ScVbaUserForm::Show( ) throw (uno::RuntimeException)
26322 +{
26323 + OSL_TRACE("ScVbaUserForm::Show( )");
26324 + short aRet = 0;
26325 + if ( m_xDialog.is() )
26326 + aRet = m_xDialog->execute();
26327 + OSL_TRACE("ScVbaUserForm::Show() execute returned %d", aRet);
26328 + if ( mbDispose )
26329 + {
26330 + try
26331 + {
26332 + uno::Reference< lang::XComponent > xComp( m_xDialog, uno::UNO_QUERY_THROW );
26333 + m_xDialog = NULL;
26334 + xComp->dispose();
26335 + mbDispose = false;
26336 + }
26337 + catch( uno::Exception& )
26338 + {
26339 + }
26340 + }
26341 +}
26342 +
26343 +rtl::OUString SAL_CALL
26344 +ScVbaUserForm::getCaption() throw (::com::sun::star::uno::RuntimeException)
26345 +{
26346 + rtl::OUString sCaption;
26347 + m_xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Title") ) ) >>= sCaption;
26348 + return sCaption;
26349 +}
26350 +void
26351 +ScVbaUserForm::setCaption( const ::rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException)
26352 +{
26353 + m_xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Title") ), uno::makeAny( _caption ) );
26354 +}
26355 +
26356 +void SAL_CALL
26357 +ScVbaUserForm::Hide( ) throw (uno::RuntimeException)
26358 +{
26359 + mbDispose = false; // hide not dispose
26360 + if ( m_xDialog.is() )
26361 + m_xDialog->endExecute();
26362 +}
26363 +
26364 +void SAL_CALL
26365 +ScVbaUserForm::RePaint( ) throw (uno::RuntimeException)
26366 +{
26367 + // do nothing
26368 +}
26369 +
26370 +void SAL_CALL
26371 +ScVbaUserForm::UnloadObject( ) throw (uno::RuntimeException)
26372 +{
26373 + mbDispose = true;
26374 + if ( m_xDialog.is() )
26375 + m_xDialog->endExecute();
26376 +}
26377 +
26378 +rtl::OUString&
26379 +ScVbaUserForm::getServiceImplName()
26380 +{
26381 + static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaUserForm") );
26382 + return sImplName;
26383 +}
26384 +
26385 +uno::Sequence< rtl::OUString >
26386 +ScVbaUserForm::getServiceNames()
26387 +{
26388 + static uno::Sequence< rtl::OUString > aServiceNames;
26389 + if ( aServiceNames.getLength() == 0 )
26390 + {
26391 + aServiceNames.realloc( 1 );
26392 + aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.excel.UserForm" ) );
26393 + }
26394 + return aServiceNames;
26395 +}
26396 +
26397 +uno::Reference< beans::XIntrospectionAccess > SAL_CALL
26398 +ScVbaUserForm::getIntrospection( ) throw (uno::RuntimeException)
26399 +{
26400 + return uno::Reference< beans::XIntrospectionAccess >();
26401 +}
26402 +
26403 +uno::Any SAL_CALL
26404 +ScVbaUserForm::invoke( const ::rtl::OUString& /*aFunctionName*/, const uno::Sequence< uno::Any >& /*aParams*/, uno::Sequence< ::sal_Int16 >& /*aOutParamIndex*/, uno::Sequence< uno::Any >& /*aOutParam*/ ) throw (lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException)
26405 +{
26406 + throw uno::RuntimeException(); // unsupported operation
26407 +}
26408 +
26409 +void SAL_CALL
26410 +ScVbaUserForm::setValue( const ::rtl::OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException)
26411 +{
26412 + uno::Any aObject = getValue( aPropertyName );
26413 + // The Object *must* support XDefaultProperty here because getValue will
26414 + // only return properties that are Objects ( e.g. controls )
26415 + // e.g. Userform1.aControl = something
26416 + // 'aControl' has to support XDefaultProperty to make sense here
26417 + uno::Reference< script::XDefaultProperty > xDfltProp( aObject, uno::UNO_QUERY_THROW );
26418 + rtl::OUString aDfltPropName = xDfltProp->getDefaultPropertyName();
26419 + uno::Reference< beans::XIntrospectionAccess > xUnoAccess( getIntrospectionAccess( aObject ) );
26420 + uno::Reference< beans::XPropertySet > xPropSet( xUnoAccess->queryAdapter( ::getCppuType( (const uno::Reference< beans::XPropertySet > *)0 ) ), uno::UNO_QUERY_THROW );
26421 + xPropSet->setPropertyValue( aDfltPropName, aValue );
26422 +}
26423 +
26424 +uno::Any SAL_CALL
26425 +ScVbaUserForm::getValue( const ::rtl::OUString& aPropertyName ) throw (beans::UnknownPropertyException, uno::RuntimeException)
26426 +{
26427 + uno::Reference< awt::XControl > xDialogControl( m_xDialog, uno::UNO_QUERY_THROW );
26428 + uno::Reference< awt::XControlContainer > xContainer( m_xDialog, uno::UNO_QUERY_THROW );
26429 + uno::Reference< awt::XControl > xControl = xContainer->getControl( aPropertyName );
26430 + ScVbaControlFactory aFac( mxContext, xControl, m_xModel );
26431 + uno::Reference< msforms::XControl > xVBAControl( aFac.createControl( xDialogControl->getModel() ) );
26432 + ScVbaControl* pControl = dynamic_cast< ScVbaControl* >( xVBAControl.get() );
26433 + pControl->setGeometryHelper( new UserFormGeometryHelper( mxContext, xControl ) );
26434 + return uno::makeAny( xVBAControl );
26435 +}
26436 +
26437 +::sal_Bool SAL_CALL
26438 +ScVbaUserForm::hasMethod( const ::rtl::OUString& /*aName*/ ) throw (uno::RuntimeException)
26439 +{
26440 + return sal_False;
26441 +}
26442 +uno::Any SAL_CALL
26443 +ScVbaUserForm::Controls( const uno::Any& index ) throw (uno::RuntimeException)
26444 +{
26445 + uno::Reference< awt::XControl > xDialogControl( m_xDialog, uno::UNO_QUERY_THROW );
26446 + uno::Reference< XCollection > xControls( new ScVbaControls( this, mxContext, xDialogControl ) );
26447 + if ( index.hasValue() )
26448 + return uno::makeAny( xControls->Item( index, uno::Any() ) );
26449 + return uno::makeAny( xControls );
26450 +}
26451 +
26452 +::sal_Bool SAL_CALL
26453 +ScVbaUserForm::hasProperty( const ::rtl::OUString& aName ) throw (uno::RuntimeException)
26454 +{
26455 + uno::Reference< awt::XControl > xControl( m_xDialog, uno::UNO_QUERY );
26456 + OSL_TRACE("ScVbaUserForm::hasProperty(%s) %d", rtl::OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr(), xControl.is() );
26457 + if ( xControl.is() )
26458 + {
26459 + uno::Reference< container::XNameAccess > xNameAccess( xControl->getModel(), uno::UNO_QUERY_THROW );
26460 + sal_Bool bRes = xNameAccess->hasByName( aName );
26461 + OSL_TRACE("ScVbaUserForm::hasProperty(%s) %d ---> %d", rtl::OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr(), xControl.is(), bRes );
26462 + return bRes;
26463 + }
26464 + return sal_False;
26465 +}
26466 +
26467 +namespace userform
26468 +{
26469 +namespace sdecl = comphelper::service_decl;
26470 +sdecl::vba_service_class_<ScVbaUserForm, sdecl::with_args<true> > serviceImpl;
26471 +extern sdecl::ServiceDecl const serviceDecl(
26472 + serviceImpl,
26473 + "ScVbaUserForm",
26474 + "ooo.vba.msforms.UserForm" );
26475 +}
26476 +
26477 --- vbahelper/source/msforms/vbauserform.hxx.old 1970-01-01 00:00:00.000000000 +0000
26478 +++ vbahelper/source/msforms/vbauserform.hxx 2009-04-06 16:42:01.000000000 +0000
26479 @@ -0,0 +1,77 @@
26480 +/*************************************************************************
26481 + *
26482 + * OpenOffice.org - a multi-platform office productivity suite
26483 + *
26484 + * $RCSfile$
26485 + *
26486 + * $Revision$
26487 + *
26488 + * last change: $Author$ $Date$
26489 + *
26490 + * The Contents of this file are made available subject to
26491 + * the terms of GNU Lesser General Public License Version 2.1.
26492 + *
26493 + *
26494 + * GNU Lesser General Public License Version 2.1
26495 + * =============================================
26496 + * Copyright 2005 by Sun Microsystems, Inc.
26497 + * 901 San Antonio Road, Palo Alto, CA 94303, USA
26498 + *
26499 + * This library is free software; you can redistribute it and/or
26500 + * modify it under the terms of the GNU Lesser General Public
26501 + * License version 2.1, as published by the Free Software Foundation.
26502 + *
26503 + * This library is distributed in the hope that it will be useful,
26504 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
26505 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
26506 + * Lesser General Public License for more details.
26507 + *
26508 + * You should have received a copy of the GNU Lesser General Public
26509 + * License along with this library; if not, write to the Free Software
26510 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
26511 + * MA 02111-1307 USA
26512 + *
26513 + ************************************************************************/
26514 +#ifndef SC_VBA_USERFORM_HXX
26515 +#define SC_VBA_USERFORM_HXX
26516 +
26517 +#include <cppuhelper/implbase1.hxx>
26518 +#include <ooo/vba/msforms/XUserForm.hpp>
26519 +#include <com/sun/star/awt/XDialog.hpp>
26520 +#include <com/sun/star/frame/XModel.hpp>
26521 +
26522 +#include <vbahelper/vbahelperinterface.hxx>
26523 +#include "vbacontrol.hxx"
26524 +
26525 +//typedef InheritedHelperInterfaceImpl1< ov::msforms::XUserForm > ScVbaUserForm_BASE;
26526 +typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XUserForm > ScVbaUserForm_BASE;
26527 +
26528 +class ScVbaUserForm : public ScVbaUserForm_BASE
26529 +{
26530 +private:
26531 + css::uno::Reference< css::awt::XDialog > m_xDialog;
26532 + bool mbDispose;
26533 +protected:
26534 +public:
26535 + ScVbaUserForm( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext ) throw ( css::lang::IllegalArgumentException );
26536 + virtual ~ScVbaUserForm();
26537 + // XUserForm
26538 + virtual void SAL_CALL RePaint( ) throw (css::uno::RuntimeException);
26539 + virtual void SAL_CALL Show( ) throw (css::uno::RuntimeException);
26540 + // XIntrospection
26541 + virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection( ) throw (css::uno::RuntimeException);
26542 + virtual css::uno::Any SAL_CALL invoke( const ::rtl::OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) throw (css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException);
26543 + virtual void SAL_CALL setValue( const ::rtl::OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException);
26544 + virtual css::uno::Any SAL_CALL getValue( const ::rtl::OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException);
26545 + virtual ::sal_Bool SAL_CALL hasMethod( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException);
26546 + virtual ::sal_Bool SAL_CALL hasProperty( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException);
26547 + virtual ::rtl::OUString SAL_CALL getCaption() throw (::com::sun::star::uno::RuntimeException);
26548 + virtual void SAL_CALL setCaption( const ::rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException);
26549 + virtual void SAL_CALL Hide( ) throw (css::uno::RuntimeException);
26550 + virtual void SAL_CALL UnloadObject( ) throw (css::uno::RuntimeException);
26551 + virtual css::uno::Any SAL_CALL Controls( const css::uno::Any& index ) throw (css::uno::RuntimeException);
26552 + //XHelperInterface
26553 + virtual rtl::OUString& getServiceImplName();
26554 + virtual css::uno::Sequence<rtl::OUString> getServiceNames();
26555 +};
26556 +#endif
26557 --- vbahelper/source/vbahelper/makefile.mk.old 1970-01-01 00:00:00.000000000 +0000
26558 +++ vbahelper/source/vbahelper/makefile.mk 2009-04-06 16:42:01.000000000 +0000
26559 @@ -0,0 +1,66 @@
26560 +#*************************************************************************
26561 +#
26562 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
26563 +#
26564 +# Copyright 2008 by Sun Microsystems, Inc.
26565 +#
26566 +# OpenOffice.org - a multi-platform office productivity suite
26567 +#
26568 +# $RCSfile: makefile.mk,v $
26569 +#
26570 +# $Revision: 1.45 $
26571 +#
26572 +# This file is part of OpenOffice.org.
26573 +#
26574 +# OpenOffice.org is free software: you can redistribute it and/or modify
26575 +# it under the terms of the GNU Lesser General Public License version 3
26576 +# only, as published by the Free Software Foundation.
26577 +#
26578 +# OpenOffice.org is distributed in the hope that it will be useful,
26579 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
26580 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
26581 +# GNU Lesser General Public License version 3 for more details
26582 +# (a copy is included in the LICENSE file that accompanied this code).
26583 +#
26584 +# You should have received a copy of the GNU Lesser General Public License
26585 +# version 3 along with OpenOffice.org. If not, see
26586 +# <http://www.openoffice.org/license.html>
26587 +# for a copy of the LGPLv3 License.
26588 +#
26589 +#*************************************************************************
26590 +
26591 +PRJ=..$/../
26592 +PRJNAME=vbahelper
26593 +TARGET=vbahelper
26594 +
26595 +ENABLE_EXCEPTIONS := TRUE
26596 +
26597 +# --- Settings -----------------------------------------------------
26598 +
26599 +.INCLUDE : settings.mk
26600 +
26601 +SLOFILES=\
26602 + $(SLO)$/vbahelper.obj \
26603 + $(SLO)$/vbapropvalue.obj \
26604 + $(SLO)$/vbacommandbars.obj \
26605 + $(SLO)$/vbacommandbar.obj \
26606 + $(SLO)$/vbacommandbarcontrols.obj \
26607 + $(SLO)$/vbacommandbarcontrol.obj \
26608 + $(SLO)$/vbaapplicationbase.obj \
26609 + $(SLO)$/vbawindowbase.obj \
26610 + $(SLO)$/vbadocumentbase.obj \
26611 + $(SLO)$/vbaglobalbase.obj \
26612 +
26613 +# --- Targets -------------------------------------------------------
26614 +
26615 +.INCLUDE : target.mk
26616 +
26617 +ALLTAR : \
26618 + $(MISC)$/$(TARGET).don \
26619 +
26620 +$(SLOFILES) : $(MISC)$/$(TARGET).don
26621 +
26622 +$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
26623 + +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
26624 + echo $@
26625 +
26626 --- vbahelper/source/vbahelper/vbaapplicationbase.cxx.old 1970-01-01 00:00:00.000000000 +0000
26627 +++ vbahelper/source/vbahelper/vbaapplicationbase.cxx 2009-04-06 16:42:01.000000000 +0000
26628 @@ -0,0 +1,139 @@
26629 +/*************************************************************************
26630 + *
26631 + * OpenOffice.org - a multi-platform office productivity suite
26632 + *
26633 + * $RCSfile$
26634 + *
26635 + * $Revision$
26636 + *
26637 + * last change: $Author$ $Date$
26638 + *
26639 + * The Contents of this file are made available subject to
26640 + * the terms of GNU Lesser General Public License Version 2.1.
26641 + *
26642 + *
26643 + * GNU Lesser General Public License Version 2.1
26644 + * =============================================
26645 + * Copyright 2005 by Sun Microsystems, Inc.
26646 + * 901 San Antonio Road, Palo Alto, CA 94303, USA
26647 + *
26648 + * This library is free software; you can redistribute it and/or
26649 + * modify it under the terms of the GNU Lesser General Public
26650 + * License version 2.1, as published by the Free Software Foundation.
26651 + *
26652 + * This library is distributed in the hope that it will be useful,
26653 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
26654 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
26655 + * Lesser General Public License for more details.
26656 + *
26657 + * You should have received a copy of the GNU Lesser General Public
26658 + * License along with this library; if not, write to the Free Software
26659 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
26660 + * MA 02111-1307 USA
26661 + *
26662 + ************************************************************************/
26663 +#include "vbahelper/vbaapplicationbase.hxx"
26664 +#include <com/sun/star/container/XIndexAccess.hpp>
26665 +#include <com/sun/star/frame/XLayoutManager.hpp>
26666 +
26667 +#include "vbacommandbars.hxx"
26668 +
26669 +using namespace com::sun::star;
26670 +using namespace ooo::vba;
26671 +
26672 +VbaApplicationBase::VbaApplicationBase( const uno::Reference< css::uno::XComponentContext >& xContext )
26673 + : ApplicationBase_BASE( uno::Reference< XHelperInterface >(), xContext )
26674 +{
26675 +}
26676 +
26677 +VbaApplicationBase::~VbaApplicationBase()
26678 +{
26679 +}
26680 +
26681 +sal_Bool SAL_CALL
26682 +VbaApplicationBase::getScreenUpdating() throw (uno::RuntimeException)
26683 +{
26684 + uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
26685 + return !xModel->hasControllersLocked();
26686 +}
26687 +
26688 +void SAL_CALL
26689 +VbaApplicationBase::setScreenUpdating(sal_Bool bUpdate) throw (uno::RuntimeException)
26690 +{
26691 + uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
26692 + if (bUpdate)
26693 + xModel->unlockControllers();
26694 + else
26695 + xModel->lockControllers();
26696 +}
26697 +
26698 +sal_Bool SAL_CALL
26699 +VbaApplicationBase::getDisplayStatusBar() throw (uno::RuntimeException)
26700 +{
26701 + uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
26702 + uno::Reference< frame::XFrame > xFrame( xModel->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW );
26703 + uno::Reference< beans::XPropertySet > xProps( xFrame, uno::UNO_QUERY_THROW );
26704 +
26705 + if( xProps.is() ){
26706 + uno::Reference< frame::XLayoutManager > xLayoutManager( xProps->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager")) ), uno::UNO_QUERY_THROW );
26707 + rtl::OUString url(RTL_CONSTASCII_USTRINGPARAM( "private:resource/statusbar/statusbar" ));
26708 + if( xLayoutManager.is() && xLayoutManager->isElementVisible( url ) ){
26709 + return sal_True;
26710 + }
26711 + }
26712 + return sal_False;
26713 +}
26714 +
26715 +void SAL_CALL
26716 +VbaApplicationBase::setDisplayStatusBar(sal_Bool bDisplayStatusBar) throw (uno::RuntimeException)
26717 +{
26718 + uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
26719 + uno::Reference< frame::XFrame > xFrame( xModel->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW );
26720 + uno::Reference< beans::XPropertySet > xProps( xFrame, uno::UNO_QUERY_THROW );
26721 +
26722 + if( xProps.is() ){
26723 + uno::Reference< frame::XLayoutManager > xLayoutManager( xProps->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager")) ), uno::UNO_QUERY_THROW );
26724 + rtl::OUString url(RTL_CONSTASCII_USTRINGPARAM( "private:resource/statusbar/statusbar" ));
26725 + if( xLayoutManager.is() ){
26726 + if( bDisplayStatusBar && !xLayoutManager->isElementVisible( url ) ){
26727 + if( !xLayoutManager->showElement( url ) )
26728 + xLayoutManager->createElement( url );
26729 + return;
26730 + }
26731 + else if( !bDisplayStatusBar && xLayoutManager->isElementVisible( url ) ){
26732 + xLayoutManager->hideElement( url );
26733 + return;
26734 + }
26735 + }
26736 + }
26737 + return;
26738 +}
26739 +
26740 +uno::Any SAL_CALL
26741 +VbaApplicationBase::CommandBars( const uno::Any& aIndex ) throw (uno::RuntimeException)
26742 +{
26743 + uno::Reference< XCommandBars > xCommandBars( new ScVbaCommandBars( this, mxContext, uno::Reference< container::XIndexAccess >() ) );
26744 + if( aIndex.hasValue() )
26745 + return uno::makeAny( xCommandBars->Item( aIndex, uno::Any() ) );
26746 + return uno::makeAny( xCommandBars );
26747 +}
26748 +
26749 +rtl::OUString&
26750 +VbaApplicationBase::getServiceImplName()
26751 +{
26752 + static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("VbaApplicationBase") );
26753 + return sImplName;
26754 +}
26755 +uno::Sequence<rtl::OUString>
26756 +VbaApplicationBase::getServiceNames()
26757 +{
26758 + static uno::Sequence< rtl::OUString > aServiceNames;
26759 + if ( aServiceNames.getLength() == 0 )
26760 + {
26761 + aServiceNames.realloc( 1 );
26762 + aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.VbaApplicationBase" ) );
26763 + }
26764 + return aServiceNames;
26765 +}
26766 +
26767 +
26768 --- vbahelper/source/vbahelper/vbacommandbar.cxx.old 1970-01-01 00:00:00.000000000 +0000
26769 +++ vbahelper/source/vbahelper/vbacommandbar.cxx 2009-04-06 16:42:01.000000000 +0000
26770 @@ -0,0 +1,346 @@
26771 +/*************************************************************************
26772 + *
26773 + * OpenOffice.org - a multi-platform office productivity suite
26774 + *
26775 + * $RCSfile$
26776 + *
26777 + * $Revision$
26778 + *
26779 + * last change: $Author$ $Date$
26780 + *
26781 + * The Contents of this file are made available subject to
26782 + * the terms of GNU Lesser General Public License Version 2.1.
26783 + *
26784 + *
26785 + * GNU Lesser General Public License Version 2.1
26786 + * =============================================
26787 + * Copyright 2005 by Sun Microsystems, Inc.
26788 + * 901 San Antonio Road, Palo Alto, CA 94303, USA
26789 + *
26790 + * This library is free software; you can redistribute it and/or
26791 + * modify it under the terms of the GNU Lesser General Public
26792 + * License version 2.1, as published by the Free Software Foundation.
26793 + *
26794 + * This library is distributed in the hope that it will be useful,
26795 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
26796 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
26797 + * Lesser General Public License for more details.
26798 + *
26799 + * You should have received a copy of the GNU Lesser General Public
26800 + * License along with this library; if not, write to the Free Software
26801 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
26802 + * MA 02111-1307 USA
26803 + *
26804 + ************************************************************************/
26805 +#include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
26806 +#include <com/sun/star/frame/XFrame.hpp>
26807 +#include <com/sun/star/frame/XDesktop.hpp>
26808 +#include <com/sun/star/frame/XLayoutManager.hpp>
26809 +#include <com/sun/star/beans/XPropertySet.hpp>
26810 +#include <com/sun/star/container/XNameContainer.hpp>
26811 +#include <ooo/vba/office/MsoBarType.hpp>
26812 +
26813 +#include "vbacommandbar.hxx"
26814 +#include "vbacommandbarcontrols.hxx"
26815 +
26816 +using namespace com::sun::star;
26817 +using namespace ooo::vba;
26818 +
26819 +ScVbaCommandBar::ScVbaCommandBar( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, sal_Int32 nModuleType ) throw (uno::RuntimeException) : CommandBar_BASE( xParent, xContext )
26820 +{
26821 + // it's a menu bar
26822 + // only supporting factory menus ( no custom menus )
26823 + m_xParentHardRef.set( xParent, uno::UNO_QUERY_THROW );
26824 + initCommandBar();
26825 + switch( nModuleType )
26826 + {
26827 + case 0:
26828 + m_sMenuModuleName = rtl::OUString::createFromAscii( "com.sun.star.sheet.SpreadsheetDocument" );
26829 + break;
26830 + case 1:
26831 + m_sMenuModuleName = rtl::OUString::createFromAscii( "com.sun.star.text.TextDocument" );
26832 + break;
26833 + default:
26834 + m_sMenuModuleName = rtl::OUString::createFromAscii( "com.sun.star.text.TextDocument" );
26835 + }
26836 + getMenuSettings();
26837 + m_bIsMenu = sal_True;
26838 + m_bCustom = sal_False;
26839 +}
26840 +ScVbaCommandBar::ScVbaCommandBar( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, rtl::OUString sToolBarName, sal_Bool bTemporary, sal_Bool bCreate ) throw (uno::RuntimeException) : CommandBar_BASE( xParent, xContext )
26841 +{
26842 + // it's a tool bar
26843 + m_xParentHardRef.set( xParent, uno::UNO_QUERY_THROW );
26844 + initCommandBar();
26845 + m_bTemporary = bTemporary;
26846 + m_bCreate = bCreate;
26847 + // get OOo ToolBarName
26848 + CommandBarNameMap::const_iterator iter = mCommandBarNameMap.find( sToolBarName.toAsciiLowerCase() );
26849 + if( iter != mCommandBarNameMap.end() )
26850 + {
26851 + m_sToolBarName = iter->second;
26852 + }
26853 + else
26854 + {
26855 + m_sToolBarName = sToolBarName;
26856 + }
26857 + m_sUIName = m_sToolBarName;
26858 + m_bIsMenu = sal_False;
26859 + getToolBarSettings( m_sToolBarName );
26860 +}
26861 +void
26862 +ScVbaCommandBar::initCommandBar() throw (uno::RuntimeException)
26863 +{
26864 + m_pScVbaCommandBars = dynamic_cast< ScVbaCommandBars* >( m_xParentHardRef.get() );
26865 + if ( !m_pScVbaCommandBars )
26866 + throw uno::RuntimeException( rtl::OUString::createFromAscii( "Parent needs to be a ScVbaCommandBars"), uno::Reference< uno::XInterface >() );
26867 + m_bIsMenu = sal_False;
26868 + m_bCustom = sal_False;
26869 + m_bTemporary = sal_True;
26870 + m_sToolBarName = rtl::OUString::createFromAscii("");
26871 + m_sUIName = rtl::OUString::createFromAscii("");
26872 + m_sMenuModuleName = m_pScVbaCommandBars->GetModuleName();
26873 +}
26874 +void
26875 +ScVbaCommandBar::getToolBarSettings( rtl::OUString sToolBarName ) throw( uno::RuntimeException )
26876 +{
26877 + rtl::OUString sFactoryToolBar = rtl::OUString::createFromAscii("private:resource/toolbar/") + sToolBarName.toAsciiLowerCase();
26878 + rtl::OUString sCustomToolBar = rtl::OUString::createFromAscii("private:resource/toolbar/custom_toolbar_") + sToolBarName;
26879 + uno::Reference< lang::XMultiServiceFactory > xMSF( mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
26880 + uno::Reference< ui::XModuleUIConfigurationManagerSupplier > xUICfgManagerSup( xMSF->createInstance(rtl::OUString::createFromAscii("com.sun.star.ui.ModuleUIConfigurationManagerSupplier") ), uno::UNO_QUERY_THROW );
26881 + m_xUICfgManager.set( xUICfgManagerSup->getUIConfigurationManager( m_pScVbaCommandBars->GetModuleName() ), uno::UNO_QUERY_THROW );
26882 + m_xUICfgPers.set( m_xUICfgManager, uno::UNO_QUERY_THROW );
26883 + if( m_xUICfgManager->hasSettings( sFactoryToolBar ) )
26884 + {
26885 + // exsiting standard ToolBar
26886 + m_xBarSettings.set( m_xUICfgManager->getSettings( sFactoryToolBar, sal_True ), uno::UNO_QUERY_THROW );
26887 + m_sToolBarName = sFactoryToolBar;
26888 + }
26889 + else if( m_xUICfgManager->hasSettings( sCustomToolBar ) )
26890 + {
26891 + // exisiting custom ToolBar
26892 + m_xBarSettings.set( m_xUICfgManager->getSettings( sCustomToolBar, sal_True ), uno::UNO_QUERY_THROW );
26893 + m_sToolBarName = sCustomToolBar;
26894 + m_bCustom = sal_True;
26895 + }
26896 + else if( m_bCreate )
26897 + {
26898 + // new custom ToolBar
26899 + m_xBarSettings.set( m_xUICfgManager->createSettings(), uno::UNO_QUERY_THROW );
26900 + m_sToolBarName = sCustomToolBar;
26901 + m_bCustom = sal_True;
26902 + addCustomBar();
26903 + }
26904 + else
26905 + throw uno::RuntimeException( rtl::OUString::createFromAscii("ToolBar do not exist"), uno::Reference< uno::XInterface >() );
26906 + if( m_pScVbaCommandBars->GetWindows()->hasByName( m_sToolBarName ) )
26907 + {
26908 + uno::Any aToolBar = m_pScVbaCommandBars->GetWindows()->getByName( m_sToolBarName );
26909 + aToolBar >>= m_aToolBar;
26910 + }
26911 +}
26912 +void
26913 +ScVbaCommandBar::addCustomBar()
26914 +{
26915 + uno::Reference< beans::XPropertySet > xPropertySet( m_xBarSettings, uno::UNO_QUERY_THROW );
26916 + xPropertySet->setPropertyValue(rtl::OUString::createFromAscii("UIName"), uno::makeAny( m_sUIName ));
26917 +
26918 + if( m_xUICfgManager->hasSettings(m_sToolBarName) )
26919 + {
26920 + m_xUICfgManager->replaceSettings( m_sToolBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
26921 + }
26922 + else
26923 + {
26924 + m_xUICfgManager->insertSettings( m_sToolBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
26925 + }
26926 + if( !m_bTemporary )
26927 + {
26928 + m_xUICfgPers->store();
26929 + }
26930 +}
26931 +void
26932 +ScVbaCommandBar::getMenuSettings()
26933 +{
26934 + try
26935 + {
26936 + rtl::OUString sMenuBar = rtl::OUString::createFromAscii( "private:resource/menubar/menubar" );
26937 + uno::Reference< lang::XMultiServiceFactory > xMSF( mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
26938 + uno::Reference< ui::XModuleUIConfigurationManagerSupplier > xUICfgManagerSup( xMSF->createInstance(rtl::OUString::createFromAscii("com.sun.star.ui.ModuleUIConfigurationManagerSupplier") ), uno::UNO_QUERY_THROW );
26939 + m_xUICfgManager.set( xUICfgManagerSup->getUIConfigurationManager( m_sMenuModuleName ), uno::UNO_QUERY_THROW );
26940 + m_xUICfgPers.set( m_xUICfgManager, uno::UNO_QUERY_THROW );
26941 + m_xBarSettings.set( m_xUICfgManager->getSettings( sMenuBar, sal_True ), uno::UNO_QUERY_THROW );
26942 + }
26943 + catch ( uno::Exception e)
26944 + {
26945 + OSL_TRACE( "getMenuSetting got a error\n" );
26946 + }
26947 +}
26948 +::rtl::OUString SAL_CALL
26949 +ScVbaCommandBar::getName() throw ( uno::RuntimeException )
26950 +{
26951 + // This will get a "NULL length string" when Name is not set.
26952 + uno::Reference< beans::XPropertySet > xPropertySet( m_xBarSettings, uno::UNO_QUERY_THROW );
26953 + uno::Any aName = xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("UIName") );
26954 + rtl::OUString sName;
26955 + aName >>= sName;
26956 + if( sName.getLength() < 1 && !m_bIsMenu )
26957 + {
26958 + uno::Reference< container::XNameAccess > xNameAccess( m_pScVbaCommandBars->GetWindows(), uno::UNO_QUERY_THROW );
26959 + if( xNameAccess->hasByName( m_sToolBarName ) )
26960 + {
26961 + beans::PropertyValues aToolBar;
26962 + xNameAccess->getByName( m_sToolBarName ) >>= aToolBar;
26963 + sal_Int32 nCount = aToolBar.getLength();
26964 + beans::PropertyValue aPropertyValue;
26965 + for( sal_Int32 i = 0; i < nCount; i++ )
26966 + {
26967 + aPropertyValue = aToolBar[i];
26968 + if( aPropertyValue.Name.equals( rtl::OUString::createFromAscii("UIName") ) )
26969 + {
26970 + aPropertyValue.Value >>= sName;
26971 + return sName;
26972 + }
26973 + }
26974 + }
26975 + }
26976 + return sName;
26977 +}
26978 +void SAL_CALL
26979 +ScVbaCommandBar::setName( const ::rtl::OUString& _name ) throw (uno::RuntimeException)
26980 +{
26981 + uno::Reference< beans::XPropertySet > xPropertySet( m_xBarSettings, uno::UNO_QUERY_THROW );
26982 + xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("UIName"), uno::makeAny( _name ) );
26983 + uno::Reference< container::XIndexAccess > xIndexAccess( m_xBarSettings, uno::UNO_QUERY_THROW );
26984 +
26985 + if( m_xUICfgManager->hasSettings( m_sToolBarName ) )
26986 + {
26987 + m_xUICfgManager->replaceSettings( m_sToolBarName, xIndexAccess );
26988 + }
26989 + else
26990 + {
26991 + // toolbar not found
26992 + }
26993 + if( !m_bTemporary )
26994 + {
26995 + m_xUICfgPers->store();
26996 + }
26997 +}
26998 +::sal_Bool SAL_CALL
26999 +ScVbaCommandBar::getVisible() throw (uno::RuntimeException)
27000 +{
27001 + sal_Bool bVisible = sal_False;
27002 + try
27003 + {
27004 + sal_Int32 i = 0;
27005 + while( !m_aToolBar[i].Name.equals( rtl::OUString::createFromAscii( "Visible" ) ) )
27006 + {
27007 + i++;
27008 + }
27009 + m_aToolBar[i].Value >>= bVisible;
27010 + }
27011 + catch ( uno::Exception e )
27012 + {
27013 + }
27014 + return bVisible;
27015 +}
27016 +void SAL_CALL
27017 +ScVbaCommandBar::setVisible( ::sal_Bool _visible ) throw (uno::RuntimeException)
27018 +{
27019 + try
27020 + {
27021 + uno::Reference< frame::XFrame > xFrame( getCurrentDocument()->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW );
27022 + uno::Reference< beans::XPropertySet > xPropertySet( xFrame, uno::UNO_QUERY_THROW );
27023 + uno::Reference< frame::XLayoutManager > xLayoutManager( xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("LayoutManager") ), uno::UNO_QUERY_THROW );
27024 + if( _visible )
27025 + {
27026 + xLayoutManager->createElement( m_sToolBarName );
27027 + xLayoutManager->showElement( m_sToolBarName );
27028 + }
27029 + else
27030 + {
27031 + xLayoutManager->hideElement( m_sToolBarName );
27032 + xLayoutManager->destroyElement( m_sToolBarName );
27033 + }
27034 + }
27035 + catch( uno::Exception e )
27036 + {
27037 + OSL_TRACE( "SetVisible get an exception\n" );
27038 + }
27039 +}
27040 +void SAL_CALL
27041 +ScVbaCommandBar::Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
27042 +{
27043 + if( m_bCustom )
27044 + {
27045 + if( m_xUICfgManager->hasSettings( m_sToolBarName ) )
27046 + {
27047 + m_xUICfgManager->removeSettings(m_sToolBarName);
27048 + // make it permanent
27049 + if( !m_bTemporary )
27050 + {
27051 + m_xUICfgPers->store();
27052 + }
27053 + }
27054 + else
27055 + {
27056 + // toolbar not found
27057 + // TODO throw Error
27058 + }
27059 + uno::Reference< container::XNameContainer > xNameContainer( m_pScVbaCommandBars->GetWindows(), uno::UNO_QUERY_THROW );
27060 + if( xNameContainer->hasByName( m_sToolBarName ) )
27061 + {
27062 + xNameContainer->removeByName( m_sToolBarName );
27063 + }
27064 + }
27065 +}
27066 +uno::Any SAL_CALL
27067 +ScVbaCommandBar::Controls( const uno::Any& aIndex ) throw (script::BasicErrorException, uno::RuntimeException)
27068 +{
27069 + sal_Int32 nIndex;
27070 + uno::Reference< XCommandBarControls > xCommandBarControls( new ScVbaCommandBarControls( this, mxContext, uno::Reference< container::XIndexAccess >() ) );
27071 + if( aIndex.hasValue() )
27072 + {
27073 + if( aIndex >>= nIndex )
27074 + {
27075 + uno::Reference< XCommandBarControl > xCommandBarControl( xCommandBarControls->Item( aIndex, uno::Any() ), uno::UNO_QUERY_THROW );
27076 + return uno::makeAny( xCommandBarControl );
27077 + }
27078 + else
27079 + throw uno::RuntimeException( rtl::OUString::createFromAscii( "invalid index" ), uno::Reference< uno::XInterface >() );
27080 + }
27081 + return uno::makeAny( xCommandBarControls );
27082 +}
27083 +
27084 +sal_Int32 SAL_CALL
27085 +ScVbaCommandBar::Type() throw (script::BasicErrorException, uno::RuntimeException)
27086 +{
27087 + // #FIXME support msoBarTypePopup
27088 + sal_Int32 nType = office::MsoBarType::msoBarTypePopup;
27089 + nType = m_bIsMenu? office::MsoBarType::msoBarTypeNormal : office::MsoBarType::msoBarTypeMenuBar;
27090 + return nType;
27091 +}
27092 +
27093 +uno::Any SAL_CALL
27094 +ScVbaCommandBar::FindControl( const uno::Any& /*aType*/, const uno::Any& /*aId*/, const uno::Any& /*aTag*/, const uno::Any& /*aVisible*/, const uno::Any& /*aRecursive*/ ) throw (script::BasicErrorException, uno::RuntimeException)
27095 +{
27096 + // alwayse fail to find control
27097 + return uno::makeAny( uno::Reference< XCommandBarControl > () );
27098 +}
27099 +
27100 +rtl::OUString&
27101 +ScVbaCommandBar::getServiceImplName()
27102 +{
27103 + static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBar") );
27104 + return sImplName;
27105 +}
27106 +uno::Sequence<rtl::OUString>
27107 +ScVbaCommandBar::getServiceNames()
27108 +{
27109 + static uno::Sequence< rtl::OUString > aServiceNames;
27110 + if ( aServiceNames.getLength() == 0 )
27111 + {
27112 + aServiceNames.realloc( 1 );
27113 + aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.CommandBar" ) );
27114 + }
27115 + return aServiceNames;
27116 +}
27117 --- vbahelper/source/vbahelper/vbacommandbar.hxx.old 1970-01-01 00:00:00.000000000 +0000
27118 +++ vbahelper/source/vbahelper/vbacommandbar.hxx 2009-04-06 16:42:01.000000000 +0000
27119 @@ -0,0 +1,107 @@
27120 +/*************************************************************************
27121 + *
27122 + * OpenOffice.org - a multi-platform office productivity suite
27123 + *
27124 + * $RCSfile$
27125 + *
27126 + * $Revision$
27127 + *
27128 + * last change: $Author$ $Date$
27129 + *
27130 + * The Contents of this file are made available subject to
27131 + * the terms of GNU Lesser General Public License Version 2.1.
27132 + *
27133 + *
27134 + * GNU Lesser General Public License Version 2.1
27135 + * =============================================
27136 + * Copyright 2005 by Sun Microsystems, Inc.
27137 + * 901 San Antonio Road, Palo Alto, CA 94303, USA
27138 + *
27139 + * This library is free software; you can redistribute it and/or
27140 + * modify it under the terms of the GNU Lesser General Public
27141 + * License version 2.1, as published by the Free Software Foundation.
27142 + *
27143 + * This library is distributed in the hope that it will be useful,
27144 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
27145 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
27146 + * Lesser General Public License for more details.
27147 + *
27148 + * You should have received a copy of the GNU Lesser General Public
27149 + * License along with this library; if not, write to the Free Software
27150 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
27151 + * MA 02111-1307 USA
27152 + *
27153 + ************************************************************************/
27154 +#ifndef SC_VBA_COMMANDBAR_HXX
27155 +#define SC_VBA_COMMANDBAR_HXX
27156 +
27157 +#include <ooo/vba/XCommandBar.hpp>
27158 +#include <com/sun/star/ui/XUIConfigurationManager.hpp>
27159 +#include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
27160 +#include <com/sun/star/container/XIndexContainer.hpp>
27161 +#include <com/sun/star/beans/PropertyValues.hpp>
27162 +
27163 +#include <vbahelper/vbahelperinterface.hxx>
27164 +#include "vbacommandbars.hxx"
27165 +
27166 +#include <map>
27167 +typedef std::map< const rtl::OUString, rtl::OUString > CommandBarNameMap;
27168 +typedef std::pair< const rtl::OUString, rtl::OUString > CommandBarNamePair;
27169 +const CommandBarNamePair namePair[] = {
27170 + CommandBarNamePair( rtl::OUString::createFromAscii("standard"), rtl::OUString::createFromAscii("standardbar") ),
27171 + CommandBarNamePair( rtl::OUString::createFromAscii("formatting"), rtl::OUString::createFromAscii("formatobjectbar") ),
27172 +};
27173 +static const CommandBarNameMap mCommandBarNameMap( namePair, ( namePair + sizeof(namePair) / sizeof(namePair[0]) ) );
27174 +
27175 +
27176 +typedef InheritedHelperInterfaceImpl1< ov::XCommandBar > CommandBar_BASE;
27177 +
27178 +class ScVbaCommandBar : public CommandBar_BASE
27179 +{
27180 +private:
27181 + rtl::OUString m_sToolBarName;
27182 + rtl::OUString m_sMenuModuleName;
27183 + rtl::OUString m_sUIName;
27184 + sal_Bool m_bTemporary;
27185 + sal_Bool m_bIsMenu;
27186 + sal_Bool m_bCustom;
27187 + sal_Bool m_bCreate;
27188 + ScVbaCommandBars* m_pScVbaCommandBars;
27189 + css::beans::PropertyValues m_aToolBar;
27190 + // hard reference for parent
27191 + css::uno::Reference< ov::XHelperInterface > m_xParentHardRef;
27192 + css::uno::Reference< css::ui::XUIConfigurationManager > m_xUICfgManager;
27193 + css::uno::Reference< css::ui::XUIConfigurationPersistence > m_xUICfgPers;
27194 + css::uno::Reference< css::container::XIndexContainer > m_xBarSettings;
27195 + void initCommandBar() throw( css::uno::RuntimeException );
27196 +protected:
27197 + void getToolBarSettings( rtl::OUString sToolBarName ) throw( css::uno::RuntimeException );
27198 + void getMenuSettings();
27199 + void addCustomBar();
27200 +public:
27201 + ScVbaCommandBar( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, sal_Int32 nModuleType ) throw( css::uno::RuntimeException );
27202 + ScVbaCommandBar( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, rtl::OUString sToolBarName, sal_Bool bTemporary, sal_Bool bCreate ) throw( css::uno::RuntimeException );
27203 +
27204 + sal_Bool IsMenu() { return m_bIsMenu; };
27205 + css::uno::Reference< css::ui::XUIConfigurationManager > GetUICfgManager() { return m_xUICfgManager; };
27206 + css::uno::Reference< css::ui::XUIConfigurationPersistence > GetUICfgPers() { return m_xUICfgPers; };
27207 + css::uno::Reference< css::container::XIndexContainer > GetBarSettings() { return m_xBarSettings; };
27208 + rtl::OUString GetToolBarName() { return m_sToolBarName; };
27209 +
27210 + // Attributes
27211 + virtual ::rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException);
27212 + virtual void SAL_CALL setName( const ::rtl::OUString& _name ) throw (css::uno::RuntimeException);
27213 + virtual ::sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
27214 + virtual void SAL_CALL setVisible( ::sal_Bool _visible ) throw (css::uno::RuntimeException);
27215 +
27216 + // Methods
27217 + virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
27218 + virtual css::uno::Any SAL_CALL Controls( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
27219 + virtual sal_Int32 SAL_CALL Type( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
27220 + virtual css::uno::Any SAL_CALL FindControl( const css::uno::Any& aType, const css::uno::Any& aId, const css::uno::Any& aTag, const css::uno::Any& aVisible, const css::uno::Any& aRecursive ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
27221 +
27222 + // XHelperInterface
27223 + virtual rtl::OUString& getServiceImplName();
27224 + virtual css::uno::Sequence<rtl::OUString> getServiceNames();
27225 +};
27226 +#endif//SC_VBA_COMMANDBAR_HXX
27227 --- vbahelper/source/vbahelper/vbacommandbarcontrol.cxx.old 1970-01-01 00:00:00.000000000 +0000
27228 +++ vbahelper/source/vbahelper/vbacommandbarcontrol.cxx 2009-04-06 16:42:01.000000000 +0000
27229 @@ -0,0 +1,453 @@
27230 +/*************************************************************************
27231 + *
27232 + * OpenOffice.org - a multi-platform office productivity suite
27233 + *
27234 + * $RCSfile$
27235 + *
27236 + * $Revision$
27237 + *
27238 + * last change: $Author$ $Date$
27239 + *
27240 + * The Contents of this file are made available subject to
27241 + * the terms of GNU Lesser General Public License Version 2.1.
27242 + *
27243 + *
27244 + * GNU Lesser General Public License Version 2.1
27245 + * =============================================
27246 + * Copyright 2005 by Sun Microsystems, Inc.
27247 + * 901 San Antonio Road, Palo Alto, CA 94303, USA
27248 + *
27249 + * This library is free software; you can redistribute it and/or
27250 + * modify it under the terms of the GNU Lesser General Public
27251 + * License version 2.1, as published by the Free Software Foundation.
27252 + *
27253 + * This library is distributed in the hope that it will be useful,
27254 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
27255 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
27256 + * Lesser General Public License for more details.
27257 + *
27258 + * You should have received a copy of the GNU Lesser General Public
27259 + * License along with this library; if not, write to the Free Software
27260 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
27261 + * MA 02111-1307 USA
27262 + *
27263 + ************************************************************************/
27264 +#include "vbacommandbarcontrol.hxx"
27265 +#include <basic/sbstar.hxx>
27266 +#include <basic/sbmod.hxx>
27267 +#include <basic/sbmeth.hxx>
27268 +
27269 +using namespace com::sun::star;
27270 +using namespace ooo::vba;
27271 +
27272 +uno::Any lcl_getPropertyValue( beans::PropertyValues aPropertyValues, rtl::OUString sPropertyName )
27273 +{
27274 + sal_Int32 nCount = aPropertyValues.getLength();
27275 + for( sal_Int32 i = 0; i < nCount; i++ )
27276 + {
27277 + if( aPropertyValues[i].Name.equalsIgnoreAsciiCase( sPropertyName ) )
27278 + {
27279 + return aPropertyValues[i].Value;
27280 + }
27281 + }
27282 + return uno::Any();
27283 +}
27284 +
27285 +beans::PropertyValues lcl_repalcePropertyValue( beans::PropertyValues aPropertyValues, rtl::OUString sPropertyName, uno::Any aValue )
27286 +{
27287 + sal_Int32 nCount = aPropertyValues.getLength();
27288 + for( sal_Int32 i = 0; i < nCount; i++ )
27289 + {
27290 + if( aPropertyValues[i].Name.equalsIgnoreAsciiCase( sPropertyName ) )
27291 + {
27292 + aPropertyValues[i].Value = aValue;
27293 + return aPropertyValues;
27294 + }
27295 + }
27296 + return aPropertyValues;
27297 +}
27298 +
27299 +ScVbaCommandBarControl::ScVbaCommandBarControl( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition, sal_Int32 nType ) throw (uno::RuntimeException) : CommandBarControl_BASE( xParent, xContext ), m_sName( sName ), m_nPosition( nPosition ), m_nType( nType )
27300 +{
27301 + // exsiting CommandBarBarControl
27302 + m_xParentHardRef.set( xParent, uno::UNO_QUERY_THROW );
27303 + initObjects();
27304 + if( m_xBarSettings->hasElements() )
27305 + {
27306 + ScVbaCommandBarControl* pParentCommandBarControl = m_pCommandBarControls->GetParentCommandBarControl();
27307 + if( pParentCommandBarControl )
27308 + {
27309 + beans::PropertyValues aPropertyValues;
27310 + pParentCommandBarControl->GetCurrentSettings()->getByIndex( pParentCommandBarControl->GetPosition() ) >>= aPropertyValues;
27311 + pParentCommandBarControl->SetPropertyValues( aPropertyValues );
27312 + m_xCurrentSettings.set( lcl_getPropertyValue( pParentCommandBarControl->GetPropertyValues(), rtl::OUString::createFromAscii( "ItemDescriptorContainer" ) ), uno::UNO_QUERY_THROW );
27313 + }
27314 + if( !m_xCurrentSettings.is() )
27315 + {
27316 + m_xCurrentSettings.set( m_xUICfgManager->getSettings( m_pCommandBarControls->GetParentToolBarName(), sal_True ), uno::UNO_QUERY_THROW );
27317 + }
27318 + }
27319 + if( m_bIsMenu )
27320 + {
27321 + m_sBarName = rtl::OUString::createFromAscii("private:resource/menubar/menubar");
27322 + }
27323 + else
27324 + {
27325 + m_sBarName = m_pCommandBarControls->GetParentToolBarName();
27326 + }
27327 + m_bTemporary = sal_True;
27328 +}
27329 +ScVbaCommandBarControl::ScVbaCommandBarControl( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition, sal_Bool bTemporary, sal_Int32 nType) throw (uno::RuntimeException) : CommandBarControl_BASE( xParent, xContext ), m_nPosition( nPosition ), m_bTemporary( bTemporary ), m_nType( nType )
27330 +{
27331 + m_xParentHardRef.set( xParent, uno::UNO_QUERY_THROW );
27332 + initObjects();
27333 + if( sName.getLength() > 0 )
27334 + {
27335 + m_sName = sName;
27336 + }
27337 + m_sCommand = rtl::OUString::createFromAscii("vnd.openoffice.org:") + sName;
27338 + if( m_bIsMenu )
27339 + {
27340 + m_sBarName = rtl::OUString::createFromAscii("private:resource/menubar/menubar");
27341 + createNewMenuBarControl();
27342 + }
27343 + else
27344 + {
27345 + m_sBarName = m_pCommandBarControls->GetParentToolBarName();
27346 + createNewToolBarControl();
27347 + }
27348 +}
27349 +
27350 +void
27351 +ScVbaCommandBarControl::initObjects() throw (uno::RuntimeException)
27352 +{
27353 + m_pCommandBarControls = dynamic_cast< ScVbaCommandBarControls* >( m_xParentHardRef.get() );
27354 + if( !m_pCommandBarControls )
27355 + throw uno::RuntimeException( rtl::OUString::createFromAscii( "Parent needs to be a ScVbaCommandBarControls"), uno::Reference< uno::XInterface >() );
27356 + m_xUICfgManager.set( m_pCommandBarControls->GetUICfgManager(), uno::UNO_QUERY_THROW );
27357 + m_xUICfgPers.set( m_pCommandBarControls->GetUICfgPers(), uno::UNO_QUERY_THROW );
27358 + m_xBarSettings.set( m_pCommandBarControls->GetBarSettings(), uno::UNO_QUERY_THROW );
27359 + m_bIsMenu = m_pCommandBarControls->IsMenu();
27360 + m_sName = rtl::OUString::createFromAscii( "Custom" );
27361 +}
27362 +
27363 +void
27364 +ScVbaCommandBarControl::createNewMenuBarControl()
27365 +{
27366 + uno::Reference< lang::XSingleComponentFactory > xMenuMSF( m_xBarSettings, uno::UNO_QUERY_THROW );
27367 +
27368 + uno::Sequence< beans::PropertyValue > aPropertys;
27369 + if( m_nType == office::MsoControlType::msoControlPopup )
27370 + aPropertys = uno::Sequence< beans::PropertyValue >( 4 );
27371 + else
27372 + aPropertys = uno::Sequence< beans::PropertyValue >( 3 );
27373 +
27374 + aPropertys[0].Name = rtl::OUString::createFromAscii("CommandURL");
27375 + aPropertys[0].Value <<= m_sCommand;
27376 + aPropertys[1].Name = rtl::OUString::createFromAscii("Label");
27377 + aPropertys[1].Value <<= m_sName;
27378 + aPropertys[2].Name = rtl::OUString::createFromAscii("Type");
27379 + aPropertys[2].Value <<= sal_Int32(0);
27380 +
27381 + if( m_nType == office::MsoControlType::msoControlPopup )
27382 + {
27383 + aPropertys[3].Name = rtl::OUString::createFromAscii("ItemDescriptorContainer");
27384 + aPropertys[3].Value <<= xMenuMSF->createInstanceWithContext( mxContext );
27385 + }
27386 +
27387 + if( m_pCommandBarControls->GetParentCommandBar() != NULL )
27388 + {
27389 + // create a new menu
27390 + m_xBarSettings->insertByIndex( m_nPosition, uno::makeAny( aPropertys ) );
27391 + m_xCurrentSettings.set( m_xBarSettings, uno::UNO_QUERY_THROW );
27392 + }
27393 + else if( m_pCommandBarControls->GetParentCommandBarControl() != NULL )
27394 + {
27395 + // create a new menu entry
27396 + ScVbaCommandBarControl* pPc = m_pCommandBarControls->GetParentCommandBarControl();
27397 + beans::PropertyValues aPropertyValues;
27398 + pPc->GetCurrentSettings()->getByIndex( pPc->GetPosition() ) >>= aPropertyValues;
27399 + pPc->SetPropertyValues( aPropertyValues );
27400 +
27401 + // has the property already been set?
27402 + if( lcl_getPropertyValue( pPc->GetPropertyValues(), rtl::OUString::createFromAscii("ItemDescriptorContainer") ).hasValue() )
27403 + {
27404 + lcl_repalcePropertyValue( pPc->GetPropertyValues(), rtl::OUString::createFromAscii("ItemDescriptorContainer"), uno::makeAny( xMenuMSF->createInstanceWithContext( mxContext ) ) );
27405 + pPc->GetCurrentSettings()->replaceByIndex( pPc->GetPosition(), uno::makeAny( pPc->GetPropertyValues() ) );
27406 + }
27407 + m_xCurrentSettings.set( lcl_getPropertyValue( pPc->GetPropertyValues(), rtl::OUString::createFromAscii("ItemDescriptorContainer") ), uno::UNO_QUERY_THROW );
27408 + m_xCurrentSettings->insertByIndex( m_nPosition, uno::makeAny( aPropertys ) );
27409 + }
27410 + if( m_xUICfgManager->hasSettings( m_sBarName ) )
27411 + {
27412 + m_xUICfgManager->replaceSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
27413 + }
27414 + else
27415 + {
27416 + m_xUICfgManager->insertSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
27417 + }
27418 + if( !m_bTemporary )
27419 + {
27420 + m_xUICfgPers->store();
27421 + }
27422 +}
27423 +
27424 +void
27425 +ScVbaCommandBarControl::createNewToolBarControl()
27426 +{
27427 + uno::Sequence< beans::PropertyValue > aPropertys(4);
27428 + aPropertys[0].Name = rtl::OUString::createFromAscii("CommandURL");
27429 + aPropertys[0].Value <<= m_sCommand;
27430 + aPropertys[1].Name = rtl::OUString::createFromAscii("Label");
27431 + aPropertys[1].Value <<= m_sName;
27432 + aPropertys[2].Name = rtl::OUString::createFromAscii("Type");
27433 + aPropertys[2].Value <<= sal_Int32(0);
27434 + aPropertys[3].Name = rtl::OUString::createFromAscii("IsVisible");
27435 + aPropertys[3].Value <<= sal_True;
27436 +
27437 + m_xBarSettings->insertByIndex( m_nPosition, uno::makeAny( aPropertys ) );
27438 + uno::Reference< beans::XPropertySet > xPropertySet( m_xBarSettings, uno::UNO_QUERY_THROW );
27439 + rtl::OUString sUIName;
27440 + xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("UIName") ) >>= sUIName;
27441 +
27442 + m_xCurrentSettings.set( m_xBarSettings, uno::UNO_QUERY_THROW );
27443 + if( m_xUICfgManager->hasSettings( m_sBarName ) )
27444 + {
27445 + m_xUICfgManager->replaceSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
27446 + }
27447 + else
27448 + {
27449 + m_xUICfgManager->insertSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
27450 + }
27451 + if( !m_bTemporary )
27452 + {
27453 + m_xUICfgPers->store();
27454 + }
27455 +}
27456 +
27457 +::rtl::OUString SAL_CALL
27458 +ScVbaCommandBarControl::getCaption() throw ( uno::RuntimeException )
27459 +{
27460 + // "Label" always empty
27461 + rtl::OUString sCaption;
27462 + beans::PropertyValues aPropertyValues;
27463 + if( m_xCurrentSettings.is() )
27464 + {
27465 + m_xCurrentSettings->getByIndex( m_nPosition ) >>= aPropertyValues;
27466 + lcl_getPropertyValue( aPropertyValues, rtl::OUString::createFromAscii("Label") ) >>= sCaption;
27467 + }
27468 + else if( m_xBarSettings.is() )
27469 + {
27470 + m_xBarSettings->getByIndex( m_nPosition ) >>= aPropertyValues;
27471 + lcl_getPropertyValue( aPropertyValues, rtl::OUString::createFromAscii("Label") ) >>= sCaption;
27472 + }
27473 + return sCaption;
27474 +}
27475 +void SAL_CALL
27476 +ScVbaCommandBarControl::setCaption( const ::rtl::OUString& _caption ) throw (uno::RuntimeException)
27477 +{
27478 + if( m_xCurrentSettings.is() )
27479 + {
27480 + beans::PropertyValues aPropertyValues;
27481 + m_xCurrentSettings->getByIndex( m_nPosition ) >>= aPropertyValues;
27482 + beans::PropertyValues aNewPropertyValues;
27483 + aNewPropertyValues = lcl_repalcePropertyValue( aPropertyValues, rtl::OUString::createFromAscii("Label"), uno::makeAny( _caption ) );
27484 + m_xCurrentSettings->replaceByIndex( m_nPosition, uno::makeAny( aNewPropertyValues ) );
27485 + if( m_xUICfgManager->hasSettings( m_sBarName ) )
27486 + {
27487 + m_xUICfgManager->replaceSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
27488 + }
27489 + else
27490 + {
27491 + m_xUICfgManager->insertSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
27492 + }
27493 + // make it permanent
27494 + if( !m_bTemporary )
27495 + {
27496 + m_xUICfgPers->store();
27497 + }
27498 + }
27499 +}
27500 +::rtl::OUString SAL_CALL
27501 +ScVbaCommandBarControl::getOnAction() throw (uno::RuntimeException)
27502 +{
27503 + if( m_xCurrentSettings.is() )
27504 + {
27505 + beans::PropertyValues aPropertyValues;
27506 + m_xCurrentSettings->getByIndex( m_nPosition ) >>= aPropertyValues;
27507 + rtl::OUString sCommandURL;
27508 + lcl_getPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( "CommandURL" ) ) >>= sCommandURL;
27509 + return sCommandURL;
27510 + }
27511 + return ::rtl::OUString();
27512 +}
27513 +void SAL_CALL
27514 +ScVbaCommandBarControl::setOnAction( const ::rtl::OUString& _onaction ) throw (uno::RuntimeException)
27515 +{
27516 + if( m_xCurrentSettings.is() )
27517 + {
27518 + // convert the comand url into something like vnd.sun.star.script:Standard.testMacro.Macro1?language=Basic&location=document
27519 + rtl::OUString aCommandURL;
27520 + rtl::OUString sScheme = rtl::OUString::createFromAscii( "vnd.sun.star.script:");
27521 + SbModule* pModule = StarBASIC::GetActiveModule();
27522 + if( pModule )
27523 + {
27524 + String sTmp = _onaction;
27525 + if( SbMethod* pMethod = dynamic_cast< SbMethod* >( pModule->Find( sTmp, SbxCLASS_METHOD ) ) )
27526 + {
27527 + if( pMethod )
27528 + {
27529 + sTmp.Insert( '.', 0 ).Insert( pModule->GetName(), 0 ).Insert( '.', 0 ).Insert( pModule->GetParent()->GetName(), 0 );
27530 + }
27531 + }
27532 +
27533 + rtl::OUString sUrlPart2 = rtl::OUString::createFromAscii( "?language=Basic&location=document");
27534 + aCommandURL = sScheme.concat( sTmp ).concat( sUrlPart2 );
27535 + OSL_TRACE("**** METHOD IS %s", rtl::OUStringToOString( aCommandURL, RTL_TEXTENCODING_UTF8 ).getStr() );
27536 + }
27537 + else
27538 + {
27539 + aCommandURL = _onaction;
27540 + }
27541 + OSL_TRACE(" ScVbaCommandBarControl::setOnAction: %s", rtl::OUStringToOString( aCommandURL, RTL_TEXTENCODING_UTF8 ).getStr() );
27542 + beans::PropertyValues aPropertyValues;
27543 + m_xCurrentSettings->getByIndex( m_nPosition ) >>= aPropertyValues;
27544 + beans::PropertyValues aNewPropertyValues;
27545 + aNewPropertyValues = lcl_repalcePropertyValue( aPropertyValues, rtl::OUString::createFromAscii("CommandURL"), uno::makeAny( aCommandURL ) );
27546 + m_xCurrentSettings->replaceByIndex( m_nPosition, uno::makeAny( aNewPropertyValues ) );
27547 + if( m_xUICfgManager->hasSettings( m_sBarName ) )
27548 + {
27549 + m_xUICfgManager->replaceSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
27550 + }
27551 + else
27552 + {
27553 + m_xUICfgManager->insertSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
27554 + }
27555 + // make it permanent
27556 + if( !m_bTemporary )
27557 + {
27558 + m_xUICfgPers->store();
27559 + }
27560 + }
27561 +}
27562 +::sal_Bool SAL_CALL
27563 +ScVbaCommandBarControl::getVisible() throw (uno::RuntimeException)
27564 +{
27565 + // not possible in UNO?
27566 + return sal_True;
27567 +}
27568 +void SAL_CALL
27569 +ScVbaCommandBarControl::setVisible( ::sal_Bool /*_visible*/ ) throw (uno::RuntimeException)
27570 +{
27571 + // "IsVisilbe"
27572 +}
27573 +void SAL_CALL
27574 +ScVbaCommandBarControl::Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
27575 +{
27576 + if( m_xCurrentSettings.is() )
27577 + {
27578 + m_xCurrentSettings->removeByIndex( m_nPosition );
27579 +
27580 + if( m_xUICfgManager->hasSettings( m_sBarName ) )
27581 + {
27582 + m_xUICfgManager->replaceSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
27583 + }
27584 + else
27585 + {
27586 + m_xUICfgManager->insertSettings( m_sBarName, uno::Reference< container::XIndexAccess > (m_xBarSettings, uno::UNO_QUERY_THROW ) );
27587 + }
27588 + // make it permanent
27589 + if( !m_bTemporary )
27590 + {
27591 + m_xUICfgPers->store();
27592 + }
27593 + }
27594 +}
27595 +uno::Any SAL_CALL
27596 +ScVbaCommandBarControl::Controls( const uno::Any& aIndex ) throw (script::BasicErrorException, uno::RuntimeException)
27597 +{
27598 + sal_Int32 nIndex;
27599 + uno::Reference< XCommandBarControls > xCommandBarControls( new ScVbaCommandBarControls( this, mxContext, uno::Reference< container::XIndexAccess >() ) );
27600 + if( aIndex.hasValue() )
27601 + {
27602 + if( aIndex >>= nIndex )
27603 + {
27604 + uno::Reference< XCommandBarControl > xCommandBarControl( xCommandBarControls->Item( aIndex, uno::Any() ), uno::UNO_QUERY_THROW );
27605 + return uno::makeAny( xCommandBarControl );
27606 + }
27607 + else
27608 + throw uno::RuntimeException( rtl::OUString::createFromAscii( "invalid index" ), uno::Reference< uno::XInterface >() );
27609 + }
27610 + return uno::makeAny( xCommandBarControls );
27611 +}
27612 +rtl::OUString&
27613 +ScVbaCommandBarControl::getServiceImplName()
27614 +{
27615 + static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBarControl") );
27616 + return sImplName;
27617 +}
27618 +uno::Sequence<rtl::OUString>
27619 +ScVbaCommandBarControl::getServiceNames()
27620 +{
27621 + static uno::Sequence< rtl::OUString > aServiceNames;
27622 + if ( aServiceNames.getLength() == 0 )
27623 + {
27624 + aServiceNames.realloc( 1 );
27625 + aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.CommandBarControl" ) );
27626 + }
27627 + return aServiceNames;
27628 +}
27629 +
27630 +//////////// ScVbaCommandBarPopup //////////////////////////////
27631 +ScVbaCommandBarPopup::ScVbaCommandBarPopup( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition ) throw (uno::RuntimeException) : CommandBarPopup_BASE( xParent, xContext, sName, nPosition, office::MsoControlType::msoControlPopup )
27632 +{
27633 +}
27634 +
27635 +ScVbaCommandBarPopup::ScVbaCommandBarPopup( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition, sal_Bool bTemporary ) throw (uno::RuntimeException) : CommandBarPopup_BASE( xParent, xContext, sName, nPosition, bTemporary, office::MsoControlType::msoControlPopup)
27636 +{
27637 +}
27638 +
27639 +rtl::OUString&
27640 +ScVbaCommandBarPopup::getServiceImplName()
27641 +{
27642 + static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBarPopup") );
27643 + return sImplName;
27644 +}
27645 +uno::Sequence<rtl::OUString>
27646 +ScVbaCommandBarPopup::getServiceNames()
27647 +{
27648 + static uno::Sequence< rtl::OUString > aServiceNames;
27649 + if ( aServiceNames.getLength() == 0 )
27650 + {
27651 + aServiceNames.realloc( 1 );
27652 + aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.CommandBarPopup" ) );
27653 + }
27654 + return aServiceNames;
27655 +}
27656 +
27657 +//////////// ScVbaCommandBarButton //////////////////////////////
27658 +ScVbaCommandBarButton::ScVbaCommandBarButton( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition ) throw (uno::RuntimeException) : CommandBarButton_BASE( xParent, xContext, sName, nPosition, office::MsoControlType::msoControlButton )
27659 +{
27660 +}
27661 +
27662 +ScVbaCommandBarButton::ScVbaCommandBarButton( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition, sal_Bool bTemporary ) throw (uno::RuntimeException) : CommandBarButton_BASE( xParent, xContext, sName, nPosition, bTemporary, office::MsoControlType::msoControlButton)
27663 +{
27664 +}
27665 +
27666 +rtl::OUString&
27667 +ScVbaCommandBarButton::getServiceImplName()
27668 +{
27669 + static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBarButton") );
27670 + return sImplName;
27671 +}
27672 +uno::Sequence<rtl::OUString>
27673 +ScVbaCommandBarButton::getServiceNames()
27674 +{
27675 + static uno::Sequence< rtl::OUString > aServiceNames;
27676 + if ( aServiceNames.getLength() == 0 )
27677 + {
27678 + aServiceNames.realloc( 1 );
27679 + aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.CommandBarButton" ) );
27680 + }
27681 + return aServiceNames;
27682 +}
27683 --- vbahelper/source/vbahelper/vbacommandbarcontrol.hxx.old 1970-01-01 00:00:00.000000000 +0000
27684 +++ vbahelper/source/vbahelper/vbacommandbarcontrol.hxx 2009-04-06 16:42:01.000000000 +0000
27685 @@ -0,0 +1,120 @@
27686 +/*************************************************************************
27687 + *
27688 + * OpenOffice.org - a multi-platform office productivity suite
27689 + *
27690 + * $RCSfile$
27691 + *
27692 + * $Revision$
27693 + *
27694 + * last change: $Author$ $Date$
27695 + *
27696 + * The Contents of this file are made available subject to
27697 + * the terms of GNU Lesser General Public License Version 2.1.
27698 + *
27699 + *
27700 + * GNU Lesser General Public License Version 2.1
27701 + * =============================================
27702 + * Copyright 2005 by Sun Microsystems, Inc.
27703 + * 901 San Antonio Road, Palo Alto, CA 94303, USA
27704 + *
27705 + * This library is free software; you can redistribute it and/or
27706 + * modify it under the terms of the GNU Lesser General Public
27707 + * License version 2.1, as published by the Free Software Foundation.
27708 + *
27709 + * This library is distributed in the hope that it will be useful,
27710 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
27711 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
27712 + * Lesser General Public License for more details.
27713 + *
27714 + * You should have received a copy of the GNU Lesser General Public
27715 + * License along with this library; if not, write to the Free Software
27716 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
27717 + * MA 02111-1307 USA
27718 + *
27719 + ************************************************************************/
27720 +#ifndef SC_VBA_COMMANDBARCONTROL_HXX
27721 +#define SC_VBA_COMMANDBARCONTROL_HXX
27722 +
27723 +#include <ooo/vba/XCommandBarControl.hpp>
27724 +#include <ooo/vba/XCommandBarPopup.hpp>
27725 +#include <ooo/vba/XCommandBarButton.hpp>
27726 +#include <ooo/vba/office/MsoControlType.hpp>
27727 +
27728 +#include <vbahelper/vbahelperinterface.hxx>
27729 +#include "vbacommandbarcontrols.hxx"
27730 +
27731 +typedef InheritedHelperInterfaceImpl1< ov::XCommandBarControl > CommandBarControl_BASE;
27732 +
27733 +class ScVbaCommandBarControl : public CommandBarControl_BASE
27734 +{
27735 +private:
27736 + rtl::OUString m_sName;
27737 + rtl::OUString m_sBarName;
27738 + rtl::OUString m_sCommand;
27739 + sal_Int32 m_nType;
27740 + sal_Int32 m_nPosition;
27741 + sal_Bool m_bTemporary;
27742 + sal_Bool m_bIsMenu;
27743 + ScVbaCommandBarControls* m_pCommandBarControls;
27744 + css::uno::Reference< ov::XHelperInterface > m_xParentHardRef;
27745 + css::uno::Reference< css::ui::XUIConfigurationManager > m_xUICfgManager;
27746 + css::uno::Reference< css::ui::XUIConfigurationPersistence > m_xUICfgPers;
27747 + css::uno::Reference< css::container::XIndexContainer > m_xBarSettings;
27748 + css::uno::Reference< css::container::XIndexContainer > m_xCurrentSettings;
27749 + css::beans::PropertyValues m_aPropertyValues;
27750 +
27751 + void initObjects() throw (css::uno::RuntimeException);
27752 + void createNewMenuBarControl();
27753 + void createNewToolBarControl();
27754 +public:
27755 + ScVbaCommandBarControl( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition = 0, sal_Int32 nType = ov::office::MsoControlType::msoControlButton ) throw (css::uno::RuntimeException);
27756 + ScVbaCommandBarControl( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition, sal_Bool bTemporary, sal_Int32 nType = ov::office::MsoControlType::msoControlButton ) throw (css::uno::RuntimeException);
27757 + css::uno::Reference< css::ui::XUIConfigurationManager > GetUICfgManager() { return m_xUICfgManager; };
27758 + css::uno::Reference< css::ui::XUIConfigurationPersistence > GetUICfgPers() { return m_xUICfgPers; };
27759 + css::uno::Reference< css::container::XIndexContainer > GetBarSettings() { return m_xBarSettings; };
27760 + sal_Bool IsMenu() { return m_bIsMenu; };
27761 + sal_Int32 GetPosition() { return m_nPosition; };
27762 + css::uno::Reference< css::container::XIndexContainer > GetCurrentSettings() { return m_xCurrentSettings; };
27763 + css::beans::PropertyValues GetPropertyValues() { return m_aPropertyValues; };
27764 + void SetPropertyValues( css::beans::PropertyValues aPropertyValues ) { m_aPropertyValues = aPropertyValues; };
27765 +
27766 + // Attributes
27767 + virtual ::rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException);
27768 + virtual void SAL_CALL setCaption( const ::rtl::OUString& _caption ) throw (css::uno::RuntimeException);
27769 + virtual ::rtl::OUString SAL_CALL getOnAction() throw (css::uno::RuntimeException);
27770 + virtual void SAL_CALL setOnAction( const ::rtl::OUString& _onaction ) throw (css::uno::RuntimeException);
27771 + virtual ::sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException);
27772 + virtual void SAL_CALL setVisible( ::sal_Bool _visible ) throw (css::uno::RuntimeException);
27773 +
27774 + // Methods
27775 + virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
27776 + virtual css::uno::Any SAL_CALL Controls( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
27777 +
27778 + // XHelperInterface
27779 + virtual rtl::OUString& getServiceImplName();
27780 + virtual css::uno::Sequence<rtl::OUString> getServiceNames();
27781 +};
27782 +
27783 +typedef cppu::ImplInheritanceHelper1< ScVbaCommandBarControl, ov::XCommandBarPopup > CommandBarPopup_BASE;
27784 +class ScVbaCommandBarPopup : public CommandBarPopup_BASE
27785 +{
27786 +public:
27787 + ScVbaCommandBarPopup( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition = 0 ) throw (css::uno::RuntimeException);
27788 + ScVbaCommandBarPopup( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition, sal_Bool bTemporary ) throw (css::uno::RuntimeException);
27789 + // XHelperInterface
27790 + virtual rtl::OUString& getServiceImplName();
27791 + virtual css::uno::Sequence<rtl::OUString> getServiceNames();
27792 +};
27793 +
27794 +typedef cppu::ImplInheritanceHelper1< ScVbaCommandBarControl, ov::XCommandBarButton > CommandBarButton_BASE;
27795 +class ScVbaCommandBarButton : public CommandBarButton_BASE
27796 +{
27797 +public:
27798 + ScVbaCommandBarButton( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition = 0 ) throw (css::uno::RuntimeException);
27799 + ScVbaCommandBarButton( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, rtl::OUString sName, sal_Int32 nPosition, sal_Bool bTemporary ) throw (css::uno::RuntimeException);
27800 + // XHelperInterface
27801 + virtual rtl::OUString& getServiceImplName();
27802 + virtual css::uno::Sequence<rtl::OUString> getServiceNames();
27803 +};
27804 +
27805 +#endif//SC_VBA_COMMANDBARCONTROL_HXX
27806 --- vbahelper/source/vbahelper/vbacommandbarcontrols.cxx.old 1970-01-01 00:00:00.000000000 +0000
27807 +++ vbahelper/source/vbahelper/vbacommandbarcontrols.cxx 2009-04-06 16:42:01.000000000 +0000
27808 @@ -0,0 +1,348 @@
27809 +/*************************************************************************
27810 + *
27811 + * OpenOffice.org - a multi-platform office productivity suite
27812 + *
27813 + * $RCSfile$
27814 + *
27815 + * $Revision$
27816 + *
27817 + * last change: $Author$ $Date$
27818 + *
27819 + * The Contents of this file are made available subject to
27820 + * the terms of GNU Lesser General Public License Version 2.1.
27821 + *
27822 + *
27823 + * GNU Lesser General Public License Version 2.1
27824 + * =============================================
27825 + * Copyright 2005 by Sun Microsystems, Inc.
27826 + * 901 San Antonio Road, Palo Alto, CA 94303, USA
27827 + *
27828 + * This library is free software; you can redistribute it and/or
27829 + * modify it under the terms of the GNU Lesser General Public
27830 + * License version 2.1, as published by the Free Software Foundation.
27831 + *
27832 + * This library is distributed in the hope that it will be useful,
27833 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
27834 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
27835 + * Lesser General Public License for more details.
27836 + *
27837 + * You should have received a copy of the GNU Lesser General Public
27838 + * License along with this library; if not, write to the Free Software
27839 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
27840 + * MA 02111-1307 USA
27841 + *
27842 + ************************************************************************/
27843 +#include "vbacommandbarcontrols.hxx"
27844 +#include "vbacommandbarcontrol.hxx"
27845 +
27846 +using namespace com::sun::star;
27847 +using namespace ooo::vba;
27848 +
27849 +uno::Any lcl_getPropertyValue( beans::PropertyValues aPropertyValues, rtl::OUString sPropertyName );
27850 +
27851 +typedef ::cppu::WeakImplHelper1< container::XEnumeration > CommandBarControlEnumeration_BASE;
27852 +class CommandBarControlEnumeration : public CommandBarControlEnumeration_BASE
27853 +{
27854 + //uno::Reference< uno::XComponentContext > m_xContext;
27855 + ScVbaCommandBarControls* m_pCommandBarControls;
27856 + sal_Int32 m_nCurrentPosition;
27857 +public:
27858 + CommandBarControlEnumeration( ScVbaCommandBarControls* pCommandBarControls ) : m_pCommandBarControls( pCommandBarControls ), m_nCurrentPosition( 0 ) {}
27859 + virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException )
27860 + {
27861 + if( m_nCurrentPosition < m_pCommandBarControls->getCount() )
27862 + return sal_True;
27863 + return sal_False;
27864 + }
27865 + virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException )
27866 + {
27867 + if( hasMoreElements() )
27868 + {
27869 + rtl::OUString sName = m_pCommandBarControls->GetControlNameByIndex( m_nCurrentPosition );
27870 + m_nCurrentPosition = m_nCurrentPosition + 1;
27871 + if( sName.getLength() > 0 )
27872 + return m_pCommandBarControls->createCollectionObject( uno::makeAny( sName ) );
27873 + else
27874 + return nextElement();
27875 + }
27876 + else
27877 + throw container::NoSuchElementException();
27878 + }
27879 +};
27880 +
27881 +ScVbaCommandBarControls::ScVbaCommandBarControls( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, const uno::Reference< container::XIndexAccess> xIndexAccess ) throw (uno::RuntimeException) : CommandBarControls_BASE( xParent, xContext, xIndexAccess )
27882 +{
27883 + m_bIsMenu = sal_False;
27884 + m_bHasElements = sal_False;
27885 + m_xParentHardRef.set( xParent, uno::UNO_QUERY_THROW );
27886 + m_pCommandBar = dynamic_cast< ScVbaCommandBar* >( m_xParentHardRef.get() );
27887 + m_pCommandBarControl = dynamic_cast< ScVbaCommandBarControl* >( m_xParentHardRef.get() );
27888 + if( m_pCommandBar )
27889 + {
27890 + m_xUICfgManager.set( m_pCommandBar->GetUICfgManager(), uno::UNO_QUERY_THROW );
27891 + m_xUICfgPers.set( m_pCommandBar->GetUICfgPers(), uno::UNO_QUERY_THROW );
27892 + m_xBarSettings.set( m_pCommandBar->GetBarSettings(), uno::UNO_QUERY_THROW );
27893 + m_bIsMenu = m_pCommandBar->IsMenu();
27894 + if( m_xBarSettings->hasElements() )
27895 + {
27896 + m_bHasElements = sal_True;
27897 + }
27898 + }
27899 + else if( m_pCommandBarControl )
27900 + {
27901 + m_xUICfgManager.set( m_pCommandBarControl->GetUICfgManager(), uno::UNO_QUERY_THROW );
27902 + m_xUICfgPers.set( m_pCommandBarControl->GetUICfgPers(), uno::UNO_QUERY_THROW );
27903 + beans::PropertyValues aPropertyValues;
27904 + m_pCommandBarControl->GetCurrentSettings()->getByIndex( m_pCommandBarControl->GetPosition() ) >>= aPropertyValues;
27905 + m_pCommandBarControl->SetPropertyValues( aPropertyValues );
27906 + m_xBarSettings.set( m_pCommandBarControl->GetCurrentSettings(), uno::UNO_QUERY_THROW );
27907 +
27908 + uno::Any aValue = lcl_getPropertyValue( m_pCommandBarControl->GetPropertyValues(), rtl::OUString::createFromAscii("ItemDescriptorContainer") );
27909 + if( aValue.hasValue() )
27910 + {
27911 + m_xCurrentSettings = m_pCommandBarControl->GetCurrentSettings();
27912 + m_bHasElements = sal_True;
27913 + }
27914 + else
27915 + {
27916 + m_bHasElements = sal_False;
27917 + }
27918 + m_bIsMenu = m_pCommandBarControl->IsMenu();
27919 + }
27920 + else
27921 + {
27922 + throw uno::RuntimeException( rtl::OUString::createFromAscii("Parent needs to be a ScVbaCommandBar or a ScVbaCommandBarControl"), uno::Reference< uno::XInterface >() );
27923 + }
27924 +}
27925 +rtl::OUString
27926 +ScVbaCommandBarControls::GetControlNameByIndex( const sal_Int32 nIndex ) throw ( uno::RuntimeException )
27927 +{
27928 + sal_Int32 nCount = 0;
27929 + if( m_bHasElements )
27930 + {
27931 + sal_Int32 nBarSettingsCount = m_xBarSettings->getCount();
27932 + for( sal_Int32 i = 0; i < nBarSettingsCount; i++ )
27933 + {
27934 + beans::PropertyValues aMenuValues;
27935 + m_xBarSettings->getByIndex( i ) >>= aMenuValues;
27936 + for( sal_Int32 j = 0; j < aMenuValues.getLength(); j++ )
27937 + {
27938 + if( aMenuValues[j].Name.equalsIgnoreAsciiCase( rtl::OUString::createFromAscii( "CommandURL" ) ) )
27939 + {
27940 + nCount++;
27941 + if( nIndex == nCount )
27942 + {
27943 + rtl::OUString sCommandURL;
27944 + aMenuValues[j].Value >>= sCommandURL;
27945 + sal_Int32 nLastIndex = sCommandURL.lastIndexOf( rtl::OUString::createFromAscii(":") );
27946 + if( ( nLastIndex != -1 ) && ( ( nLastIndex +1 ) < sCommandURL.getLength() ) )
27947 + {
27948 + sCommandURL = sCommandURL.copy( nLastIndex + 1 );
27949 + return sCommandURL;
27950 + }
27951 + }
27952 + }
27953 + }
27954 + }
27955 + }
27956 + else
27957 + throw uno::RuntimeException( rtl::OUString::createFromAscii( "Out of bound" ), uno::Reference< uno::XInterface >() );
27958 + return rtl::OUString();
27959 +}
27960 +
27961 +// Attributes
27962 +sal_Int32 SAL_CALL
27963 +ScVbaCommandBarControls::getCount() throw (uno::RuntimeException)
27964 +{
27965 + sal_Int32 nCount = 0;
27966 + if( m_bHasElements )
27967 + {
27968 + sal_Int32 nBarSettingsCount = m_xBarSettings->getCount();
27969 + for( sal_Int32 i = 0; i < nBarSettingsCount; i++ )
27970 + {
27971 + beans::PropertyValues aMenuValues;
27972 + m_xBarSettings->getByIndex( i ) >>= aMenuValues;
27973 + for( sal_Int32 j = 0; j < aMenuValues.getLength(); j++ )
27974 + {
27975 + if( aMenuValues[j].Name.equalsIgnoreAsciiCase( rtl::OUString::createFromAscii( "CommandURL" ) ) )
27976 + {
27977 + nCount++;
27978 + }
27979 + }
27980 + }
27981 + }
27982 + return nCount;
27983 +}
27984 +// XEnumerationAccess
27985 +uno::Type SAL_CALL
27986 +ScVbaCommandBarControls::getElementType() throw ( uno::RuntimeException )
27987 +{
27988 + return XCommandBarControls::static_type( 0 );
27989 +}
27990 +uno::Reference< container::XEnumeration >
27991 +ScVbaCommandBarControls::createEnumeration() throw ( uno::RuntimeException )
27992 +{
27993 + return uno::Reference< container::XEnumeration >( new CommandBarControlEnumeration( this ) );
27994 +}
27995 +uno::Any
27996 +ScVbaCommandBarControls::createCollectionObject( const uno::Any& aSource )
27997 +{
27998 + // only surport the aSource as a name string, because this class is a API wrapper
27999 + rtl::OUString sName;
28000 + if( aSource >>= sName )
28001 + {
28002 + uno::Reference< container::XIndexContainer > xCurrentSettings;
28003 + beans::PropertyValues aPropertyValues;
28004 + if( m_pCommandBarControl )
28005 + {
28006 + m_pCommandBarControl->GetCurrentSettings()->getByIndex( m_pCommandBarControl->GetPosition() ) >>= aPropertyValues;
28007 + xCurrentSettings.set( lcl_getPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( "ItemDescriptorContainer" ) ), uno::UNO_QUERY );
28008 + if( !xCurrentSettings.is() )
28009 + {
28010 + xCurrentSettings.set( m_xUICfgManager->getSettings( GetParentToolBarName(), sal_True ), uno::UNO_QUERY );
28011 + }
28012 + }
28013 +
28014 + sal_Int32 nPosition = -1;
28015 + for( sal_Int32 i = 0; i < xCurrentSettings->getCount(); i++ )
28016 + {
28017 + xCurrentSettings->getByIndex( i ) >>= aPropertyValues;
28018 + // Label always empty in OOo
28019 + rtl::OUString sLabel;
28020 + lcl_getPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( "Label" ) ) >>= sLabel;
28021 + if( sLabel.equalsIgnoreAsciiCase( sName ) )
28022 + {
28023 + nPosition = i;
28024 + break;
28025 + }
28026 + // using CammandURL to find
28027 + rtl::OUString sCommandURL;
28028 + lcl_getPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( "CommandURL" ) ) >>= sCommandURL;
28029 + sal_Int32 nLastIndex = sCommandURL.lastIndexOf( rtl::OUString::createFromAscii(":") );
28030 + if( ( nLastIndex != -1 ) && ( ( nLastIndex + 1 ) < sCommandURL.getLength() ) )
28031 + {
28032 + sCommandURL = sCommandURL.copy( nLastIndex + 1 );
28033 + }
28034 + if( sCommandURL.equalsIgnoreAsciiCase( sName ) )
28035 + {
28036 + nPosition = i;
28037 + break;
28038 + }
28039 + }
28040 +
28041 + if( nPosition != -1 )
28042 + {
28043 + uno::Reference< container::XIndexContainer > xSubMenu;
28044 + lcl_getPropertyValue( aPropertyValues, rtl::OUString::createFromAscii( "ItemDescriptorContainer" ) ) >>= xSubMenu;
28045 + ScVbaCommandBarControl* pNewCommandBarControl = NULL;
28046 + if( xSubMenu.is() )
28047 + pNewCommandBarControl = new ScVbaCommandBarPopup( this, mxContext, sName, nPosition );
28048 + else
28049 + pNewCommandBarControl = new ScVbaCommandBarButton( this, mxContext, sName, nPosition );
28050 +
28051 + return uno::makeAny( uno::Reference< XCommandBarControl > ( pNewCommandBarControl ) );
28052 + }
28053 + else
28054 + throw uno::RuntimeException( rtl::OUString::createFromAscii("The CommandBarControl do not exist"), uno::Reference< uno::XInterface >() );
28055 +
28056 + }
28057 + return uno::Any();
28058 +}
28059 +
28060 +// Methods
28061 +uno::Any SAL_CALL
28062 +ScVbaCommandBarControls::Item( const uno::Any& aIndex, const uno::Any& /*aIndex*/ ) throw (uno::RuntimeException)
28063 +{
28064 + if( aIndex.getValueTypeClass() == uno::TypeClass_STRING )
28065 + {
28066 + return createCollectionObject( aIndex );
28067 + }
28068 + sal_Int32 nIndex = 0;
28069 + if( aIndex >>= nIndex )
28070 + {
28071 + return createCollectionObject( uno::makeAny( GetControlNameByIndex( nIndex ) ) );
28072 + }
28073 +
28074 + return uno::Any();
28075 +}
28076 +uno::Reference< XCommandBarControl > SAL_CALL
28077 +ScVbaCommandBarControls::Add( const uno::Any& Type, const uno::Any& Id, const uno::Any& /*Parameter*/, const uno::Any& Before, const uno::Any& Temporary ) throw (script::BasicErrorException, uno::RuntimeException)
28078 +{
28079 + // Parameter is not supported
28080 + // the following name needs to be individually created;
28081 + rtl::OUString sCaption( rtl::OUString::createFromAscii("custom Control") );
28082 + rtl::OUString sCommand( rtl::OUString::createFromAscii("macro:///Standard.Module1.Test()") );
28083 + sal_Int32 nType =0;
28084 + sal_Int32 nPosition = 0;
28085 + sal_Int32 nId;
28086 + sal_Bool bTemporary = sal_True;
28087 +
28088 + if( Type.hasValue() )
28089 + if( Type >>= nType )
28090 + {
28091 + // evalute the type of the new control
28092 + }
28093 + if( Id.hasValue() )
28094 + if( Id >>= nId )
28095 + {
28096 + // evalute the action of the new control
28097 + }
28098 + if( Before.hasValue() )
28099 + Before >>= nPosition;
28100 + else
28101 + {
28102 + // if Before is ignore, the new control should be placed at the end of the commandbars;
28103 + if( m_pCommandBar )
28104 + nPosition = getCount();
28105 + else if ( m_pCommandBarControl )
28106 + {
28107 + css::uno::Reference< css::container::XIndexContainer > xCurrentSettings;
28108 + xCurrentSettings.set( lcl_getPropertyValue( m_pCommandBarControl->GetPropertyValues(), rtl::OUString::createFromAscii("ItemDescriptorContainer") ), uno::UNO_QUERY );
28109 + if( xCurrentSettings.is() )
28110 + {
28111 + nPosition = xCurrentSettings->getCount();
28112 + }
28113 + }
28114 + }
28115 + if( Temporary.hasValue() )
28116 + if( Temporary >>= bTemporary )
28117 + {
28118 + // evalute the temporary of the new Control
28119 + }
28120 +
28121 + ScVbaCommandBarControl* pNewCommandBarControl = NULL;
28122 + if( nType == office::MsoControlType::msoControlButton )
28123 + {
28124 + pNewCommandBarControl = new ScVbaCommandBarButton( this, mxContext, sCaption, nPosition, bTemporary );
28125 + }
28126 + else if ( nType == office::MsoControlType::msoControlPopup )
28127 + {
28128 + pNewCommandBarControl = new ScVbaCommandBarPopup( this, mxContext, sCaption, nPosition, bTemporary );
28129 + }
28130 + else
28131 + {
28132 + pNewCommandBarControl = new ScVbaCommandBarControl( this, mxContext, sCaption, nPosition, bTemporary );
28133 + }
28134 +
28135 + return uno::Reference< XCommandBarControl >( pNewCommandBarControl );
28136 +}
28137 +
28138 +// XHelperInterface
28139 +rtl::OUString&
28140 +ScVbaCommandBarControls::getServiceImplName()
28141 +{
28142 + static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBarControls") );
28143 + return sImplName;
28144 +}
28145 +uno::Sequence<rtl::OUString>
28146 +ScVbaCommandBarControls::getServiceNames()
28147 +{
28148 + static uno::Sequence< rtl::OUString > aServiceNames;
28149 + if ( aServiceNames.getLength() == 0 )
28150 + {
28151 + aServiceNames.realloc( 1 );
28152 + aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.CommandBarControls" ) );
28153 + }
28154 + return aServiceNames;
28155 +}
28156 +
28157 --- vbahelper/source/vbahelper/vbacommandbarcontrols.hxx.old 1970-01-01 00:00:00.000000000 +0000
28158 +++ vbahelper/source/vbahelper/vbacommandbarcontrols.hxx 2009-04-06 16:42:01.000000000 +0000
28159 @@ -0,0 +1,91 @@
28160 +/*************************************************************************
28161 + *
28162 + * OpenOffice.org - a multi-platform office productivity suite
28163 + *
28164 + * $RCSfile$
28165 + *
28166 + * $Revision$
28167 + *
28168 + * last change: $Author$ $Date$
28169 + *
28170 + * The Contents of this file are made available subject to
28171 + * the terms of GNU Lesser General Public License Version 2.1.
28172 + *
28173 + *
28174 + * GNU Lesser General Public License Version 2.1
28175 + * =============================================
28176 + * Copyright 2005 by Sun Microsystems, Inc.
28177 + * 901 San Antonio Road, Palo Alto, CA 94303, USA
28178 + *
28179 + * This library is free software; you can redistribute it and/or
28180 + * modify it under the terms of the GNU Lesser General Public
28181 + * License version 2.1, as published by the Free Software Foundation.
28182 + *
28183 + * This library is distributed in the hope that it will be useful,
28184 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
28185 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
28186 + * Lesser General Public License for more details.
28187 + *
28188 + * You should have received a copy of the GNU Lesser General Public
28189 + * License along with this library; if not, write to the Free Software
28190 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
28191 + * MA 02111-1307 USA
28192 + *
28193 + ************************************************************************/
28194 +#ifndef SC_VBA_COMMANDBARCONTROLS_HXX
28195 +#define SC_VBA_COMMANDBARCONTROLS_HXX
28196 +
28197 +#include <ooo/vba/XCommandBarControls.hpp>
28198 +
28199 +#include <vbahelper/vbahelperinterface.hxx>
28200 +#include "vbacommandbar.hxx"
28201 +#include <vbahelper/vbacollectionimpl.hxx>
28202 +
28203 +class ScVbaCommandBarControl;
28204 +
28205 +typedef CollTestImplHelper< ov::XCommandBarControls > CommandBarControls_BASE;
28206 +
28207 +class ScVbaCommandBarControls : public CommandBarControls_BASE
28208 +{
28209 +private:
28210 + sal_Bool m_bIsMenu;
28211 + sal_Bool m_bHasElements;
28212 + ScVbaCommandBar* m_pCommandBar;
28213 + ScVbaCommandBarControl* m_pCommandBarControl;
28214 + css::uno::Reference< ov::XHelperInterface > m_xParentHardRef;
28215 + css::uno::Reference< css::ui::XUIConfigurationManager > m_xUICfgManager;
28216 + css::uno::Reference< css::ui::XUIConfigurationPersistence > m_xUICfgPers;
28217 + css::uno::Reference< css::container::XIndexContainer > m_xBarSettings;
28218 + css::uno::Reference< css::container::XIndexContainer > m_xCurrentSettings;
28219 +
28220 +public:
28221 + ScVbaCommandBarControls( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, const css::uno::Reference< css::container::XIndexAccess > xIndexAccess ) throw( css::uno::RuntimeException );
28222 + css::uno::Reference< css::ui::XUIConfigurationManager > GetUICfgManager() { return m_xUICfgManager; };
28223 + css::uno::Reference< css::ui::XUIConfigurationPersistence > GetUICfgPers() { return m_xUICfgPers; };
28224 + css::uno::Reference< css::container::XIndexContainer > GetBarSettings() { return m_xBarSettings; };
28225 + sal_Bool IsMenu() { return m_bIsMenu; };
28226 + ScVbaCommandBar* GetParentCommandBar() { return m_pCommandBar; };
28227 + ScVbaCommandBarControl* GetParentCommandBarControl() { return m_pCommandBarControl; };
28228 + rtl::OUString GetParentToolBarName()
28229 + {
28230 + if( m_pCommandBar ) return m_pCommandBar->GetToolBarName();
28231 + else return rtl::OUString();
28232 + }
28233 + rtl::OUString GetControlNameByIndex( const sal_Int32 nIndex ) throw ( css::uno::RuntimeException );
28234 +
28235 + // Attributes
28236 + virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException);
28237 + // XEnumerationAccess
28238 + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
28239 + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
28240 + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
28241 +
28242 + // Methods
28243 + virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) throw (css::uno::RuntimeException);
28244 + virtual css::uno::Reference< ov::XCommandBarControl > SAL_CALL Add( const css::uno::Any& Type, const css::uno::Any& Id, const css::uno::Any& Parameter, const css::uno::Any& Before, const css::uno::Any& Temporary ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
28245 + // XHelperInterface
28246 + virtual rtl::OUString& getServiceImplName();
28247 + virtual css::uno::Sequence<rtl::OUString> getServiceNames();
28248 +};
28249 +
28250 +#endif//SC_VBA_COMMANDBARCONTROLS_HXX
28251 --- vbahelper/source/vbahelper/vbacommandbars.cxx.old 1970-01-01 00:00:00.000000000 +0000
28252 +++ vbahelper/source/vbahelper/vbacommandbars.cxx 2009-04-06 16:42:01.000000000 +0000
28253 @@ -0,0 +1,261 @@
28254 +/*************************************************************************
28255 + *
28256 + * OpenOffice.org - a multi-platform office productivity suite
28257 + *
28258 + * $RCSfile$
28259 + *
28260 + * $Revision$
28261 + *
28262 + * last change: $Author$ $Date$
28263 + *
28264 + * The Contents of this file are made available subject to
28265 + * the terms of GNU Lesser General Public License Version 2.1.
28266 + *
28267 + *
28268 + * GNU Lesser General Public License Version 2.1
28269 + * =============================================
28270 + * Copyright 2005 by Sun Microsystems, Inc.
28271 + * 901 San Antonio Road, Palo Alto, CA 94303, USA
28272 + *
28273 + * This library is free software; you can redistribute it and/or
28274 + * modify it under the terms of the GNU Lesser General Public
28275 + * License version 2.1, as published by the Free Software Foundation.
28276 + *
28277 + * This library is distributed in the hope that it will be useful,
28278 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
28279 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
28280 + * Lesser General Public License for more details.
28281 + *
28282 + * You should have received a copy of the GNU Lesser General Public
28283 + * License along with this library; if not, write to the Free Software
28284 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
28285 + * MA 02111-1307 USA
28286 + *
28287 + ************************************************************************/
28288 +#include <com/sun/star/lang/XServiceInfo.hpp>
28289 +#include <com/sun/star/frame/XDesktop.hpp>
28290 +#include <com/sun/star/container/XNameAccess.hpp>
28291 +
28292 +#include "vbacommandbars.hxx"
28293 +#include "vbacommandbar.hxx"
28294 +
28295 +using namespace com::sun::star;
28296 +using namespace ooo::vba;
28297 +
28298 +typedef ::cppu::WeakImplHelper1< container::XEnumeration > CommandBarEnumeration_BASE;
28299 +
28300 +static rtl::OUString sSpreadsheetDocumentUrl( rtl::OUString::createFromAscii( "com.sun.star.sheet.SpreadsheetDocument" ) );
28301 +static rtl::OUString sTextDocumentUrl( rtl::OUString::createFromAscii( "com.sun.star.text.TextDocument" ) );
28302 +static rtl::OUString sWindowStateConfUrl( rtl::OUString::createFromAscii( "com.sun.star.ui.WindowStateConfiguration" ) );
28303 +
28304 +class CommandBarEnumeration : public CommandBarEnumeration_BASE
28305 +{
28306 + uno::Reference< uno::XComponentContext > m_xContext;
28307 + uno::Reference< XCommandBars > m_xCommandBars;
28308 + uno::Sequence< rtl::OUString > m_sNames;
28309 + sal_Int32 m_nCurrentPosition;
28310 +public:
28311 + CommandBarEnumeration( const uno::Reference< uno::XComponentContext > xContext, const uno::Reference< XCommandBars > xCommandBars, const uno::Sequence< rtl::OUString > sNames ) : m_xContext( xContext ), m_xCommandBars( xCommandBars ), m_sNames( sNames ), m_nCurrentPosition( 0 )
28312 + {
28313 + }
28314 + virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException )
28315 + {
28316 + if( m_nCurrentPosition < m_sNames.getLength() )
28317 + return sal_True;
28318 + return sal_False;
28319 + }
28320 + virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException )
28321 + {
28322 + if( hasMoreElements() )
28323 + {
28324 + rtl::OUString sName( m_sNames[ m_nCurrentPosition ] );
28325 + m_nCurrentPosition = m_nCurrentPosition + 1;
28326 + if( sName.indexOf( rtl::OUString::createFromAscii("private:resource/toolbar/") ) != -1 )
28327 + {
28328 + sal_Int32 nLastIndex = sName.lastIndexOf( rtl::OUString::createFromAscii( "/" ) );
28329 + if( ( nLastIndex != -1 ) && ( ( nLastIndex + 1 ) < sName.getLength() ) )
28330 + {
28331 + sName = sName.copy( nLastIndex + 1);
28332 + if( sName.getLength() > 0 )
28333 + {
28334 + uno::Reference< XHelperInterface > xHelperInterface( m_xCommandBars, uno::UNO_QUERY_THROW );
28335 + uno::Reference< XCommandBar > xCommandBar( new ScVbaCommandBar( xHelperInterface, m_xContext, sName, sal_True, sal_False ) );
28336 + if( xCommandBar.is() )
28337 + return uno::makeAny( xCommandBar );
28338 + else
28339 + return nextElement();
28340 + }
28341 + else
28342 + return nextElement();
28343 + }
28344 + }
28345 + else
28346 + return nextElement();
28347 + }
28348 + else
28349 + throw container::NoSuchElementException();
28350 + return uno::Any();
28351 + }
28352 +};
28353 +
28354 +
28355 +ScVbaCommandBars::ScVbaCommandBars( const uno::Reference< XHelperInterface > xParent, const uno::Reference< uno::XComponentContext > xContext, const uno::Reference< container::XIndexAccess > xIndexAccess ) : CommandBars_BASE( xParent, xContext, xIndexAccess )
28356 +{
28357 + retrieveObjects();
28358 +}
28359 +void
28360 +ScVbaCommandBars::retrieveObjects() throw ( uno::RuntimeException )
28361 +{
28362 + uno::Reference< lang::XServiceInfo > xServiceInfo( getCurrentDocument(), uno::UNO_QUERY_THROW );
28363 + if( xServiceInfo->supportsService( sSpreadsheetDocumentUrl ) )
28364 + {
28365 + m_sModuleName = sSpreadsheetDocumentUrl;
28366 + }
28367 + else if( xServiceInfo->supportsService( sTextDocumentUrl ) )
28368 + {
28369 + m_sModuleName = sTextDocumentUrl;
28370 + }
28371 + else
28372 + throw uno::RuntimeException( rtl::OUString::createFromAscii( "Unsupported Document" ), uno::Reference< uno::XInterface >() );
28373 +
28374 + uno::Reference < lang::XMultiServiceFactory > xMSF( mxContext->getServiceManager(), uno::UNO_QUERY_THROW );
28375 + uno::Reference < container::XNameAccess > xNameAccess( xMSF->createInstance( sWindowStateConfUrl ), uno::UNO_QUERY_THROW );
28376 + m_xNameAccess.set( xNameAccess->getByName( m_sModuleName ), uno::UNO_QUERY_THROW );
28377 +}
28378 +
28379 +// XEnumerationAccess
28380 +uno::Type SAL_CALL
28381 +ScVbaCommandBars::getElementType() throw ( uno::RuntimeException )
28382 +{
28383 + return XCommandBars::static_type( 0 );
28384 +}
28385 +uno::Reference< container::XEnumeration >
28386 +ScVbaCommandBars::createEnumeration() throw ( uno::RuntimeException )
28387 +{
28388 + return uno::Reference< container::XEnumeration >( new CommandBarEnumeration( mxContext, this, m_xNameAccess->getElementNames() ) );
28389 +}
28390 +
28391 +uno::Any
28392 +ScVbaCommandBars::createCollectionObject( const uno::Any& aSource )
28393 +{
28394 + // aSource should be a name at this time, because of the class is API wrapper.
28395 + rtl::OUString sToolBarName;
28396 + if( aSource >>= sToolBarName )
28397 + {
28398 + sToolBarName = sToolBarName.toAsciiLowerCase();
28399 + if( sToolBarName.equalsIgnoreAsciiCase( rtl::OUString::createFromAscii("Worksheet Menu Bar") ) )
28400 + {
28401 + return uno::makeAny( uno::Reference< XCommandBar > ( new ScVbaCommandBar( this, mxContext, 0 ) ) );
28402 + }
28403 + else if( sToolBarName.equalsIgnoreAsciiCase( rtl::OUString::createFromAscii("Menu Bar") ) )
28404 + {
28405 + return uno::makeAny( uno::Reference< XCommandBar > ( new ScVbaCommandBar( this, mxContext, 1 ) ) );
28406 + }
28407 + else if( checkToolBarExist( sToolBarName ) )
28408 + {
28409 + return uno::makeAny( uno::Reference< XCommandBar > (new ScVbaCommandBar( this, mxContext, sToolBarName, sal_True, sal_False ) ) );
28410 + }
28411 + }
28412 + return uno::Any();
28413 +}
28414 +
28415 +// XCommandBars
28416 +uno::Reference< XCommandBar > SAL_CALL
28417 +ScVbaCommandBars::Add( const css::uno::Any& Name, const css::uno::Any& /*Position*/, const css::uno::Any& /*MenuBar*/, const css::uno::Any& Temporary ) throw (css::script::BasicErrorException, css::uno::RuntimeException)
28418 +{
28419 + // Position - MsoBar MenuBar - sal_Bool
28420 + // Currently only the Name is supported.
28421 + rtl::OUString sName;
28422 + if( !( Name >>= sName ) )
28423 + {
28424 + sName = rtl::OUString::createFromAscii("Custom1");
28425 + }
28426 + sal_Bool bTemporary = false;
28427 + if( !( Temporary >>= bTemporary ) )
28428 + {
28429 + bTemporary = sal_True;
28430 + }
28431 + return uno::Reference< XCommandBar >( new ScVbaCommandBar( this, mxContext, sName.toAsciiLowerCase(), bTemporary, sal_True ) );
28432 +}
28433 +sal_Int32 SAL_CALL
28434 +ScVbaCommandBars::getCount() throw(css::uno::RuntimeException)
28435 +{
28436 + // Filter out all toolbars from the window collection
28437 + sal_Int32 nCount = 0;
28438 + uno::Sequence< ::rtl::OUString > allNames = m_xNameAccess->getElementNames();
28439 + for( sal_Int32 i = 0; i < allNames.getLength(); i++ )
28440 + {
28441 + if(allNames[i].indexOf( rtl::OUString::createFromAscii("private:resource/toolbar/") ) != -1 )
28442 + {
28443 + nCount++;
28444 + }
28445 + }
28446 + return nCount;
28447 +}
28448 +
28449 +// ScVbaCollectionBaseImpl
28450 +uno::Any SAL_CALL
28451 +ScVbaCommandBars::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) throw( uno::RuntimeException )
28452 +{
28453 + if( aIndex.getValueTypeClass() == uno::TypeClass_STRING )
28454 + {
28455 + return createCollectionObject( aIndex );
28456 + }
28457 +
28458 + // hardcode if "aIndex = 1" that would return "main menu".
28459 + sal_Int16 nIndex = 0;
28460 + aIndex >>= nIndex;
28461 + if( nIndex == 1 )
28462 + {
28463 + uno::Any aSource;
28464 + if( m_sModuleName.equalsIgnoreAsciiCase( sSpreadsheetDocumentUrl ) )
28465 + aSource <<= rtl::OUString::createFromAscii( "Worksheet Menu Bar" );
28466 + else if( m_sModuleName.equalsIgnoreAsciiCase( sTextDocumentUrl ) )
28467 + aSource <<= rtl::OUString::createFromAscii( "Menu Bar" );
28468 + if( aSource.hasValue() )
28469 + return createCollectionObject( aSource );
28470 + }
28471 + return uno::Any();
28472 +}
28473 +
28474 +sal_Bool
28475 +ScVbaCommandBars::checkToolBarExist( rtl::OUString sToolBarName )
28476 +{
28477 + CommandBarNameMap::const_iterator iter = mCommandBarNameMap.find( sToolBarName.toAsciiLowerCase() );
28478 + if( iter != mCommandBarNameMap.end() )
28479 + {
28480 + return sal_True;
28481 + }
28482 + uno::Sequence< ::rtl::OUString > allNames = m_xNameAccess->getElementNames();
28483 + for( sal_Int32 i = 0; i < allNames.getLength(); i++ )
28484 + {
28485 + if(allNames[i].indexOf( rtl::OUString::createFromAscii("private:resource/toolbar/") ) != -1 )
28486 + {
28487 + if( allNames[i].indexOf( sToolBarName ) != -1 )
28488 + {
28489 + return sal_True;
28490 + }
28491 + }
28492 + }
28493 + return sal_False;
28494 +}
28495 +
28496 +// XHelperInterface
28497 +rtl::OUString&
28498 +ScVbaCommandBars::getServiceImplName()
28499 +{
28500 + static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBars") );
28501 + return sImplName;
28502 +}
28503 +uno::Sequence<rtl::OUString>
28504 +ScVbaCommandBars::getServiceNames()
28505 +{
28506 + static uno::Sequence< rtl::OUString > aServiceNames;
28507 + if ( aServiceNames.getLength() == 0 )
28508 + {
28509 + aServiceNames.realloc( 1 );
28510 + aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.CommandBars" ) );
28511 + }
28512 + return aServiceNames;
28513 +}
28514 +
28515 --- vbahelper/source/vbahelper/vbacommandbars.hxx.old 1970-01-01 00:00:00.000000000 +0000
28516 +++ vbahelper/source/vbahelper/vbacommandbars.hxx 2009-04-06 16:42:01.000000000 +0000
28517 @@ -0,0 +1,79 @@
28518 +/*************************************************************************
28519 + *
28520 + * OpenOffice.org - a multi-platform office productivity suite
28521 + *
28522 + * $RCSfile$
28523 + *
28524 + * $Revision$
28525 + *
28526 + * last change: $Author$ $Date$
28527 + *
28528 + * The Contents of this file are made available subject to
28529 + * the terms of GNU Lesser General Public License Version 2.1.
28530 + *
28531 + *
28532 + * GNU Lesser General Public License Version 2.1
28533 + * =============================================
28534 + * Copyright 2005 by Sun Microsystems, Inc.
28535 + * 901 San Antonio Road, Palo Alto, CA 94303, USA
28536 + *
28537 + * This library is free software; you can redistribute it and/or
28538 + * modify it under the terms of the GNU Lesser General Public
28539 + * License version 2.1, as published by the Free Software Foundation.
28540 + *
28541 + * This library is distributed in the hope that it will be useful,
28542 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
28543 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
28544 + * Lesser General Public License for more details.
28545 + *
28546 + * You should have received a copy of the GNU Lesser General Public
28547 + * License along with this library; if not, write to the Free Software
28548 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
28549 + * MA 02111-1307 USA
28550 + *
28551 + ************************************************************************/
28552 +#ifndef SC_VBA_COMMANDBARS_HXX
28553 +#define SC_VBA_COMMANDBARS_HXX
28554 +
28555 +#include <ooo/vba/XCommandBar.hpp>
28556 +#include <ooo/vba/XCommandBars.hpp>
28557 +#include <com/sun/star/container/XNameAccess.hpp>
28558 +
28559 +#include <cppuhelper/implbase1.hxx>
28560 +
28561 +#include <vbahelper/vbahelperinterface.hxx>
28562 +#include <vbahelper/vbacollectionimpl.hxx>
28563 +
28564 +typedef CollTestImplHelper< ov::XCommandBars > CommandBars_BASE;
28565 +
28566 +class ScVbaCommandBars : public CommandBars_BASE
28567 +{
28568 +private:
28569 + css::uno::Reference< css::container::XNameAccess > m_xNameAccess;
28570 + rtl::OUString m_sModuleName;
28571 + void retrieveObjects() throw( css::uno::RuntimeException );
28572 +public:
28573 + ScVbaCommandBars( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, const css::uno::Reference< css::container::XIndexAccess > xIndexAccess );
28574 +
28575 + sal_Bool checkToolBarExist( rtl::OUString sToolBarName );
28576 + rtl::OUString GetModuleName(){ return m_sModuleName; };
28577 + css::uno::Reference< css::container::XNameAccess > GetWindows()
28578 + {
28579 + retrieveObjects();
28580 + return m_xNameAccess;
28581 + };
28582 + // XCommandBars
28583 + virtual css::uno::Reference< ov::XCommandBar > SAL_CALL Add( const css::uno::Any& Name, const css::uno::Any& Position, const css::uno::Any& MenuBar, const css::uno::Any& Temporary ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
28584 + // XEnumerationAccess
28585 + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException);
28586 + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException);
28587 + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource );
28588 +
28589 + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException);
28590 + virtual css::uno::Any SAL_CALL Item( const css::uno::Any& aIndex, const css::uno::Any& /*aIndex2*/ ) throw( css::uno::RuntimeException);
28591 + // XHelperInterface
28592 + virtual rtl::OUString& getServiceImplName();
28593 + virtual css::uno::Sequence<rtl::OUString> getServiceNames();
28594 +};
28595 +
28596 +#endif//SC_VBA_COMMANDBARS_HXX
28597 --- vbahelper/source/vbahelper/vbadocumentbase.cxx.old 1970-01-01 00:00:00.000000000 +0000
28598 +++ vbahelper/source/vbahelper/vbadocumentbase.cxx 2009-04-06 16:42:01.000000000 +0000
28599 @@ -0,0 +1,223 @@
28600 +/*************************************************************************
28601 + *
28602 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
28603 + *
28604 + * Copyright 2008 by Sun Microsystems, Inc.
28605 + *
28606 + * OpenOffice.org - a multi-platform office productivity suite
28607 + *
28608 + * $RCSfile:
28609 + * $Revision:
28610 + *
28611 + * This file is part of OpenOffice.org.
28612 + *
28613 + * OpenOffice.org is free software: you can redistribute it and/or modify
28614 + * it under the terms of the GNU Lesser General Public License version 3
28615 + * only, as published by the Free Software Foundation.
28616 + *
28617 + * OpenOffice.org is distributed in the hope that it will be useful,
28618 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
28619 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
28620 + * GNU Lesser General Public License version 3 for more details
28621 + * (a copy is included in the LICENSE file that accompanied this code).
28622 + *
28623 + * You should have received a copy of the GNU Lesser General Public License
28624 + * version 3 along with OpenOffice.org. If not, see
28625 + * <http://www.openoffice.org/license.html>
28626 + * for a copy of the LGPLv3 License.
28627 + *
28628 + ************************************************************************/
28629 +#include <vbahelper/vbadocumentbase.hxx>
28630 +#include <vbahelper/helperdecl.hxx>
28631 +#include <comphelper/unwrapargs.hxx>
28632 +
28633 +#include <com/sun/star/util/XModifiable.hpp>
28634 +#include <com/sun/star/util/XProtectable.hpp>
28635 +#include <com/sun/star/util/XCloseable.hpp>
28636 +#include <com/sun/star/frame/XStorable.hpp>
28637 +#include <com/sun/star/frame/XFrame.hpp>
28638 +#include <com/sun/star/beans/XPropertySet.hpp>
28639 +
28640 +#include <tools/urlobj.hxx>
28641 +#include <osl/file.hxx>
28642 +
28643 +using namespace ::com::sun::star;
28644 +using namespace ::ooo::vba;
28645 +
28646 +VbaDocumentBase::VbaDocumentBase( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext) :VbaDocumentBase_BASE( xParent, xContext ), mxModel(NULL)
28647 +{
28648 +}
28649 +
28650 +VbaDocumentBase::VbaDocumentBase( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, uno::Reference< frame::XModel > xModel ) : VbaDocumentBase_BASE( xParent, xContext ), mxModel( xModel )
28651 +{
28652 +}
28653 +
28654 +VbaDocumentBase::VbaDocumentBase( uno::Sequence< uno::Any> const & args,
28655 + uno::Reference< uno::XComponentContext> const & xContext ) : VbaDocumentBase_BASE( getXSomethingFromArgs< XHelperInterface >( args, 0 ), xContext ), mxModel( getXSomethingFromArgs< frame::XModel >( args, 1 ) )
28656 +{
28657 +}
28658 +
28659 +::rtl::OUString
28660 +VbaDocumentBase::getName() throw (uno::RuntimeException)
28661 +{
28662 + rtl::OUString sName = getModel()->getURL();
28663 + if ( sName.getLength() )
28664 + {
28665 +
28666 + INetURLObject aURL( getModel()->getURL() );
28667 + ::osl::File::getSystemPathFromFileURL( aURL.GetLastName(), sName );
28668 + }
28669 + else
28670 + {
28671 + const static rtl::OUString sTitle( RTL_CONSTASCII_USTRINGPARAM("Title" ) );
28672 + // process "UntitledX - $(PRODUCTNAME)"
28673 + uno::Reference< frame::XFrame > xFrame( getModel()->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW );
28674 + uno::Reference< beans::XPropertySet > xProps( xFrame, uno::UNO_QUERY_THROW );
28675 + xProps->getPropertyValue(sTitle ) >>= sName;
28676 + sal_Int32 pos = 0;
28677 + sName = sName.getToken(0,' ',pos);
28678 + }
28679 + return sName;
28680 +}
28681 +::rtl::OUString
28682 +VbaDocumentBase::getPath() throw (uno::RuntimeException)
28683 +{
28684 + INetURLObject aURL( getModel()->getURL() );
28685 + aURL.CutLastName();
28686 + return aURL.GetURLPath();
28687 +}
28688 +
28689 +::rtl::OUString
28690 +VbaDocumentBase::getFullName() throw (uno::RuntimeException)
28691 +{
28692 + INetURLObject aURL( getModel()->getURL() );
28693 + return aURL.GetURLPath();
28694 +}
28695 +void
28696 +VbaDocumentBase::Close( const uno::Any &rSaveArg, const uno::Any &rFileArg,
28697 + const uno::Any &rRouteArg ) throw (uno::RuntimeException)
28698 +{
28699 + sal_Bool bSaveChanges = sal_False;
28700 + rtl::OUString aFileName;
28701 + sal_Bool bRouteWorkbook = sal_True;
28702 +
28703 + rSaveArg >>= bSaveChanges;
28704 + sal_Bool bFileName = ( rFileArg >>= aFileName );
28705 + rRouteArg >>= bRouteWorkbook;
28706 + uno::Reference< frame::XStorable > xStorable( getModel(), uno::UNO_QUERY_THROW );
28707 + uno::Reference< util::XModifiable > xModifiable( getModel(), uno::UNO_QUERY_THROW );
28708 +
28709 + if( bSaveChanges )
28710 + {
28711 + if( xStorable->isReadonly() )
28712 + {
28713 + throw uno::RuntimeException(::rtl::OUString(
28714 + RTL_CONSTASCII_USTRINGPARAM( "Unable to save to a read only file ") ),
28715 + uno::Reference< XInterface >() );
28716 + }
28717 + if( bFileName )
28718 + xStorable->storeAsURL( aFileName, uno::Sequence< beans::PropertyValue >(0) );
28719 + else
28720 + xStorable->store();
28721 + }
28722 + else
28723 + xModifiable->setModified( false );
28724 +
28725 + uno::Reference< util::XCloseable > xCloseable( getModel(), uno::UNO_QUERY );
28726 +
28727 + if( xCloseable.is() )
28728 + // use close(boolean DeliverOwnership)
28729 +
28730 + // The boolean parameter DeliverOwnership tells objects vetoing the close process that they may
28731 + // assume ownership if they object the closure by throwing a CloseVetoException
28732 + // Here we give up ownership. To be on the safe side, catch possible veto exception anyway.
28733 + xCloseable->close(sal_True);
28734 + // If close is not supported by this model - try to dispose it.
28735 + // But if the model disagree with a reset request for the modify state
28736 + // we shouldn't do so. Otherwhise some strange things can happen.
28737 + else
28738 + {
28739 + uno::Reference< lang::XComponent > xDisposable ( getCurrentDocument(), uno::UNO_QUERY );
28740 + if ( xDisposable.is() )
28741 + xDisposable->dispose();
28742 + }
28743 +}
28744 +
28745 +void
28746 +VbaDocumentBase::Protect( const uno::Any &aPassword ) throw (uno::RuntimeException)
28747 +{
28748 + rtl::OUString rPassword;
28749 + uno::Reference< util::XProtectable > xProt( getModel(), uno::UNO_QUERY_THROW );
28750 + SC_VBA_FIXME(("Workbook::Protect stub"));
28751 + if( aPassword >>= rPassword )
28752 + xProt->protect( rPassword );
28753 + else
28754 + xProt->protect( rtl::OUString() );
28755 +}
28756 +
28757 +void
28758 +VbaDocumentBase::Unprotect( const uno::Any &aPassword ) throw (uno::RuntimeException)
28759 +{
28760 + rtl::OUString rPassword;
28761 + uno::Reference< util::XProtectable > xProt( getModel(), uno::UNO_QUERY_THROW );
28762 + if( !xProt->isProtected() )
28763 + throw uno::RuntimeException(::rtl::OUString(
28764 + RTL_CONSTASCII_USTRINGPARAM( "File is already unprotected" ) ),
28765 + uno::Reference< XInterface >() );
28766 + else
28767 + {
28768 + if( aPassword >>= rPassword )
28769 + xProt->unprotect( rPassword );
28770 + else
28771 + xProt->unprotect( rtl::OUString() );
28772 + }
28773 +}
28774 +
28775 +void
28776 +VbaDocumentBase::setSaved( sal_Bool bSave ) throw (uno::RuntimeException)
28777 +{
28778 + uno::Reference< util::XModifiable > xModifiable( getModel(), uno::UNO_QUERY_THROW );
28779 + xModifiable->setModified( bSave );
28780 +}
28781 +
28782 +sal_Bool
28783 +VbaDocumentBase::getSaved() throw (uno::RuntimeException)
28784 +{
28785 + uno::Reference< util::XModifiable > xModifiable( getModel(), uno::UNO_QUERY_THROW );
28786 + return xModifiable->isModified();
28787 +}
28788 +
28789 +void
28790 +VbaDocumentBase::Save() throw (uno::RuntimeException)
28791 +{
28792 + rtl::OUString url = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".uno:Save"));
28793 + uno::Reference< frame::XModel > xModel = getModel();
28794 + dispatchRequests(xModel,url);
28795 +}
28796 +
28797 +void
28798 +VbaDocumentBase::Activate() throw (uno::RuntimeException)
28799 +{
28800 + uno::Reference< frame::XFrame > xFrame( getModel()->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW );
28801 + xFrame->activate();
28802 +}
28803 +
28804 +rtl::OUString&
28805 +VbaDocumentBase::getServiceImplName()
28806 +{
28807 + static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("VbaDocumentBase") );
28808 + return sImplName;
28809 +}
28810 +
28811 +uno::Sequence< rtl::OUString >
28812 +VbaDocumentBase::getServiceNames()
28813 +{
28814 + static uno::Sequence< rtl::OUString > aServiceNames;
28815 + if ( aServiceNames.getLength() == 0 )
28816 + {
28817 + aServiceNames.realloc( 1 );
28818 + aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.VbaDocumentBase" ) );
28819 + }
28820 + return aServiceNames;
28821 +}
28822 +
28823 --- vbahelper/source/vbahelper/vbaglobalbase.cxx.old 1970-01-01 00:00:00.000000000 +0000
28824 +++ vbahelper/source/vbahelper/vbaglobalbase.cxx 2009-04-06 16:42:01.000000000 +0000
28825 @@ -0,0 +1,113 @@
28826 +/*************************************************************************
28827 + *
28828 + * OpenOffice.org - a multi-platform office productivity suite
28829 + *
28830 + * $RCSfile$
28831 + *
28832 + * $Revision$
28833 + *
28834 + * last change: $Author$ $Date$
28835 + *
28836 + * The Contents of this file are made available subject to
28837 + * the terms of GNU Lesser General Public License Version 2.1.
28838 + *
28839 + *
28840 + * GNU Lesser General Public License Version 2.1
28841 + * =============================================
28842 + * Copyright 2005 by Sun Microsystems, Inc.
28843 + * 901 San Antonio Road, Palo Alto, CA 94303, USA
28844 + *
28845 + * This library is free software; you can redistribute it and/or
28846 + * modify it under the terms of the GNU Lesser General Public
28847 + * License version 2.1, as published by the Free Software Foundation.
28848 + *
28849 + * This library is distributed in the hope that it will be useful,
28850 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
28851 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
28852 + * Lesser General Public License for more details.
28853 + *
28854 + * You should have received a copy of the GNU Lesser General Public
28855 + * License along with this library; if not, write to the Free Software
28856 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
28857 + * MA 02111-1307 USA
28858 + *
28859 + ************************************************************************/
28860 +#include "vbahelper/vbaglobalbase.hxx"
28861 +
28862 +#include <cppuhelper/component_context.hxx>
28863 +#include <comphelper/processfactory.hxx>
28864 +#include <com/sun/star/container/XNameContainer.hpp>
28865 +
28866 +using namespace com::sun::star;
28867 +using namespace ooo::vba;
28868 +
28869 +VbaGlobalsBase::VbaGlobalsBase(
28870 +const uno::Reference< ov::XHelperInterface >& xParent,
28871 +const uno::Reference< uno::XComponentContext >& xContext)
28872 +: Globals_BASE( xParent, xContext )
28873 +{
28874 + // overwrite context with custom one ( that contains the application )
28875 + ::cppu::ContextEntry_Init aHandlerContextInfo[] =
28876 + {
28877 + ::cppu::ContextEntry_Init( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Application" ) ), uno::Any() )
28878 + };
28879 +
28880 + mxContext = ::cppu::createComponentContext( aHandlerContextInfo, sizeof( aHandlerContextInfo ) / sizeof( aHandlerContextInfo[0] ), xContext );
28881 +
28882 +}
28883 +
28884 +void
28885 +VbaGlobalsBase::init( uno::Reference< uno::XComponentContext >const& rxContext, const uno::Any& aApplication )
28886 +{
28887 + uno::Reference< container::XNameContainer > xNameContainer( mxContext, uno::UNO_QUERY_THROW );
28888 + xNameContainer->replaceByName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Application") ), aApplication );
28889 + uno::Reference< XHelperInterface > xParent( aApplication, uno::UNO_QUERY );
28890 + mxParent = xParent;
28891 +}
28892 +
28893 +uno::Reference< uno::XInterface > SAL_CALL
28894 +VbaGlobalsBase::createInstance( const ::rtl::OUString& aServiceSpecifier ) throw (uno::Exception, uno::RuntimeException)
28895 +{
28896 + uno::Reference< uno::XInterface > xReturn;
28897 +
28898 + if ( hasServiceName( aServiceSpecifier ) )
28899 + xReturn = mxContext->getServiceManager()->createInstanceWithContext( aServiceSpecifier, mxContext );
28900 + return xReturn;
28901 +}
28902 +
28903 +uno::Reference< uno::XInterface > SAL_CALL
28904 +VbaGlobalsBase::createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const uno::Sequence< uno::Any >& Arguments ) throw (uno::Exception, uno::RuntimeException)
28905 +{
28906 +
28907 + uno::Reference< uno::XInterface > xReturn;
28908 +
28909 + if ( hasServiceName( ServiceSpecifier ) )
28910 + xReturn = mxContext->getServiceManager()->createInstanceWithArgumentsAndContext( ServiceSpecifier, Arguments, mxContext );
28911 + return xReturn;
28912 +}
28913 +
28914 +uno::Sequence< ::rtl::OUString > SAL_CALL
28915 +VbaGlobalsBase::getAvailableServiceNames( ) throw (uno::RuntimeException)
28916 +{
28917 + static const rtl::OUString names[] = {
28918 + // common
28919 + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "ooo.vba.msforms.UserForm" ) ),
28920 + };
28921 + static uno::Sequence< rtl::OUString > serviceNames( names, sizeof( names )/ sizeof( names[0] ) );
28922 + return serviceNames;
28923 +}
28924 +
28925 +bool
28926 +VbaGlobalsBase::hasServiceName( const rtl::OUString& serviceName )
28927 +{
28928 + uno::Sequence< rtl::OUString > sServiceNames( getAvailableServiceNames() );
28929 + sal_Int32 nLen = sServiceNames.getLength();
28930 + for ( sal_Int32 index = 0; index < nLen; ++index )
28931 + {
28932 + if ( sServiceNames[ index ].equals( serviceName ) )
28933 + return true;
28934 + }
28935 + return false;
28936 +}
28937 +
28938 +
28939 --- vbahelper/source/vbahelper/vbahelper.cxx.old 1970-01-01 00:00:00.000000000 +0000
28940 +++ vbahelper/source/vbahelper/vbahelper.cxx 2009-04-06 16:42:01.000000000 +0000
28941 @@ -0,0 +1,1170 @@
28942 +/*************************************************************************
28943 + *
28944 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
28945 + *
28946 + * Copyright 2008 by Sun Microsystems, Inc.
28947 + *
28948 + * OpenOffice.org - a multi-platform office productivity suite
28949 + *
28950 + * $RCSfile: vbahelper.cxx,v $
28951 + * $Revision: 1.5.32.1 $
28952 + *
28953 + * This file is part of OpenOffice.org.
28954 + *
28955 + * OpenOffice.org is free software: you can redistribute it and/or modify
28956 + * it under the terms of the GNU Lesser General Public License version 3
28957 + * only, as published by the Free Software Foundation.
28958 + *
28959 + * OpenOffice.org is distributed in the hope that it will be useful,
28960 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
28961 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
28962 + * GNU Lesser General Public License version 3 for more details
28963 + * (a copy is included in the LICENSE file that accompanied this code).
28964 + *
28965 + * You should have received a copy of the GNU Lesser General Public License
28966 + * version 3 along with OpenOffice.org. If not, see
28967 + * <http://www.openoffice.org/license.html>
28968 + * for a copy of the LGPLv3 License.
28969 + *
28970 + ************************************************************************/
28971 +#include <cppuhelper/bootstrap.hxx>
28972 +#include <com/sun/star/util/XURLTransformer.hpp>
28973 +#include <com/sun/star/frame/XDispatchProvider.hpp>
28974 +#include <com/sun/star/frame/XModel.hpp>
28975 +#include <com/sun/star/frame/XFrame.hpp>
28976 +#include <com/sun/star/frame/XDesktop.hpp>
28977 +#include <com/sun/star/frame/XController.hpp>
28978 +#include <com/sun/star/uno/XComponentContext.hpp>
28979 +#include <com/sun/star/lang/XMultiComponentFactory.hpp>
28980 +#include <com/sun/star/beans/XPropertySet.hpp>
28981 +#include <com/sun/star/beans/XIntrospection.hpp>
28982 +#include <ooo/vba/msforms/XShape.hpp>
28983 +
28984 +#include <comphelper/processfactory.hxx>
28985 +
28986 +#include <sfx2/objsh.hxx>
28987 +#include <sfx2/viewfrm.hxx>
28988 +#include <sfx2/dispatch.hxx>
28989 +#include <sfx2/app.hxx>
28990 +#include <svtools/stritem.hxx>
28991 +#include <svtools/eitem.hxx>
28992 +#include <svtools/intitem.hxx>
28993 +#include <svtools/itemset.hxx>
28994 +//#include <svtools/itempool.hxx>
28995 +#include <sfx2/docfac.hxx>
28996 +#include <sfx2/viewfac.hxx>
28997 +
28998 +#include <basic/sbx.hxx>
28999 +#include <basic/sbstar.hxx>
29000 +#include <basic/basmgr.hxx>
29001 +#include <basic/sbmod.hxx>
29002 +#include <basic/sbmeth.hxx>
29003 +#include <rtl/math.hxx>
29004 +#include <sfx2/viewsh.hxx>
29005 +#include <math.h>
29006 +#include <tools/urlobj.hxx>
29007 +#include <osl/file.hxx>
29008 +#include <toolkit/awt/vclxwindow.hxx>
29009 +#include <toolkit/helper/vclunohelper.hxx>
29010 +#include <com/sun/star/frame/XModel2.hpp>
29011 +#include <vcl/window.hxx>
29012 +#include <vcl/syswin.hxx>
29013 +#include <tools/diagnose_ex.h>
29014 +
29015 +#ifndef OOVBA_DLLIMPLEMENTATION
29016 +#define OOVBA_DLLIMPLEMENTATION
29017 +#endif
29018 +
29019 +#include <vbahelper/vbahelper.hxx>
29020 +#include <sfx2/app.hxx>
29021 +// #FIXME needs service
29022 +//#include "vbashape.hxx"
29023 +//#include "unonames.hxx"
29024 +
29025 +using namespace ::com::sun::star;
29026 +using namespace ::ooo::vba;
29027 +
29028 +#define NAME_HEIGHT "Height"
29029 +#define NAME_WIDTH "Width"
29030 +
29031 +#define POINTTO100THMILLIMETERFACTOR 35.27778
29032 +
29033 +void unoToSbxValue( SbxVariable* pVar, const uno::Any& aValue );
29034 +
29035 +uno::Any sbxToUnoValue( SbxVariable* pVar );
29036 +
29037 +
29038 +namespace ooo
29039 +{
29040 +namespace vba
29041 +{
29042 +
29043 +uno::Reference< lang::XMultiServiceFactory > getVBAServiceFactory( SfxObjectShell* pShell )
29044 +{
29045 + uno::Any aUnoVar;
29046 + if ( !pShell || ! pShell->GetBasicManager()->GetGlobalUNOConstant( "VBAGlobals", aUnoVar ) )
29047 + throw lang::IllegalArgumentException();
29048 + uno::Reference< lang::XMultiServiceFactory > xVBAFactory( aUnoVar, uno::UNO_QUERY_THROW );
29049 + return xVBAFactory;
29050 +}
29051 +
29052 +css::uno::Reference< css::uno::XInterface > createVBAUnoAPIService( SfxObjectShell* pShell, const sal_Char* _pAsciiName ) throw (css::uno::RuntimeException)
29053 +{
29054 + OSL_PRECOND( pShell, "createVBAUnoAPIService: no shell!" );
29055 + ::rtl::OUString sVarName( ::rtl::OUString::createFromAscii( _pAsciiName ) );
29056 + return getVBAServiceFactory( pShell )->createInstance( sVarName );
29057 +}
29058 +
29059 +css::uno::Reference< css::uno::XInterface > createVBAUnoAPIServiceWithArgs( SfxObjectShell* pShell, const sal_Char* _pAsciiName, const uno::Sequence< uno::Any >& aArgs ) throw ( css::uno::RuntimeException )
29060 +{
29061 + OSL_PRECOND( pShell, "createVBAUnoAPIService: no shell!" );
29062 + ::rtl::OUString sVarName( ::rtl::OUString::createFromAscii( _pAsciiName ) );
29063 + uno::Reference< uno::XInterface > xIf = getVBAServiceFactory( pShell )->createInstanceWithArguments( sVarName, aArgs );
29064 + return xIf;
29065 +}
29066 +// helper method to determine if the view ( calc ) is in print-preview mode
29067 +bool isInPrintPreview( SfxViewFrame* pView )
29068 +{
29069 + sal_uInt16 nViewNo = SID_VIEWSHELL1 - SID_VIEWSHELL0;
29070 + if ( pView->GetObjectShell()->GetFactory().GetViewFactoryCount() >
29071 +nViewNo && !pView->GetObjectShell()->IsInPlaceActive() )
29072 + {
29073 + SfxViewFactory &rViewFactory =
29074 + pView->GetObjectShell()->GetFactory().GetViewFactory(nViewNo);
29075 + if ( pView->GetCurViewId() == rViewFactory.GetOrdinal() )
29076 + return true;
29077 + }
29078 + return false;
29079 +}
29080 +#if 0
29081 +namespace excel // all in this namespace probably can be moved to sc
29082 +{
29083 +
29084 +
29085 +const ::rtl::OUString REPLACE_CELLS_WARNING( RTL_CONSTASCII_USTRINGPARAM( "ReplaceCellsWarning"));
29086 +class PasteCellsWarningReseter
29087 +{
29088 +private:
29089 + bool bInitialWarningState;
29090 + static uno::Reference< beans::XPropertySet > getGlobalSheetSettings() throw ( uno::RuntimeException )
29091 + {
29092 + static uno::Reference< beans::XPropertySet > xTmpProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
29093 + static uno::Reference<uno::XComponentContext > xContext( xTmpProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), uno::UNO_QUERY_THROW );
29094 + static uno::Reference<lang::XMultiComponentFactory > xServiceManager(
29095 + xContext->getServiceManager(), uno::UNO_QUERY_THROW );
29096 + static uno::Reference< beans::XPropertySet > xProps( xServiceManager->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.GlobalSheetSettings" ) ) ,xContext ), uno::UNO_QUERY_THROW );
29097 + return xProps;
29098 + }
29099 +
29100 + bool getReplaceCellsWarning() throw ( uno::RuntimeException )
29101 + {
29102 + sal_Bool res = sal_False;
29103 + getGlobalSheetSettings()->getPropertyValue( REPLACE_CELLS_WARNING ) >>= res;
29104 + return ( res == sal_True );
29105 + }
29106 +
29107 + void setReplaceCellsWarning( bool bState ) throw ( uno::RuntimeException )
29108 + {
29109 + getGlobalSheetSettings()->setPropertyValue( REPLACE_CELLS_WARNING, uno::makeAny( bState ) );
29110 + }
29111 +public:
29112 + PasteCellsWarningReseter() throw ( uno::RuntimeException )
29113 + {
29114 + bInitialWarningState = getReplaceCellsWarning();
29115 + if ( bInitialWarningState )
29116 + setReplaceCellsWarning( false );
29117 + }
29118 + ~PasteCellsWarningReseter()
29119 + {
29120 + if ( bInitialWarningState )
29121 + {
29122 + // don't allow dtor to throw
29123 + try
29124 + {
29125 + setReplaceCellsWarning( true );
29126 + }
29127 + catch ( uno::Exception& /*e*/ ){}
29128 + }
29129 + }
29130 +};
29131 +
29132 +void
29133 +implnPaste()
29134 +{
29135 + PasteCellsWarningReseter resetWarningBox;
29136 + ScTabViewShell* pViewShell = getCurrentBestViewShell();
29137 + if ( pViewShell )
29138 + {
29139 + pViewShell->PasteFromSystem();
29140 + pViewShell->CellContentChanged();
29141 + }
29142 +}
29143 +
29144 +
29145 +void
29146 +implnCopy()
29147 +{
29148 + ScTabViewShell* pViewShell = getCurrentBestViewShell();
29149 + if ( pViewShell )
29150 + pViewShell->CopyToClip(NULL,false,false,true);
29151 +}
29152 +
29153 +void
29154 +implnCut()
29155 +{
29156 + ScTabViewShell* pViewShell = getCurrentBestViewShell();
29157 + if ( pViewShell )
29158 + pViewShell->CutToClip( NULL, TRUE );
29159 +}
29160 +void implnPasteSpecial(SfxViewShell* pViewShell, USHORT nFlags,USHORT nFunction,sal_Bool bSkipEmpty, sal_Bool bTranspose)
29161 +{
29162 + PasteCellsWarningReseter resetWarningBox;
29163 + sal_Bool bAsLink(sal_False), bOtherDoc(sal_False);
29164 + InsCellCmd eMoveMode = INS_NONE;
29165 +
29166 + if ( !pTabViewShell )
29167 + // none active, try next best
29168 + pTabViewShell = getCurrentBestViewShell();
29169 + if ( pTabViewShell )
29170 + {
29171 + ScViewData* pView = pTabViewShell->GetViewData();
29172 + Window* pWin = ( pView != NULL ) ? pView->GetActiveWin() : NULL;
29173 + if ( pView && pWin )
29174 + {
29175 + if ( bAsLink && bOtherDoc )
29176 + pTabViewShell->PasteFromSystem(0);//SOT_FORMATSTR_ID_LINK
29177 + else
29178 + {
29179 + ScTransferObj* pOwnClip = ScTransferObj::GetOwnClipboard( pWin );
29180 + ScDocument* pDoc = NULL;
29181 + if ( pOwnClip )
29182 + pDoc = pOwnClip->GetDocument();
29183 + pTabViewShell->PasteFromClip( nFlags, pDoc,
29184 + nFunction, bSkipEmpty, bTranspose, bAsLink,
29185 + eMoveMode, IDF_NONE, TRUE );
29186 + pTabViewShell->CellContentChanged();
29187 + }
29188 + }
29189 + }
29190 +
29191 +}
29192 +
29193 +ScDocShell*
29194 +getDocShell( css::uno::Reference< css::frame::XModel>& xModel )
29195 +{
29196 + uno::Reference< uno::XInterface > xIf( xModel, uno::UNO_QUERY_THROW );
29197 + ScModelObj* pModel = dynamic_cast< ScModelObj* >( xIf.get() );
29198 + ScDocShell* pDocShell = NULL;
29199 + if ( pModel )
29200 + pDocShell = (ScDocShell*)pModel->GetEmbeddedObject();
29201 + return pDocShell;
29202 +
29203 +}
29204 +
29205 +ScTabViewShell*
29206 +getBestViewShell( css::uno::Reference< css::frame::XModel>& xModel )
29207 +{
29208 + ScDocShell* pDocShell = getDocShell( xModel );
29209 + if ( pDocShell )
29210 + return pDocShell->GetBestViewShell();
29211 + return NULL;
29212 +}
29213 +
29214 +ScTabViewShell*
29215 +getCurrentBestViewShell()
29216 +{
29217 + uno::Reference< frame::XModel > xModel = getCurrentDocument();
29218 + return getBestViewShell( xModel );
29219 +}
29220 +
29221 +SfxViewFrame*
29222 +getCurrentViewFrame()
29223 +{
29224 + ScTabViewShell* pViewShell = getCurrentBestViewShell();
29225 + if ( pViewShell )
29226 + return pViewShell->GetViewFrame();
29227 + return NULL;
29228 +}
29229 +};
29230 +
29231 +#endif
29232 +const double Millimeter::factor = 35.27778;
29233 +
29234 +uno::Reference< beans::XIntrospectionAccess >
29235 +getIntrospectionAccess( const uno::Any& aObject ) throw (uno::RuntimeException)
29236 +{
29237 + static uno::Reference< beans::XIntrospection > xIntrospection;
29238 + if( !xIntrospection.is() )
29239 + {
29240 + uno::Reference< lang::XMultiServiceFactory > xFactory( comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
29241 + xIntrospection.set( xFactory->createInstance( rtl::OUString::createFromAscii("com.sun.star.beans.Introspection") ), uno::UNO_QUERY_THROW );
29242 + }
29243 + return xIntrospection->inspect( aObject );
29244 +}
29245 +
29246 +uno::Reference< script::XTypeConverter >
29247 +getTypeConverter( const uno::Reference< uno::XComponentContext >& xContext ) throw (uno::RuntimeException)
29248 +{
29249 + static uno::Reference< script::XTypeConverter > xTypeConv( xContext->getServiceManager()->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter") ), xContext ), uno::UNO_QUERY_THROW );
29250 + return xTypeConv;
29251 +}
29252 +const uno::Any&
29253 +aNULL()
29254 +{
29255 + static uno::Any aNULLL = uno::makeAny( uno::Reference< uno::XInterface >() );
29256 + return aNULLL;
29257 +}
29258 +
29259 +void dispatchExecute(SfxViewShell* pViewShell, USHORT nSlot, SfxCallMode nCall)
29260 +{
29261 + SfxViewFrame* pViewFrame = NULL;
29262 + if ( pViewShell )
29263 + pViewFrame = pViewShell->GetViewFrame();
29264 + if ( pViewFrame )
29265 + {
29266 + SfxDispatcher* pDispatcher = pViewFrame->GetDispatcher();
29267 + if( pDispatcher )
29268 + {
29269 + pDispatcher->Execute( nSlot , nCall );
29270 + }
29271 + }
29272 +}
29273 +
29274 +void
29275 +dispatchRequests (uno::Reference< frame::XModel>& xModel,rtl::OUString & aUrl, uno::Sequence< beans::PropertyValue >& sProps )
29276 +{
29277 +
29278 + util::URL url ;
29279 + url.Complete = aUrl;
29280 + rtl::OUString emptyString = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "" ));
29281 + uno::Reference<frame::XController> xController = xModel->getCurrentController();
29282 + uno::Reference<frame::XFrame> xFrame = xController->getFrame();
29283 + uno::Reference<frame::XDispatchProvider> xDispatchProvider (xFrame,uno::UNO_QUERY_THROW);
29284 + try
29285 + {
29286 + uno::Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
29287 + uno::Reference<uno::XComponentContext > xContext( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), uno::UNO_QUERY_THROW );
29288 + if ( !xContext.is() )
29289 + {
29290 + return ;
29291 + }
29292 +
29293 + uno::Reference<lang::XMultiComponentFactory > xServiceManager(
29294 + xContext->getServiceManager() );
29295 + if ( !xServiceManager.is() )
29296 + {
29297 + return ;
29298 + }
29299 + uno::Reference<util::XURLTransformer> xParser( xServiceManager->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ) )
29300 + ,xContext), uno::UNO_QUERY_THROW );
29301 + if (!xParser.is())
29302 + return;
29303 + xParser->parseStrict (url);
29304 + }
29305 + catch ( uno::Exception & /*e*/ )
29306 + {
29307 + return ;
29308 + }
29309 +
29310 + uno::Reference<frame::XDispatch> xDispatcher = xDispatchProvider->queryDispatch(url,emptyString,0);
29311 +
29312 + uno::Sequence<beans::PropertyValue> dispatchProps(1);
29313 +
29314 + sal_Int32 nProps = sProps.getLength();
29315 + beans::PropertyValue* pDest = dispatchProps.getArray();
29316 + if ( nProps )
29317 + {
29318 + dispatchProps.realloc( nProps + 1 );
29319 + // need to reaccquire pDest after realloc
29320 + pDest = dispatchProps.getArray();
29321 + beans::PropertyValue* pSrc = sProps.getArray();
29322 + for ( sal_Int32 index=0; index<nProps; ++index, ++pSrc, ++pDest )
29323 + *pDest = *pSrc;
29324 + }
29325 +
29326 + (*pDest).Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Silent" ));
29327 + (*pDest).Value <<= (sal_Bool)sal_True;
29328 +
29329 + if (xDispatcher.is())
29330 + xDispatcher->dispatch( url, dispatchProps );
29331 +}
29332 +
29333 +void
29334 +dispatchRequests (uno::Reference< frame::XModel>& xModel,rtl::OUString & aUrl)
29335 +{
29336 + uno::Sequence<beans::PropertyValue> dispatchProps;
29337 + dispatchRequests( xModel, aUrl, dispatchProps );
29338 +}
29339 +
29340 +
29341 +
29342 + uno::Reference< frame::XModel >
29343 +getCurrentDocument() throw (uno::RuntimeException)
29344 +{
29345 + uno::Reference< frame::XModel > xModel;
29346 + SbxObject* pBasic = dynamic_cast< SbxObject* > ( SFX_APP()->GetBasic() );
29347 + SbxObject* basicChosen = pBasic ;
29348 + if ( basicChosen == NULL)
29349 + {
29350 + OSL_TRACE("getModelFromBasic() StarBASIC* is NULL" );
29351 + return xModel;
29352 + }
29353 + SbxObject* p = pBasic;
29354 + SbxObject* pParent = p->GetParent();
29355 + SbxObject* pParentParent = pParent ? pParent->GetParent() : NULL;
29356 +
29357 + if( pParentParent )
29358 + {
29359 + basicChosen = pParentParent;
29360 + }
29361 + else if( pParent )
29362 + {
29363 + basicChosen = pParent;
29364 + }
29365 +
29366 +
29367 + uno::Any aModel;
29368 + SbxVariable *pCompVar = basicChosen->Find( UniString(RTL_CONSTASCII_USTRINGPARAM("ThisComponent")), SbxCLASS_OBJECT );
29369 +
29370 + if ( pCompVar )
29371 + {
29372 + aModel = sbxToUnoValue( pCompVar );
29373 + if ( sal_False == ( aModel >>= xModel ) ||
29374 + !xModel.is() )
29375 + {
29376 + // trying last gasp try the current component
29377 + uno::Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
29378 + // test if vba service is present
29379 + uno::Reference< uno::XComponentContext > xCtx( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), uno::UNO_QUERY_THROW );
29380 + uno::Reference<lang::XMultiComponentFactory > xSMgr( xCtx->getServiceManager(), uno::UNO_QUERY_THROW );
29381 + uno::Reference< frame::XDesktop > xDesktop (xSMgr->createInstanceWithContext(::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop"), xCtx), uno::UNO_QUERY_THROW );
29382 + xModel.set( xDesktop->getCurrentComponent(), uno::UNO_QUERY );
29383 + if ( !xModel.is() )
29384 + {
29385 + throw uno::RuntimeException(
29386 + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can't extract model from basic ( its obviously not set yet ) therefore don't know the currently selected document") ), uno::Reference< uno::XInterface >() );
29387 + }
29388 + return xModel;
29389 + }
29390 + else
29391 + {
29392 + OSL_TRACE("Have model ThisComponent points to url %s",
29393 + ::rtl::OUStringToOString( xModel->getURL(),
29394 + RTL_TEXTENCODING_ASCII_US ).pData->buffer );
29395 + }
29396 + }
29397 + else
29398 + {
29399 + OSL_TRACE("Failed to get ThisComponent");
29400 + throw uno::RuntimeException(
29401 + rtl::OUString(
29402 + RTL_CONSTASCII_USTRINGPARAM(
29403 + "Can't determine the currently selected document") ),
29404 + uno::Reference< uno::XInterface >() );
29405 + }
29406 + return xModel;
29407 +}
29408 +
29409 +sal_Int32
29410 +OORGBToXLRGB( sal_Int32 nCol )
29411 +{
29412 + sal_Int32 nRed = nCol;
29413 + nRed &= 0x00FF0000;
29414 + nRed >>= 16;
29415 + sal_Int32 nGreen = nCol;
29416 + nGreen &= 0x0000FF00;
29417 + nGreen >>= 8;
29418 + sal_Int32 nBlue = nCol;
29419 + nBlue &= 0x000000FF;
29420 + sal_Int32 nRGB = ( (nBlue << 16) | (nGreen << 8) | nRed );
29421 + return nRGB;
29422 +}
29423 +sal_Int32
29424 +XLRGBToOORGB( sal_Int32 nCol )
29425 +{
29426 + sal_Int32 nBlue = nCol;
29427 + nBlue &= 0x00FF0000;
29428 + nBlue >>= 16;
29429 + sal_Int32 nGreen = nCol;
29430 + nGreen &= 0x0000FF00;
29431 + nGreen >>= 8;
29432 + sal_Int32 nRed = nCol;
29433 + nRed &= 0x000000FF;
29434 + sal_Int32 nRGB = ( (nRed << 16) | (nGreen << 8) | nBlue );
29435 + return nRGB;
29436 +}
29437 +uno::Any
29438 +OORGBToXLRGB( const uno::Any& aCol )
29439 +{
29440 + sal_Int32 nCol;
29441 + aCol >>= nCol;
29442 + nCol = OORGBToXLRGB( nCol );
29443 + return uno::makeAny( nCol );
29444 +}
29445 +uno::Any
29446 +XLRGBToOORGB( const uno::Any& aCol )
29447 +{
29448 + sal_Int32 nCol;
29449 + aCol >>= nCol;
29450 + nCol = XLRGBToOORGB( nCol );
29451 + return uno::makeAny( nCol );
29452 +}
29453 +
29454 +void PrintOutHelper( SfxViewShell* pViewShell, 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, sal_Bool bUseSelection )
29455 +{
29456 + sal_Int32 nTo = 0;
29457 + sal_Int32 nFrom = 0;
29458 + sal_Int16 nCopies = 1;
29459 + sal_Bool bPreview = sal_False;
29460 + sal_Bool bCollate = sal_False;
29461 + sal_Bool bSelection = bUseSelection;
29462 + From >>= nFrom;
29463 + To >>= nTo;
29464 + Copies >>= nCopies;
29465 + Preview >>= bPreview;
29466 + if ( nCopies > 1 ) // Collate only useful when more that 1 copy
29467 + Collate >>= bCollate;
29468 +
29469 + rtl::OUString sRange( RTL_CONSTASCII_USTRINGPARAM( "-" ) );
29470 + rtl::OUString sFileName;
29471 +
29472 + if (( nFrom || nTo ) )
29473 + {
29474 + if ( nFrom )
29475 + sRange = ( ::rtl::OUString::valueOf( nFrom ) + sRange );
29476 + if ( nTo )
29477 + sRange += ::rtl::OUString::valueOf( nTo );
29478 + }
29479 +
29480 + if ( PrToFileName.getValue() )
29481 + {
29482 + PrToFileName >>= sFileName;
29483 + }
29484 + SfxViewFrame* pViewFrame = NULL;
29485 + if ( pViewShell )
29486 + pViewFrame = pViewShell->GetViewFrame();
29487 + if ( pViewFrame )
29488 + {
29489 + SfxAllItemSet aArgs( SFX_APP()->GetPool() );
29490 +
29491 + SfxBoolItem sfxCollate( SID_PRINT_COLLATE, bCollate );
29492 + aArgs.Put( sfxCollate, sfxCollate.Which() );
29493 + SfxInt16Item sfxCopies( SID_PRINT_COPIES, nCopies );
29494 + aArgs.Put( sfxCopies, sfxCopies.Which() );
29495 + if ( sFileName.getLength() )
29496 + {
29497 + SfxStringItem sfxFileName( SID_FILE_NAME, sFileName);
29498 + aArgs.Put( sfxFileName, sfxFileName.Which() );
29499 +
29500 + }
29501 + if ( sRange.getLength() )
29502 + {
29503 + SfxStringItem sfxRange( SID_PRINT_PAGES, sRange );
29504 + aArgs.Put( sfxRange, sfxRange.Which() );
29505 + }
29506 + SfxBoolItem sfxSelection( SID_SELECTION, bSelection );
29507 + aArgs.Put( sfxSelection, sfxSelection.Which() );
29508 + SfxBoolItem sfxAsync( SID_ASYNCHRON, sal_False );
29509 + aArgs.Put( sfxAsync, sfxAsync.Which() );
29510 + SfxDispatcher* pDispatcher = pViewFrame->GetDispatcher();
29511 +
29512 + if ( pDispatcher )
29513 + {
29514 + if ( bPreview )
29515 + {
29516 + if ( !pViewFrame->GetFrame()->IsInPlace() )
29517 + {
29518 + // #TODO is this necessary ( calc specific )
29519 +// SC_MOD()->InputEnterHandler();
29520 + pViewFrame->GetDispatcher()->Execute( SID_VIEWSHELL1, SFX_CALLMODE_SYNCHRON );
29521 + while ( isInPrintPreview( pViewFrame ) )
29522 + Application::Yield();
29523 + }
29524 + }
29525 + else
29526 + pDispatcher->Execute( (USHORT)SID_PRINTDOC, (SfxCallMode)SFX_CALLMODE_SYNCHRON, aArgs );
29527 + }
29528 +
29529 + }
29530 +
29531 + // #FIXME #TODO
29532 + // 1 ActivePrinter ( how/can we switch a printer via API? )
29533 + // 2 PrintToFile ( ms behaviour if this option is specified but no
29534 + // filename supplied 'PrToFileName' then the user will be prompted )
29535 + // 3 Need to check behaviour of Selected sheets with range ( e.g. From & To
29536 + // values ) in oOO these options are mutually exclusive
29537 + // 4 There is a pop up to do with transparent objects in the print source
29538 + // should be able to disable that via configuration for the duration
29539 + // of this method
29540 +}
29541 +
29542 + void PrintPreviewHelper( const css::uno::Any& /*EnableChanges*/, SfxViewShell* pViewShell )
29543 +{
29544 + dispatchExecute( pViewShell, SID_VIEWSHELL1 );
29545 +}
29546 +
29547 +rtl::OUString getAnyAsString( const uno::Any& pvargItem ) throw ( uno::RuntimeException )
29548 +{
29549 + uno::Type aType = pvargItem.getValueType();
29550 + uno::TypeClass eTypeClass = aType.getTypeClass();
29551 + rtl::OUString sString;
29552 + switch ( eTypeClass )
29553 + {
29554 + case uno::TypeClass_BOOLEAN:
29555 + {
29556 + sal_Bool bBool = sal_False;
29557 + pvargItem >>= bBool;
29558 + sString = rtl::OUString::valueOf( bBool );
29559 + break;
29560 + }
29561 + case uno::TypeClass_STRING:
29562 + pvargItem >>= sString;
29563 + break;
29564 + case uno::TypeClass_FLOAT:
29565 + {
29566 + float aFloat = 0;
29567 + pvargItem >>= aFloat;
29568 + sString = rtl::OUString::valueOf( aFloat );
29569 + break;
29570 + }
29571 + case uno::TypeClass_DOUBLE:
29572 + {
29573 + double aDouble = 0;
29574 + pvargItem >>= aDouble;
29575 + sString = rtl::OUString::valueOf( aDouble );
29576 + break;
29577 + }
29578 + case uno::TypeClass_SHORT:
29579 + case uno::TypeClass_LONG:
29580 + case uno::TypeClass_BYTE:
29581 + {
29582 + sal_Int32 aNum = 0;
29583 + pvargItem >>= aNum;
29584 + sString = rtl::OUString::valueOf( aNum );
29585 + break;
29586 + }
29587 +
29588 + case uno::TypeClass_HYPER:
29589 + {
29590 + sal_Int64 aHyper = 0;
29591 + pvargItem >>= aHyper;
29592 + sString = rtl::OUString::valueOf( aHyper );
29593 + break;
29594 + }
29595 + default:
29596 + throw uno::RuntimeException( rtl::OUString::createFromAscii( "Invalid type, can't convert" ), uno::Reference< uno::XInterface >() );
29597 + }
29598 + return sString;
29599 +}
29600 +
29601 +
29602 +rtl::OUString
29603 +ContainerUtilities::getUniqueName( const uno::Sequence< ::rtl::OUString >& _slist, const rtl::OUString& _sElementName, const ::rtl::OUString& _sSuffixSeparator)
29604 +{
29605 + return getUniqueName(_slist, _sElementName, _sSuffixSeparator, sal_Int32(2));
29606 +}
29607 +
29608 +rtl::OUString
29609 +ContainerUtilities::getUniqueName( const uno::Sequence< rtl::OUString >& _slist, const rtl::OUString _sElementName, const rtl::OUString& _sSuffixSeparator, sal_Int32 _nStartSuffix)
29610 +{
29611 + sal_Int32 a = _nStartSuffix;
29612 + rtl::OUString scompname = _sElementName;
29613 + bool bElementexists = true;
29614 + sal_Int32 nLen = _slist.getLength();
29615 + if ( nLen == 0 )
29616 + return _sElementName;
29617 +
29618 + while (bElementexists == true)
29619 + {
29620 + for (sal_Int32 i = 0; i < nLen; i++)
29621 + {
29622 + if (FieldInList(_slist, scompname) == -1)
29623 + {
29624 + return scompname;
29625 + }
29626 + }
29627 + scompname = _sElementName + _sSuffixSeparator + rtl::OUString::valueOf( a++ );
29628 + }
29629 + return rtl::OUString();
29630 +}
29631 +
29632 +sal_Int32
29633 +ContainerUtilities::FieldInList( const uno::Sequence< rtl::OUString >& SearchList, const rtl::OUString& SearchString )
29634 +{
29635 + sal_Int32 FieldLen = SearchList.getLength();
29636 + sal_Int32 retvalue = -1;
29637 + for (sal_Int32 i = 0; i < FieldLen; i++)
29638 + {
29639 + // I wonder why comparing lexicographically is done
29640 + // when its a match is whats interesting?
29641 + //if (SearchList[i].compareTo(SearchString) == 0)
29642 + if ( SearchList[i].equals( SearchString ) )
29643 + {
29644 + retvalue = i;
29645 + break;
29646 + }
29647 + }
29648 + return retvalue;
29649 +
29650 +}
29651 +bool NeedEsc(sal_Unicode cCode)
29652 +{
29653 + String sEsc(RTL_CONSTASCII_USTRINGPARAM(".^$+\\|{}()"));
29654 + return (STRING_NOTFOUND != sEsc.Search(cCode));
29655 +}
29656 +
29657 +rtl::OUString VBAToRegexp(const rtl::OUString &rIn, bool bForLike )
29658 +{
29659 + rtl::OUStringBuffer sResult;
29660 + const sal_Unicode *start = rIn.getStr();
29661 + const sal_Unicode *end = start + rIn.getLength();
29662 +
29663 + int seenright = 0;
29664 + if ( bForLike )
29665 + sResult.append(static_cast<sal_Unicode>('^'));
29666 +
29667 + while (start < end)
29668 + {
29669 + switch (*start)
29670 + {
29671 + case '?':
29672 + sResult.append(static_cast<sal_Unicode>('.'));
29673 + start++;
29674 + break;
29675 + case '*':
29676 + sResult.append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".*")));
29677 + start++;
29678 + break;
29679 + case '#':
29680 + sResult.append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[0-9]")));
29681 + start++;
29682 + break;
29683 + case '~':
29684 + sResult.append(static_cast<sal_Unicode>('\\'));
29685 + sResult.append(*(++start));
29686 + start++;
29687 + break;
29688 + // dump the ~ and escape the next characture
29689 + case ']':
29690 + sResult.append(static_cast<sal_Unicode>('\\'));
29691 + sResult.append(*start++);
29692 + break;
29693 + case '[':
29694 + sResult.append(*start++);
29695 + seenright = 0;
29696 + while (start < end && !seenright)
29697 + {
29698 + switch (*start)
29699 + {
29700 + case '[':
29701 + case '?':
29702 + case '*':
29703 + sResult.append(static_cast<sal_Unicode>('\\'));
29704 + sResult.append(*start);
29705 + break;
29706 + case ']':
29707 + sResult.append(*start);
29708 + seenright = 1;
29709 + break;
29710 + case '!':
29711 + sResult.append(static_cast<sal_Unicode>('^'));
29712 + break;
29713 + default:
29714 + if (NeedEsc(*start))
29715 + sResult.append(static_cast<sal_Unicode>('\\'));
29716 + sResult.append(*start);
29717 + break;
29718 + }
29719 + start++;
29720 + }
29721 + break;
29722 + default:
29723 + if (NeedEsc(*start))
29724 + sResult.append(static_cast<sal_Unicode>('\\'));
29725 + sResult.append(*start++);
29726 + }
29727 + }
29728 +
29729 + if ( bForLike )
29730 + sResult.append(static_cast<sal_Unicode>('$'));
29731 +
29732 + return sResult.makeStringAndClear( );
29733 +}
29734 +
29735 +double getPixelTo100thMillimeterConversionFactor( css::uno::Reference< css::awt::XDevice >& xDevice, sal_Bool bVertical)
29736 +{
29737 + double fConvertFactor = 1.0;
29738 + if( bVertical )
29739 + {
29740 + fConvertFactor = xDevice->getInfo().PixelPerMeterY/100000;
29741 + }
29742 + else
29743 + {
29744 + fConvertFactor = xDevice->getInfo().PixelPerMeterX/100000;
29745 + }
29746 + return fConvertFactor;
29747 +}
29748 +
29749 +double PointsToPixels( css::uno::Reference< css::awt::XDevice >& xDevice, double fPoints, sal_Bool bVertical)
29750 +{
29751 + double fConvertFactor = getPixelTo100thMillimeterConversionFactor( xDevice, bVertical );
29752 + return fPoints * POINTTO100THMILLIMETERFACTOR * fConvertFactor;
29753 +}
29754 +double PixelsToPoints( css::uno::Reference< css::awt::XDevice >& xDevice, double fPixels, sal_Bool bVertical)
29755 +{
29756 + double fConvertFactor = getPixelTo100thMillimeterConversionFactor( xDevice, bVertical );
29757 + return (fPixels/fConvertFactor)/POINTTO100THMILLIMETERFACTOR;
29758 +}
29759 +
29760 +ConcreteXShapeGeometryAttributes::ConcreteXShapeGeometryAttributes( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape )
29761 +{
29762 +// #FIXME needs to be an instantiable service
29763 +// m_xShape = new ScVbaShape( xContext, xShape );
29764 +}
29765 +
29766 +static uno::Reference< frame::XController > lcl_getCurrentController()
29767 +{
29768 + const uno::Reference< frame::XModel > xWorkingDoc( SfxObjectShell::GetCurrentComponent(), uno::UNO_QUERY );
29769 + uno::Reference< frame::XController > xController;
29770 + if ( xWorkingDoc.is() )
29771 + xController.set( xWorkingDoc->getCurrentController(), uno::UNO_SET_THROW );
29772 + else
29773 + xController.set( SfxObjectShell::GetCurrentComponent(), uno::UNO_QUERY_THROW );
29774 + return xController;
29775 +}
29776 +
29777 +sal_Int32 getPointerStyle()
29778 +{
29779 + sal_Int32 nPointerStyle( POINTER_ARROW );
29780 + try
29781 + {
29782 + const uno::Reference< frame::XController > xController( lcl_getCurrentController(), uno::UNO_SET_THROW );
29783 + const uno::Reference< frame::XFrame > xFrame ( xController->getFrame(), uno::UNO_SET_THROW );
29784 + const uno::Reference< awt::XWindow > xWindow ( xFrame->getContainerWindow(), uno::UNO_SET_THROW );
29785 + // why the heck isn't there an XWindowPeer::getPointer, but a setPointer only?
29786 + const Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
29787 + if ( pWindow )
29788 + nPointerStyle = pWindow->GetSystemWindow()->GetPointer().GetStyle();
29789 + }
29790 + catch( const uno::Exception& )
29791 + {
29792 + DBG_UNHANDLED_EXCEPTION();
29793 + }
29794 + return nPointerStyle;
29795 +}
29796 +
29797 +void setCursorHelper( const Pointer& rPointer, sal_Bool bOverWrite )
29798 +{
29799 + ::std::vector< uno::Reference< frame::XController > > aControllers;
29800 +
29801 + const uno::Reference< frame::XModel2 > xModel2( SfxObjectShell::GetCurrentComponent(), uno::UNO_QUERY );
29802 + if ( xModel2.is() )
29803 + {
29804 + const uno::Reference< container::XEnumeration > xEnumControllers( xModel2->getControllers(), uno::UNO_SET_THROW );
29805 + while ( xEnumControllers->hasMoreElements() )
29806 + {
29807 + const uno::Reference< frame::XController > xController( xEnumControllers->nextElement(), uno::UNO_QUERY_THROW );
29808 + aControllers.push_back( xController );
29809 + }
29810 + }
29811 + else
29812 + {
29813 + const uno::Reference< frame::XModel > xModel( SfxObjectShell::GetCurrentComponent(), uno::UNO_QUERY );
29814 + if ( xModel.is() )
29815 + {
29816 + const uno::Reference< frame::XController > xController( xModel->getCurrentController(), uno::UNO_SET_THROW );
29817 + aControllers.push_back( xController );
29818 + }
29819 + else
29820 + {
29821 + const uno::Reference< frame::XController > xController( SfxObjectShell::GetCurrentComponent(), uno::UNO_QUERY_THROW );
29822 + aControllers.push_back( xController );
29823 + }
29824 + }
29825 +
29826 + for ( ::std::vector< uno::Reference< frame::XController > >::const_iterator controller = aControllers.begin();
29827 + controller != aControllers.end();
29828 + ++controller
29829 + )
29830 + {
29831 + const uno::Reference< frame::XFrame > xFrame ( (*controller)->getFrame(), uno::UNO_SET_THROW );
29832 + const uno::Reference< awt::XWindow > xWindow ( xFrame->getContainerWindow(), uno::UNO_SET_THROW );
29833 +
29834 + Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
29835 + OSL_ENSURE( pWindow, "ScVbaApplication::setCursor: no window!" );
29836 + if ( !pWindow )
29837 + continue;
29838 +
29839 + pWindow->GetSystemWindow()->SetPointer( rPointer );
29840 + pWindow->GetSystemWindow()->EnableChildPointerOverwrite( bOverWrite );
29841 + }
29842 +}
29843 +
29844 +String docMacroExists( SfxObjectShell* pShell, const String& sMod, const String& sMacro )
29845 +{
29846 + String sFullName;
29847 + // would use the script provider to see if the macro exists but
29848 + // called at this stage tdoc content handler stuff is not set up
29849 + // so it fails
29850 +
29851 + String sLibrary( RTL_CONSTASCII_USTRINGPARAM("Standard"));
29852 + BasicManager* pBasicMgr = pShell-> GetBasicManager();
29853 + if ( pBasicMgr )
29854 + {
29855 + if ( pBasicMgr->GetName().Len() )
29856 + sLibrary = pBasicMgr->GetName();
29857 + StarBASIC* pBasic = pBasicMgr->GetLib( sLibrary );
29858 + if ( !pBasic )
29859 + {
29860 + USHORT nId = pBasicMgr->GetLibId( sLibrary );
29861 + pBasicMgr->LoadLib( nId );
29862 + pBasic = pBasicMgr->GetLib( sLibrary );
29863 + }
29864 + if ( pBasic )
29865 + {
29866 + if ( sMod.Len() ) // we wish to find the macro is a specific module
29867 + {
29868 + SbModule* pModule = pBasic->FindModule( sMod );
29869 + if ( pModule )
29870 + {
29871 + SbxArray* pMethods = pModule->GetMethods();
29872 + if ( pMethods )
29873 + {
29874 + SbMethod* pMethod = static_cast< SbMethod* >( pMethods->Find( sMacro, SbxCLASS_METHOD ) );
29875 + if ( pMethod )
29876 + {
29877 + sFullName = sMacro;
29878 + sFullName.Insert( '.', 0 ).Insert( sMod, 0 ).Insert( '.', 0 ).Insert( sLibrary, 0 );
29879 + }
29880 + }
29881 + }
29882 + }
29883 + else if( SbMethod* pMethod = dynamic_cast< SbMethod* >( pBasic->Find( sMacro, SbxCLASS_METHOD ) ) )
29884 + {
29885 + if( SbModule* pModule = pMethod->GetModule() )
29886 + {
29887 + sFullName = sMacro;
29888 + sFullName.Insert( '.', 0 ).Insert( pModule->GetName(), 0).Insert( '.', 0 ).Insert( sLibrary, 0 );
29889 + }
29890 + }
29891 +
29892 + }
29893 + }
29894 + return sFullName;
29895 +}
29896 +
29897 +#define VBA_LEFT "PositionX"
29898 +#define VBA_TOP "PositionY"
29899 +UserFormGeometryHelper::UserFormGeometryHelper( const uno::Reference< uno::XComponentContext >& /*xContext*/, const uno::Reference< awt::XControl >& xControl )
29900 +{
29901 + mxModel.set( xControl->getModel(), uno::UNO_QUERY_THROW );
29902 +}
29903 + double UserFormGeometryHelper::getLeft()
29904 + {
29905 + sal_Int32 nLeft = 0;
29906 + mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_LEFT ) ) ) >>= nLeft;
29907 + return Millimeter::getInPoints( nLeft );
29908 + }
29909 + void UserFormGeometryHelper::setLeft( double nLeft )
29910 + {
29911 + mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_LEFT ) ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nLeft ) ) );
29912 + }
29913 + double UserFormGeometryHelper::getTop()
29914 + {
29915 + sal_Int32 nTop = 0;
29916 + mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_TOP ) ) ) >>= nTop;
29917 + return Millimeter::getInPoints( nTop );
29918 + }
29919 + void UserFormGeometryHelper::setTop( double nTop )
29920 + {
29921 + mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_TOP ) ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nTop ) ) );
29922 + }
29923 + double UserFormGeometryHelper::getHeight()
29924 + {
29925 + sal_Int32 nHeight = 0;
29926 + mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( NAME_HEIGHT ) ) ) >>= nHeight;
29927 + return Millimeter::getInPoints( nHeight );
29928 + }
29929 + void UserFormGeometryHelper::setHeight( double nHeight )
29930 + {
29931 + mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( NAME_HEIGHT ) ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nHeight ) ) );
29932 + }
29933 + double UserFormGeometryHelper::getWidth()
29934 + {
29935 + sal_Int32 nWidth = 0;
29936 + mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( NAME_WIDTH ) ) ) >>= nWidth;
29937 + return Millimeter::getInPoints( nWidth );
29938 + }
29939 + void UserFormGeometryHelper::setWidth( double nWidth)
29940 + {
29941 + mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( NAME_WIDTH ) ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nWidth ) ) );
29942 + }
29943 +
29944 + double ConcreteXShapeGeometryAttributes::getLeft()
29945 + {
29946 + return m_xShape->getLeft();
29947 + }
29948 + void ConcreteXShapeGeometryAttributes::setLeft( double nLeft )
29949 + {
29950 + m_xShape->setLeft( nLeft );
29951 + }
29952 + double ConcreteXShapeGeometryAttributes::getTop()
29953 + {
29954 + return m_xShape->getTop();
29955 + }
29956 + void ConcreteXShapeGeometryAttributes::setTop( double nTop )
29957 + {
29958 + m_xShape->setTop( nTop );
29959 + }
29960 +
29961 + double ConcreteXShapeGeometryAttributes::getHeight()
29962 + {
29963 + return m_xShape->getHeight();
29964 + }
29965 + void ConcreteXShapeGeometryAttributes::setHeight( double nHeight )
29966 + {
29967 + m_xShape->setHeight( nHeight );
29968 + }
29969 + double ConcreteXShapeGeometryAttributes::getWidth()
29970 + {
29971 + return m_xShape->getWidth();
29972 + }
29973 + void ConcreteXShapeGeometryAttributes::setWidth( double nWidth)
29974 + {
29975 + m_xShape->setHeight( nWidth );
29976 + }
29977 +
29978 +
29979 + ShapeHelper::ShapeHelper( const css::uno::Reference< css::drawing::XShape >& _xShape) throw (css::script::BasicErrorException ) : xShape( _xShape )
29980 + {
29981 + if( !xShape.is() )
29982 + throw css::uno::RuntimeException( rtl::OUString::createFromAscii("No valid shape for helper"), css::uno::Reference< css::uno::XInterface >() );
29983 + }
29984 +
29985 + double ShapeHelper::getHeight()
29986 + {
29987 + return Millimeter::getInPoints(xShape->getSize().Height);
29988 + }
29989 +
29990 +
29991 + void ShapeHelper::setHeight(double _fheight) throw ( css::script::BasicErrorException )
29992 + {
29993 + try
29994 + {
29995 + css::awt::Size aSize = xShape->getSize();
29996 + aSize.Height = Millimeter::getInHundredthsOfOneMillimeter(_fheight);
29997 + xShape->setSize(aSize);
29998 + }
29999 + catch ( css::uno::Exception& /*e*/)
30000 + {
30001 + throw css::script::BasicErrorException( rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() );
30002 + }
30003 + }
30004 +
30005 +
30006 + double ShapeHelper::getWidth()
30007 + {
30008 + return Millimeter::getInPoints(xShape->getSize().Width);
30009 + }
30010 +
30011 + void ShapeHelper::setWidth(double _fWidth) throw ( css::script::BasicErrorException )
30012 + {
30013 + try
30014 + {
30015 + css::awt::Size aSize = xShape->getSize();
30016 + aSize.Width = Millimeter::getInHundredthsOfOneMillimeter(_fWidth);
30017 + xShape->setSize(aSize);
30018 + }
30019 + catch (css::uno::Exception& /*e*/)
30020 + {
30021 + throw css::script::BasicErrorException( rtl::OUString(), css::uno::Reference< css::uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() );
30022 + }
30023 + }
30024 +
30025 +
30026 + double ShapeHelper::getLeft()
30027 + {
30028 + return Millimeter::getInPoints(xShape->getPosition().X);
30029 + }
30030 +
30031 +
30032 + void ShapeHelper::setLeft(double _fLeft)
30033 + {
30034 + css::awt::Point aPoint = xShape->getPosition();
30035 + aPoint.X = Millimeter::getInHundredthsOfOneMillimeter(_fLeft);
30036 + xShape->setPosition(aPoint);
30037 + }
30038 +
30039 +
30040 + double ShapeHelper::getTop()
30041 + {
30042 + return Millimeter::getInPoints(xShape->getPosition().Y);
30043 + }
30044 +
30045 +
30046 + void ShapeHelper::setTop(double _fTop)
30047 + {
30048 + css::awt::Point aPoint = xShape->getPosition();
30049 + aPoint.Y = Millimeter::getInHundredthsOfOneMillimeter(_fTop);
30050 + xShape->setPosition(aPoint);
30051 + }
30052 +
30053 + void DebugHelper::exception( const rtl::OUString& DetailedMessage, const css::uno::Exception& ex, int err, const rtl::OUString& /*additionalArgument*/ ) throw( css::script::BasicErrorException )
30054 + {
30055 + // #TODO #FIXME ( do we want to support additionalArg here )
30056 + throw css::script::BasicErrorException( DetailedMessage.concat( rtl::OUString::createFromAscii(" ") ).concat( ex.Message ), css::uno::Reference< css::uno::XInterface >(), err, rtl::OUString() );
30057 + }
30058 +
30059 + void DebugHelper::exception( int err, const rtl::OUString& additionalArgument ) throw( css::script::BasicErrorException )
30060 + {
30061 + exception( rtl::OUString(), css::uno::Exception(), err, additionalArgument );
30062 + }
30063 + void DebugHelper::exception( css::uno::Exception& ex ) throw( css::script::BasicErrorException )
30064 + {
30065 + exception( rtl::OUString(), ex, SbERR_INTERNAL_ERROR, rtl::OUString() );
30066 + }
30067 +
30068 + Millimeter::Millimeter():m_nMillimeter(0) {}
30069 +
30070 + Millimeter::Millimeter(double mm):m_nMillimeter(mm) {}
30071 +
30072 + void Millimeter::set(double mm) { m_nMillimeter = mm; }
30073 + void Millimeter::setInPoints(double points)
30074 + {
30075 + m_nMillimeter = points * 0.352777778;
30076 + // 25.4mm / 72
30077 + }
30078 +
30079 + void Millimeter::setInHundredthsOfOneMillimeter(double hmm)
30080 + {
30081 + m_nMillimeter = hmm / 100;
30082 + }
30083 +
30084 + double Millimeter::get()
30085 + {
30086 + return m_nMillimeter;
30087 + }
30088 + double Millimeter::getInHundredthsOfOneMillimeter()
30089 + {
30090 + return m_nMillimeter * 100;
30091 + }
30092 + double Millimeter::getInPoints()
30093 + {
30094 + return m_nMillimeter * 2.834645669; // 72 / 25.4mm
30095 + }
30096 +
30097 + sal_Int32 Millimeter::getInHundredthsOfOneMillimeter(double points)
30098 + {
30099 + sal_Int32 mm = static_cast<sal_Int32>(points * factor);
30100 + return mm;
30101 + }
30102 +
30103 + double Millimeter::getInPoints(int _hmm)
30104 + {
30105 + double points = double( static_cast<double>(_hmm) / factor);
30106 + return points;
30107 + }
30108 +
30109 +
30110 +} // openoffice
30111 +} //org
30112 --- vbahelper/source/vbahelper/vbapropvalue.cxx.old 1970-01-01 00:00:00.000000000 +0000
30113 +++ vbahelper/source/vbahelper/vbapropvalue.cxx 2009-04-06 16:42:01.000000000 +0000
30114 @@ -0,0 +1,48 @@
30115 +/*************************************************************************
30116 + *
30117 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
30118 + *
30119 + * Copyright 2008 by Sun Microsystems, Inc.
30120 + *
30121 + * OpenOffice.org - a multi-platform office productivity suite
30122 + *
30123 + * $RCSfile: vbapropvalue.cxx,v $
30124 + * $Revision: 1.3 $
30125 + *
30126 + * This file is part of OpenOffice.org.
30127 + *
30128 + * OpenOffice.org is free software: you can redistribute it and/or modify
30129 + * it under the terms of the GNU Lesser General Public License version 3
30130 + * only, as published by the Free Software Foundation.
30131 + *
30132 + * OpenOffice.org is distributed in the hope that it will be useful,
30133 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
30134 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
30135 + * GNU Lesser General Public License version 3 for more details
30136 + * (a copy is included in the LICENSE file that accompanied this code).
30137 + *
30138 + * You should have received a copy of the GNU Lesser General Public License
30139 + * version 3 along with OpenOffice.org. If not, see
30140 + * <http://www.openoffice.org/license.html>
30141 + * for a copy of the LGPLv3 License.
30142 + *
30143 + ************************************************************************/
30144 +#include "vbahelper/vbapropvalue.hxx"
30145 +
30146 +using namespace com::sun::star;
30147 +
30148 +ScVbaPropValue::ScVbaPropValue( PropListener* pListener ) : m_pListener( pListener )
30149 +{
30150 +}
30151 +
30152 +css::uno::Any SAL_CALL
30153 +ScVbaPropValue::getValue() throw (css::uno::RuntimeException)
30154 +{
30155 + return m_pListener->getValueEvent();
30156 +}
30157 +
30158 +void SAL_CALL
30159 +ScVbaPropValue::setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException)
30160 +{
30161 + m_pListener->setValueEvent( _value );
30162 +}
30163 --- vbahelper/source/vbahelper/vbawindowbase.cxx.old 1970-01-01 00:00:00.000000000 +0000
30164 +++ vbahelper/source/vbahelper/vbawindowbase.cxx 2009-04-06 16:42:01.000000000 +0000
30165 @@ -0,0 +1,180 @@
30166 +/*************************************************************************
30167 + *
30168 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
30169 + *
30170 + * Copyright 2008 by Sun Microsystems, Inc.
30171 + *
30172 + * OpenOffice.org - a multi-platform office productivity suite
30173 + *
30174 + * $RCSfile:
30175 + * $Revision:
30176 + *
30177 + * This file is part of OpenOffice.org.
30178 + *
30179 + * OpenOffice.org is free software: you can redistribute it and/or modify
30180 + * it under the terms of the GNU Lesser General Public License version 3
30181 + * only, as published by the Free Software Foundation.
30182 + *
30183 + * OpenOffice.org is distributed in the hope that it will be useful,
30184 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
30185 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
30186 + * GNU Lesser General Public License version 3 for more details
30187 + * (a copy is included in the LICENSE file that accompanied this code).
30188 + *
30189 + * You should have received a copy of the GNU Lesser General Public License
30190 + * version 3 along with OpenOffice.org. If not, see
30191 + * <http://www.openoffice.org/license.html>
30192 + * for a copy of the LGPLv3 License.
30193 + *
30194 + ************************************************************************/
30195 +#include <vbahelper/helperdecl.hxx>
30196 +#include <vbahelper/vbawindowbase.hxx>
30197 +#include <com/sun/star/awt/XWindow.hpp>
30198 +#include <com/sun/star/awt/XWindow2.hpp>
30199 +#include <com/sun/star/awt/PosSize.hpp>
30200 +
30201 +using namespace ::com::sun::star;
30202 +using namespace ::ooo::vba;
30203 +
30204 +VbaWindowBase::VbaWindowBase( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : WindowBaseImpl_BASE( xParent, xContext ), m_xModel( xModel )
30205 +{
30206 +}
30207 +
30208 +VbaWindowBase::VbaWindowBase( uno::Sequence< uno::Any > const & args, uno::Reference< uno::XComponentContext > const & xContext )
30209 + : WindowBaseImpl_BASE( getXSomethingFromArgs< XHelperInterface >( args, 0 ), xContext ),
30210 + m_xModel( getXSomethingFromArgs< frame::XModel >( args, 1 ) )
30211 +{
30212 +}
30213 +
30214 +sal_Bool SAL_CALL
30215 +VbaWindowBase::getVisible() throw (uno::RuntimeException)
30216 +{
30217 + sal_Bool bVisible = sal_True;
30218 + uno::Reference< frame::XController > xController( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
30219 + uno::Reference< css::awt::XWindow > xWindow (xController->getFrame()->getContainerWindow(), uno::UNO_QUERY_THROW );
30220 + uno::Reference< css::awt::XWindow2 > xWindow2 (xWindow, uno::UNO_QUERY_THROW );
30221 + if( xWindow2.is() )
30222 + {
30223 + bVisible = xWindow2->isVisible();
30224 + }
30225 + return bVisible;
30226 +}
30227 +
30228 +void SAL_CALL
30229 +VbaWindowBase::setVisible(sal_Bool _visible) throw (uno::RuntimeException)
30230 +{
30231 + uno::Reference< frame::XController > xController( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW );
30232 + uno::Reference< css::awt::XWindow > xWindow (xController->getFrame()->getContainerWindow(), uno::UNO_QUERY_THROW );
30233 + if( xWindow.is() )
30234 + {
30235 + xWindow->setVisible( _visible );
30236 + }
30237 +}
30238 +
30239 +css::awt::Rectangle getPosSize( const uno::Reference< frame::XModel >& xModel )
30240 +{
30241 + css::awt::Rectangle aRect;
30242 + uno::Reference< frame::XController > xController( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
30243 + uno::Reference< css::awt::XWindow > xWindow (xController->getFrame()->getContainerWindow(), uno::UNO_QUERY_THROW );
30244 + if( xWindow.is() )
30245 + {
30246 + aRect = xWindow->getPosSize();
30247 + }
30248 + return aRect;
30249 +}
30250 +
30251 +void setPosSize( const uno::Reference< frame::XModel >& xModel, sal_Int32 nValue, USHORT nFlag )
30252 +{
30253 + uno::Reference< frame::XController > xController( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
30254 + uno::Reference< css::awt::XWindow > xWindow (xController->getFrame()->getContainerWindow(), uno::UNO_QUERY_THROW );
30255 + if( xWindow.is() )
30256 + {
30257 + css::awt::Rectangle aRect = xWindow->getPosSize();
30258 + switch( nFlag )
30259 + {
30260 + case css::awt::PosSize::X:
30261 + xWindow->setPosSize( nValue, aRect.Y, 0, 0, css::awt::PosSize::X );
30262 + break;
30263 + case css::awt::PosSize::Y:
30264 + xWindow->setPosSize( aRect.X, nValue, 0, 0, css::awt::PosSize::Y );
30265 + break;
30266 + case css::awt::PosSize::WIDTH:
30267 + xWindow->setPosSize( 0, 0, nValue, aRect.Height, css::awt::PosSize::WIDTH );
30268 + break;
30269 + case css::awt::PosSize::HEIGHT:
30270 + xWindow->setPosSize( 0, 0, aRect.Width, nValue, css::awt::PosSize::HEIGHT );
30271 + break;
30272 + default:
30273 + break;
30274 + }
30275 + }
30276 +}
30277 +
30278 +sal_Int32 SAL_CALL
30279 +VbaWindowBase::getHeight() throw (uno::RuntimeException)
30280 +{
30281 + css::awt::Rectangle aRect = getPosSize(m_xModel);
30282 + return aRect.Height;
30283 +}
30284 +
30285 +void SAL_CALL
30286 +VbaWindowBase::setHeight( sal_Int32 _height ) throw (uno::RuntimeException)
30287 +{
30288 + setPosSize(m_xModel, _height, css::awt::PosSize::HEIGHT);
30289 +}
30290 +
30291 +sal_Int32 SAL_CALL
30292 +VbaWindowBase::getLeft() throw (uno::RuntimeException)
30293 +{
30294 + css::awt::Rectangle aRect = getPosSize(m_xModel);
30295 + return aRect.X;
30296 +}
30297 +
30298 +void SAL_CALL
30299 +VbaWindowBase::setLeft( sal_Int32 _left ) throw (uno::RuntimeException)
30300 +{
30301 + setPosSize(m_xModel, _left, css::awt::PosSize::X);
30302 +}
30303 +sal_Int32 SAL_CALL
30304 +VbaWindowBase::getTop() throw (uno::RuntimeException)
30305 +{
30306 + css::awt::Rectangle aRect = getPosSize(m_xModel);
30307 + return aRect.Y;
30308 +}
30309 +
30310 +void SAL_CALL
30311 +VbaWindowBase::setTop( sal_Int32 _top ) throw (uno::RuntimeException)
30312 +{
30313 + setPosSize(m_xModel, _top, css::awt::PosSize::Y);
30314 +}
30315 +sal_Int32 SAL_CALL
30316 +VbaWindowBase::getWidth() throw (uno::RuntimeException)
30317 +{
30318 + css::awt::Rectangle aRect = getPosSize(m_xModel);
30319 + return aRect.Width;
30320 +}
30321 +
30322 +void SAL_CALL
30323 +VbaWindowBase::setWidth( sal_Int32 _width ) throw (uno::RuntimeException)
30324 +{
30325 + setPosSize(m_xModel, _width, css::awt::PosSize::WIDTH);
30326 +}
30327 +
30328 +rtl::OUString&
30329 +VbaWindowBase::getServiceImplName()
30330 +{
30331 + static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("VbaWindowBase") );
30332 + return sImplName;
30333 +}
30334 +
30335 +uno::Sequence< rtl::OUString >
30336 +VbaWindowBase::getServiceNames()
30337 +{
30338 + static uno::Sequence< rtl::OUString > aServiceNames;
30339 + if ( aServiceNames.getLength() == 0 )
30340 + {
30341 + aServiceNames.realloc( 1 );
30342 + aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.VbaWindowBase" ) );
30343 + }
30344 + return aServiceNames;
30345 +}
30346 --- vbahelper/util/makefile.mk.old 1970-01-01 00:00:00.000000000 +0000
30347 +++ vbahelper/util/makefile.mk 2009-04-06 16:42:01.000000000 +0000
30348 @@ -0,0 +1,97 @@
30349 +#*************************************************************************
30350 +#
30351 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
30352 +#
30353 +# Copyright 2008 by Sun Microsystems, Inc.
30354 +#
30355 +# OpenOffice.org - a multi-platform office productivity suite
30356 +#
30357 +# $RCSfile: makefile.mk,v $
30358 +#
30359 +# $Revision: 1.24 $
30360 +#
30361 +# This file is part of OpenOffice.org.
30362 +#
30363 +# OpenOffice.org is free software: you can redistribute it and/or modify
30364 +# it under the terms of the GNU Lesser General Public License version 3
30365 +# only, as published by the Free Software Foundation.
30366 +#
30367 +# OpenOffice.org is distributed in the hope that it will be useful,
30368 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
30369 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
30370 +# GNU Lesser General Public License version 3 for more details
30371 +# (a copy is included in the LICENSE file that accompanied this code).
30372 +#
30373 +# You should have received a copy of the GNU Lesser General Public License
30374 +# version 3 along with OpenOffice.org. If not, see
30375 +# <http://www.openoffice.org/license.html>
30376 +# for a copy of the LGPLv3 License.
30377 +#
30378 +#*************************************************************************
30379 +
30380 +PRJ=..
30381 +
30382 +PRJNAME=vbahelper
30383 +TARGET=vbahelper
30384 +
30385 +# --- Settings ---------------------------------------------------
30386 +
30387 +.INCLUDE : settings.mk
30388 +
30389 +
30390 +TARGET_HELPER=vbahelper
30391 +SHL1TARGET= $(TARGET_HELPER)$(DLLPOSTFIX)
30392 +SHL1IMPLIB= i$(TARGET_HELPER)
30393 +
30394 +SHL1DEF=$(MISC)$/$(SHL1TARGET).def
30395 +DEF1NAME=$(SHL1TARGET)
30396 +
30397 +LIB1FILES=$(SLB)$/$(TARGET_HELPER).lib
30398 +
30399 +# dynamic libraries
30400 +SHL1STDLIBS= \
30401 + $(CPPULIB) \
30402 + $(COMPHELPERLIB) \
30403 + $(CPPUHELPERLIB) \
30404 + $(BASICLIB) \
30405 + $(TOOLSLIB) \
30406 + $(SALLIB)\
30407 + $(SFXLIB) \
30408 + $(SVTOOLLIB) \
30409 + $(SVLLIB) \
30410 + $(VCLLIB) \
30411 + $(SVTOOLLIB) \
30412 + $(TKLIB) \
30413 +
30414 +#SHL4DEPN=$(SHL1TARGETN)
30415 +SHL1LIBS=$(LIB1FILES)
30416 +
30417 +TARGET_MSFORMS=msforms
30418 +SHL2TARGET=$(TARGET_MSFORMS)$(DLLPOSTFIX).uno
30419 +SHL2IMPLIB= i$(TARGET_MSFORMS)
30420 +
30421 +SHL2VERSIONMAP=$(TARGET_MSFORMS).map
30422 +SHL2DEF=$(MISC)$/$(SHL2TARGET).def
30423 +DEF2NAME=$(SHL2TARGET)
30424 +SHL2STDLIBS= \
30425 + $(CPPUHELPERLIB) \
30426 + $(CPPULIB) \
30427 + $(COMPHELPERLIB) \
30428 + $(SVLIB) \
30429 + $(TOOLSLIB) \
30430 + $(SALLIB)\
30431 + $(VBAHELPERLIB) \
30432 + $(SFXLIB) \
30433 + $(SVXLIB) \
30434 + $(SVTOOLLIB) \
30435 + $(SVLLIB) \
30436 + $(VCLLIB) \
30437 + $(TKLIB) \
30438 + $(BASICLIB) \
30439 +
30440 +SHL2DEPN=$(SHL1TARGETN)
30441 +SHL2LIBS=$(SLB)$/$(TARGET_MSFORMS).lib
30442 +
30443 +# --- Targets -----------------------------------------------------------
30444 +
30445 +.INCLUDE : target.mk
30446 --- vbahelper/util/msforms.map.old 1970-01-01 00:00:00.000000000 +0000
30447 +++ vbahelper/util/msforms.map 2009-04-06 16:42:01.000000000 +0000
30448 @@ -0,0 +1,9 @@
30449 +OOO_1.1 {
30450 + global:
30451 + component_getImplementationEnvironment;
30452 + component_getFactory;
30453 + component_writeInfo;
30454 +
30455 + local:
30456 + *;
30457 +};
30458 --- basic/source/uno/namecont.cxx.old 2009-04-06 16:41:59.000000000 +0000
30459 +++ basic/source/uno/namecont.cxx 2009-04-06 16:42:01.000000000 +0000
30460 @@ -2730,6 +2730,10 @@ OUString SfxLibraryContainer::expand_url
30461 {
30462 // get the standard library
30463 String aLibName( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) );
30464 +
30465 + if ( pBasMgr->GetName().Len() )
30466 + aLibName = pBasMgr->GetName();
30467 +
30468 StarBASIC* pBasic = pBasMgr->GetLib( aLibName );
30469 if( pBasic )
30470 bVBACompat = pBasic->isVBAEnabled();
30471 --- sc/inc/cellsuno.hxx.old 2009-04-02 10:45:43.000000000 +0000
30472 +++ sc/inc/cellsuno.hxx 2009-04-06 16:42:01.000000000 +0000
30473 @@ -152,8 +152,10 @@ public:
30474 namespace ooo
30475 {
30476 namespace vba {
30477 + namespace excel {
30478 class ScVbaCellRangeAccess; // Vba Helper class
30479 }
30480 + }
30481 }
30483 class SC_DLLPUBLIC ScCellRangesBase : public com::sun::star::beans::XPropertySet,
30484 @@ -175,7 +177,7 @@ class SC_DLLPUBLIC ScCellRangesBase : pu
30485 {
30486 friend class ScTabViewObj; // fuer select()
30487 friend class ScTableSheetObj; // fuer createCursorByRange()
30488 - friend class ooo::vba::ScVbaCellRangeAccess;
30489 + friend class ooo::vba::excel::ScVbaCellRangeAccess;
30491 private:
30492 SfxItemPropertySet aPropSet;
30493 --- sc/source/ui/vba/vbafont.cxx.old 2009-04-02 10:45:35.000000000 +0000
30494 +++ sc/source/ui/vba/vbafont.cxx 2009-04-06 16:42:01.000000000 +0000
30495 @@ -76,7 +76,7 @@ ScVbaFont::ScVbaFont( const uno::Referen
30496 SfxItemSet*
30497 ScVbaFont::GetDataSet()
30498 {
30499 - SfxItemSet* pDataSet = ScVbaCellRangeAccess::GetDataSet( mpRangeObj );
30500 + SfxItemSet* pDataSet = excel::ScVbaCellRangeAccess::GetDataSet( mpRangeObj );
30501 return pDataSet;
30502 }