diff options
Diffstat (limited to 'vbahelper')
88 files changed, 567 insertions, 567 deletions
diff --git a/vbahelper/inc/vbahelper/helperdecl.hxx b/vbahelper/inc/vbahelper/helperdecl.hxx index 8419be6a357e..930041d3fe1e 100644 --- a/vbahelper/inc/vbahelper/helperdecl.hxx +++ b/vbahelper/inc/vbahelper/helperdecl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ struct vba_service_class_ : public serviceimpl_base< detail::OwnServiceImpl<Impl vba_service_class_() : baseT() {} template <typename PostProcessFuncT> /** Ctor to pass a post processing function/functor. - + @tpl PostProcessDefaultT let your compiler deduce this @param postProcessFunc function/functor that gets the yet unacquired ImplT_ pointer returning a diff --git a/vbahelper/inc/vbahelper/vbaaccesshelper.hxx b/vbahelper/inc/vbahelper/vbaaccesshelper.hxx index 6d8c0ebd3c31..11afc3a0e7fa 100644 --- a/vbahelper/inc/vbahelper/vbaaccesshelper.hxx +++ b/vbahelper/inc/vbahelper/vbaaccesshelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,9 +40,9 @@ #include <vbahelper/vbadllapi.h> #include <memory> namespace css = ::com::sun::star; -namespace ooo +namespace ooo { - namespace vba + namespace vba { VBAHELPER_DLLPRIVATE inline css::uno::Reference< css::lang::XMultiServiceFactory > getVBAServiceFactory( SfxObjectShell* pShell ) diff --git a/vbahelper/inc/vbahelper/vbaapplicationbase.hxx b/vbahelper/inc/vbahelper/vbaapplicationbase.hxx index a7cd8af230c5..0a402c244ee5 100644 --- a/vbahelper/inc/vbahelper/vbaapplicationbase.hxx +++ b/vbahelper/inc/vbahelper/vbaapplicationbase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ protected: public: // XHelperInterface ( parent is itself ) virtual css::uno::Reference< ov::XHelperInterface > SAL_CALL getParent( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { return this; } - + virtual sal_Bool SAL_CALL getScreenUpdating() throw (css::uno::RuntimeException); virtual void SAL_CALL setScreenUpdating(sal_Bool bUpdate) throw (css::uno::RuntimeException); virtual sal_Bool SAL_CALL getDisplayStatusBar() throw (css::uno::RuntimeException); diff --git a/vbahelper/inc/vbahelper/vbacollectionimpl.hxx b/vbahelper/inc/vbahelper/vbacollectionimpl.hxx index 0df452f25bf9..0674ed1a7984 100644 --- a/vbahelper/inc/vbahelper/vbacollectionimpl.hxx +++ b/vbahelper/inc/vbahelper/vbacollectionimpl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - + #ifndef OOVBAAPI_VBA_COLLECTION_IMPL_HXX #define OOVBAAPI_VBA_COLLECTION_IMPL_HXX @@ -163,12 +163,12 @@ private: typename XNamedVec::iterator mIt; public: XNamedEnumerationHelper( const XNamedVec& sMap ) : mXNamedVec( sMap ), mIt( mXNamedVec.begin() ) {} - + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (css::uno::RuntimeException) { return ( mIt != mXNamedVec.end() ); } - + virtual css::uno::Any SAL_CALL nextElement( ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException) { if ( hasMoreElements() ) @@ -185,7 +185,7 @@ public: // XElementAccess virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException) { return Ifc1::static_type(0); } virtual ::sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException) { return ( mXNamedVec.size() > 0 ); } - // XNameAcess + // XNameAcess virtual css::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException) { if ( !hasByName(aName) ) @@ -201,7 +201,7 @@ public: for ( ; it != it_end; ++it, ++pString ) { - css::uno::Reference< css::container::XNamed > xName( *it, css::uno::UNO_QUERY_THROW ); + css::uno::Reference< css::container::XNamed > xName( *it, css::uno::UNO_QUERY_THROW ); *pString = xName->getName(); } return sNames; @@ -212,7 +212,7 @@ public: typename XNamedVec::iterator it_end = mXNamedVec.end(); for ( ; cachePos != it_end; ++cachePos ) { - css::uno::Reference< css::container::XNamed > xName( *cachePos, css::uno::UNO_QUERY_THROW ); + css::uno::Reference< css::container::XNamed > xName( *cachePos, css::uno::UNO_QUERY_THROW ); if ( aName.equals( xName->getName() ) ) break; } @@ -220,12 +220,12 @@ public: } // XElementAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (css::uno::RuntimeException) { return mXNamedVec.size(); } + virtual ::sal_Int32 SAL_CALL getCount( ) throw (css::uno::RuntimeException) { return mXNamedVec.size(); } virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException ) { if ( Index < 0 || Index >= getCount() ) throw css::lang::IndexOutOfBoundsException(); - + return css::uno::makeAny( mXNamedVec[ Index ] ); } @@ -263,8 +263,8 @@ protected: } } } - return createCollectionObject( m_xNameAccess->getByName( sIndex ) ); - } + return createCollectionObject( m_xNameAccess->getByName( sIndex ) ); + } virtual css::uno::Any getItemByIntIndex( const sal_Int32 nIndex ) throw (css::uno::RuntimeException) { @@ -272,13 +272,13 @@ protected: throw css::uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ScVbaCollectionBase numeric index access not supported by this object") ), css::uno::Reference< css::uno::XInterface >() ); if ( nIndex <= 0 ) { - throw css::lang::IndexOutOfBoundsException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "index is 0 or negative" ) ), + throw css::lang::IndexOutOfBoundsException( + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( + "index is 0 or negative" ) ), css::uno::Reference< css::uno::XInterface >() ); } // need to adjust for vba index ( for which first element is 1 ) - return createCollectionObject( m_xIndexAccess->getByIndex( nIndex - 1 ) ); + return createCollectionObject( m_xIndexAccess->getByIndex( nIndex - 1 ) ); } virtual void UpdateCollectionIndex( const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess ) @@ -301,7 +301,7 @@ public: if ( Index1.getValueTypeClass() != css::uno::TypeClass_STRING ) { sal_Int32 nIndex = 0; - + if ( ( Index1 >>= nIndex ) != sal_True ) { rtl::OUString message; @@ -310,12 +310,12 @@ public: throw css::lang::IndexOutOfBoundsException( message, css::uno::Reference< css::uno::XInterface >() ); } - return getItemByIntIndex( nIndex ); + return getItemByIntIndex( nIndex ); } rtl::OUString aStringSheet; Index1 >>= aStringSheet; - return getItemByStringIndex( aStringSheet ); + return getItemByStringIndex( aStringSheet ); } // XDefaultMethod ::rtl::OUString SAL_CALL getDefaultMethodName( ) throw (css::uno::RuntimeException) @@ -324,7 +324,7 @@ public: return sName; } // XEnumerationAccess - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) = 0; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) = 0; // XElementAccess virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) = 0; @@ -334,7 +334,7 @@ public: return ( m_xIndexAccess->getCount() > 0 ); } virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) = 0; - + }; typedef ::cppu::WeakImplHelper1<ov::XCollection> XCollection_InterfacesBASE; diff --git a/vbahelper/inc/vbahelper/vbadialogbase.hxx b/vbahelper/inc/vbahelper/vbadialogbase.hxx index 6353df3d01cd..acf4b7e1ddb7 100644 --- a/vbahelper/inc/vbahelper/vbadialogbase.hxx +++ b/vbahelper/inc/vbahelper/vbadialogbase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vbahelper/inc/vbahelper/vbadialogsbase.hxx b/vbahelper/inc/vbahelper/vbadialogsbase.hxx index 36c4df6ab9df..a20903094092 100644 --- a/vbahelper/inc/vbahelper/vbadialogsbase.hxx +++ b/vbahelper/inc/vbahelper/vbadialogsbase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ class VBAHELPER_DLLPUBLIC VbaDialogsBase : public VbaDialogsBase_BASE protected: css::uno::Reference< css::frame::XModel > m_xModel; public: - VbaDialogsBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > &xContext, const css::uno::Reference< css::frame::XModel >& xModel ): VbaDialogsBase_BASE( xParent, xContext ), m_xModel( xModel ) {} + VbaDialogsBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > &xContext, const css::uno::Reference< css::frame::XModel >& xModel ): VbaDialogsBase_BASE( xParent, xContext ), m_xModel( xModel ) {} virtual ~VbaDialogsBase() {} // XCollection diff --git a/vbahelper/inc/vbahelper/vbadllapi.h b/vbahelper/inc/vbahelper/vbadllapi.h index 0db6078e0cca..f3e6c5e581bf 100644 --- a/vbahelper/inc/vbahelper/vbadllapi.h +++ b/vbahelper/inc/vbahelper/vbadllapi.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vbahelper/inc/vbahelper/vbadocumentbase.hxx b/vbahelper/inc/vbahelper/vbadocumentbase.hxx index 4a7dc837bfae..f08790ab26d2 100644 --- a/vbahelper/inc/vbahelper/vbadocumentbase.hxx +++ b/vbahelper/inc/vbahelper/vbadocumentbase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,11 +40,11 @@ protected: css::uno::Reference< css::frame::XModel > mxModel; protected: virtual css::uno::Reference< css::frame::XModel > getModel() { return mxModel; } - VbaDocumentBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext); + VbaDocumentBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext); public: - VbaDocumentBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, + VbaDocumentBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, css::uno::Reference< css::frame::XModel > xModel ); - VbaDocumentBase( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext ); + VbaDocumentBase( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext >const& xContext ); virtual ~VbaDocumentBase() {} // Attributes @@ -63,7 +63,7 @@ public: virtual void SAL_CALL Unprotect( const css::uno::Any &aPassword ) throw (css::uno::RuntimeException); virtual void SAL_CALL Save() throw (css::uno::RuntimeException); virtual void SAL_CALL Activate() throw (css::uno::RuntimeException); - + // XHelperInterface virtual rtl::OUString& getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); diff --git a/vbahelper/inc/vbahelper/vbadocumentsbase.hxx b/vbahelper/inc/vbahelper/vbadocumentsbase.hxx index 4193b6f2c024..d67d96108055 100644 --- a/vbahelper/inc/vbahelper/vbadocumentsbase.hxx +++ b/vbahelper/inc/vbahelper/vbadocumentsbase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vbahelper/inc/vbahelper/vbaeventshelperbase.hxx b/vbahelper/inc/vbahelper/vbaeventshelperbase.hxx index bfd9c5df4337..3c410831ce0d 100644 --- a/vbahelper/inc/vbahelper/vbaeventshelperbase.hxx +++ b/vbahelper/inc/vbahelper/vbaeventshelperbase.hxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - + #ifndef VBAHELPER_VBAEVENTSHELPERBASE_HXX #define VBAHELPER_VBAEVENTSHELPERBASE_HXX @@ -61,7 +61,7 @@ public: protected: // ------------------------------------------------------------------------ - + enum EventHandlerType { EVENTHANDLER_GLOBAL, EVENTHANDLER_DOCUMENT }; struct EventHandlerInfo { @@ -105,7 +105,7 @@ protected: inline EventQueueEntry( sal_Int32 nEventId, const css::uno::Sequence< css::uno::Any >& rArgs ) : mnEventId( nEventId ), maArgs( rArgs ) {} }; typedef ::std::deque< EventQueueEntry > EventQueue; - + /** Derived classes return whether event processing is enabled. Throws if the instance is in an invalid state. */ virtual bool implEventsEnabled() throw (css::uno::RuntimeException) = 0; diff --git a/vbahelper/inc/vbahelper/vbafontbase.hxx b/vbahelper/inc/vbahelper/vbafontbase.hxx index e2fe222b125b..8e2ad0fd5dda 100644 --- a/vbahelper/inc/vbahelper/vbafontbase.hxx +++ b/vbahelper/inc/vbahelper/vbafontbase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,7 +65,7 @@ protected: css::uno::Reference< css::beans::XPropertySet > mxFont; css::uno::Reference< css::container::XIndexAccess > mxPalette; bool mbFormControl; - + public: VbaFontBase( const css::uno::Reference< ov::XHelperInterface >& xParent, diff --git a/vbahelper/inc/vbahelper/vbaglobalbase.hxx b/vbahelper/inc/vbahelper/vbaglobalbase.hxx index 491f8d5d244e..1f7d7a280f56 100644 --- a/vbahelper/inc/vbahelper/vbaglobalbase.hxx +++ b/vbahelper/inc/vbahelper/vbaglobalbase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ class VBAHELPER_DLLPUBLIC VbaGlobalsBase : public Globals_BASE { protected: rtl::OUString msDocCtxName; - + bool hasServiceName( const rtl::OUString& serviceName ); void init( const css::uno::Sequence< css::beans::PropertyValue >& aInitArgs ); diff --git a/vbahelper/inc/vbahelper/vbahelper.hxx b/vbahelper/inc/vbahelper/vbahelper.hxx index 8f9f6dcc1e7f..2843ce30ade0 100644 --- a/vbahelper/inc/vbahelper/vbahelper.hxx +++ b/vbahelper/inc/vbahelper/vbahelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,11 +54,11 @@ #include "vbaaccesshelper.hxx" namespace css = ::com::sun::star; -namespace ooo +namespace ooo { - namespace vba + namespace vba { - template < class T > + template < class T > css::uno::Reference< T > getXSomethingFromArgs( css::uno::Sequence< css::uno::Any > const & args, sal_Int32 nPos, bool bCanBeNull = true ) throw (css::lang::IllegalArgumentException) { if ( args.getLength() < ( nPos + 1) ) @@ -88,8 +88,8 @@ namespace ooo VBAHELPER_DLLPUBLIC sal_Int32 XLRGBToOORGB( sal_Int32 ); VBAHELPER_DLLPUBLIC css::uno::Any OORGBToXLRGB( const css::uno::Any& ); VBAHELPER_DLLPUBLIC css::uno::Any XLRGBToOORGB( const css::uno::Any& ); - // provide a NULL object that can be passed as variant so that - // the object when passed to IsNull will return true. aNULL + // provide a NULL object that can be passed as variant so that + // the object when passed to IsNull will return true. aNULL // contains an empty object reference VBAHELPER_DLLPUBLIC const css::uno::Any& aNULL(); 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 ); @@ -101,7 +101,7 @@ namespace ooo /** Extracts a boolean value from the passed Any, which may contain sal_Bool or an integer or floating-point value. Throws, if the Any is empty or contains an incompatible type. */ VBAHELPER_DLLPUBLIC bool extractBoolFromAny( const css::uno::Any& rAny ) throw (css::uno::RuntimeException); - + VBAHELPER_DLLPUBLIC rtl::OUString getAnyAsString( const css::uno::Any& pvargItem ) throw ( css::uno::RuntimeException ); 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 ) VBAHELPER_DLLPUBLIC double getPixelTo100thMillimeterConversionFactor( css::uno::Reference< css::awt::XDevice >& xDevice, sal_Bool bVertical); @@ -125,9 +125,9 @@ private: public: Millimeter(); - + Millimeter(double mm); - + void set(double mm); void setInPoints(double points) ; void setInHundredthsOfOneMillimeter(double hmm); @@ -162,21 +162,21 @@ protected: css::uno::Reference< css::drawing::XShape > xShape; public: ShapeHelper( const css::uno::Reference< css::drawing::XShape >& _xShape) throw (css::script::BasicErrorException ); - + double getHeight(); void setHeight(double _fheight) throw ( css::script::BasicErrorException ); - + double getWidth(); void setWidth(double _fWidth) throw ( css::script::BasicErrorException ); - + double getLeft(); - + void setLeft(double _fLeft); double getTop(); - + void setTop(double _fTop); }; @@ -222,7 +222,7 @@ public: class VBAHELPER_DLLPUBLIC ContainerUtilities { -public: +public: static rtl::OUString getUniqueName( const css::uno::Sequence< ::rtl::OUString >& _slist, const rtl::OUString& _sElementName, const ::rtl::OUString& _sSuffixSeparator); static rtl::OUString getUniqueName( const css::uno::Sequence< rtl::OUString >& _slist, const rtl::OUString _sElementName, const rtl::OUString& _sSuffixSeparator, sal_Int32 _nStartSuffix ); diff --git a/vbahelper/inc/vbahelper/vbahelperinterface.hxx b/vbahelper/inc/vbahelper/vbahelperinterface.hxx index 37d11b874b37..68217a63add9 100644 --- a/vbahelper/inc/vbahelper/vbahelperinterface.hxx +++ b/vbahelper/inc/vbahelper/vbahelperinterface.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,13 +38,13 @@ // use this class when you have an a object like // interface XAnInterface which contains XHelperInterface in its inheritance hierarchy // interface XAnInterface -// { +// { // interface XHelperInterface; // [attribute, string] name; // } // or // interface XAnInterface : XHelperInterface; -// { +// { // [attribute, string] name; // } // @@ -55,10 +55,10 @@ // { // public: // AnInterface( const Reference< HelperInterface >& xParent ) : AnInterfaceImpl_BASE( xParent ) {} -// // implement XAnInterface methods only, no need to implement the XHelperInterface +// // implement XAnInterface methods only, no need to implement the XHelperInterface // // methods -// virtual void setName( const OUString& ); -// virtual OUString getName(); +// virtual void setName( const OUString& ); +// virtual OUString getName(); // } // const ::rtl::OUString sHelperServiceName( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.HelperServiceBase" ) ); @@ -66,7 +66,7 @@ const ::rtl::OUString sHelperServiceName( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba. template< typename Ifc1 > class VBAHELPER_DLLPUBLIC InheritedHelperInterfaceImpl : public Ifc1 { -protected: +protected: css::uno::WeakReference< ov::XHelperInterface > mxParent; css::uno::Reference< css::uno::XComponentContext > mxContext; public: @@ -82,8 +82,8 @@ public: return 0x53756E4F; } virtual css::uno::Reference< ov::XHelperInterface > SAL_CALL getParent( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { return mxParent; } - - virtual css::uno::Any SAL_CALL Application( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { + + virtual css::uno::Any SAL_CALL Application( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { // The application could certainly be passed around in the context - seems // to make sense css::uno::Reference< css::container::XNameAccess > xNameAccess( mxContext, css::uno::UNO_QUERY_THROW ); @@ -92,18 +92,18 @@ public: // XServiceInfo Methods virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException) { return getServiceImplName(); } - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (css::uno::RuntimeException) - { + virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (css::uno::RuntimeException) + { css::uno::Sequence< rtl::OUString > sServices = getSupportedServiceNames(); const rtl::OUString* pStart = sServices.getConstArray(); const rtl::OUString* pEnd = pStart + sServices.getLength(); for ( ; pStart != pEnd ; ++pStart ) if ( (*pStart).equals( ServiceName ) ) return sal_True; - return sal_False; + return sal_False; } - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) - { + virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) + { css::uno::Sequence< rtl::OUString > aNames = getServiceNames(); return aNames; } diff --git a/vbahelper/inc/vbahelper/vbapagesetupbase.hxx b/vbahelper/inc/vbahelper/vbapagesetupbase.hxx index 44543430490c..a4294f425705 100644 --- a/vbahelper/inc/vbahelper/vbapagesetupbase.hxx +++ b/vbahelper/inc/vbahelper/vbapagesetupbase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ typedef InheritedHelperInterfaceImpl1< ooo::vba::XPageSetupBase > VbaPageSetupBase_BASE; -class VBAHELPER_DLLPUBLIC VbaPageSetupBase : public VbaPageSetupBase_BASE +class VBAHELPER_DLLPUBLIC VbaPageSetupBase : public VbaPageSetupBase_BASE { protected: css::uno::Reference< css::frame::XModel > mxModel; @@ -44,11 +44,11 @@ protected: sal_Int32 mnOrientLandscape; sal_Int32 mnOrientPortrait; - VbaPageSetupBase( const css::uno::Reference< ov::XHelperInterface >& xParent, - const css::uno::Reference< css::uno::XComponentContext >& xContext ) throw (css::uno::RuntimeException); + VbaPageSetupBase( const css::uno::Reference< ov::XHelperInterface >& xParent, + const css::uno::Reference< css::uno::XComponentContext >& xContext ) throw (css::uno::RuntimeException); public: virtual ~VbaPageSetupBase(){} - + // Attribute virtual double SAL_CALL getTopMargin() throw (css::uno::RuntimeException); virtual void SAL_CALL setTopMargin( double margin ) throw (css::uno::RuntimeException); diff --git a/vbahelper/inc/vbahelper/vbapropvalue.hxx b/vbahelper/inc/vbahelper/vbapropvalue.hxx index dbfb44419a7b..f48e034b0eec 100644 --- a/vbahelper/inc/vbahelper/vbapropvalue.hxx +++ b/vbahelper/inc/vbahelper/vbapropvalue.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,15 +34,15 @@ typedef ::cppu::WeakImplHelper1< ov::XPropValue > PropValueImpl_BASE; -class VBAHELPER_DLLPUBLIC PropListener +class VBAHELPER_DLLPUBLIC PropListener { public: virtual void setValueEvent( const css::uno::Any& value ) = 0; - virtual css::uno::Any getValueEvent() = 0; + virtual css::uno::Any getValueEvent() = 0; }; -class VBAHELPER_DLLPUBLIC ScVbaPropValue : public PropValueImpl_BASE +class VBAHELPER_DLLPUBLIC ScVbaPropValue : public PropValueImpl_BASE { PropListener* m_pListener; public: diff --git a/vbahelper/inc/vbahelper/vbashape.hxx b/vbahelper/inc/vbahelper/vbashape.hxx index 9bc507190bc4..93f670f1d5fe 100644 --- a/vbahelper/inc/vbahelper/vbashape.hxx +++ b/vbahelper/inc/vbahelper/vbashape.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vbahelper/inc/vbahelper/vbashaperange.hxx b/vbahelper/inc/vbahelper/vbashaperange.hxx index 1aad3bd9f746..7a580dac5e77 100644 --- a/vbahelper/inc/vbahelper/vbashaperange.hxx +++ b/vbahelper/inc/vbahelper/vbashaperange.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -82,7 +82,7 @@ public: virtual void SAL_CALL ZOrder( sal_Int32 ZOrderCmd ) throw (css::uno::RuntimeException); //XEnumerationAccess virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); // ScVbaCollectionBaseImpl virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); }; diff --git a/vbahelper/inc/vbahelper/vbashapes.hxx b/vbahelper/inc/vbahelper/vbashapes.hxx index 212810b907c6..86e1ba3c6f37 100644 --- a/vbahelper/inc/vbahelper/vbashapes.hxx +++ b/vbahelper/inc/vbahelper/vbashapes.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ typedef CollTestImplHelper< ov::msforms::XShapes > ScVbaShapes_BASE; class VBAHELPER_DLLPUBLIC ScVbaShapes : public ScVbaShapes_BASE { -private: +private: css::uno::Reference< css::drawing::XShapes > m_xShapes; css::uno::Reference< css::drawing::XDrawPage > m_xDrawPage; sal_Int32 m_nNewShapeCount; @@ -59,7 +59,7 @@ protected: css::uno::Any AddShape( const rtl::OUString& sService, const rtl::OUString& sName, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight ) throw (css::uno::RuntimeException); //TODO helperapi using a writer document //css::awt::Point calculateTopLeftMargin( css::uno::Reference< ov::XHelperInterface > xDocument ); - + public: ScVbaShapes( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess > xShapes, const css::uno::Reference< css::frame::XModel >& xModel ); static void setDefaultShapeProperties( css::uno::Reference< css::drawing::XShape > xShape ) throw (css::uno::RuntimeException); diff --git a/vbahelper/inc/vbahelper/vbatextframe.hxx b/vbahelper/inc/vbahelper/vbatextframe.hxx index d08902096fa6..584e2559315c 100644 --- a/vbahelper/inc/vbahelper/vbatextframe.hxx +++ b/vbahelper/inc/vbahelper/vbatextframe.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ typedef InheritedHelperInterfaceImpl1< ov::msforms::XTextFrame > VbaTextFrame_BA class VBAHELPER_DLLPUBLIC VbaTextFrame : public VbaTextFrame_BASE { -protected: +protected: css::uno::Reference< css::drawing::XShape > m_xShape; css::uno::Reference< css::beans::XPropertySet > m_xPropertySet; protected: diff --git a/vbahelper/inc/vbahelper/vbawindowbase.hxx b/vbahelper/inc/vbahelper/vbawindowbase.hxx index 963ae4d510fa..f7e68273343f 100644 --- a/vbahelper/inc/vbahelper/vbawindowbase.hxx +++ b/vbahelper/inc/vbahelper/vbawindowbase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,8 +37,8 @@ typedef InheritedHelperInterfaceImpl1<ov::XWindowBase > WindowBaseImpl_BASE; class VBAHELPER_DLLPUBLIC VbaWindowBase : public WindowBaseImpl_BASE -{ -protected: +{ +protected: css::uno::Reference< css::frame::XModel > m_xModel; public: VbaWindowBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::frame::XModel >& xModel ); diff --git a/vbahelper/source/msforms/service.cxx b/vbahelper/source/msforms/service.cxx index 432552254b91..e86a5807449d 100644 --- a/vbahelper/source/msforms/service.cxx +++ b/vbahelper/source/msforms/service.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,24 +51,24 @@ extern sdecl::ServiceDecl const serviceDecl; extern "C" { - SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( + SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { OSL_TRACE("In component_getImplementationEnv"); *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( + SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) { OSL_TRACE("In component_writeInfo"); // Component registration - return component_writeInfoHelper( pServiceManager, pRegistryKey, + return component_writeInfoHelper( pServiceManager, pRegistryKey, controlprovider::serviceDecl, userform::serviceDecl ); } - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( + SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) { diff --git a/vbahelper/source/msforms/vbabutton.cxx b/vbahelper/source/msforms/vbabutton.cxx index 69e4733c5d86..d7e5249b3b3b 100644 --- a/vbahelper/source/msforms/vbabutton.cxx +++ b/vbahelper/source/msforms/vbabutton.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ ScVbaButton::ScVbaButton( const uno::Reference< XHelperInterface >& xParent, con } // Attributes -rtl::OUString SAL_CALL +rtl::OUString SAL_CALL ScVbaButton::getCaption() throw (css::uno::RuntimeException) { rtl::OUString Label; @@ -46,20 +46,20 @@ ScVbaButton::getCaption() throw (css::uno::RuntimeException) return Label; } -void SAL_CALL +void SAL_CALL ScVbaButton::setCaption( const rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException) { m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) ); } -rtl::OUString& +rtl::OUString& ScVbaButton::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaButton") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaButton::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/vbahelper/source/msforms/vbabutton.hxx b/vbahelper/source/msforms/vbabutton.hxx index 1a01d69165f0..e30605edb897 100644 --- a/vbahelper/source/msforms/vbabutton.hxx +++ b/vbahelper/source/msforms/vbabutton.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vbahelper/source/msforms/vbacheckbox.cxx b/vbahelper/source/msforms/vbacheckbox.cxx index fea0853b68da..cc026bd70c48 100644 --- a/vbahelper/source/msforms/vbacheckbox.cxx +++ b/vbahelper/source/msforms/vbacheckbox.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ ScVbaCheckbox::ScVbaCheckbox( const uno::Reference< ov::XHelperInterface >& xPar } // Attributes -rtl::OUString SAL_CALL +rtl::OUString SAL_CALL ScVbaCheckbox::getCaption() throw (css::uno::RuntimeException) { rtl::OUString Label; @@ -48,26 +48,26 @@ ScVbaCheckbox::getCaption() throw (css::uno::RuntimeException) return Label; } -void SAL_CALL +void SAL_CALL ScVbaCheckbox::setCaption( const rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException) { m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) ); } -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaCheckbox::getValue() throw (css::uno::RuntimeException) { sal_Int16 nValue = -1; m_xProps->getPropertyValue( STATE ) >>= nValue; if( nValue != 0 ) nValue = -1; -// return uno::makeAny( nValue ); +// return uno::makeAny( nValue ); // I must be missing something MSO says value should be -1 if selected, 0 if not // selected - return uno::makeAny( ( nValue == -1 ) ? sal_True : sal_False ); + return uno::makeAny( ( nValue == -1 ) ? sal_True : sal_False ); } -void SAL_CALL +void SAL_CALL ScVbaCheckbox::setValue( const uno::Any& _value ) throw (css::uno::RuntimeException) { sal_Int16 nValue = 0; @@ -88,14 +88,14 @@ ScVbaCheckbox::setValue( const uno::Any& _value ) throw (css::uno::RuntimeExcept if ( nValue != nOldValue ) fireClickEvent(); } -rtl::OUString& +rtl::OUString& ScVbaCheckbox::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCheckbox") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaCheckbox::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/vbahelper/source/msforms/vbacheckbox.hxx b/vbahelper/source/msforms/vbacheckbox.hxx index b3940b03f486..64563cc81410 100644 --- a/vbahelper/source/msforms/vbacheckbox.hxx +++ b/vbahelper/source/msforms/vbacheckbox.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vbahelper/source/msforms/vbacombobox.cxx b/vbahelper/source/msforms/vbacombobox.cxx index d0446bca775b..10910f4ef01b 100644 --- a/vbahelper/source/msforms/vbacombobox.cxx +++ b/vbahelper/source/msforms/vbacombobox.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,13 +55,13 @@ ScVbaComboBox::ScVbaComboBox( const uno::Reference< XHelperInterface >& xParent, // Value, [read] e.g. getValue returns the value of ooo Text propery e.g. the value in // the drop down -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaComboBox::getValue() throw (uno::RuntimeException) { return m_xProps->getPropertyValue( sSourceName ); } -void SAL_CALL +void SAL_CALL ScVbaComboBox::setListIndex( const uno::Any& _value ) throw (uno::RuntimeException) { sal_Int16 nIndex = 0; @@ -83,7 +83,7 @@ ScVbaComboBox::setListIndex( const uno::Any& _value ) throw (uno::RuntimeExcepti } } -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaComboBox::getListIndex() throw (uno::RuntimeException) { uno::Sequence< rtl::OUString > sItems; @@ -101,16 +101,16 @@ ScVbaComboBox::getListIndex() throw (uno::RuntimeException) OSL_TRACE("getListIndex returning %d", index ); return uno::makeAny( index ); } - - } - } + + } + } OSL_TRACE("getListIndex returning %d", -1 ); return uno::makeAny( sal_Int32( -1 ) ); } // Value, [write]e.g. setValue sets the value in the drop down, and if the value is one // of the values in the list then the selection is also set -void SAL_CALL +void SAL_CALL ScVbaComboBox::setValue( const uno::Any& _value ) throw (uno::RuntimeException) { rtl::OUString sOldValue, sNewValue; @@ -149,7 +149,7 @@ ScVbaComboBox::setValue( const uno::Any& _value ) throw (uno::RuntimeException) // see Value -::rtl::OUString SAL_CALL +::rtl::OUString SAL_CALL ScVbaComboBox::getText() throw (uno::RuntimeException) { rtl::OUString result; @@ -157,26 +157,26 @@ ScVbaComboBox::getText() throw (uno::RuntimeException) return result; } -void SAL_CALL +void SAL_CALL ScVbaComboBox::setText( const ::rtl::OUString& _text ) throw (uno::RuntimeException) { setValue( uno::makeAny( _text ) ); // seems the same } // Methods -void SAL_CALL +void SAL_CALL ScVbaComboBox::AddItem( const uno::Any& pvargItem, const uno::Any& pvargIndex ) throw (uno::RuntimeException) { mpListHelper->AddItem( pvargItem, pvargIndex ); } -void SAL_CALL +void SAL_CALL ScVbaComboBox::removeItem( const uno::Any& index ) throw (uno::RuntimeException) { mpListHelper->removeItem( index ); } -void SAL_CALL +void SAL_CALL ScVbaComboBox::Clear( ) throw (uno::RuntimeException) { mpListHelper->Clear(); @@ -194,21 +194,21 @@ ScVbaComboBox::getListCount() throw (uno::RuntimeException) { return mpListHelper->getListCount(); } - -uno::Any SAL_CALL + +uno::Any SAL_CALL ScVbaComboBox::List( const ::uno::Any& pvargIndex, const uno::Any& pvarColumn ) throw (uno::RuntimeException) { return mpListHelper->List( pvargIndex, pvarColumn ); } -rtl::OUString& +rtl::OUString& ScVbaComboBox::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaComboBox") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaComboBox::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/vbahelper/source/msforms/vbacombobox.hxx b/vbahelper/source/msforms/vbacombobox.hxx index 9f9b05962613..a48e56ba02b2 100644 --- a/vbahelper/source/msforms/vbacombobox.hxx +++ b/vbahelper/source/msforms/vbacombobox.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,12 +42,12 @@ typedef cppu::ImplInheritanceHelper2<ScVbaControl, ov::msforms::XComboBox, css::script::XDefaultProperty > ComboBoxImpl_BASE; class ScVbaComboBox : public ComboBoxImpl_BASE -{ +{ std::auto_ptr< ListControlHelper > mpListHelper; - rtl::OUString sSourceName; + rtl::OUString sSourceName; rtl::OUString msDftPropName; bool mbDialogType; - + public: 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 ); diff --git a/vbahelper/source/msforms/vbacontrol.hxx b/vbahelper/source/msforms/vbacontrol.hxx index ed7004a1e43a..2d52d30c2726 100644 --- a/vbahelper/source/msforms/vbacontrol.hxx +++ b/vbahelper/source/msforms/vbacontrol.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,10 +67,10 @@ protected: void fireClickEvent(); void fireEvent( css::script::ScriptEvent& evt ); public: - ScVbaControl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, + ScVbaControl( 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* pHelper ); virtual ~ScVbaControl(); - // This class will own the helper, so make sure it is allocated from + // This class will own the helper, so make sure it is allocated from // the heap void setGeometryHelper( ov::AbstractGeometryAttributes* pHelper ); // sets the name of the associated library ( used for UserForm controls ) @@ -117,7 +117,7 @@ public: class ScVbaControlFactory { public: - ScVbaControlFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext, + ScVbaControlFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel ); ScVbaControl* createControl( const css::uno::Reference< css::uno::XInterface >& xParent ) throw ( css::uno::RuntimeException ); private: diff --git a/vbahelper/source/msforms/vbacontrols.cxx b/vbahelper/source/msforms/vbacontrols.cxx index 9afb60208f6b..b4c2f6a6f497 100644 --- a/vbahelper/source/msforms/vbacontrols.cxx +++ b/vbahelper/source/msforms/vbacontrols.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,7 +69,7 @@ private: msNames[ nIndex ] = getControlName( xCtrl ); mControls.push_back( xCtrl ); mIndices[ msNames[ nIndex ] ] = nIndex; - } + } } public: @@ -79,7 +79,7 @@ public: { mxDialog.set( xDialog, uno::UNO_QUERY_THROW ); uno::Sequence< uno::Reference< awt::XControl > > sXControls = mxDialog->getControls(); - + msNames.realloc( sXControls.getLength() ); for ( sal_Int32 i = 0; i < sXControls.getLength(); ++i ) SetArrayElementTo( sXControls[ i ], i ); @@ -90,7 +90,7 @@ public: // in this case the wrapper should work in dummy mode } } - + static rtl::OUString getControlName( const uno::Reference< awt::XControl >& xCtrl ) { if ( !xCtrl.is() ) @@ -108,37 +108,37 @@ public: { return awt::XControl::static_type(0); } - - virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException) + + virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException) { return ( mControls.size() > 0 ); } - - // XNameAcess + + // XNameAcess virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { if ( !hasByName( aName ) ) throw container::NoSuchElementException(); return getByIndex( mIndices[ aName ] ); } - + virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) { return msNames; } - + virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (css::uno::RuntimeException) { ControlIndexMap::iterator it = mIndices.find( aName ); return it != mIndices.end(); } - + // XElementAccess virtual ::sal_Int32 SAL_CALL getCount( ) throw (css::uno::RuntimeException) { return mControls.size(); } - + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException ) { if ( Index < 0 || Index >= static_cast< sal_Int32 >( mControls.size() ) ) @@ -222,7 +222,7 @@ ScVbaControls::createCollectionObject( const css::uno::Any& aSource ) return uno::makeAny( xVBAControl ); } -void SAL_CALL +void SAL_CALL ScVbaControls::Move( double cx, double cy ) throw (uno::RuntimeException) { uno::Reference< container::XEnumeration > xEnum( createEnumeration() ); @@ -230,7 +230,7 @@ ScVbaControls::Move( double cx, double cy ) throw (uno::RuntimeException) { uno::Reference< msforms::XControl > xControl( xEnum->nextElement(), uno::UNO_QUERY_THROW ); xControl->setLeft( xControl->getLeft() + cx ); - xControl->setTop( xControl->getTop() + cy ); + xControl->setTop( xControl->getTop() + cy ); } } @@ -312,7 +312,7 @@ uno::Any SAL_CALL ScVbaControls::Add( const uno::Any& Object, const uno::Any& St { throw lang::WrappedTargetException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can not create AXControl!" ) ), uno::Reference< uno::XInterface >(), - uno::makeAny( e ) ); + uno::makeAny( e ) ); } return aResult; @@ -367,7 +367,7 @@ void SAL_CALL ScVbaControls::Remove( const uno::Any& StringKeyOrIndex ) { // throw lang::WrappedTargetException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can not create AXControl!" ) ), // uno::Reference< uno::XInterface >(), - // uno::makeAny( e ) ); + // uno::makeAny( e ) ); } } @@ -377,14 +377,14 @@ ScVbaControls::getElementType() throw (uno::RuntimeException) { return ooo::vba::msforms::XControl::static_type(0); } -rtl::OUString& +rtl::OUString& ScVbaControls::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaControls") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaControls::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/vbahelper/source/msforms/vbacontrols.hxx b/vbahelper/source/msforms/vbacontrols.hxx index cbbb4fcafe54..c525cb49297c 100644 --- a/vbahelper/source/msforms/vbacontrols.hxx +++ b/vbahelper/source/msforms/vbacontrols.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,9 +44,9 @@ class ScVbaControls : public ControlsImpl_BASE protected: virtual rtl::OUString& getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); - + public: - ScVbaControls( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, + ScVbaControls( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::awt::XControl >& xDialog ); // XControls virtual void SAL_CALL Move( double cx, double cy ) throw (css::uno::RuntimeException); @@ -59,7 +59,7 @@ public: // ScVbaCollectionBaseImpl virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - + }; #endif //SC_VBA_OLEOBJECTS_HXX diff --git a/vbahelper/source/msforms/vbaimage.cxx b/vbahelper/source/msforms/vbaimage.cxx index fbe0d10e1b0d..08a3007d5714 100644 --- a/vbahelper/source/msforms/vbaimage.cxx +++ b/vbahelper/source/msforms/vbaimage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,14 +37,14 @@ ScVbaImage::ScVbaImage( const uno::Reference< XHelperInterface >& xParent, const { } -rtl::OUString& +rtl::OUString& ScVbaImage::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaImage") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaImage::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/vbahelper/source/msforms/vbaimage.hxx b/vbahelper/source/msforms/vbaimage.hxx index c1098fdd8b60..e360fe4f67b1 100644 --- a/vbahelper/source/msforms/vbaimage.hxx +++ b/vbahelper/source/msforms/vbaimage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vbahelper/source/msforms/vbalabel.hxx b/vbahelper/source/msforms/vbalabel.hxx index 24623e16a114..6adbc6e70f7b 100644 --- a/vbahelper/source/msforms/vbalabel.hxx +++ b/vbahelper/source/msforms/vbalabel.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vbahelper/source/msforms/vbalistbox.hxx b/vbahelper/source/msforms/vbalistbox.hxx index 9eee80c48044..72e61ec20116 100644 --- a/vbahelper/source/msforms/vbalistbox.hxx +++ b/vbahelper/source/msforms/vbalistbox.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,13 +41,13 @@ typedef cppu::ImplInheritanceHelper2<ScVbaControl, ov::msforms::XListBox, css::script::XDefaultProperty > ListBoxImpl_BASE; class ScVbaListBox : public ListBoxImpl_BASE ,public PropListener -{ +{ std::auto_ptr< ListControlHelper > mpListHelper; - rtl::OUString sSourceName; + rtl::OUString sSourceName; rtl::OUString msDftPropName; sal_Int16 m_nIndex; - + public: 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 ); @@ -73,10 +73,10 @@ public: // XDefaultProperty rtl::OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException) { return ::rtl::OUString::createFromAscii("Value"); } - + //XHelperInterface virtual rtl::OUString& getServiceImplName(); - virtual css::uno::Sequence<rtl::OUString> getServiceNames(); + virtual css::uno::Sequence<rtl::OUString> getServiceNames(); //PropListener virtual void setValueEvent( const css::uno::Any& value ); diff --git a/vbahelper/source/msforms/vbalistcontrolhelper.hxx b/vbahelper/source/msforms/vbalistcontrolhelper.hxx index 82ac3387658b..930204ebd5d5 100644 --- a/vbahelper/source/msforms/vbalistcontrolhelper.hxx +++ b/vbahelper/source/msforms/vbalistcontrolhelper.hxx @@ -12,7 +12,7 @@ public: ListControlHelper( const css::uno::Reference< css::beans::XPropertySet >& rxControl ) : m_xProps( rxControl ){} virtual ~ListControlHelper() {} virtual void SAL_CALL AddItem( const css::uno::Any& pvargItem, const css::uno::Any& pvargIndex ) throw (css::uno::RuntimeException); - virtual void SAL_CALL removeItem( const css::uno::Any& index ) throw (css::uno::RuntimeException); + virtual void SAL_CALL removeItem( const css::uno::Any& index ) throw (css::uno::RuntimeException); virtual void SAL_CALL setRowSource( const rtl::OUString& _rowsource ) throw (css::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getListCount() throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL List( const css::uno::Any& pvargIndex, const css::uno::Any& pvarColumn ) throw (css::uno::RuntimeException); diff --git a/vbahelper/source/msforms/vbamultipage.cxx b/vbahelper/source/msforms/vbamultipage.cxx index 46593a156876..2d657440a7c3 100644 --- a/vbahelper/source/msforms/vbamultipage.cxx +++ b/vbahelper/source/msforms/vbamultipage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,7 +63,7 @@ public: return ( mnPages > 0 ); } }; -uno::Reference< container::XIndexAccess > +uno::Reference< container::XIndexAccess > ScVbaMultiPage::getPages( sal_Int32 nPages ) { return new PagesImpl( nPages ); @@ -77,7 +77,7 @@ ScVbaMultiPage::ScVbaMultiPage( const uno::Reference< ov::XHelperInterface >& xP } // Attributes -sal_Int32 SAL_CALL +sal_Int32 SAL_CALL ScVbaMultiPage::getValue() throw (css::uno::RuntimeException) { sal_Int32 nValue = 0; @@ -85,7 +85,7 @@ ScVbaMultiPage::getValue() throw (css::uno::RuntimeException) return nValue; } -void SAL_CALL +void SAL_CALL ScVbaMultiPage::setValue( const sal_Int32 _value ) throw (::com::sun::star::uno::RuntimeException) { // track change in dialog ( dialog value is 1 based, 0 is a special value ) @@ -98,14 +98,14 @@ ScVbaMultiPage::setValue( const sal_Int32 _value ) throw (::com::sun::star::uno: } -rtl::OUString& +rtl::OUString& ScVbaMultiPage::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaMultiPage") ); return sImplName; } -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaMultiPage::Pages( const uno::Any& index ) throw (uno::RuntimeException) { sal_Int32 nValue = 0; @@ -116,7 +116,7 @@ ScVbaMultiPage::Pages( const uno::Any& index ) throw (uno::RuntimeException) return xColl->Item( uno::makeAny( index ), uno::Any() ); } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaMultiPage::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/vbahelper/source/msforms/vbamultipage.hxx b/vbahelper/source/msforms/vbamultipage.hxx index d3f58786a612..756ae03b27a9 100644 --- a/vbahelper/source/msforms/vbamultipage.hxx +++ b/vbahelper/source/msforms/vbamultipage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vbahelper/source/msforms/vbapages.cxx b/vbahelper/source/msforms/vbapages.cxx index 7f6b2d5be828..a32519c41f57 100644 --- a/vbahelper/source/msforms/vbapages.cxx +++ b/vbahelper/source/msforms/vbapages.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,33 +34,33 @@ ScVbaPages::ScVbaPages( const uno::Reference< XHelperInterface >& xParent, const { } -uno::Type SAL_CALL +uno::Type SAL_CALL ScVbaPages::getElementType() throw (uno::RuntimeException) { - // return msforms::XPage::static_type(0); - return uno::XInterface::static_type(0); + // return msforms::XPage::static_type(0); + return uno::XInterface::static_type(0); } -uno::Any +uno::Any ScVbaPages::createCollectionObject( const css::uno::Any& aSource ) { return aSource; } -rtl::OUString& +rtl::OUString& ScVbaPages::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaPages") ); return sImplName; } -uno::Reference< container::XEnumeration > SAL_CALL +uno::Reference< container::XEnumeration > SAL_CALL ScVbaPages::createEnumeration() throw (uno::RuntimeException) { return uno::Reference< container::XEnumeration >(); } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaPages::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/vbahelper/source/msforms/vbapages.hxx b/vbahelper/source/msforms/vbapages.hxx index f19c6120f4aa..63e989891b8e 100644 --- a/vbahelper/source/msforms/vbapages.hxx +++ b/vbahelper/source/msforms/vbapages.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ #include <cppuhelper/implbase1.hxx> #include <vbahelper/vbacollectionimpl.hxx> -typedef CollTestImplHelper< +typedef CollTestImplHelper< ov::msforms::XPages > ScVbaPages_BASE; class ScVbaPages : public ScVbaPages_BASE diff --git a/vbahelper/source/msforms/vbaprogressbar.cxx b/vbahelper/source/msforms/vbaprogressbar.cxx index 80b05467ce5d..5e82443da203 100644 --- a/vbahelper/source/msforms/vbaprogressbar.cxx +++ b/vbahelper/source/msforms/vbaprogressbar.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,26 +39,26 @@ ScVbaProgressBar::ScVbaProgressBar( const uno::Reference< ov::XHelperInterface > } // Attributes -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaProgressBar::getValue() throw (css::uno::RuntimeException) { return m_xProps->getPropertyValue( SVALUE ); } -void SAL_CALL +void SAL_CALL ScVbaProgressBar::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException) { m_xProps->setPropertyValue( SVALUE, _value ); } -rtl::OUString& +rtl::OUString& ScVbaProgressBar::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaProgressBar") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaProgressBar::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/vbahelper/source/msforms/vbaprogressbar.hxx b/vbahelper/source/msforms/vbaprogressbar.hxx index 9f313c5bb541..39686e6cb3d4 100644 --- a/vbahelper/source/msforms/vbaprogressbar.hxx +++ b/vbahelper/source/msforms/vbaprogressbar.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vbahelper/source/msforms/vbaradiobutton.cxx b/vbahelper/source/msforms/vbaradiobutton.cxx index aa088519029c..8c89b08ff1ef 100644 --- a/vbahelper/source/msforms/vbaradiobutton.cxx +++ b/vbahelper/source/msforms/vbaradiobutton.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ ScVbaRadioButton::ScVbaRadioButton( const uno::Reference< XHelperInterface >& xP } // Attributes -rtl::OUString SAL_CALL +rtl::OUString SAL_CALL ScVbaRadioButton::getCaption() throw (css::uno::RuntimeException) { rtl::OUString Label; @@ -47,27 +47,27 @@ ScVbaRadioButton::getCaption() throw (css::uno::RuntimeException) return Label; } -void SAL_CALL +void SAL_CALL ScVbaRadioButton::setCaption( const rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException) { m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) ); } -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaRadioButton::getValue() throw (css::uno::RuntimeException) { sal_Int16 nValue = -1; m_xProps->getPropertyValue( STATE ) >>= nValue; if( nValue != 0 ) nValue = -1; -// return uno::makeAny( nValue ); +// return uno::makeAny( nValue ); // I must be missing something MSO says value should be -1 if selected, 0 if not // selected - return uno::makeAny( ( nValue == -1 ) ? sal_True : sal_False ); + return uno::makeAny( ( nValue == -1 ) ? sal_True : sal_False ); } -void SAL_CALL +void SAL_CALL ScVbaRadioButton::setValue( const uno::Any& _value ) throw (uno::RuntimeException) { sal_Int16 nValue = 0; @@ -97,14 +97,14 @@ ScVbaRadioButton::setValue( const uno::Any& _value ) throw (uno::RuntimeExceptio } } -rtl::OUString& +rtl::OUString& ScVbaRadioButton::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaRadioButton") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaRadioButton::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/vbahelper/source/msforms/vbaradiobutton.hxx b/vbahelper/source/msforms/vbaradiobutton.hxx index fda0f00e6684..0e67b6ec0e6f 100644 --- a/vbahelper/source/msforms/vbaradiobutton.hxx +++ b/vbahelper/source/msforms/vbaradiobutton.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vbahelper/source/msforms/vbascrollbar.cxx b/vbahelper/source/msforms/vbascrollbar.cxx index 0cf4e6c9635c..6b9eefaaf642 100644 --- a/vbahelper/source/msforms/vbascrollbar.cxx +++ b/vbahelper/source/msforms/vbascrollbar.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,19 +44,19 @@ ScVbaScrollBar::ScVbaScrollBar( const css::uno::Reference< ov::XHelperInterface } // Attributes -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaScrollBar::getValue() throw (css::uno::RuntimeException) { return m_xProps->getPropertyValue( SCROLLVALUE ); } -void SAL_CALL +void SAL_CALL ScVbaScrollBar::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException) { m_xProps->setPropertyValue( SCROLLVALUE, _value ); } -::sal_Int32 SAL_CALL +::sal_Int32 SAL_CALL ScVbaScrollBar::getMax() throw (uno::RuntimeException) { sal_Int32 nMax = 0; @@ -64,13 +64,13 @@ ScVbaScrollBar::getMax() throw (uno::RuntimeException) return nMax; } -void SAL_CALL +void SAL_CALL ScVbaScrollBar::setMax( sal_Int32 nVal ) throw (uno::RuntimeException) { - m_xProps->setPropertyValue( SCROLLMAX, uno::makeAny( nVal ) ); + m_xProps->setPropertyValue( SCROLLMAX, uno::makeAny( nVal ) ); } -::sal_Int32 SAL_CALL +::sal_Int32 SAL_CALL ScVbaScrollBar::getMin() throw (uno::RuntimeException) { sal_Int32 nVal = 0; @@ -78,19 +78,19 @@ ScVbaScrollBar::getMin() throw (uno::RuntimeException) return nVal; } -void SAL_CALL +void SAL_CALL ScVbaScrollBar::setMin( sal_Int32 nVal ) throw (uno::RuntimeException) { - m_xProps->setPropertyValue( SCROLLMIN, uno::makeAny( nVal ) ); + m_xProps->setPropertyValue( SCROLLMIN, uno::makeAny( nVal ) ); } -void SAL_CALL +void SAL_CALL ScVbaScrollBar::setLargeChange( ::sal_Int32 _largechange ) throw (uno::RuntimeException) { m_xProps->setPropertyValue( LARGECHANGE, uno::makeAny( _largechange ) ); } -::sal_Int32 SAL_CALL +::sal_Int32 SAL_CALL ScVbaScrollBar::getLargeChange() throw (uno::RuntimeException) { sal_Int32 nVal = 0; @@ -98,7 +98,7 @@ ScVbaScrollBar::getLargeChange() throw (uno::RuntimeException) return nVal; } -::sal_Int32 SAL_CALL +::sal_Int32 SAL_CALL ScVbaScrollBar::getSmallChange() throw (uno::RuntimeException) { sal_Int32 nSmallChange = 0; @@ -106,20 +106,20 @@ ScVbaScrollBar::getSmallChange() throw (uno::RuntimeException) return nSmallChange; } -void SAL_CALL +void SAL_CALL ScVbaScrollBar::setSmallChange( ::sal_Int32 _smallchange ) throw (uno::RuntimeException) { m_xProps->setPropertyValue( SMALLCHANGE, uno::makeAny( _smallchange ) ); } -rtl::OUString& +rtl::OUString& ScVbaScrollBar::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaScrollBar") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaScrollBar::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/vbahelper/source/msforms/vbascrollbar.hxx b/vbahelper/source/msforms/vbascrollbar.hxx index de36b5139809..bfb6430c4312 100644 --- a/vbahelper/source/msforms/vbascrollbar.hxx +++ b/vbahelper/source/msforms/vbascrollbar.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vbahelper/source/msforms/vbaspinbutton.cxx b/vbahelper/source/msforms/vbaspinbutton.cxx index 42f025a45fca..0e9472e71190 100644 --- a/vbahelper/source/msforms/vbaspinbutton.cxx +++ b/vbahelper/source/msforms/vbaspinbutton.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,19 +42,19 @@ ScVbaSpinButton::ScVbaSpinButton( const css::uno::Reference< ov::XHelperInterfa } // Attributes -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaSpinButton::getValue() throw (css::uno::RuntimeException) { return m_xProps->getPropertyValue( SPINVALUE ); } -void SAL_CALL +void SAL_CALL ScVbaSpinButton::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException) { m_xProps->setPropertyValue( SPINVALUE, _value ); } -::sal_Int32 SAL_CALL +::sal_Int32 SAL_CALL ScVbaSpinButton::getMax() throw (uno::RuntimeException) { sal_Int32 nMax = 0; @@ -62,13 +62,13 @@ ScVbaSpinButton::getMax() throw (uno::RuntimeException) return nMax; } -void SAL_CALL +void SAL_CALL ScVbaSpinButton::setMax( sal_Int32 nVal ) throw (uno::RuntimeException) { - m_xProps->setPropertyValue( SPINMAX, uno::makeAny( nVal ) ); + m_xProps->setPropertyValue( SPINMAX, uno::makeAny( nVal ) ); } -::sal_Int32 SAL_CALL +::sal_Int32 SAL_CALL ScVbaSpinButton::getMin() throw (uno::RuntimeException) { sal_Int32 nVal = 0; @@ -76,20 +76,20 @@ ScVbaSpinButton::getMin() throw (uno::RuntimeException) return nVal; } -void SAL_CALL +void SAL_CALL ScVbaSpinButton::setMin( sal_Int32 nVal ) throw (uno::RuntimeException) { - m_xProps->setPropertyValue( SPINMIN, uno::makeAny( nVal ) ); + m_xProps->setPropertyValue( SPINMIN, uno::makeAny( nVal ) ); } -rtl::OUString& +rtl::OUString& ScVbaSpinButton::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaSpinButton") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaSpinButton::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/vbahelper/source/msforms/vbaspinbutton.hxx b/vbahelper/source/msforms/vbaspinbutton.hxx index 66d2b906ef49..2726b44e5765 100644 --- a/vbahelper/source/msforms/vbaspinbutton.hxx +++ b/vbahelper/source/msforms/vbaspinbutton.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vbahelper/source/msforms/vbasystemaxcontrol.cxx b/vbahelper/source/msforms/vbasystemaxcontrol.cxx index 171986ac6c8a..1724ad31c154 100644 --- a/vbahelper/source/msforms/vbasystemaxcontrol.cxx +++ b/vbahelper/source/msforms/vbasystemaxcontrol.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -80,7 +80,7 @@ uno::Any SAL_CALL VbaSystemAXControl::getValue( const ::rtl::OUString& aProperty } //---------------------------------------------------------- -rtl::OUString& +rtl::OUString& VbaSystemAXControl::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM( "VbaSystemAXControl" ) ); @@ -88,7 +88,7 @@ VbaSystemAXControl::getServiceImplName() } //---------------------------------------------------------- -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > VbaSystemAXControl::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/vbahelper/source/msforms/vbasystemaxcontrol.hxx b/vbahelper/source/msforms/vbasystemaxcontrol.hxx index 45bcb3a63070..0ede40b1e979 100644 --- a/vbahelper/source/msforms/vbasystemaxcontrol.hxx +++ b/vbahelper/source/msforms/vbasystemaxcontrol.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vbahelper/source/msforms/vbatextbox.cxx b/vbahelper/source/msforms/vbatextbox.cxx index 3fc94c7a1743..f73bdca68b54 100644 --- a/vbahelper/source/msforms/vbatextbox.cxx +++ b/vbahelper/source/msforms/vbatextbox.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,13 +40,13 @@ ScVbaTextBox::ScVbaTextBox( const uno::Reference< ov::XHelperInterface >& xParen } // Attributes -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaTextBox::getValue() throw (css::uno::RuntimeException) { return uno::makeAny( getText() ); } -void SAL_CALL +void SAL_CALL ScVbaTextBox::setValue( const uno::Any& _value ) throw (css::uno::RuntimeException) { rtl::OUString sVal = getAnyAsString( _value ); @@ -54,7 +54,7 @@ ScVbaTextBox::setValue( const uno::Any& _value ) throw (css::uno::RuntimeExcepti } //getString() will cause some imfo lose. -rtl::OUString SAL_CALL +rtl::OUString SAL_CALL ScVbaTextBox::getText() throw (css::uno::RuntimeException) { uno::Any aValue; @@ -65,7 +65,7 @@ ScVbaTextBox::getText() throw (css::uno::RuntimeException) return sString; } -void SAL_CALL +void SAL_CALL ScVbaTextBox::setText( const rtl::OUString& _text ) throw (css::uno::RuntimeException) { rtl::OUString sOldText = getText(); @@ -76,7 +76,7 @@ ScVbaTextBox::setText( const rtl::OUString& _text ) throw (css::uno::RuntimeExce xTextRange->setString( _text ); } else - m_xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Text") ), uno::makeAny( _text ) ); + m_xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Text") ), uno::makeAny( _text ) ); if ( _text != sOldText ) { @@ -84,7 +84,7 @@ ScVbaTextBox::setText( const rtl::OUString& _text ) throw (css::uno::RuntimeExce } } -sal_Int32 SAL_CALL +sal_Int32 SAL_CALL ScVbaTextBox::getMaxLength() throw (css::uno::RuntimeException) { uno::Any aValue; @@ -95,7 +95,7 @@ ScVbaTextBox::getMaxLength() throw (css::uno::RuntimeException) return nMaxLength; } -void SAL_CALL +void SAL_CALL ScVbaTextBox::setMaxLength( sal_Int32 _maxlength ) throw (css::uno::RuntimeException) { sal_Int16 _maxlength16 = static_cast<sal_Int16> (_maxlength); @@ -104,7 +104,7 @@ ScVbaTextBox::setMaxLength( sal_Int32 _maxlength ) throw (css::uno::RuntimeExcep (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MaxTextLen" ) ), aValue); } -sal_Bool SAL_CALL +sal_Bool SAL_CALL ScVbaTextBox::getMultiline() throw (css::uno::RuntimeException) { uno::Any aValue; @@ -115,7 +115,7 @@ ScVbaTextBox::getMultiline() throw (css::uno::RuntimeException) return bRet; } -void SAL_CALL +void SAL_CALL ScVbaTextBox::setMultiline( sal_Bool _multiline ) throw (css::uno::RuntimeException) { uno::Any aValue( _multiline ); @@ -123,14 +123,14 @@ ScVbaTextBox::setMultiline( sal_Bool _multiline ) throw (css::uno::RuntimeExcept (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MultiLine" ) ), aValue); } -rtl::OUString& +rtl::OUString& ScVbaTextBox::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaTextBox") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaTextBox::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/vbahelper/source/msforms/vbatextbox.hxx b/vbahelper/source/msforms/vbatextbox.hxx index c53cf7672f1f..8b9788dd05cb 100644 --- a/vbahelper/source/msforms/vbatextbox.hxx +++ b/vbahelper/source/msforms/vbatextbox.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vbahelper/source/msforms/vbatogglebutton.cxx b/vbahelper/source/msforms/vbatogglebutton.cxx index 297e30c103b3..a6f20a28f39f 100644 --- a/vbahelper/source/msforms/vbatogglebutton.cxx +++ b/vbahelper/source/msforms/vbatogglebutton.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ ScVbaToggleButton::~ScVbaToggleButton() } // Attributes -rtl::OUString SAL_CALL +rtl::OUString SAL_CALL ScVbaToggleButton::getCaption() throw (css::uno::RuntimeException) { rtl::OUString Label; @@ -55,13 +55,13 @@ ScVbaToggleButton::getCaption() throw (css::uno::RuntimeException) return Label; } -void SAL_CALL +void SAL_CALL ScVbaToggleButton::setCaption( const rtl::OUString& _caption ) throw (::com::sun::star::uno::RuntimeException) { m_xProps->setPropertyValue( LABEL, uno::makeAny( _caption ) ); } -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaToggleButton::getValue() throw (uno::RuntimeException) { sal_Int16 nState = 0; @@ -70,7 +70,7 @@ ScVbaToggleButton::getValue() throw (uno::RuntimeException) } -void SAL_CALL +void SAL_CALL ScVbaToggleButton::setValue( const uno::Any& _value ) throw (uno::RuntimeException) { sal_Int16 nState = 0; @@ -97,14 +97,14 @@ ScVbaToggleButton::setValue( const uno::Any& _value ) throw (uno::RuntimeExcepti } -rtl::OUString& +rtl::OUString& ScVbaToggleButton::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaToggleButton") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaToggleButton::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/vbahelper/source/msforms/vbatogglebutton.hxx b/vbahelper/source/msforms/vbatogglebutton.hxx index 5ccbe2ccfc96..a68ad464e726 100644 --- a/vbahelper/source/msforms/vbatogglebutton.hxx +++ b/vbahelper/source/msforms/vbatogglebutton.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vbahelper/source/msforms/vbauserform.cxx b/vbahelper/source/msforms/vbauserform.cxx index 1894d3c17bff..dadb8656e6e4 100644 --- a/vbahelper/source/msforms/vbauserform.cxx +++ b/vbahelper/source/msforms/vbauserform.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ using namespace ::com::sun::star; // some little notes // XDialog implementation has the following interesting bits // a Controls property ( which is an array of the container controls ) -// each item in the controls array is a XControl, where the model is +// each item in the controls array is a XControl, where the model is // basically a property bag // additionally the XDialog instance has itself a model // this model has a ControlModels ( array of models ) property @@ -63,7 +63,7 @@ ScVbaUserForm::~ScVbaUserForm() { } -void SAL_CALL +void SAL_CALL ScVbaUserForm::Show( ) throw (uno::RuntimeException) { OSL_TRACE("ScVbaUserForm::Show( )"); @@ -79,7 +79,7 @@ ScVbaUserForm::Show( ) throw (uno::RuntimeException) uno::Reference< lang::XComponent > xComp( m_xDialog, uno::UNO_QUERY_THROW ); m_xDialog = NULL; xComp->dispose(); - mbDispose = false; + mbDispose = false; } catch( uno::Exception& ) { @@ -87,7 +87,7 @@ ScVbaUserForm::Show( ) throw (uno::RuntimeException) } } -rtl::OUString SAL_CALL +rtl::OUString SAL_CALL ScVbaUserForm::getCaption() throw (::com::sun::star::uno::RuntimeException) { rtl::OUString sCaption; @@ -100,7 +100,7 @@ ScVbaUserForm::setCaption( const ::rtl::OUString& _caption ) throw (::com::sun:: m_xProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Title") ), uno::makeAny( _caption ) ); } -void SAL_CALL +void SAL_CALL ScVbaUserForm::Hide( ) throw (uno::RuntimeException) { mbDispose = false; // hide not dispose @@ -126,13 +126,13 @@ void SAL_CALL ScVbaUserForm::setVisible( sal_Bool bVisible ) throw (uno::Runtime } } -void SAL_CALL +void SAL_CALL ScVbaUserForm::RePaint( ) throw (uno::RuntimeException) { // do nothing } -void SAL_CALL +void SAL_CALL ScVbaUserForm::UnloadObject( ) throw (uno::RuntimeException) { mbDispose = true; @@ -140,14 +140,14 @@ ScVbaUserForm::UnloadObject( ) throw (uno::RuntimeException) m_xDialog->endExecute(); } -rtl::OUString& +rtl::OUString& ScVbaUserForm::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaUserForm") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaUserForm::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; @@ -159,19 +159,19 @@ ScVbaUserForm::getServiceNames() return aServiceNames; } -uno::Reference< beans::XIntrospectionAccess > SAL_CALL +uno::Reference< beans::XIntrospectionAccess > SAL_CALL ScVbaUserForm::getIntrospection( ) throw (uno::RuntimeException) { return uno::Reference< beans::XIntrospectionAccess >(); } -uno::Any SAL_CALL +uno::Any SAL_CALL 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) { throw uno::RuntimeException(); // unsupported operation } -void SAL_CALL +void SAL_CALL ScVbaUserForm::setValue( const ::rtl::OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException) { uno::Any aObject = getValue( aPropertyName ); @@ -191,7 +191,7 @@ ScVbaUserForm::setValue( const ::rtl::OUString& aPropertyName, const uno::Any& a } } -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaUserForm::getValue( const ::rtl::OUString& aPropertyName ) throw (beans::UnknownPropertyException, uno::RuntimeException) { uno::Any aResult; @@ -214,12 +214,12 @@ ScVbaUserForm::getValue( const ::rtl::OUString& aPropertyName ) throw (beans::Un return aResult; } -::sal_Bool SAL_CALL +::sal_Bool SAL_CALL ScVbaUserForm::hasMethod( const ::rtl::OUString& /*aName*/ ) throw (uno::RuntimeException) { return sal_False; } -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaUserForm::Controls( const uno::Any& index ) throw (uno::RuntimeException) { // if the dialog already closed we should do nothing, but the VBA will call methods of the Controls objects @@ -231,14 +231,14 @@ ScVbaUserForm::Controls( const uno::Any& index ) throw (uno::RuntimeException) return uno::makeAny( xControls ); } -::sal_Bool SAL_CALL +::sal_Bool SAL_CALL ScVbaUserForm::hasProperty( const ::rtl::OUString& aName ) throw (uno::RuntimeException) { uno::Reference< awt::XControl > xControl( m_xDialog, uno::UNO_QUERY ); OSL_TRACE("ScVbaUserForm::hasProperty(%s) %d", rtl::OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr(), xControl.is() ); if ( xControl.is() ) { - uno::Reference< container::XNameAccess > xNameAccess( xControl->getModel(), uno::UNO_QUERY_THROW ); + uno::Reference< container::XNameAccess > xNameAccess( xControl->getModel(), uno::UNO_QUERY_THROW ); sal_Bool bRes = xNameAccess->hasByName( aName ); OSL_TRACE("ScVbaUserForm::hasProperty(%s) %d ---> %d", rtl::OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr(), xControl.is(), bRes ); return bRes; diff --git a/vbahelper/source/msforms/vbauserform.hxx b/vbahelper/source/msforms/vbauserform.hxx index 646ef38b077d..6389557b1afa 100644 --- a/vbahelper/source/msforms/vbauserform.hxx +++ b/vbahelper/source/msforms/vbauserform.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx b/vbahelper/source/vbahelper/vbaapplicationbase.cxx index 0539ae5c349c..13049c1d49be 100644 --- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx +++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - + #include "vbahelper/vbaapplicationbase.hxx" #include <sal/macros.h> @@ -244,7 +244,7 @@ VbaApplicationBase::setDisplayStatusBar(sal_Bool bDisplayStatusBar) throw (uno:: return; } else if( !bDisplayStatusBar && xLayoutManager->isElementVisible( url ) ){ - xLayoutManager->hideElement( url ); + xLayoutManager->hideElement( url ); return; } } @@ -258,7 +258,7 @@ VbaApplicationBase::setDisplayStatusBar(sal_Bool bDisplayStatusBar) throw (uno:: uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW ); uno::Reference< frame::XFrame > xFrame( xModel->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW ); uno::Reference< awt::XWindow2 > xWindow( xFrame->getContainerWindow(), uno::UNO_QUERY_THROW ); - + return xWindow->isEnabled(); } @@ -327,7 +327,7 @@ uno::Any SAL_CALL VbaApplicationBase::Run( const ::rtl::OUString& MacroName, con // get the next element as a UNO Any uno::Any aComponentHelper = xEnum->nextElement(); uno::Reference <frame::XModel> xDocModel( aComponentHelper, uno::UNO_QUERY_THROW ); - + // get the name of the sheet from its XNamed interface ::rtl::OUString aName = xDocModel->getURL(); @@ -341,11 +341,11 @@ uno::Any SAL_CALL VbaApplicationBase::Run( const ::rtl::OUString& MacroName, con } else { - aMacroDocumentModel = getCurrentDocument(); + aMacroDocumentModel = getCurrentDocument(); sMacro_only_Name = MacroName.copy(0); } - + // search the global tempalte VBAMacroResolvedInfo aMacroInfo = resolveVBAMacro( getSfxObjShell( aMacroDocumentModel ), sMacro_only_Name, sal_True ); if( aMacroInfo.IsResolved() ) @@ -468,7 +468,7 @@ VbaApplicationBase::getServiceImplName() return sImplName; } -uno::Sequence<rtl::OUString> +uno::Sequence<rtl::OUString> VbaApplicationBase::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; @@ -495,7 +495,7 @@ void VbaApplicationBase::Quit() throw (uno::RuntimeException) { SbModule* pMod = dynamic_cast< SbModule* >( pMeth->GetParent() ); if ( pMod ) - { + { StarBASIC* pBasic = dynamic_cast< StarBASIC* >( pMod->GetParent() ); if ( pBasic ) pBasic->QuitAndExitApplication(); diff --git a/vbahelper/source/vbahelper/vbacolorformat.cxx b/vbahelper/source/vbahelper/vbacolorformat.cxx index 2590911bf0b7..d87e1db7df1b 100644 --- a/vbahelper/source/vbahelper/vbacolorformat.cxx +++ b/vbahelper/source/vbahelper/vbacolorformat.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,7 +70,7 @@ ScVbaColorFormat::setColorFormat( sal_Int16 _ntype ) } // Attribute -sal_Int32 SAL_CALL +sal_Int32 SAL_CALL ScVbaColorFormat::getRGB() throw (uno::RuntimeException) { sal_Int32 nRGB = 0; @@ -96,7 +96,7 @@ ScVbaColorFormat::getRGB() throw (uno::RuntimeException) return nRGB; } -void SAL_CALL +void SAL_CALL ScVbaColorFormat::setRGB( sal_Int32 _rgb ) throw (uno::RuntimeException) { sal_Int32 nRGB = XLRGBToOORGB( _rgb ); @@ -122,17 +122,17 @@ ScVbaColorFormat::setRGB( sal_Int32 _rgb ) throw (uno::RuntimeException) m_pFillFormat->setForeColorAndInternalStyle(nRGB); } break; - default: + default: throw uno::RuntimeException( rtl::OUString::createFromAscii("Second parameter of ColorFormat is wrong."), uno::Reference< uno::XInterface >() ); } } -sal_Int32 SAL_CALL +sal_Int32 SAL_CALL ScVbaColorFormat::getSchemeColor() throw (uno::RuntimeException) { sal_Int32 nColor = getRGB(); // #TODO I guess the number of elements is determined by the correct scheme - // the implementation here seems to be a rehash of color index ( which seems to be a + // the implementation here seems to be a rehash of color index ( which seems to be a // different thing ) - I would guess we need to know/import etc. the correct color scheme // or at least find out a little more sal_Int32 i = 0; @@ -144,8 +144,8 @@ ScVbaColorFormat::getSchemeColor() throw (uno::RuntimeException) if( i == 56 ) // this is most likely an error condition --i; - return i; - // #TODO figure out what craziness is this, + return i; + // #TODO figure out what craziness is this, // the 56 colors seems incorrect, as in default XL ( 2003 ) there are 80 colors /* if( i == 56 ) @@ -157,7 +157,7 @@ ScVbaColorFormat::getSchemeColor() throw (uno::RuntimeException) */ } -void SAL_CALL +void SAL_CALL ScVbaColorFormat::setSchemeColor( sal_Int32 _schemecolor ) throw (uno::RuntimeException) { // the table is 0 based diff --git a/vbahelper/source/vbahelper/vbacolorformat.hxx b/vbahelper/source/vbahelper/vbacolorformat.hxx index e29ea90cb92c..c0e023dc5ce7 100644 --- a/vbahelper/source/vbahelper/vbacolorformat.hxx +++ b/vbahelper/source/vbahelper/vbacolorformat.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -96,7 +96,7 @@ struct MsoColorIndizes const static sal_Int32 HAPICOLOR_GRAY_80_PERCENT = 3355443; static sal_Int32 getColorIndex( sal_Int32 nIndex ); - + }; class ScVbaColorFormat : public ScVbaColorFormat_BASE diff --git a/vbahelper/source/vbahelper/vbacommandbar.cxx b/vbahelper/source/vbahelper/vbacommandbar.cxx index e0955163d984..94c71919a8cf 100644 --- a/vbahelper/source/vbahelper/vbacommandbar.cxx +++ b/vbahelper/source/vbahelper/vbacommandbar.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -25,8 +25,8 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "vbacommandbar.hxx" -#include "vbacommandbarcontrols.hxx" +#include "vbacommandbar.hxx" +#include "vbacommandbarcontrols.hxx" #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XDesktop.hpp> @@ -45,7 +45,7 @@ ScVbaCommandBar::ScVbaCommandBar( const uno::Reference< ov::XHelperInterface > x ::rtl::OUString SAL_CALL ScVbaCommandBar::getName() throw ( uno::RuntimeException ) { - // This will get a "NULL length string" when Name is not set. + // This will get a "NULL length string" when Name is not set. uno::Reference< beans::XPropertySet > xPropertySet( m_xBarSettings, uno::UNO_QUERY_THROW ); uno::Any aName = xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("UIName") ); rtl::OUString sName; @@ -60,32 +60,32 @@ ScVbaCommandBar::getName() throw ( uno::RuntimeException ) sName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Worksheet Menu Bar") ); else if( pCBarHelper->getModuleId().equalsAscii("com.sun.star.text.TextDocument") ) sName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Menu Bar") ); - return sName; + return sName; } } // Toolbar name uno::Reference< container::XNameAccess > xNameAccess = pCBarHelper->getPersistentWindowState(); if( xNameAccess->hasByName( m_sResourceUrl ) ) { - uno::Sequence< beans::PropertyValue > aToolBar; + uno::Sequence< beans::PropertyValue > aToolBar; xNameAccess->getByName( m_sResourceUrl ) >>= aToolBar; getPropertyValue( aToolBar, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("UIName") ) ) >>= sName; } } return sName; } -void SAL_CALL +void SAL_CALL ScVbaCommandBar::setName( const ::rtl::OUString& _name ) throw (uno::RuntimeException) { uno::Reference< beans::XPropertySet > xPropertySet( m_xBarSettings, uno::UNO_QUERY_THROW ); xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("UIName"), uno::makeAny( _name ) ); - + pCBarHelper->ApplyChange( m_sResourceUrl, m_xBarSettings ); } -::sal_Bool SAL_CALL +::sal_Bool SAL_CALL ScVbaCommandBar::getVisible() throw (uno::RuntimeException) { - // menu bar is allways visible in OOo + // menu bar is allways visible in OOo if( m_bIsMenu ) return sal_True; @@ -95,7 +95,7 @@ ScVbaCommandBar::getVisible() throw (uno::RuntimeException) uno::Reference< container::XNameAccess > xNameAccess = pCBarHelper->getPersistentWindowState(); if( xNameAccess->hasByName( m_sResourceUrl ) ) { - uno::Sequence< beans::PropertyValue > aToolBar; + uno::Sequence< beans::PropertyValue > aToolBar; xNameAccess->getByName( m_sResourceUrl ) >>= aToolBar; getPropertyValue( aToolBar, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Visible") ) ) >>= bVisible; } @@ -105,7 +105,7 @@ ScVbaCommandBar::getVisible() throw (uno::RuntimeException) } return bVisible; } -void SAL_CALL +void SAL_CALL ScVbaCommandBar::setVisible( ::sal_Bool _visible ) throw (uno::RuntimeException) { try @@ -128,7 +128,7 @@ ScVbaCommandBar::setVisible( ::sal_Bool _visible ) throw (uno::RuntimeException) } } -::sal_Bool SAL_CALL +::sal_Bool SAL_CALL ScVbaCommandBar::getEnabled() throw (uno::RuntimeException) { // emulated with Visible @@ -142,7 +142,7 @@ ScVbaCommandBar::setEnabled( sal_Bool _enabled ) throw (uno::RuntimeException) setVisible( _enabled ); } -void SAL_CALL +void SAL_CALL ScVbaCommandBar::Delete( ) throw (script::BasicErrorException, uno::RuntimeException) { pCBarHelper->removeSettings( m_sResourceUrl ); @@ -152,7 +152,7 @@ ScVbaCommandBar::Delete( ) throw (script::BasicErrorException, uno::RuntimeExce xNameContainer->removeByName( m_sResourceUrl ); } } -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaCommandBar::Controls( const uno::Any& aIndex ) throw (script::BasicErrorException, uno::RuntimeException) { uno::Reference< awt::XMenu > xMenu; @@ -179,20 +179,20 @@ ScVbaCommandBar::Type() throw (script::BasicErrorException, uno::RuntimeExceptio return nType; } -uno::Any SAL_CALL +uno::Any SAL_CALL 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) { // alwayse fail to find control return uno::makeAny( uno::Reference< XCommandBarControl > () ); } -rtl::OUString& +rtl::OUString& ScVbaCommandBar::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBar") ); return sImplName; } -uno::Sequence<rtl::OUString> +uno::Sequence<rtl::OUString> ScVbaCommandBar::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/vbahelper/source/vbahelper/vbacommandbar.hxx b/vbahelper/source/vbahelper/vbacommandbar.hxx index de9c32c350f0..707c8194743b 100644 --- a/vbahelper/source/vbahelper/vbacommandbar.hxx +++ b/vbahelper/source/vbahelper/vbacommandbar.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -101,7 +101,7 @@ public: // XHelperInterface virtual rtl::OUString& getServiceImplName(); virtual css::uno::Sequence<rtl::OUString> getServiceNames(); - + private: ::rtl::OUString maName; sal_Int32 mnType; diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx b/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx index 449c9e4d82fa..ebf2f33c3044 100644 --- a/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx +++ b/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,7 +58,7 @@ ScVbaCommandBarControl::getCaption() throw ( uno::RuntimeException ) return sCaption; } -void SAL_CALL +void SAL_CALL ScVbaCommandBarControl::setCaption( const ::rtl::OUString& _caption ) throw (uno::RuntimeException) { rtl::OUString sCaption = _caption.replace('&','~'); @@ -66,7 +66,7 @@ ScVbaCommandBarControl::setCaption( const ::rtl::OUString& _caption ) throw (uno ApplyChange(); } -::rtl::OUString SAL_CALL +::rtl::OUString SAL_CALL ScVbaCommandBarControl::getOnAction() throw (uno::RuntimeException) { rtl::OUString sCommandURL; @@ -74,11 +74,11 @@ ScVbaCommandBarControl::getOnAction() throw (uno::RuntimeException) return sCommandURL; } -void SAL_CALL +void SAL_CALL ScVbaCommandBarControl::setOnAction( const ::rtl::OUString& _onaction ) throw (uno::RuntimeException) { // get the current model - uno::Reference< frame::XModel > xModel( pCBarHelper->getModel() ); + uno::Reference< frame::XModel > xModel( pCBarHelper->getModel() ); VBAMacroResolvedInfo aResolvedMacro = ooo::vba::resolveVBAMacro( getSfxObjShell( xModel ), _onaction, true ); if ( aResolvedMacro.IsResolved() ) { @@ -89,7 +89,7 @@ ScVbaCommandBarControl::setOnAction( const ::rtl::OUString& _onaction ) throw (u } } -::sal_Bool SAL_CALL +::sal_Bool SAL_CALL ScVbaCommandBarControl::getVisible() throw (uno::RuntimeException) { sal_Bool bVisible = sal_True; @@ -98,7 +98,7 @@ ScVbaCommandBarControl::getVisible() throw (uno::RuntimeException) aValue >>= bVisible; return bVisible; } -void SAL_CALL +void SAL_CALL ScVbaCommandBarControl::setVisible( ::sal_Bool _visible ) throw (uno::RuntimeException) { uno::Any aValue = getPropertyValue( m_aPropertyValues, rtl::OUString::createFromAscii("IsVisible") ); @@ -109,7 +109,7 @@ ScVbaCommandBarControl::setVisible( ::sal_Bool _visible ) throw (uno::RuntimeExc } } -::sal_Bool SAL_CALL +::sal_Bool SAL_CALL ScVbaCommandBarControl::getEnabled() throw (uno::RuntimeException) { sal_Bool bEnabled = sal_True; @@ -123,7 +123,7 @@ ScVbaCommandBarControl::getEnabled() throw (uno::RuntimeException) { // emulated with Visible bEnabled = getVisible(); - } + } return bEnabled; } @@ -139,7 +139,7 @@ ScVbaCommandBarControl::setEnabled( sal_Bool _enabled ) throw (uno::RuntimeExcep { // emulated with Visible setVisible( _enabled ); - } + } } ::sal_Bool SAL_CALL @@ -158,7 +158,7 @@ ScVbaCommandBarControl::setBeginGroup( ::sal_Bool _begin ) throw (css::uno::Runt } } -void SAL_CALL +void SAL_CALL ScVbaCommandBarControl::Delete( ) throw (script::BasicErrorException, uno::RuntimeException) { if( m_xCurrentSettings.is() ) @@ -170,7 +170,7 @@ ScVbaCommandBarControl::Delete( ) throw (script::BasicErrorException, uno::Runt } } -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaCommandBarControl::Controls( const uno::Any& aIndex ) throw (script::BasicErrorException, uno::RuntimeException) { // only Popup Menu has controls @@ -178,13 +178,13 @@ ScVbaCommandBarControl::Controls( const uno::Any& aIndex ) throw (script::BasicE getPropertyValue( m_aPropertyValues, rtl::OUString::createFromAscii( ITEM_DESCRIPTOR_CONTAINER ) ) >>= xSubMenu; if( !xSubMenu.is() ) throw uno::RuntimeException(); - + uno::Reference< awt::XMenu > xMenu; if( m_xParentMenu.is() ) { sal_Int16 nItemId = m_xParentMenu->getItemId( sal::static_int_cast< sal_Int16 >( m_nPosition ) ); xMenu.set( m_xParentMenu->getPopupMenu( nItemId ), uno::UNO_QUERY ); - } + } uno::Reference< XCommandBarControls > xCommandBarControls( new ScVbaCommandBarControls( this, mxContext, xSubMenu, pCBarHelper, m_xBarSettings, m_sResourceUrl, xMenu ) ); if( aIndex.hasValue() ) @@ -194,14 +194,14 @@ ScVbaCommandBarControl::Controls( const uno::Any& aIndex ) throw (script::BasicE return uno::makeAny( xCommandBarControls ); } -rtl::OUString& +rtl::OUString& ScVbaCommandBarControl::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBarControl") ); return sImplName; } -uno::Sequence<rtl::OUString> +uno::Sequence<rtl::OUString> ScVbaCommandBarControl::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; @@ -222,13 +222,13 @@ ScVbaCommandBarPopup::ScVbaCommandBarPopup( const css::uno::Reference< ov::XHelp m_xParentMenu = xMenu; } -rtl::OUString& +rtl::OUString& ScVbaCommandBarPopup::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBarPopup") ); return sImplName; } -uno::Sequence<rtl::OUString> +uno::Sequence<rtl::OUString> ScVbaCommandBarPopup::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; @@ -249,13 +249,13 @@ ScVbaCommandBarButton::ScVbaCommandBarButton( const css::uno::Reference< ov::XHe m_xParentMenu = xMenu; } -rtl::OUString& +rtl::OUString& ScVbaCommandBarButton::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBarButton") ); return sImplName; } -uno::Sequence<rtl::OUString> +uno::Sequence<rtl::OUString> ScVbaCommandBarButton::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx b/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx index c599472682ff..1b9a58e660e8 100644 --- a/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx +++ b/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,7 +58,7 @@ private: public: ScVbaCommandBarControl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const rtl::OUString& sResourceUrl ) throw (css::uno::RuntimeException); ScVbaCommandBarControl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xSettings, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const rtl::OUString& sResourceUrl, sal_Int32 nPosition, sal_Bool bTemporary ) throw (css::uno::RuntimeException); - + // Attributes virtual ::rtl::OUString SAL_CALL getCaption() throw (css::uno::RuntimeException); virtual void SAL_CALL setCaption( const ::rtl::OUString& _caption ) throw (css::uno::RuntimeException); diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx index 6e409f8e840f..d488ffb8992a 100644 --- a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx +++ b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -133,7 +133,7 @@ ScVbaCommandBarControls::createCollectionObject( const uno::Any& aSource ) } // Methods -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaCommandBarControls::Item( const uno::Any& aIndex, const uno::Any& /*aIndex*/ ) throw (uno::RuntimeException) { sal_Int32 nPosition = -1; @@ -142,7 +142,7 @@ ScVbaCommandBarControls::Item( const uno::Any& aIndex, const uno::Any& /*aIndex* rtl::OUString sName; aIndex >>= sName; nPosition = VbaCommandBarHelper::findControlByName( m_xIndexAccess, sName, m_bIsMenu ); - } + } else { aIndex >>= nPosition; @@ -152,11 +152,11 @@ ScVbaCommandBarControls::Item( const uno::Any& aIndex, const uno::Any& /*aIndex* { throw uno::RuntimeException(); } - - return createCollectionObject( uno::makeAny( nPosition ) ); + + return createCollectionObject( uno::makeAny( nPosition ) ); } -uno::Reference< XCommandBarControl > SAL_CALL +uno::Reference< XCommandBarControl > SAL_CALL 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) { // Parameter is not supported @@ -166,7 +166,7 @@ ScVbaCommandBarControls::Add( const uno::Any& Type, const uno::Any& Id, const un sal_Int32 nType = office::MsoControlType::msoControlButton; sal_Int32 nPosition = 0; sal_Bool bTemporary = sal_True; - + if( Type.hasValue() ) { Type >>= nType; @@ -188,7 +188,7 @@ ScVbaCommandBarControls::Add( const uno::Any& Type, const uno::Any& Id, const un if( Temporary.hasValue() ) Temporary >>= bTemporary; - + uno::Any aSubMenu; if( nType == office::MsoControlType::msoControlPopup ) { @@ -197,7 +197,7 @@ ScVbaCommandBarControls::Add( const uno::Any& Type, const uno::Any& Id, const un aSubMenu <<= xSCF->createInstanceWithContext( mxContext ); } - // create control + // create control uno::Sequence< beans::PropertyValue > aProps; rtl::OUString sHelpUrl; sal_uInt16 nItemType = 0; @@ -218,7 +218,7 @@ ScVbaCommandBarControls::Add( const uno::Any& Type, const uno::Any& Id, const un pCBarHelper->ApplyChange( m_sResourceUrl, m_xBarSettings ); - // sometimes it would crash if passing m_xMenu instead of uno::Reference< awt::XMenu >() in Linux. + // sometimes it would crash if passing m_xMenu instead of uno::Reference< awt::XMenu >() in Linux. ScVbaCommandBarControl* pNewCommandBarControl = NULL; if( nType == office::MsoControlType::msoControlPopup ) pNewCommandBarControl = new ScVbaCommandBarPopup( this, mxContext, m_xIndexAccess, pCBarHelper, m_xBarSettings, m_sResourceUrl, nPosition, bTemporary, uno::Reference< awt::XMenu >() ); @@ -227,15 +227,15 @@ ScVbaCommandBarControls::Add( const uno::Any& Type, const uno::Any& Id, const un return uno::Reference< XCommandBarControl >( pNewCommandBarControl ); } - + // XHelperInterface -rtl::OUString& +rtl::OUString& ScVbaCommandBarControls::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBarControls") ); return sImplName; } -uno::Sequence<rtl::OUString> +uno::Sequence<rtl::OUString> ScVbaCommandBarControls::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrols.hxx b/vbahelper/source/vbahelper/vbacommandbarcontrols.hxx index b62b18e44b4d..53ec12d2f154 100644 --- a/vbahelper/source/vbahelper/vbacommandbarcontrols.hxx +++ b/vbahelper/source/vbahelper/vbacommandbarcontrols.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,8 +57,8 @@ public: virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - // Methods - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) throw (css::uno::RuntimeException); + // Methods + virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) throw (css::uno::RuntimeException); 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); // XHelperInterface virtual rtl::OUString& getServiceImplName(); diff --git a/vbahelper/source/vbahelper/vbacommandbarhelper.cxx b/vbahelper/source/vbahelper/vbacommandbarhelper.cxx index d8302bb321d1..c8fd28fa6ba5 100644 --- a/vbahelper/source/vbahelper/vbacommandbarhelper.cxx +++ b/vbahelper/source/vbahelper/vbacommandbarhelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "vbacommandbarhelper.hxx" +#include "vbacommandbarhelper.hxx" #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> #include <com/sun/star/ui/XUIConfigurationStorage.hpp> #include <com/sun/star/ui/XModuleUIConfigurationManager.hpp> @@ -120,7 +120,7 @@ void VbaCommandBarHelper::Init( ) throw (css::uno::RuntimeException) } uno::Reference< lang::XMultiServiceFactory > xServiceManager( mxContext->getServiceManager(), uno::UNO_QUERY_THROW ); - + css::uno::Reference< css::ui::XModuleUIConfigurationManagerSupplier > xUICfgMgrSupp( xServiceManager->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.ModuleUIConfigurationManagerSupplier" ))), uno::UNO_QUERY_THROW ); m_xAppCfgMgr.set( xUICfgMgrSupp->getUIConfigurationManager( maModuleId ), uno::UNO_QUERY_THROW ); @@ -149,7 +149,7 @@ void VbaCommandBarHelper::removeSettings( const rtl::OUString& sResourceUrl ) th m_xDocCfgMgr->removeSettings( sResourceUrl ); else if( m_xAppCfgMgr->hasSettings( sResourceUrl ) ) m_xAppCfgMgr->removeSettings( sResourceUrl ); - + // persistChanges(); } @@ -183,7 +183,7 @@ sal_Bool VbaCommandBarHelper::persistChanges() throw (css::uno::RuntimeException uno::Reference< frame::XLayoutManager > VbaCommandBarHelper::getLayoutManager() throw (uno::RuntimeException) { - uno::Reference< frame::XFrame > xFrame( getModel()->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW ); + uno::Reference< frame::XFrame > xFrame( getModel()->getCurrentController()->getFrame(), uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xPropertySet( xFrame, uno::UNO_QUERY_THROW ); uno::Reference< frame::XLayoutManager > xLayoutManager( xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("LayoutManager") ), uno::UNO_QUERY_THROW ); return xLayoutManager; @@ -222,7 +222,7 @@ rtl::OUString VbaCommandBarHelper::findToolbarByName( const css::uno::Reference< return sResourceUrl; } } - + // the customize toolbars creating during importing, shoud found there. static rtl::OUString sToolbarPrefix( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/custom_" ) ); sResourceUrl = sToolbarPrefix.concat( sName ); diff --git a/vbahelper/source/vbahelper/vbacommandbarhelper.hxx b/vbahelper/source/vbahelper/vbacommandbarhelper.hxx index e494c8787b7f..b93d037c1213 100644 --- a/vbahelper/source/vbahelper/vbacommandbarhelper.hxx +++ b/vbahelper/source/vbahelper/vbacommandbarhelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,7 +47,7 @@ static const char ITEM_DESCRIPTOR_TYPE[] = "Type"; static const char ITEM_DESCRIPTOR_STYLE[] = "Style"; static const char ITEM_DESCRIPTOR_ISVISIBLE[] = "IsVisible"; static const char ITEM_DESCRIPTOR_RESOURCEURL[] = "ResourceURL"; -static const char ITEM_DESCRIPTOR_UINAME[] = "UIName"; +static const char ITEM_DESCRIPTOR_UINAME[] = "UIName"; static const char ITEM_MENUBAR_URL[] = "private:resource/menubar/menubar"; static const char ITEM_TOOLBAR_URL[] = "private:resource/toolbar/"; diff --git a/vbahelper/source/vbahelper/vbacommandbars.cxx b/vbahelper/source/vbahelper/vbacommandbars.cxx index 6b6a547150ac..b76e23002c45 100644 --- a/vbahelper/source/vbahelper/vbacommandbars.cxx +++ b/vbahelper/source/vbahelper/vbacommandbars.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,7 +68,7 @@ public: if( hasMoreElements() ) { rtl::OUString sResourceUrl( m_sNames[ m_nCurrentPosition++ ] ); - if( sResourceUrl.indexOf( rtl::OUString::createFromAscii("private:resource/toolbar/") ) != -1 ) + if( sResourceUrl.indexOf( rtl::OUString::createFromAscii("private:resource/toolbar/") ) != -1 ) { uno::Reference< container::XIndexAccess > xCBarSetting = m_pCBarHelper->getSettings( sResourceUrl ); uno::Reference< XCommandBar > xCommandBar( new ScVbaCommandBar( m_xParent, m_xContext, m_pCBarHelper, xCBarSetting, sResourceUrl, sal_False, sal_False ) ); @@ -93,7 +93,7 @@ ScVbaCommandBars::~ScVbaCommandBars() } // XEnumerationAccess -uno::Type SAL_CALL +uno::Type SAL_CALL ScVbaCommandBars::getElementType() throw ( uno::RuntimeException ) { return XCommandBar::static_type( 0 ); @@ -114,7 +114,7 @@ ScVbaCommandBars::createCollectionObject( const uno::Any& aSource ) rtl::OUString sBarName; sal_Bool bMenu = sal_False; uno::Any aRet; - + if( aSource >>= sBarName ) { // some built-in command bars @@ -163,7 +163,7 @@ ScVbaCommandBars::createCollectionObject( const uno::Any& aSource ) } // XCommandBars -uno::Reference< XCommandBar > SAL_CALL +uno::Reference< XCommandBar > SAL_CALL 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) { // FIXME: only support to add Toolbar @@ -183,19 +183,19 @@ ScVbaCommandBars::Add( const css::uno::Any& Name, const css::uno::Any& /*Positio else { sName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Custom1") ); - } + } sal_Bool bTemporary = sal_False; if( Temporary.hasValue() ) Temporary >>= bTemporary; - + sResourceUrl = VbaCommandBarHelper::generateCustomURL(); uno::Reference< container::XIndexAccess > xBarSettings( m_pCBarHelper->getSettings( sResourceUrl ), uno::UNO_QUERY_THROW ); uno::Reference< XCommandBar > xCBar( new ScVbaCommandBar( this, mxContext, m_pCBarHelper, xBarSettings, sResourceUrl, sal_False, bTemporary ) ); xCBar->setName( sName ); return xCBar; } -sal_Int32 SAL_CALL +sal_Int32 SAL_CALL ScVbaCommandBars::getCount() throw(css::uno::RuntimeException) { // Filter out all toolbars from the window collection @@ -217,7 +217,7 @@ ScVbaCommandBars::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) th { if( aIndex.getValueTypeClass() == uno::TypeClass_STRING ) { - return createCollectionObject( aIndex ); + return createCollectionObject( aIndex ); } // hardcode if "aIndex = 1" that would return "main menu". @@ -230,20 +230,20 @@ ScVbaCommandBars::Item( const uno::Any& aIndex, const uno::Any& /*aIndex2*/ ) th aSource <<= rtl::OUString::createFromAscii( "Worksheet Menu Bar" ); else if( m_pCBarHelper->getModuleId().equalsAscii("com.sun.star.text.TextDocument") ) aSource <<= rtl::OUString::createFromAscii( "Menu Bar" ); - if( aSource.hasValue() ) + if( aSource.hasValue() ) return createCollectionObject( aSource ); } return uno::Any(); } // XHelperInterface -rtl::OUString& +rtl::OUString& ScVbaCommandBars::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaCommandBars") ); return sImplName; } -uno::Sequence<rtl::OUString> +uno::Sequence<rtl::OUString> ScVbaCommandBars::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/vbahelper/source/vbahelper/vbacommandbars.hxx b/vbahelper/source/vbahelper/vbacommandbars.hxx index 27af1dbd10d5..3c32b7d4a9b5 100644 --- a/vbahelper/source/vbahelper/vbacommandbars.hxx +++ b/vbahelper/source/vbahelper/vbacommandbars.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vbahelper/source/vbahelper/vbadialogbase.cxx b/vbahelper/source/vbahelper/vbadialogbase.cxx index 0b852411f918..05e693cce589 100644 --- a/vbahelper/source/vbahelper/vbadialogbase.cxx +++ b/vbahelper/source/vbahelper/vbadialogbase.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vbahelper/source/vbahelper/vbadialogsbase.cxx b/vbahelper/source/vbahelper/vbadialogsbase.cxx index e60d3f5be532..d625184a8b1d 100644 --- a/vbahelper/source/vbahelper/vbadialogsbase.cxx +++ b/vbahelper/source/vbahelper/vbadialogsbase.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vbahelper/source/vbahelper/vbadocumentsbase.cxx b/vbahelper/source/vbahelper/vbadocumentsbase.cxx index ad25c4c6520f..2eb98845e90d 100644 --- a/vbahelper/source/vbahelper/vbadocumentsbase.cxx +++ b/vbahelper/source/vbahelper/vbadocumentsbase.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -100,13 +100,13 @@ public: m_it = m_documents.begin(); } // XEnumeration - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException) - { + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException) + { return m_it != m_documents.end(); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) - { + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + { if ( !hasMoreElements() ) { throw container::NoSuchElementException(); @@ -119,9 +119,9 @@ public: // a very similar one is used in vbawindow ( SelectedSheetsEnumAccess ) // Maybe a template base class that does all of the operations on the hashmap // and vector only, and the sub-class does everything else -// => ctor, createEnumeration & factory method need be defined ( to be called +// => ctor, createEnumeration & factory method need be defined ( to be called // by getByIndex, getByName ) -typedef ::cppu::WeakImplHelper3< container::XEnumerationAccess +typedef ::cppu::WeakImplHelper3< container::XEnumerationAccess , com::sun::star::container::XIndexAccess , com::sun::star::container::XNameAccess > DocumentsAccessImpl_BASE; @@ -132,7 +132,7 @@ class DocumentsAccessImpl : public DocumentsAccessImpl_BASE Documents m_documents; NameIndexHash namesToIndices; VbaDocumentsBase::DOCUMENT_TYPE meDocType; -public: +public: DocumentsAccessImpl( const uno::Reference< uno::XComponentContext >& xContext, VbaDocumentsBase::DOCUMENT_TYPE eDocType ) throw (uno::RuntimeException) :m_xContext( xContext ), meDocType( eDocType ) { uno::Reference< container::XEnumeration > xEnum = new DocumentsEnumImpl( m_xContext ); @@ -140,7 +140,7 @@ public: while( xEnum->hasMoreElements() ) { uno::Reference< lang::XServiceInfo > xServiceInfo( xEnum->nextElement(), uno::UNO_QUERY ); - if ( xServiceInfo.is() + if ( xServiceInfo.is() && ( ( xServiceInfo->supportsService( sSpreadsheetDocument ) && meDocType == VbaDocumentsBase::EXCEL_DOCUMENT ) || ( xServiceInfo->supportsService( sTextDocument ) && meDocType == VbaDocumentsBase::WORD_DOCUMENT ) ) ) { @@ -155,61 +155,61 @@ public: namesToIndices[ sName ] = nIndex++; } } - + } - + //XEnumerationAccess virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException) { - return new DocumentsEnumImpl( m_xContext, m_documents ); + return new DocumentsEnumImpl( m_xContext, m_documents ); } // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException) - { + virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException) + { return m_documents.size(); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw ( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) - { - if ( Index < 0 - || static_cast< Documents::size_type >(Index) >= m_documents.size() ) + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw ( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) + { + if ( Index < 0 + || static_cast< Documents::size_type >(Index) >= m_documents.size() ) throw lang::IndexOutOfBoundsException(); return makeAny( m_documents[ Index ] ); // returns xspreadsheetdoc } //XElementAccess virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) - { - return frame::XModel::static_type(0); + { + return frame::XModel::static_type(0); } - virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException) - { + virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException) + { return (m_documents.size() > 0); } //XNameAccess - virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) - { + virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + { NameIndexHash::const_iterator it = namesToIndices.find( aName ); if ( it == namesToIndices.end() ) throw container::NoSuchElementException(); return makeAny( m_documents[ it->second ] ); - + } - virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) - { + virtual uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException) + { uno::Sequence< ::rtl::OUString > names( namesToIndices.size() ); ::rtl::OUString* pString = names.getArray(); NameIndexHash::const_iterator it = namesToIndices.begin(); NameIndexHash::const_iterator it_end = namesToIndices.end(); for ( ; it != it_end; ++it, ++pString ) - *pString = it->first; - return names; + *pString = it->first; + return names; } - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException) - { + virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (uno::RuntimeException) + { NameIndexHash::const_iterator it = namesToIndices.find( aName ); return (it != namesToIndices.end()); } @@ -239,8 +239,8 @@ VbaDocumentsBase::Add() throw (uno::RuntimeException) throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() ); uno::Reference< lang::XComponent > xComponent = xLoader->loadComponentFromURL( sURL , - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("_blank") ), 0, - uno::Sequence< beans::PropertyValue >(0) ); + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("_blank") ), 0, + uno::Sequence< beans::PropertyValue >(0) ); return uno::makeAny( xComponent ); } @@ -288,7 +288,7 @@ VbaDocumentsBase::Open( const rtl::OUString& rFileName, const uno::Any& ReadOnly sProps[ sProps.getLength() - 1 ].Value <<= uno::makeAny( document::MacroExecMode::ALWAYS_EXECUTE_NO_WARN ); sal_Int32 nIndex = sProps.getLength() - 1; - + if ( ReadOnly.hasValue() ) { sal_Bool bIsReadOnly = sal_False; ReadOnly >>= bIsReadOnly; diff --git a/vbahelper/source/vbahelper/vbaeventshelperbase.cxx b/vbahelper/source/vbahelper/vbaeventshelperbase.cxx index c222b04e4dda..d70a8046512a 100644 --- a/vbahelper/source/vbahelper/vbaeventshelperbase.cxx +++ b/vbahelper/source/vbahelper/vbaeventshelperbase.cxx @@ -74,16 +74,16 @@ void SAL_CALL VbaEventsHelperBase::processVbaEvent( sal_Int32 nEventId, const un a queue. First element in the queue is the next event to be processed. */ EventQueue aEventQueue; aEventQueue.push_back( EventQueueEntry( nEventId, rArgs ) ); - + /* bEnabled will track if event processing is enabled. Every event handler may disable handling of other events. */ bool bEnabled = true; - + /* bCancel will contain the current Cancel value. It is possible that multiple events will try to modify the Cancel value. Every event handler receives the Cancel value of the previous event handler. */ bool bCancel = false; - + /* bSuccess will change to true if at least one event handler has been executed successfully. */ bool bSuccess = false; diff --git a/vbahelper/source/vbahelper/vbafillformat.cxx b/vbahelper/source/vbahelper/vbafillformat.cxx index 89d074e89ee2..151c90911055 100644 --- a/vbahelper/source/vbahelper/vbafillformat.cxx +++ b/vbahelper/source/vbahelper/vbafillformat.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -83,7 +83,7 @@ ScVbaFillFormat::setForeColorAndInternalStyle( sal_Int32 nForeColor ) throw (css } // Attributes -sal_Bool SAL_CALL +sal_Bool SAL_CALL ScVbaFillFormat::getVisible() throw (uno::RuntimeException) { drawing::FillStyle nFillStyle; @@ -93,7 +93,7 @@ ScVbaFillFormat::getVisible() throw (uno::RuntimeException) return sal_True; } -void SAL_CALL +void SAL_CALL ScVbaFillFormat::setVisible( sal_Bool _visible ) throw (uno::RuntimeException) { drawing::FillStyle aFillStyle; @@ -111,7 +111,7 @@ ScVbaFillFormat::setVisible( sal_Bool _visible ) throw (uno::RuntimeException) } } -double SAL_CALL +double SAL_CALL ScVbaFillFormat::getTransparency() throw (uno::RuntimeException) { sal_Int16 nTransparence = 0; @@ -122,7 +122,7 @@ ScVbaFillFormat::getTransparency() throw (uno::RuntimeException) return dTransparence; } -void SAL_CALL +void SAL_CALL ScVbaFillFormat::setTransparency( double _transparency ) throw (uno::RuntimeException) { sal_Int16 nTransparence = static_cast< sal_Int16 >( _transparency * 100 ); @@ -131,13 +131,13 @@ ScVbaFillFormat::setTransparency( double _transparency ) throw (uno::RuntimeExce // Methods -void SAL_CALL +void SAL_CALL ScVbaFillFormat::Solid() throw (uno::RuntimeException) { setFillStyle( drawing::FillStyle_SOLID ); } -void SAL_CALL +void SAL_CALL ScVbaFillFormat::TwoColorGradient( sal_Int32 style, sal_Int32 /*variant*/ ) throw (uno::RuntimeException) { if( style == office::MsoGradientStyle::msoGradientHorizontal ) @@ -162,7 +162,7 @@ ScVbaFillFormat::TwoColorGradient( sal_Int32 style, sal_Int32 /*variant*/ ) thro } } -uno::Reference< msforms::XColorFormat > SAL_CALL +uno::Reference< msforms::XColorFormat > SAL_CALL ScVbaFillFormat::BackColor() throw (uno::RuntimeException) { if( !m_xColorFormat.is() ) @@ -170,7 +170,7 @@ ScVbaFillFormat::BackColor() throw (uno::RuntimeException) return m_xColorFormat; } -uno::Reference< msforms::XColorFormat > SAL_CALL +uno::Reference< msforms::XColorFormat > SAL_CALL ScVbaFillFormat::ForeColor() throw (uno::RuntimeException) { if( !m_xColorFormat.is() ) diff --git a/vbahelper/source/vbahelper/vbafillformat.hxx b/vbahelper/source/vbahelper/vbafillformat.hxx index c2db69f525cc..6cdaf0e0cd17 100644 --- a/vbahelper/source/vbahelper/vbafillformat.hxx +++ b/vbahelper/source/vbahelper/vbafillformat.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vbahelper/source/vbahelper/vbafontbase.cxx b/vbahelper/source/vbahelper/vbafontbase.cxx index e807a1842c2a..3f681c6eec68 100644 --- a/vbahelper/source/vbahelper/vbafontbase.cxx +++ b/vbahelper/source/vbahelper/vbafontbase.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,7 +63,7 @@ VbaFontBase::setSuperscript( const uno::Any& aValue ) throw ( uno::RuntimeExcept // not supported in form controls if( mbFormControl ) return; - + sal_Bool bValue = sal_False; aValue >>= bValue; sal_Int16 nValue = NORMAL; diff --git a/vbahelper/source/vbahelper/vbaglobalbase.cxx b/vbahelper/source/vbahelper/vbaglobalbase.cxx index fd85d99a952d..7e6d365823c8 100644 --- a/vbahelper/source/vbahelper/vbaglobalbase.cxx +++ b/vbahelper/source/vbahelper/vbaglobalbase.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,8 +40,8 @@ rtl::OUString sApplication( RTL_CONSTASCII_USTRINGPARAM("Application") ); // special key to return the Application rtl::OUString sAppService( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.Application") ); -VbaGlobalsBase::VbaGlobalsBase( -const uno::Reference< ov::XHelperInterface >& xParent, +VbaGlobalsBase::VbaGlobalsBase( +const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const rtl::OUString& sDocCtxName ) : Globals_BASE( xParent, xContext ), msDocCtxName( sDocCtxName ) { @@ -55,8 +55,8 @@ const uno::Reference< uno::XComponentContext >& xContext, const rtl::OUString& s ::cppu::ContextEntry_Init aHandlerContextInfo[] = { - ::cppu::ContextEntry_Init( sApplication, uno::Any() ), - ::cppu::ContextEntry_Init( sDocCtxName, uno::Any() ), + ::cppu::ContextEntry_Init( sApplication, uno::Any() ), + ::cppu::ContextEntry_Init( sDocCtxName, uno::Any() ), ::cppu::ContextEntry_Init( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/singletons/com.sun.star.lang.theServiceManager" ) ), aSrvMgr ) }; // don't pass a delegate, this seems to introduce yet another cyclic dependency ( and @@ -95,12 +95,12 @@ VbaGlobalsBase::init( const uno::Sequence< beans::PropertyValue >& aInitArgs ) uno::Reference< XHelperInterface > xParent( aInitArgs[ nIndex ].Value, uno::UNO_QUERY ); mxParent = xParent; } - else + else xNameContainer->replaceByName( aInitArgs[ nIndex ].Name, aInitArgs[ nIndex ].Value ); } } -uno::Reference< uno::XInterface > SAL_CALL +uno::Reference< uno::XInterface > SAL_CALL VbaGlobalsBase::createInstance( const ::rtl::OUString& aServiceSpecifier ) throw (uno::Exception, uno::RuntimeException) { uno::Reference< uno::XInterface > xReturn; @@ -115,10 +115,10 @@ VbaGlobalsBase::createInstance( const ::rtl::OUString& aServiceSpecifier ) throw return xReturn; } -uno::Reference< uno::XInterface > SAL_CALL +uno::Reference< uno::XInterface > SAL_CALL VbaGlobalsBase::createInstanceWithArguments( const ::rtl::OUString& aServiceSpecifier, const uno::Sequence< uno::Any >& Arguments ) throw (uno::Exception, uno::RuntimeException) { - + uno::Reference< uno::XInterface > xReturn; if ( aServiceSpecifier.equals( sAppService ) ) { @@ -131,10 +131,10 @@ VbaGlobalsBase::createInstanceWithArguments( const ::rtl::OUString& aServiceSpec return xReturn; } -uno::Sequence< ::rtl::OUString > SAL_CALL +uno::Sequence< ::rtl::OUString > SAL_CALL VbaGlobalsBase::getAvailableServiceNames( ) throw (uno::RuntimeException) { - static const rtl::OUString names[] = { + static const rtl::OUString names[] = { // common ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "ooo.vba.msforms.UserForm" ) ), }; diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx index d7996bc70e3a..a601d24eee02 100644 --- a/vbahelper/source/vbahelper/vbahelper.cxx +++ b/vbahelper/source/vbahelper/vbahelper.cxx @@ -457,7 +457,7 @@ void PrintOutHelper( SfxViewShell* pViewShell, const uno::Any& From, const uno:: if ( !pViewFrame->GetFrame().IsInPlace() ) { // #TODO is this necessary ( calc specific ) -// SC_MOD()->InputEnterHandler(); +// SC_MOD()->InputEnterHandler(); pViewFrame->GetDispatcher()->Execute( SID_VIEWSHELL1, SFX_CALLMODE_SYNCHRON ); while ( isInPrintPreview( pViewFrame ) ) Application::Yield(); diff --git a/vbahelper/source/vbahelper/vbalineformat.cxx b/vbahelper/source/vbahelper/vbalineformat.cxx index 58c00be4dcab..7a265170009b 100644 --- a/vbahelper/source/vbahelper/vbalineformat.cxx +++ b/vbahelper/source/vbahelper/vbalineformat.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ using namespace ooo::vba; using namespace com::sun::star; -ScVbaLineFormat::ScVbaLineFormat( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< drawing::XShape > xShape ) : ScVbaLineFormat_BASE( xParent, xContext ), m_xShape( xShape ) +ScVbaLineFormat::ScVbaLineFormat( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< drawing::XShape > xShape ) : ScVbaLineFormat_BASE( xParent, xContext ), m_xShape( xShape ) { m_xPropertySet.set( xShape, uno::UNO_QUERY_THROW ); m_nLineDashStyle = office::MsoLineDashStyle::msoLineSolid; @@ -99,7 +99,7 @@ ScVbaLineFormat::convertLineStartEndNameToArrowheadStyle( rtl::OUString sLineNam return nLineType; } -rtl::OUString +rtl::OUString ScVbaLineFormat::convertArrowheadStyleToLineStartEndName( sal_Int32 nArrowheadStyle ) throw (uno::RuntimeException) { switch( nArrowheadStyle ) @@ -122,7 +122,7 @@ ScVbaLineFormat::convertArrowheadStyleToLineStartEndName( sal_Int32 nArrowheadSt } // Attributes -sal_Int32 SAL_CALL +sal_Int32 SAL_CALL ScVbaLineFormat::getBeginArrowheadStyle() throw (uno::RuntimeException) { sal_Int32 nLineType = office::MsoArrowheadStyle::msoArrowheadNone; @@ -142,73 +142,73 @@ ScVbaLineFormat::getBeginArrowheadStyle() throw (uno::RuntimeException) return nLineType; } -void SAL_CALL +void SAL_CALL ScVbaLineFormat::setBeginArrowheadStyle( sal_Int32 _beginarrowheadstyle ) throw (uno::RuntimeException) { rtl::OUString sArrayName = convertArrowheadStyleToLineStartEndName( _beginarrowheadstyle ); m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "LineStartName" ), uno::makeAny( sArrayName ) ); } -sal_Int32 SAL_CALL +sal_Int32 SAL_CALL ScVbaLineFormat::getBeginArrowheadLength() throw (uno::RuntimeException) { throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() ); } -void SAL_CALL +void SAL_CALL ScVbaLineFormat::setBeginArrowheadLength( sal_Int32 /*_beginarrowheadlength*/ ) throw (uno::RuntimeException) { throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() ); } -sal_Int32 SAL_CALL +sal_Int32 SAL_CALL ScVbaLineFormat::getBeginArrowheadWidth() throw (uno::RuntimeException) { throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() ); } -void SAL_CALL +void SAL_CALL ScVbaLineFormat::setBeginArrowheadWidth( sal_Int32 /*_beginarrowheadwidth*/ ) throw (uno::RuntimeException) { throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() ); } -sal_Int32 SAL_CALL +sal_Int32 SAL_CALL ScVbaLineFormat::getEndArrowheadStylel() throw (uno::RuntimeException) { return 0; } -void SAL_CALL +void SAL_CALL ScVbaLineFormat::setEndArrowheadStylel( sal_Int32 /*_endarrowheadstylel*/ ) throw (uno::RuntimeException) { } -sal_Int32 SAL_CALL +sal_Int32 SAL_CALL ScVbaLineFormat::getEndArrowheadLength() throw (uno::RuntimeException) { throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() ); } -void SAL_CALL +void SAL_CALL ScVbaLineFormat::setEndArrowheadLength( sal_Int32 /*_endarrowheadlength*/ ) throw (uno::RuntimeException) { throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() ); } -sal_Int32 SAL_CALL +sal_Int32 SAL_CALL ScVbaLineFormat::getEndArrowheadWidth() throw (uno::RuntimeException) { throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() ); } -void SAL_CALL +void SAL_CALL ScVbaLineFormat::setEndArrowheadWidth( sal_Int32 /*_endarrowheadwidth*/ ) throw (uno::RuntimeException) { throw uno::RuntimeException( rtl::OUString::createFromAscii("Property 'EndArrowheadWidth' is not supported."), uno::Reference< uno::XInterface >() ); } -double SAL_CALL +double SAL_CALL ScVbaLineFormat::getWeight() throw (uno::RuntimeException) { sal_Int32 nLineWidth=0; @@ -217,7 +217,7 @@ ScVbaLineFormat::getWeight() throw (uno::RuntimeException) return dLineWidth; } -void SAL_CALL +void SAL_CALL ScVbaLineFormat::setWeight( double _weight ) throw (uno::RuntimeException) { if( _weight < 0 ) @@ -227,13 +227,13 @@ ScVbaLineFormat::setWeight( double _weight ) throw (uno::RuntimeException) m_nLineWeight = _weight; Millimeter aMillimeter; aMillimeter.setInPoints( _weight ); - + sal_Int32 nLineWidth = static_cast<sal_Int32>( aMillimeter.getInHundredthsOfOneMillimeter() ); m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "LineWidth" ), uno::makeAny( nLineWidth ) ); setDashStyle( m_nLineDashStyle ); } -sal_Bool SAL_CALL +sal_Bool SAL_CALL ScVbaLineFormat::getVisible() throw (uno::RuntimeException) { drawing::LineStyle aLineStyle; @@ -245,7 +245,7 @@ ScVbaLineFormat::getVisible() throw (uno::RuntimeException) return sal_True; } -void SAL_CALL +void SAL_CALL ScVbaLineFormat::setVisible( sal_Bool _visible ) throw (uno::RuntimeException) { drawing::LineStyle aLineStyle; @@ -264,7 +264,7 @@ ScVbaLineFormat::setVisible( sal_Bool _visible ) throw (uno::RuntimeException) } } -double SAL_CALL +double SAL_CALL ScVbaLineFormat::getTransparency() throw (uno::RuntimeException) { sal_Int16 nTransparency = 0; @@ -273,14 +273,14 @@ ScVbaLineFormat::getTransparency() throw (uno::RuntimeException) return fTransparency / 100; } -void SAL_CALL +void SAL_CALL ScVbaLineFormat::setTransparency( double _transparency ) throw (uno::RuntimeException) { sal_Int16 nTransparency = static_cast<sal_Int16>( _transparency * 100 ); m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "LineTransparence" ), uno::makeAny( nTransparency ) ); } -sal_Int16 SAL_CALL +sal_Int16 SAL_CALL ScVbaLineFormat::getStyle() throw (uno::RuntimeException) { //OpenOffice.org only supports one LineStyle (other than the DashStyles) @@ -288,7 +288,7 @@ ScVbaLineFormat::getStyle() throw (uno::RuntimeException) return 1; } -void SAL_CALL +void SAL_CALL ScVbaLineFormat::setStyle( sal_Int16 /*_style */) throw (uno::RuntimeException) { //OpenOffice.org only supports one LineStyle (other than the DashStyles) @@ -297,7 +297,7 @@ ScVbaLineFormat::setStyle( sal_Int16 /*_style */) throw (uno::RuntimeException) //will be done with the according methods. } -sal_Int32 SAL_CALL +sal_Int32 SAL_CALL ScVbaLineFormat::getDashStyle() throw (uno::RuntimeException) { drawing::LineStyle eLineStyle; @@ -348,7 +348,7 @@ ScVbaLineFormat::getDashStyle() throw (uno::RuntimeException) return m_nLineDashStyle; } -void SAL_CALL +void SAL_CALL ScVbaLineFormat::setDashStyle( sal_Int32 _dashstyle ) throw (uno::RuntimeException) { m_nLineDashStyle = _dashstyle; @@ -434,14 +434,14 @@ ScVbaLineFormat::ForeColor() throw (uno::RuntimeException) } -rtl::OUString& +rtl::OUString& ScVbaLineFormat::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaLineFormat") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaLineFormat::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/vbahelper/source/vbahelper/vbalineformat.hxx b/vbahelper/source/vbahelper/vbalineformat.hxx index 9a96ceaa853b..2596056e86b2 100644 --- a/vbahelper/source/vbahelper/vbalineformat.hxx +++ b/vbahelper/source/vbahelper/vbalineformat.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vbahelper/source/vbahelper/vbapagesetupbase.cxx b/vbahelper/source/vbahelper/vbapagesetupbase.cxx index 7b509f9288ac..976fc232cc5b 100644 --- a/vbahelper/source/vbahelper/vbapagesetupbase.cxx +++ b/vbahelper/source/vbahelper/vbapagesetupbase.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,10 +30,10 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; -VbaPageSetupBase::VbaPageSetupBase(const uno::Reference< XHelperInterface >& xParent, +VbaPageSetupBase::VbaPageSetupBase(const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext ) throw (uno::RuntimeException): VbaPageSetupBase_BASE( xParent, xContext ) { -} +} double SAL_CALL VbaPageSetupBase::getTopMargin() throw (css::uno::RuntimeException) { @@ -59,7 +59,7 @@ double SAL_CALL VbaPageSetupBase::getTopMargin() throw (css::uno::RuntimeExcepti catch( uno::Exception& ) { } - + return Millimeter::getInPoints( topMargin ); } @@ -73,7 +73,7 @@ void SAL_CALL VbaPageSetupBase::setTopMargin( double margin ) throw (css::uno::R { uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderIsOn"))); aValue >>= headerOn; - + if( headerOn ) { aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("HeaderHeight"))); @@ -113,7 +113,7 @@ double SAL_CALL VbaPageSetupBase::getBottomMargin() throw (css::uno::RuntimeExce catch( uno::Exception& ) { } - + return Millimeter::getInPoints( bottomMargin ); } @@ -127,7 +127,7 @@ void SAL_CALL VbaPageSetupBase::setBottomMargin( double margin ) throw (css::uno { uno::Any aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterIsOn"))); aValue >>= footerOn; - + if( footerOn ) { aValue = mxPageProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FooterHeight"))); @@ -154,7 +154,7 @@ double SAL_CALL VbaPageSetupBase::getRightMargin() throw (css::uno::RuntimeExcep catch( uno::Exception& ) { } - + return Millimeter::getInPoints( rightMargin );; } @@ -184,7 +184,7 @@ double SAL_CALL VbaPageSetupBase::getLeftMargin() throw (css::uno::RuntimeExcept catch( uno::Exception& ) { } - + return Millimeter::getInPoints( leftMargin );; } @@ -213,7 +213,7 @@ double SAL_CALL VbaPageSetupBase::getHeaderMargin() throw (css::uno::RuntimeExce catch( uno::Exception& ) { } - + return Millimeter::getInPoints( headerMargin );; } @@ -242,7 +242,7 @@ double SAL_CALL VbaPageSetupBase::getFooterMargin() throw (css::uno::RuntimeExce catch( uno::Exception& ) { } - + return Millimeter::getInPoints( footerMargin );; } @@ -295,7 +295,7 @@ void SAL_CALL VbaPageSetupBase::setOrientation( sal_Int32 orientation ) throw (c aValue >>= isLandscape; sal_Bool switchOrientation = sal_False; - if(( isLandscape && orientation != mnOrientLandscape ) || + if(( isLandscape && orientation != mnOrientLandscape ) || ( !isLandscape && orientation != mnOrientPortrait )) { switchOrientation = sal_True; diff --git a/vbahelper/source/vbahelper/vbapictureformat.cxx b/vbahelper/source/vbahelper/vbapictureformat.cxx index 37117daf014c..0574a6cf3180 100644 --- a/vbahelper/source/vbahelper/vbapictureformat.cxx +++ b/vbahelper/source/vbahelper/vbapictureformat.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ using namespace com::sun::star; ScVbaPictureFormat::ScVbaPictureFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, - uno::Reference< drawing::XShape > xShape ) + uno::Reference< drawing::XShape > xShape ) throw( lang::IllegalArgumentException ) : ScVbaPictureFormat_BASE( xParent, xContext ), m_xShape( xShape ) { m_xPropertySet.set( m_xShape, uno::UNO_QUERY_THROW ); @@ -52,26 +52,26 @@ ScVbaPictureFormat::checkParameterRangeInDouble( double nRange, double nMin, dou } // Attributes -double SAL_CALL +double SAL_CALL ScVbaPictureFormat::getBrightness() throw (uno::RuntimeException) { sal_Int16 nLuminance = 0; m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii("AdjustLuminance") ) >>= nLuminance; double fBrightness = static_cast< double >( nLuminance ); fBrightness = ( fBrightness +100 ) / 200; - return fBrightness; + return fBrightness; } -void SAL_CALL +void SAL_CALL ScVbaPictureFormat::setBrightness( double _brightness ) throw (uno::RuntimeException) { checkParameterRangeInDouble( _brightness, 0.0, 1.0 ); double fLuminance = _brightness * 200 - 100; sal_Int16 nLuminance = static_cast< sal_Int16 >( fLuminance ); - m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("AdjustLuminance"), uno::makeAny( nLuminance ) ); + m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii("AdjustLuminance"), uno::makeAny( nLuminance ) ); } -double SAL_CALL +double SAL_CALL ScVbaPictureFormat::getContrast() throw (uno::RuntimeException) { sal_Int16 nContrast = 0; @@ -81,7 +81,7 @@ ScVbaPictureFormat::getContrast() throw (uno::RuntimeException) return fContrast; } -void SAL_CALL +void SAL_CALL ScVbaPictureFormat::setContrast( double _contrast ) throw (uno::RuntimeException) { checkParameterRangeInDouble( _contrast, 0.0, 1.0 ); @@ -92,7 +92,7 @@ ScVbaPictureFormat::setContrast( double _contrast ) throw (uno::RuntimeException // Methods -void SAL_CALL +void SAL_CALL ScVbaPictureFormat::IncrementBrightness( double increment ) throw (uno::RuntimeException) { double fBrightness = getBrightness(); @@ -108,7 +108,7 @@ ScVbaPictureFormat::IncrementBrightness( double increment ) throw (uno::RuntimeE setBrightness( fBrightness ); } -void SAL_CALL +void SAL_CALL ScVbaPictureFormat::IncrementContrast( double increment ) throw (uno::RuntimeException) { double nContrast = getContrast(); diff --git a/vbahelper/source/vbahelper/vbapictureformat.hxx b/vbahelper/source/vbahelper/vbapictureformat.hxx index d11d8aecee77..56422cc7b623 100644 --- a/vbahelper/source/vbahelper/vbapictureformat.hxx +++ b/vbahelper/source/vbahelper/vbapictureformat.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/vbahelper/source/vbahelper/vbapropvalue.cxx b/vbahelper/source/vbahelper/vbapropvalue.cxx index e75a7a45ddf3..87a4e40e882c 100644 --- a/vbahelper/source/vbahelper/vbapropvalue.cxx +++ b/vbahelper/source/vbahelper/vbapropvalue.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,18 +28,18 @@ #include "vbahelper/vbapropvalue.hxx" using namespace com::sun::star; - + ScVbaPropValue::ScVbaPropValue( PropListener* pListener ) : m_pListener( pListener ) { } -css::uno::Any SAL_CALL +css::uno::Any SAL_CALL ScVbaPropValue::getValue() throw (css::uno::RuntimeException) { return m_pListener->getValueEvent(); } -void SAL_CALL +void SAL_CALL ScVbaPropValue::setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException) { m_pListener->setValueEvent( _value ); diff --git a/vbahelper/source/vbahelper/vbashaperange.cxx b/vbahelper/source/vbahelper/vbashaperange.cxx index 4de8745c87a3..e58b8c87a0a3 100644 --- a/vbahelper/source/vbahelper/vbashaperange.cxx +++ b/vbahelper/source/vbahelper/vbashaperange.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,14 +61,14 @@ ScVbaShapeRange::ScVbaShapeRange( const uno::Reference< XHelperInterface >& xPar } // Methods -void SAL_CALL +void SAL_CALL ScVbaShapeRange::Select( ) throw (uno::RuntimeException) { uno::Reference< view::XSelectionSupplier > xSelectSupp( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW ); xSelectSupp->select( uno::makeAny( getShapes() ) ); } -uno::Reference< msforms::XShape > SAL_CALL +uno::Reference< msforms::XShape > SAL_CALL ScVbaShapeRange::Group() throw (uno::RuntimeException) { uno::Reference< drawing::XShapeGrouper > xShapeGrouper( m_xDrawPage, uno::UNO_QUERY_THROW ); @@ -77,7 +77,7 @@ ScVbaShapeRange::Group() throw (uno::RuntimeException) return uno::Reference< msforms::XShape >( new ScVbaShape( getParent(), mxContext, xShape, getShapes(), m_xModel, office::MsoShapeType::msoGroup ) ); } -uno::Reference< drawing::XShapes > +uno::Reference< drawing::XShapes > ScVbaShapeRange::getShapes() throw (uno::RuntimeException) { if ( !m_xShapes.is() ) @@ -93,7 +93,7 @@ ScVbaShapeRange::getShapes() throw (uno::RuntimeException) } -void SAL_CALL +void SAL_CALL ScVbaShapeRange::IncrementRotation( double Increment ) throw (uno::RuntimeException) { sal_Int32 nLen = getCount(); @@ -104,7 +104,7 @@ ScVbaShapeRange::IncrementRotation( double Increment ) throw (uno::RuntimeExcept } } -void SAL_CALL +void SAL_CALL ScVbaShapeRange::IncrementLeft( double Increment ) throw (uno::RuntimeException) { sal_Int32 nLen = getCount(); @@ -115,7 +115,7 @@ ScVbaShapeRange::IncrementLeft( double Increment ) throw (uno::RuntimeException) } } -void SAL_CALL +void SAL_CALL ScVbaShapeRange::IncrementTop( double Increment ) throw (uno::RuntimeException) { sal_Int32 nLen = getCount(); @@ -375,7 +375,7 @@ ScVbaShapeRange::getElementType() throw (uno::RuntimeException) return msforms::XShape::static_type(0); } -uno::Reference< container::XEnumeration > SAL_CALL +uno::Reference< container::XEnumeration > SAL_CALL ScVbaShapeRange::createEnumeration() throw (uno::RuntimeException) { return new VbShapeRangeEnumHelper( this, m_xIndexAccess ); @@ -385,20 +385,20 @@ uno::Any ScVbaShapeRange:: createCollectionObject( const css::uno::Any& aSource ) { uno::Reference< drawing::XShape > xShape( aSource, uno::UNO_QUERY_THROW ); - // #TODO #FIXME Shape parent should always be the sheet the shapes belong - // to - uno::Reference< msforms::XShape > xVbShape( new ScVbaShape( uno::Reference< XHelperInterface >(), mxContext, xShape, getShapes(), m_xModel, ScVbaShape::getType( xShape ) ) ); + // #TODO #FIXME Shape parent should always be the sheet the shapes belong + // to + uno::Reference< msforms::XShape > xVbShape( new ScVbaShape( uno::Reference< XHelperInterface >(), mxContext, xShape, getShapes(), m_xModel, ScVbaShape::getType( xShape ) ) ); return uno::makeAny( xVbShape ); } -rtl::OUString& +rtl::OUString& ScVbaShapeRange::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaShapeRange") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaShapeRange::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; diff --git a/vbahelper/source/vbahelper/vbashapes.cxx b/vbahelper/source/vbahelper/vbashapes.cxx index 018da926f2fd..a748906d4b78 100644 --- a/vbahelper/source/vbahelper/vbashapes.cxx +++ b/vbahelper/source/vbahelper/vbashapes.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -90,7 +90,7 @@ void ScVbaShapes::initBaseCollection() ScVbaShapes::ScVbaShapes( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess > xShapes, const uno::Reference< frame::XModel>& xModel ): ScVbaShapes_BASE( xParent, xContext, xShapes, sal_True ), m_nNewShapeCount(0), m_xModel( xModel ) { m_xShapes.set( xShapes, uno::UNO_QUERY_THROW ); - m_xDrawPage.set( xShapes, uno::UNO_QUERY_THROW ); + m_xDrawPage.set( xShapes, uno::UNO_QUERY_THROW ); initBaseCollection(); } @@ -116,14 +116,14 @@ ScVbaShapes::getElementType() throw (uno::RuntimeException) { return ooo::vba::msforms::XShape::static_type(0); } -rtl::OUString& +rtl::OUString& ScVbaShapes::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("ScVbaShapes") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > ScVbaShapes::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; @@ -135,12 +135,12 @@ ScVbaShapes::getServiceNames() return aServiceNames; } -css::uno::Reference< css::container::XIndexAccess > +css::uno::Reference< css::container::XIndexAccess > ScVbaShapes::getShapesByArrayIndices( const uno::Any& Index ) throw (uno::RuntimeException) { if ( Index.getValueTypeClass() != uno::TypeClass_SEQUENCE ) throw uno::RuntimeException(); - + uno::Reference< script::XTypeConverter > xConverter = getTypeConverter(mxContext); uno::Any aConverted; aConverted = xConverter->convertTo( Index, getCppuType((uno::Sequence< uno::Any >*)0) ); @@ -163,21 +163,21 @@ ScVbaShapes::getShapesByArrayIndices( const uno::Any& Index ) throw (uno::Runti sal_Int32 nIndex = 0; sIndices[ index ] >>= nIndex; // adjust for 1 based mso indexing - xShape.set( m_xIndexAccess->getByIndex( nIndex - 1 ), uno::UNO_QUERY ); - + xShape.set( m_xIndexAccess->getByIndex( nIndex - 1 ), uno::UNO_QUERY ); + } // populate map with drawing::XShapes if ( xShape.is() ) mShapes.push_back( xShape ); - } + } uno::Reference< container::XIndexAccess > xIndexAccess( new XNamedObjectCollectionHelper< drawing::XShape >( mShapes ) ); return xIndexAccess; } -uno::Any SAL_CALL +uno::Any SAL_CALL ScVbaShapes::Item( const uno::Any& Index, const uno::Any& Index2 ) throw (uno::RuntimeException) { - // I don't think we need to support Array of indices for shapes + // I don't think we need to support Array of indices for shapes /* if ( Index.getValueTypeClass() == uno::TypeClass_SEQUENCE ) { @@ -187,10 +187,10 @@ ScVbaShapes::Item( const uno::Any& Index, const uno::Any& Index2 ) throw (uno::R return uno::makeAny( xShapesCollection ); } */ - return ScVbaShapes_BASE::Item( Index, Index2 ); + return ScVbaShapes_BASE::Item( Index, Index2 ); } -uno::Reference< msforms::XShapeRange > SAL_CALL +uno::Reference< msforms::XShapeRange > SAL_CALL ScVbaShapes::Range( const uno::Any& shapes ) throw (css::uno::RuntimeException) { // shapes, can be an index or an array of indices @@ -209,7 +209,7 @@ ScVbaShapes::Range( const uno::Any& shapes ) throw (css::uno::RuntimeException) return new ScVbaShapeRange( getParent(), mxContext, xShapes, m_xDrawPage, m_xModel ); } -void SAL_CALL +void SAL_CALL ScVbaShapes::SelectAll() throw (uno::RuntimeException) { uno::Reference< view::XSelectionSupplier > xSelectSupp( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW ); @@ -218,14 +218,14 @@ ScVbaShapes::SelectAll() throw (uno::RuntimeException) xSelectSupp->select( uno::makeAny( m_xShapes ) ); } // viewuno.cxx ScTabViewObj::select will throw IllegalArgumentException - // if one of the shapes is no 'markable' e.g. a button + // if one of the shapes is no 'markable' e.g. a button // the method still works catch( lang::IllegalArgumentException& ) { } } -uno::Reference< drawing::XShape > +uno::Reference< drawing::XShape > ScVbaShapes::createShape( rtl::OUString service ) throw (css::uno::RuntimeException) { uno::Reference< lang::XMultiServiceFactory > xMSF( m_xModel, uno::UNO_QUERY_THROW ); @@ -233,7 +233,7 @@ ScVbaShapes::createShape( rtl::OUString service ) throw (css::uno::RuntimeExcept return xShape; } -uno::Any +uno::Any ScVbaShapes::AddRectangle( sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWidth, sal_Int32 nLineHeight, uno::Any aRange ) throw (css::uno::RuntimeException) { rtl::OUString sCreateShapeName( rtl::OUString::createFromAscii( "com.sun.star.drawing.RectangleShape" ) ); @@ -261,11 +261,11 @@ ScVbaShapes::AddRectangle( sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWi xShape->setSize( size ); ScVbaShape *pScVbaShape = new ScVbaShape( getParent(), mxContext, xShape, m_xShapes, m_xModel, ScVbaShape::getType( xShape ) ); - pScVbaShape->setRange( aRange ); + pScVbaShape->setRange( aRange ); return uno::makeAny( uno::Reference< msforms::XShape > ( pScVbaShape ) ); } -uno::Any +uno::Any ScVbaShapes::AddEllipse( sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWidth, sal_Int32 nLineHeight, uno::Any aRange ) throw (css::uno::RuntimeException) { rtl::OUString sCreateShapeName( rtl::OUString::createFromAscii( "com.sun.star.drawing.EllipseShape" ) ); @@ -305,7 +305,7 @@ ScVbaShapes::AddEllipse( sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWidt xShape->setSize(size); ScVbaShape *pScVbaShape = new ScVbaShape( getParent(), mxContext, xShape, m_xShapes, m_xModel, ScVbaShape::getType( xShape ) ); - pScVbaShape->setRange( aRange ); + pScVbaShape->setRange( aRange ); return uno::makeAny( uno::Reference< msforms::XShape > ( pScVbaShape ) ); } @@ -320,12 +320,12 @@ ScVbaShapes::AddLine( sal_Int32 StartX, sal_Int32 StartY, sal_Int32 endX, sal_In sal_Int32 nWidth = Millimeter::getInHundredthsOfOneMillimeter( nLineWidth ); sal_Int32 nXPos = Millimeter::getInHundredthsOfOneMillimeter( StartX ); sal_Int32 nYPos = Millimeter::getInHundredthsOfOneMillimeter( StartY ); - + uno::Reference< drawing::XShape > xShape( createShape( rtl::OUString::createFromAscii("com.sun.star.drawing.LineShape") ), uno::UNO_QUERY_THROW ); m_xShapes->add( xShape ); awt::Point aMovePositionIfRange( 0, 0 ); - + rtl::OUString name = createName( rtl::OUString::createFromAscii( "Line" ) ); setDefaultShapeProperties(xShape); setShape_NameProperty(xShape, name); @@ -472,7 +472,7 @@ rtl::OUString ScVbaShapes::createName( rtl::OUString sName ) { sal_Int32 nActNumber = 1 + m_nNewShapeCount; - m_nNewShapeCount++; + m_nNewShapeCount++; sName += rtl::OUString::valueOf( nActNumber ); return sName; } diff --git a/vbahelper/source/vbahelper/vbatextframe.cxx b/vbahelper/source/vbahelper/vbatextframe.cxx index 8f6f9e2c1562..b490f9b427a0 100644 --- a/vbahelper/source/vbahelper/vbatextframe.cxx +++ b/vbahelper/source/vbahelper/vbatextframe.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,11 +63,11 @@ void VbaTextFrame::setMargin( rtl::OUString sMarginType, float fMargin ) } // Attributes -sal_Bool SAL_CALL +sal_Bool SAL_CALL VbaTextFrame::getAutoSize() throw (uno::RuntimeException) { // I don't know why, but in OOo, TextAutoGrowHeight is the property control autosize. not TextFitToSize. - // TextFitToSize control the text content. + // TextFitToSize control the text content. // and in mso, there isnot option TextWordWrap which means auto wrap. the default is False. sal_Bool bAutosize = sal_False; uno::Any aTextAutoGrowHeight = m_xPropertySet->getPropertyValue( rtl::OUString::createFromAscii( "TextAutoGrowHeight" ) ); @@ -75,14 +75,14 @@ VbaTextFrame::getAutoSize() throw (uno::RuntimeException) return bAutosize; } -void SAL_CALL +void SAL_CALL VbaTextFrame::setAutoSize( sal_Bool _autosize ) throw (uno::RuntimeException) { setAsMSObehavior(); m_xPropertySet->setPropertyValue( rtl::OUString::createFromAscii( "TextAutoGrowHeight" ), uno::makeAny( _autosize ) ); } -float SAL_CALL +float SAL_CALL VbaTextFrame::getMarginBottom() throw (uno::RuntimeException) { sal_Int32 nMargin = getMargin( rtl::OUString::createFromAscii( "TextLowerDistance" ) ); @@ -90,13 +90,13 @@ VbaTextFrame::getMarginBottom() throw (uno::RuntimeException) return fMargin; } -void SAL_CALL +void SAL_CALL VbaTextFrame::setMarginBottom( float _marginbottom ) throw (uno::RuntimeException) { setMargin( rtl::OUString::createFromAscii( "TextLowerDistance" ), _marginbottom ); } -float SAL_CALL +float SAL_CALL VbaTextFrame::getMarginTop() throw (uno::RuntimeException) { sal_Int32 nMargin = getMargin( rtl::OUString::createFromAscii( "TextUpperDistance" ) ); @@ -104,13 +104,13 @@ VbaTextFrame::getMarginTop() throw (uno::RuntimeException) return fMargin; } -void SAL_CALL +void SAL_CALL VbaTextFrame::setMarginTop( float _margintop ) throw (uno::RuntimeException) { setMargin( rtl::OUString::createFromAscii( "TextUpperDistance" ), _margintop ); } -float SAL_CALL +float SAL_CALL VbaTextFrame::getMarginLeft() throw (uno::RuntimeException) { sal_Int32 nMargin = getMargin( rtl::OUString::createFromAscii( "TextLeftDistance" ) ); @@ -118,13 +118,13 @@ VbaTextFrame::getMarginLeft() throw (uno::RuntimeException) return fMargin; } -void SAL_CALL +void SAL_CALL VbaTextFrame::setMarginLeft( float _marginleft ) throw (uno::RuntimeException) { setMargin( rtl::OUString::createFromAscii( "TextLeftDistance" ), _marginleft ); } -float SAL_CALL +float SAL_CALL VbaTextFrame::getMarginRight() throw (uno::RuntimeException) { sal_Int32 nMargin = getMargin( rtl::OUString::createFromAscii( "TextRightDistance" ) ); @@ -132,7 +132,7 @@ VbaTextFrame::getMarginRight() throw (uno::RuntimeException) return fMargin; } -void SAL_CALL +void SAL_CALL VbaTextFrame::setMarginRight( float _marginright ) throw (uno::RuntimeException) { setMargin( rtl::OUString::createFromAscii( "TextRightDistance" ), _marginright ); @@ -140,7 +140,7 @@ VbaTextFrame::setMarginRight( float _marginright ) throw (uno::RuntimeException) // Methods -uno::Any SAL_CALL +uno::Any SAL_CALL VbaTextFrame::Characters() throw (uno::RuntimeException) { throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Not implemented") ), uno::Reference< uno::XInterface >() ); diff --git a/vbahelper/source/vbahelper/vbawindowbase.cxx b/vbahelper/source/vbahelper/vbawindowbase.cxx index 2a6d92421b21..853dd47bf61e 100644 --- a/vbahelper/source/vbahelper/vbawindowbase.cxx +++ b/vbahelper/source/vbahelper/vbawindowbase.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,11 +34,11 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; -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 ) +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 ) { } -VbaWindowBase::VbaWindowBase( uno::Sequence< uno::Any > const & args, uno::Reference< uno::XComponentContext > const & xContext ) +VbaWindowBase::VbaWindowBase( uno::Sequence< uno::Any > const & args, uno::Reference< uno::XComponentContext > const & xContext ) : WindowBaseImpl_BASE( getXSomethingFromArgs< XHelperInterface >( args, 0 ), xContext ), m_xModel( getXSomethingFromArgs< frame::XModel >( args, 1 ) ) { @@ -47,13 +47,13 @@ VbaWindowBase::VbaWindowBase( uno::Sequence< uno::Any > const & args, uno::Refer sal_Bool SAL_CALL VbaWindowBase::getVisible() throw (uno::RuntimeException) { - sal_Bool bVisible = sal_True; + sal_Bool bVisible = sal_True; uno::Reference< frame::XController > xController( m_xModel->getCurrentController(), uno::UNO_QUERY_THROW ); uno::Reference< css::awt::XWindow > xWindow (xController->getFrame()->getContainerWindow(), uno::UNO_QUERY_THROW ); uno::Reference< css::awt::XWindow2 > xWindow2 (xWindow, uno::UNO_QUERY_THROW ); if( xWindow2.is() ) { - bVisible = xWindow2->isVisible(); + bVisible = xWindow2->isVisible(); } return bVisible; } @@ -65,7 +65,7 @@ VbaWindowBase::setVisible(sal_Bool _visible) throw (uno::RuntimeException) uno::Reference< css::awt::XWindow > xWindow (xController->getFrame()->getContainerWindow(), uno::UNO_QUERY_THROW ); if( xWindow.is() ) { - xWindow->setVisible( _visible ); + xWindow->setVisible( _visible ); } } @@ -91,81 +91,81 @@ void setPosSize( const uno::Reference< frame::XModel >& xModel, sal_Int32 nValue switch( nFlag ) { case css::awt::PosSize::X: - xWindow->setPosSize( nValue, aRect.Y, 0, 0, css::awt::PosSize::X ); + xWindow->setPosSize( nValue, aRect.Y, 0, 0, css::awt::PosSize::X ); break; case css::awt::PosSize::Y: - xWindow->setPosSize( aRect.X, nValue, 0, 0, css::awt::PosSize::Y ); + xWindow->setPosSize( aRect.X, nValue, 0, 0, css::awt::PosSize::Y ); break; case css::awt::PosSize::WIDTH: - xWindow->setPosSize( 0, 0, nValue, aRect.Height, css::awt::PosSize::WIDTH ); + xWindow->setPosSize( 0, 0, nValue, aRect.Height, css::awt::PosSize::WIDTH ); break; case css::awt::PosSize::HEIGHT: - xWindow->setPosSize( 0, 0, aRect.Width, nValue, css::awt::PosSize::HEIGHT ); + xWindow->setPosSize( 0, 0, aRect.Width, nValue, css::awt::PosSize::HEIGHT ); break; default: break; } } -} +} -sal_Int32 SAL_CALL +sal_Int32 SAL_CALL VbaWindowBase::getHeight() throw (uno::RuntimeException) { css::awt::Rectangle aRect = getPosSize(m_xModel); return aRect.Height; } -void SAL_CALL +void SAL_CALL VbaWindowBase::setHeight( sal_Int32 _height ) throw (uno::RuntimeException) { setPosSize(m_xModel, _height, css::awt::PosSize::HEIGHT); } -sal_Int32 SAL_CALL +sal_Int32 SAL_CALL VbaWindowBase::getLeft() throw (uno::RuntimeException) { css::awt::Rectangle aRect = getPosSize(m_xModel); return aRect.X; } -void SAL_CALL +void SAL_CALL VbaWindowBase::setLeft( sal_Int32 _left ) throw (uno::RuntimeException) { setPosSize(m_xModel, _left, css::awt::PosSize::X); } -sal_Int32 SAL_CALL +sal_Int32 SAL_CALL VbaWindowBase::getTop() throw (uno::RuntimeException) { css::awt::Rectangle aRect = getPosSize(m_xModel); return aRect.Y; } -void SAL_CALL +void SAL_CALL VbaWindowBase::setTop( sal_Int32 _top ) throw (uno::RuntimeException) { setPosSize(m_xModel, _top, css::awt::PosSize::Y); } -sal_Int32 SAL_CALL +sal_Int32 SAL_CALL VbaWindowBase::getWidth() throw (uno::RuntimeException) { css::awt::Rectangle aRect = getPosSize(m_xModel); return aRect.Width; } -void SAL_CALL +void SAL_CALL VbaWindowBase::setWidth( sal_Int32 _width ) throw (uno::RuntimeException) { setPosSize(m_xModel, _width, css::awt::PosSize::WIDTH); } -rtl::OUString& +rtl::OUString& VbaWindowBase::getServiceImplName() { static rtl::OUString sImplName( RTL_CONSTASCII_USTRINGPARAM("VbaWindowBase") ); return sImplName; } -uno::Sequence< rtl::OUString > +uno::Sequence< rtl::OUString > VbaWindowBase::getServiceNames() { static uno::Sequence< rtl::OUString > aServiceNames; |