From debb2c44e90a5b50187465d1c238306eabca5b7f Mon Sep 17 00:00:00 2001 From: "Ocke Janssen [oj]" Date: Wed, 26 May 2010 15:22:44 +0200 Subject: dba33g: #i111550# change name --- .../registry/data/org/openoffice/Office/ExtendedColorScheme.xcu | 2 +- reportbuilder/registry/data/org/openoffice/Setup.xcu | 2 +- reportbuilder/registry/schema/org/openoffice/Office/ReportDesign.xcs | 4 ++-- reportbuilder/util/description.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu b/reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu index 1cde8649d07a..e17460345a61 100644 --- a/reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu +++ b/reportbuilder/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu @@ -130,7 +130,7 @@ - Sun Report Builder + Oracle Report Builder diff --git a/reportbuilder/registry/data/org/openoffice/Setup.xcu b/reportbuilder/registry/data/org/openoffice/Setup.xcu index 86913d0eb5b8..57ab2d9bb28e 100644 --- a/reportbuilder/registry/data/org/openoffice/Setup.xcu +++ b/reportbuilder/registry/data/org/openoffice/Setup.xcu @@ -45,7 +45,7 @@ GenericCategories - Base: Sun Report Builder + Base: Oracle Report Builder diff --git a/reportbuilder/registry/schema/org/openoffice/Office/ReportDesign.xcs b/reportbuilder/registry/schema/org/openoffice/Office/ReportDesign.xcs index 8311358f233c..c290e002e24f 100644 --- a/reportbuilder/registry/schema/org/openoffice/Office/ReportDesign.xcs +++ b/reportbuilder/registry/schema/org/openoffice/Office/ReportDesign.xcs @@ -50,7 +50,7 @@ LLA - Direct download URL to the Sun(tm) Report Builder extension. + Direct download URL to the Oracle(tm) Report Builder extension. http://extensions.services.openoffice.org @@ -59,7 +59,7 @@ LLA Name of the extension. - Sun(tm) Report Builder + Oracle(tm) Report Builder diff --git a/reportbuilder/util/description.xml b/reportbuilder/util/description.xml index a4031236bd2b..56337f039758 100644 --- a/reportbuilder/util/description.xml +++ b/reportbuilder/util/description.xml @@ -4,7 +4,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> Oracle Report Builder - + -- cgit v1.2.1 From 873a6fcf3d0322e5b701a7991979856ca688262f Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Wed, 16 Jun 2010 14:30:30 +0200 Subject: fs33a: fixed VCLXFixedText::calcAdjustedSize to respect the given size --- toolkit/source/awt/vclxwindows.cxx | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index e2fc78421d5e..eaff4abf8621 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -2865,16 +2865,15 @@ short VCLXFixedText::getAlignment() throw(::com::sun::star::uno::RuntimeExceptio return getMinimumSize(); } -::com::sun::star::awt::Size VCLXFixedText::calcAdjustedSize( const ::com::sun::star::awt::Size& rNewSize ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::awt::Size VCLXFixedText::calcAdjustedSize( const ::com::sun::star::awt::Size& rMaxSize ) throw(::com::sun::star::uno::RuntimeException) { ::vos::OGuard aGuard( GetMutex() ); - ::com::sun::star::awt::Size aSz = rNewSize; - ::com::sun::star::awt::Size aMinSz = getMinimumSize(); - if ( aSz.Height != aMinSz.Height ) - aSz.Height = aMinSz.Height; - - return aSz; + Size aAdjustedSize( VCLUnoHelper::ConvertToVCLSize( rMaxSize ) ); + FixedText* pFixedText = (FixedText*)GetWindow(); + if ( pFixedText ) + aAdjustedSize = pFixedText->CalcMinimumSize( rMaxSize.Width ); + return VCLUnoHelper::ConvertToAWTSize( aAdjustedSize ); } // ---------------------------------------------------- -- cgit v1.2.1 From 34aaddf76fc80f377aff5fcf2c28d47b7842bc42 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Wed, 16 Jun 2010 09:53:37 +0200 Subject: fs33a: fixed supportsService --- toolkit/source/controls/unocontrol.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx index 1abe0b34004f..4db6dbb17b81 100644 --- a/toolkit/source/controls/unocontrol.cxx +++ b/toolkit/source/controls/unocontrol.cxx @@ -1463,7 +1463,7 @@ sal_Bool UnoControl::supportsService( const ::rtl::OUString& rServiceName ) thro Sequence< ::rtl::OUString > aSNL = getSupportedServiceNames(); const ::rtl::OUString* pArray = aSNL.getConstArray(); - const ::rtl::OUString* pArrayEnd = aSNL.getConstArray(); + const ::rtl::OUString* pArrayEnd = aSNL.getConstArray() + aSNL.getLength(); for (; pArray != pArrayEnd; ++pArray ) if( *pArray == rServiceName ) break; -- cgit v1.2.1 From 9a4b737c86d9a9eb65611a96b1a4c0562c994885 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Thu, 17 Jun 2010 18:28:42 +0200 Subject: unoawt2: allow creating dialogs with a parent window --- offapi/com/sun/star/awt/XDialogProvider2.idl | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/offapi/com/sun/star/awt/XDialogProvider2.idl b/offapi/com/sun/star/awt/XDialogProvider2.idl index 79e4594f65a8..9cd203b7796a 100644 --- a/offapi/com/sun/star/awt/XDialogProvider2.idl +++ b/offapi/com/sun/star/awt/XDialogProvider2.idl @@ -31,6 +31,9 @@ #ifndef __com_sun_star_awt_XDialogProvider_idl__ #include #endif +#ifndef __com_sun_star_beans_PropertyValue_idl__ +#include +#endif //============================================================================= @@ -107,6 +110,25 @@ interface XDialogProvider2 : ::com::sun::star::awt::XDialogProvider { com::sun::star::awt::XDialog createDialogWithHandler ( [in] string URL, [in] com::sun::star::uno::XInterface xHandler ) raises ( com::sun::star::lang::IllegalArgumentException ); + + /** creates a dialog for the given URL, accepting additional creation parameters + +

The arguments accepted so far are +

  • ParentWindow - must be a component supporting the XWindowPeer interface, + or a component supporting the XControl interfac, so an XWindowPeer can be + obtained from it. The given window will be used as parent window for the to-be-created dialog.
    • +
  • EventHandler - specifies a component handling events in the dialog. See + createDialogWithHandler for a detailed specification of dialog event handling.
    • +
+

+ */ + + XDialog createDialogWithArguments( + [in] string URL, + [in] sequence< ::com::sun::star::beans::PropertyValue > Arguments + ) + raises ( com::sun::star::lang::IllegalArgumentException + ); }; //============================================================================= -- cgit v1.2.1 From 5dd14a854a449af2df6e573bc008416fd9f71e53 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Thu, 17 Jun 2010 18:28:42 +0200 Subject: unoawt2: allow creating dialogs with a parent window --- scripting/source/dlgprov/dlgprov.cxx | 25 +++++++++++++++++++++++++ scripting/source/dlgprov/dlgprov.hxx | 5 +++++ 2 files changed, 30 insertions(+) diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx index aa6c6cfb966a..48aac0c88f4e 100644 --- a/scripting/source/dlgprov/dlgprov.cxx +++ b/scripting/source/dlgprov/dlgprov.cxx @@ -766,6 +766,31 @@ static ::rtl::OUString aResourceResolverPropName = ::rtl::OUString::createFromAs return xDialog; } + Reference < XDialog > DialogProviderImpl::createDialogWithArguments( + const ::rtl::OUString& URL, const Sequence< PropertyValue >& Arguments ) + throw (IllegalArgumentException, RuntimeException) + { + ::comphelper::NamedValueCollection aArguments( Arguments ); + + Reference< XWindowPeer > xParentPeer; + if ( aArguments.has( "ParentWindow" ) ) + { + const Any aParentWindow( aArguments.get( "ParentWindow" ) ); + if ( !( aParentWindow >>= xParentPeer ) ) + { + const Reference< XControl > xParentControl( aParentWindow, UNO_QUERY ); + if ( xParentControl.is() ) + xParentPeer = xParentControl->getPeer(); + } + } + + const Reference< XInterface > xHandler( aArguments.get( "EventHandler" ), UNO_QUERY ); + + Reference < XControl > xControl = DialogProviderImpl::createDialogImpl( URL, xHandler, xParentPeer, true ); + Reference< XDialog > xDialog( xControl, UNO_QUERY ); + return xDialog; + } + Reference< XWindow > DialogProviderImpl::createContainerWindow( const ::rtl::OUString& URL, const ::rtl::OUString& WindowType, const Reference< XWindowPeer >& xParent, const Reference< XInterface >& xHandler ) diff --git a/scripting/source/dlgprov/dlgprov.hxx b/scripting/source/dlgprov/dlgprov.hxx index f55239ff13e8..d8bd8782b9f1 100644 --- a/scripting/source/dlgprov/dlgprov.hxx +++ b/scripting/source/dlgprov/dlgprov.hxx @@ -138,6 +138,11 @@ namespace dlgprov const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xHandler ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference < ::com::sun::star::awt::XDialog > SAL_CALL createDialogWithArguments( + const ::rtl::OUString& URL, + const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createContainerWindow( const ::rtl::OUString& URL, const ::rtl::OUString& WindowType, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParent, -- cgit v1.2.1 From 886532a78822b648c296d2862803fab38950e753 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Fri, 18 Jun 2010 12:21:57 +0200 Subject: unoawt2: don't assume URLs such as private:standardimage/... are relative --- toolkit/source/controls/dialogcontrol.cxx | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index 405356c2b7ac..c54549baed5e 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -2116,9 +2116,14 @@ throw (RuntimeException) urlObj.removeSegment(); baseLocation = urlObj.GetMainURL( INetURLObject::NO_DECODE ); - ::rtl::OUString testAbsoluteURL; - if ( ::osl::FileBase::E_None == ::osl::FileBase::getAbsoluteFileURL( baseLocation, url, testAbsoluteURL ) ) - absoluteURL = testAbsoluteURL; + const INetURLObject protocolCheck( url ); + const INetProtocol protocol = protocolCheck.GetProtocol(); + if ( protocol == INET_PROT_NOT_VALID ) + { + ::rtl::OUString testAbsoluteURL; + if ( ::osl::FileBase::E_None == ::osl::FileBase::getAbsoluteFileURL( baseLocation, url, testAbsoluteURL ) ) + absoluteURL = testAbsoluteURL; + } } return absoluteURL; -- cgit v1.2.1 From 45d85c7599ea0521e5d83de41ec31207a54ead16 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Fri, 18 Jun 2010 15:33:54 +0200 Subject: unoawt2: get rid of the ImageConsumer/Producer connection between image-rendering controls and their models - this channel doesn't correctly transport transparency. The connection via the 'Graphic' property works absolutely fine here. --- svtools/source/inc/unoiface.hxx | 5 +- svtools/source/uno/unoiface.cxx | 2 +- toolkit/inc/pch/precompiled_toolkit.hxx | 2 - toolkit/inc/toolkit/awt/vclxwindows.hxx | 30 ++--- toolkit/inc/toolkit/controls/roadmapcontrol.hxx | 21 +--- toolkit/inc/toolkit/controls/unocontrols.hxx | 91 +++++--------- toolkit/inc/toolkit/helper/servicenames.hxx | 5 - toolkit/source/awt/vclxwindows.cxx | 109 +++++----------- toolkit/source/controls/roadmapcontrol.cxx | 91 -------------- toolkit/source/controls/unocontrols.cxx | 160 +++--------------------- toolkit/source/helper/servicenames.cxx | 1 - toolkit/source/layout/core/import.cxx | 11 -- 12 files changed, 89 insertions(+), 439 deletions(-) diff --git a/svtools/source/inc/unoiface.hxx b/svtools/source/inc/unoiface.hxx index 5d34ea6f47ed..f15cb7c10d4c 100644 --- a/svtools/source/inc/unoiface.hxx +++ b/svtools/source/inc/unoiface.hxx @@ -39,7 +39,6 @@ #include #include #include -#include #include @@ -243,7 +242,7 @@ struct RMItemData ::rtl::OUString Label; }; -typedef ::cppu::ImplInheritanceHelper3 < VCLXImageConsumer +typedef ::cppu::ImplInheritanceHelper3 < VCLXGraphicControl , ::com::sun::star::container::XContainerListener , ::com::sun::star::beans::XPropertyChangeListener , ::com::sun::star::awt::XItemEventBroadcaster @@ -288,7 +287,7 @@ public: protected: - // VCLXImageConsumer overridables + // VCLXGraphicControl overridables virtual void ImplSetNewImage(); static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx index f2090be1655f..2d22d9cedb33 100644 --- a/svtools/source/uno/unoiface.cxx +++ b/svtools/source/uno/unoiface.cxx @@ -1664,7 +1664,7 @@ void SVTXRoadmap::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) BASEPROPERTY_TEXT, 0); VCLXWindow::ImplGetPropertyIds( rIds, true ); - VCLXImageConsumer::ImplGetPropertyIds( rIds ); + VCLXGraphicControl::ImplGetPropertyIds( rIds ); } // ---------------------------------------------------- diff --git a/toolkit/inc/pch/precompiled_toolkit.hxx b/toolkit/inc/pch/precompiled_toolkit.hxx index 386bd6803ca4..affcf376b071 100644 --- a/toolkit/inc/pch/precompiled_toolkit.hxx +++ b/toolkit/inc/pch/precompiled_toolkit.hxx @@ -107,8 +107,6 @@ #include "com/sun/star/awt/XFont.hpp" #include "com/sun/star/awt/XGraphics.hpp" #include "com/sun/star/awt/XImageButton.hpp" -#include "com/sun/star/awt/XImageConsumer.hpp" -#include "com/sun/star/awt/XImageProducer.hpp" #include "com/sun/star/awt/XInfoPrinter.hpp" #include "com/sun/star/awt/XItemEventBroadcaster.hpp" #include "com/sun/star/awt/XItemListener.hpp" diff --git a/toolkit/inc/toolkit/awt/vclxwindows.hxx b/toolkit/inc/toolkit/awt/vclxwindows.hxx index ca3267bffb5e..75085020ca7b 100644 --- a/toolkit/inc/toolkit/awt/vclxwindows.hxx +++ b/toolkit/inc/toolkit/awt/vclxwindows.hxx @@ -82,7 +82,6 @@ #include #include #include -#include #include #include #include @@ -111,17 +110,14 @@ class VclSimpleEvent; class VclMenuEvent; // ---------------------------------------------------- -// class VCLXImageConsumer -// deriving from VCLXWindow and XImageConsumer +// class VCLXGraphicControl +// deriving from VCLXWindow, drawing the graphic which exists as "Graphic" at the model // ---------------------------------------------------- -typedef ::cppu::ImplInheritanceHelper1< VCLXWindow, ::com::sun::star::awt::XImageConsumer > VCLXImageConsumer_Base; -class TOOLKIT_DLLPUBLIC VCLXImageConsumer : public VCLXImageConsumer_Base +class TOOLKIT_DLLPUBLIC VCLXGraphicControl : public VCLXWindow { private: - /// implements our XImageConsumer functionality - ImageConsumer maImageConsumer; /// the image we currently display Image maImage; @@ -132,20 +128,10 @@ protected: // ::com::sun::star::awt::XWindow void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw(::com::sun::star::uno::RuntimeException); - // ::com::sun::star::awt::XImageConsumer - void SAL_CALL init( sal_Int32 Width, sal_Int32 Height ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setColorModel( sal_Int16 BitCount, const ::com::sun::star::uno::Sequence< sal_Int32 >& RGBAPal, sal_Int32 RedMask, sal_Int32 GreenMask, sal_Int32 BlueMask, sal_Int32 AlphaMask ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setPixelsByBytes( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight, const ::com::sun::star::uno::Sequence< sal_Int8 >& aProducerData, sal_Int32 nOffset, sal_Int32 nScanSize ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL setPixelsByLongs( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight, const ::com::sun::star::uno::Sequence< sal_Int32 >& aProducerData, sal_Int32 nOffset, sal_Int32 nScanSize ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL complete( sal_Int32 Status, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageProducer >& xProducer ) throw(::com::sun::star::uno::RuntimeException); - // ::com::sun::star::awt::VclWindowPeer void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException); -protected: - void ImplUpdateImage( sal_Bool bGetNewImage ); - protected: /** forward our bitmap to our window @precond @@ -155,6 +141,7 @@ protected: @see GetBitmap */ virtual void ImplSetNewImage(); + public: static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } @@ -164,7 +151,7 @@ public: // ---------------------------------------------------- // class VCLXButton // ---------------------------------------------------- -typedef ::cppu::ImplInheritanceHelper2 < VCLXImageConsumer +typedef ::cppu::ImplInheritanceHelper2 < VCLXGraphicControl , ::com::sun::star::awt::XButton , ::com::sun::star::awt::XToggleButton > VCLXButton_Base; @@ -213,7 +200,7 @@ public: // ---------------------------------------------------- // class VCLXImageControl // ---------------------------------------------------- -class VCLXImageControl : public VCLXImageConsumer +class VCLXImageControl : public VCLXGraphicControl { public: VCLXImageControl(); @@ -230,6 +217,7 @@ public: static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) { return ImplGetPropertyIds( aIds ); } + protected: virtual void ImplSetNewImage(); }; @@ -239,7 +227,7 @@ protected: // ---------------------------------------------------- class VCLXCheckBox : public ::com::sun::star::awt::XCheckBox, public ::com::sun::star::awt::XButton, - public VCLXImageConsumer + public VCLXGraphicControl { private: ActionListenerMultiplexer maActionListeners; @@ -297,7 +285,7 @@ public: // ---------------------------------------------------- class VCLXRadioButton : public ::com::sun::star::awt::XRadioButton, public ::com::sun::star::awt::XButton, - public VCLXImageConsumer + public VCLXGraphicControl { private: ItemListenerMultiplexer maItemListeners; diff --git a/toolkit/inc/toolkit/controls/roadmapcontrol.hxx b/toolkit/inc/toolkit/controls/roadmapcontrol.hxx index 46f31947b276..219231b02ad2 100644 --- a/toolkit/inc/toolkit/controls/roadmapcontrol.hxx +++ b/toolkit/inc/toolkit/controls/roadmapcontrol.hxx @@ -40,13 +40,9 @@ #include #include #include -#include -#include #include - -#ifndef _CPPUHELPER_IMPLBASE5_HXX_ +#include #include -#endif @@ -55,10 +51,9 @@ typedef UnoControlModel UnoControlRoadmapModel_Base; -typedef ::cppu::ImplHelper4 < ::com::sun::star::lang::XSingleServiceFactory +typedef ::cppu::ImplHelper3 < ::com::sun::star::lang::XSingleServiceFactory , ::com::sun::star::container::XContainer , ::com::sun::star::container::XIndexContainer - , ::com::sun::star::awt::XImageProducer > UnoControlRoadmapModel_IBase; @@ -100,8 +95,6 @@ namespace toolkit{ typedef ::std::vector< Reference< XInterface > > RoadmapItemHolderList; - std::list< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer > > maImageListeners; - ContainerListenerMultiplexer maContainerListeners; RoadmapItemHolderList maRoadmapItems; @@ -151,12 +144,6 @@ namespace toolkit{ void SAL_CALL release() throw() { UnoControlModel::release(); } - // ::com::sun::star::awt::XImageProducer - void SAL_CALL addConsumer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer >& xConsumer ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL removeConsumer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer >& xConsumer ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL startProduction( ) throw (::com::sun::star::uno::RuntimeException); - - // ::com::sun::star::beans::XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException); @@ -190,8 +177,6 @@ namespace toolkit{ sal_Bool SAL_CALL setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& Model) throw ( ::com::sun::star::uno::RuntimeException ); - void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& rEvent )throw(::com::sun::star::uno::RuntimeException); void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& rEvent )throw(::com::sun::star::uno::RuntimeException); void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& rEvent )throw(::com::sun::star::uno::RuntimeException); @@ -204,8 +189,6 @@ namespace toolkit{ virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw (::com::sun::star::uno::RuntimeException); - void ImplSetPeerProperty( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Any& rVal ); - // XTypeProvider DECLARE_XTYPEPROVIDER( ) DECLARE_XINTERFACE() diff --git a/toolkit/inc/toolkit/controls/unocontrols.hxx b/toolkit/inc/toolkit/controls/unocontrols.hxx index 88449418c70a..fd775cd568c1 100644 --- a/toolkit/inc/toolkit/controls/unocontrols.hxx +++ b/toolkit/inc/toolkit/controls/unocontrols.hxx @@ -35,8 +35,6 @@ #include #include #include -#include -#include #include #include #include @@ -217,31 +215,20 @@ public: }; // ---------------------------------------------------- -// class ImageProducerControlModel +// class GraphicControlModel // ---------------------------------------------------- -class ImageProducerControlModel : public ::com::sun::star::awt::XImageProducer, - public UnoControlModel +class GraphicControlModel : public UnoControlModel { private: - std::list< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer > > maListeners; bool mbAdjustingImagePosition; bool mbAdjustingGraphic; ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicObject > mxGrfObj; ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > getGraphicFromURL_nothrow( const ::rtl::OUString& _rURL ); -protected: - ImageProducerControlModel() : mbAdjustingImagePosition( false ), mbAdjustingGraphic( false ) { } - ImageProducerControlModel( const ImageProducerControlModel& _rSource ) : com::sun::star::awt::XImageProducer(), UnoControlModel( _rSource ), mbAdjustingImagePosition( false ), mbAdjustingGraphic( false ) { } - - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw(); - void SAL_CALL release() throw(); - // ::com::sun::star::awt::XImageProducer - void SAL_CALL addConsumer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer >& xConsumer ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL removeConsumer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer >& xConsumer ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL startProduction( ) throw (::com::sun::star::uno::RuntimeException); +protected: + GraphicControlModel() : mbAdjustingImagePosition( false ), mbAdjustingGraphic( false ) { } + GraphicControlModel( const GraphicControlModel& _rSource ) : UnoControlModel( _rSource ), mbAdjustingImagePosition( false ), mbAdjustingGraphic( false ) { } // ::cppu::OPropertySetHelper void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception); @@ -250,35 +237,13 @@ protected: ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; private: - ImageProducerControlModel& operator=( const ImageProducerControlModel& ); // never implemented -}; - -// ---------------------------------------------------- -// class ImageConsumerControl -// ---------------------------------------------------- -class ImageConsumerControl : public UnoControlBase -{ -protected: - ImageConsumerControl() { } - - void ImplSetPeerProperty( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Any& rVal ); - - // XControl - sal_Bool SAL_CALL setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& Model) throw ( ::com::sun::star::uno::RuntimeException ); - - void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException); - - void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException); - -private: - ImageConsumerControl( const ImageConsumerControl& ); // never implemented - ImageConsumerControl& operator=( const ImageConsumerControl& ); // never implemented + GraphicControlModel& operator=( const GraphicControlModel& ); // never implemented }; // ---------------------------------------------------- // class UnoControlButtonModel // ---------------------------------------------------- -class UnoControlButtonModel : public ImageProducerControlModel +class UnoControlButtonModel : public GraphicControlModel { protected: ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; @@ -286,7 +251,7 @@ protected: public: UnoControlButtonModel(); - UnoControlButtonModel( const UnoControlButtonModel& rModel ) : ImageProducerControlModel( rModel ) {;} + UnoControlButtonModel( const UnoControlButtonModel& rModel ) : GraphicControlModel( rModel ) {;} UnoControlModel* Clone() const { return new UnoControlButtonModel( *this ); } @@ -297,13 +262,13 @@ public: ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - DECLIMPL_SERVICEINFO_DERIVED( UnoControlButtonModel, ImageProducerControlModel, szServiceName2_UnoControlButtonModel ) + DECLIMPL_SERVICEINFO_DERIVED( UnoControlButtonModel, GraphicControlModel, szServiceName2_UnoControlButtonModel ) }; // ---------------------------------------------------- // class UnoButtonControl // ---------------------------------------------------- -typedef ::cppu::AggImplInheritanceHelper4 < ImageConsumerControl +typedef ::cppu::AggImplInheritanceHelper4 < UnoControlBase , ::com::sun::star::awt::XButton , ::com::sun::star::awt::XToggleButton , ::com::sun::star::awt::XLayoutConstrains @@ -347,13 +312,13 @@ public: ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - DECLIMPL_SERVICEINFO_DERIVED( UnoButtonControl, ImageConsumerControl, szServiceName2_UnoControlButton ) + DECLIMPL_SERVICEINFO_DERIVED( UnoButtonControl, UnoControlBase, szServiceName2_UnoControlButton ) }; // ---------------------------------------------------- // class UnoControlImageControlModel // ---------------------------------------------------- -class UnoControlImageControlModel : public ImageProducerControlModel +class UnoControlImageControlModel : public GraphicControlModel { private: bool mbAdjustingImageScaleMode; @@ -364,7 +329,7 @@ protected: public: UnoControlImageControlModel(); - UnoControlImageControlModel( const UnoControlImageControlModel& rModel ) : ImageProducerControlModel( rModel ), mbAdjustingImageScaleMode( false ) { } + UnoControlImageControlModel( const UnoControlImageControlModel& rModel ) : GraphicControlModel( rModel ), mbAdjustingImageScaleMode( false ) { } UnoControlModel* Clone() const { return new UnoControlImageControlModel( *this ); } @@ -375,7 +340,7 @@ public: ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - DECLIMPL_SERVICEINFO_DERIVED( UnoControlImageControlModel, ImageProducerControlModel, szServiceName2_UnoControlImageControlModel ) + DECLIMPL_SERVICEINFO_DERIVED( UnoControlImageControlModel, GraphicControlModel, szServiceName2_UnoControlImageControlModel ) // ::cppu::OPropertySetHelper void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception); @@ -384,7 +349,7 @@ public: // ---------------------------------------------------- // class UnoImageControlControl // ---------------------------------------------------- -typedef ::cppu::AggImplInheritanceHelper1 < ImageConsumerControl +typedef ::cppu::AggImplInheritanceHelper1 < UnoControlBase , ::com::sun::star::awt::XLayoutConstrains > UnoImageControlControl_Base; class UnoImageControlControl : public UnoImageControlControl_Base @@ -409,13 +374,13 @@ public: ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - DECLIMPL_SERVICEINFO_DERIVED( UnoImageControlControl, ImageConsumerControl, szServiceName2_UnoControlImageControl ) + DECLIMPL_SERVICEINFO_DERIVED( UnoImageControlControl, UnoControlBase, szServiceName2_UnoControlImageControl ) }; // ---------------------------------------------------- // class UnoControlRadioButtonModel // ---------------------------------------------------- -class UnoControlRadioButtonModel : public ImageProducerControlModel +class UnoControlRadioButtonModel : public GraphicControlModel { protected: @@ -424,7 +389,7 @@ protected: public: UnoControlRadioButtonModel(); - UnoControlRadioButtonModel( const UnoControlRadioButtonModel& rModel ) : ImageProducerControlModel( rModel ) {;} + UnoControlRadioButtonModel( const UnoControlRadioButtonModel& rModel ) : GraphicControlModel( rModel ) {;} UnoControlModel* Clone() const { return new UnoControlRadioButtonModel( *this ); } @@ -435,14 +400,14 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - DECLIMPL_SERVICEINFO_DERIVED( UnoControlRadioButtonModel, ImageProducerControlModel, szServiceName2_UnoControlRadioButtonModel ) + DECLIMPL_SERVICEINFO_DERIVED( UnoControlRadioButtonModel, GraphicControlModel, szServiceName2_UnoControlRadioButtonModel ) }; // ---------------------------------------------------- // class UnoRadioButtonControl // ---------------------------------------------------- -typedef ::cppu::AggImplInheritanceHelper4 < ImageConsumerControl +typedef ::cppu::AggImplInheritanceHelper4 < UnoControlBase , ::com::sun::star::awt::XButton , ::com::sun::star::awt::XRadioButton , ::com::sun::star::awt::XItemListener @@ -462,7 +427,7 @@ public: void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException) { ImageConsumerControl::disposing( Source ); } + void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException) { UnoControlBase::disposing( Source ); } // ::com::sun::star::awt::XControl sal_Bool SAL_CALL isTransparent( ) throw(::com::sun::star::uno::RuntimeException); @@ -488,14 +453,14 @@ public: ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - DECLIMPL_SERVICEINFO_DERIVED( UnoRadioButtonControl, ImageConsumerControl, szServiceName2_UnoControlRadioButton ) + DECLIMPL_SERVICEINFO_DERIVED( UnoRadioButtonControl, UnoControlBase, szServiceName2_UnoControlRadioButton ) }; // ---------------------------------------------------- // class UnoControlCheckBoxModel // ---------------------------------------------------- -class UnoControlCheckBoxModel : public ImageProducerControlModel +class UnoControlCheckBoxModel : public GraphicControlModel { protected: ::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; @@ -503,7 +468,7 @@ protected: public: UnoControlCheckBoxModel(); - UnoControlCheckBoxModel( const UnoControlCheckBoxModel& rModel ) : ImageProducerControlModel( rModel ) {;} + UnoControlCheckBoxModel( const UnoControlCheckBoxModel& rModel ) : GraphicControlModel( rModel ) {;} UnoControlModel* Clone() const { return new UnoControlCheckBoxModel( *this ); } @@ -514,13 +479,13 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - DECLIMPL_SERVICEINFO_DERIVED( UnoControlCheckBoxModel, ImageProducerControlModel, szServiceName2_UnoControlCheckBoxModel ) + DECLIMPL_SERVICEINFO_DERIVED( UnoControlCheckBoxModel, GraphicControlModel, szServiceName2_UnoControlCheckBoxModel ) }; // ---------------------------------------------------- // class UnoCheckBoxControl // ---------------------------------------------------- -typedef ::cppu::AggImplInheritanceHelper4 < ImageConsumerControl +typedef ::cppu::AggImplInheritanceHelper4 < UnoControlBase , ::com::sun::star::awt::XButton , ::com::sun::star::awt::XCheckBox , ::com::sun::star::awt::XItemListener @@ -541,7 +506,7 @@ public: void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException) { ImageConsumerControl::disposing( Source ); } + void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException) { UnoControlBase::disposing( Source ); } // ::com::sun::star::awt::XControl sal_Bool SAL_CALL isTransparent( ) throw(::com::sun::star::uno::RuntimeException); @@ -569,7 +534,7 @@ public: ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - DECLIMPL_SERVICEINFO_DERIVED( UnoCheckBoxControl, ImageConsumerControl, szServiceName2_UnoControlCheckBox ) + DECLIMPL_SERVICEINFO_DERIVED( UnoCheckBoxControl, UnoControlBase, szServiceName2_UnoControlCheckBox ) }; diff --git a/toolkit/inc/toolkit/helper/servicenames.hxx b/toolkit/inc/toolkit/helper/servicenames.hxx index 96d9d5810cc0..2d1df79b733b 100644 --- a/toolkit/inc/toolkit/helper/servicenames.hxx +++ b/toolkit/inc/toolkit/helper/servicenames.hxx @@ -104,10 +104,5 @@ extern const sal_Char __FAR_DATA szServiceName_UnoThrobberControl[], szServiceNa extern const sal_Char __FAR_DATA szServiceName_UnoThrobberControlModel[], szServiceName2_UnoThrobberControlModel[]; extern const sal_Char __FAR_DATA szServiceName_UnoControlFixedHyperlink[], szServiceName_UnoControlFixedHyperlinkModel[]; -// ExtUnoWrapper: -extern const char __FAR_DATA szServiceName_ImageProducer[], szServiceName2_ImageProducer[]; - - - #endif // _TOOLKIT_HELPER_SERVICENAMES_HXX_ diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index 08e3ed286dd9..b79fee56e3d8 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -206,33 +206,22 @@ namespace toolkit } // ---------------------------------------------------- -// class VCLXImageConsumer +// class VCLXGraphicControl // ---------------------------------------------------- -void VCLXImageConsumer::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) +void VCLXGraphicControl::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) { VCLXWindow::ImplGetPropertyIds( rIds ); } -void VCLXImageConsumer::ImplSetNewImage() +void VCLXGraphicControl::ImplSetNewImage() { - OSL_PRECOND( GetWindow(), "VCLXImageConsumer::ImplSetNewImage: window is required to be not-NULL!" ); + OSL_PRECOND( GetWindow(), "VCLXGraphicControl::ImplSetNewImage: window is required to be not-NULL!" ); Button* pButton = static_cast< Button* >( GetWindow() ); pButton->SetModeBitmap( GetBitmap() ); } -void VCLXImageConsumer::ImplUpdateImage( sal_Bool bGetNewImage ) -{ - if ( !GetWindow() ) - return; - - if ( bGetNewImage && !maImageConsumer.GetData( maImage ) ) - return; - - ImplSetNewImage(); -} - -void VCLXImageConsumer::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, short Flags ) throw(::com::sun::star::uno::RuntimeException) +void VCLXGraphicControl::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, short Flags ) throw(::com::sun::star::uno::RuntimeException) { ::vos::OGuard aGuard( GetMutex() ); @@ -241,49 +230,11 @@ void VCLXImageConsumer::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, s Size aOldSize = GetWindow()->GetSizePixel(); VCLXWindow::setPosSize( X, Y, Width, Height, Flags ); if ( ( aOldSize.Width() != Width ) || ( aOldSize.Height() != Height ) ) - ImplUpdateImage( sal_False ); + ImplSetNewImage(); } } -void VCLXImageConsumer::init( sal_Int32 Width, sal_Int32 Height ) throw(::com::sun::star::uno::RuntimeException) -{ - ::vos::OGuard aGuard( GetMutex() ); - - maImageConsumer.Init( Width, Height ); -} - -void VCLXImageConsumer::setColorModel( sal_Int16 BitCount, const ::com::sun::star::uno::Sequence< sal_Int32 >& RGBAPal, sal_Int32 RedMask, sal_Int32 GreenMask, sal_Int32 BlueMask, sal_Int32 AlphaMask ) throw(::com::sun::star::uno::RuntimeException) -{ - ::vos::OGuard aGuard( GetMutex() ); - - maImageConsumer.SetColorModel( BitCount, RGBAPal.getLength(), (const sal_uInt32*) RGBAPal.getConstArray(), RedMask, GreenMask, BlueMask, AlphaMask ); -} - -void VCLXImageConsumer::setPixelsByBytes( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, const ::com::sun::star::uno::Sequence< sal_Int8 >& ProducerData, sal_Int32 Offset, sal_Int32 Scansize ) throw(::com::sun::star::uno::RuntimeException) -{ - ::vos::OGuard aGuard( GetMutex() ); - - maImageConsumer.SetPixelsByBytes( X, Y, Width, Height, (sal_uInt8*)ProducerData.getConstArray(), Offset, Scansize ); - ImplUpdateImage( sal_True ); -} - -void VCLXImageConsumer::setPixelsByLongs( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, const ::com::sun::star::uno::Sequence< sal_Int32 >& ProducerData, sal_Int32 Offset, sal_Int32 Scansize ) throw(::com::sun::star::uno::RuntimeException) -{ - ::vos::OGuard aGuard( GetMutex() ); - - maImageConsumer.SetPixelsByLongs( X, Y, Width, Height, (const sal_uInt32*) ProducerData.getConstArray(), Offset, Scansize ); - ImplUpdateImage( sal_True ); -} - -void VCLXImageConsumer::complete( sal_Int32 Status, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageProducer > & ) throw(::com::sun::star::uno::RuntimeException) -{ - ::vos::OGuard aGuard( GetMutex() ); - - maImageConsumer.Completed( Status ); - ImplUpdateImage( sal_True ); -} - -void VCLXImageConsumer::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) +void VCLXGraphicControl::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) { ::vos::OGuard aGuard( GetMutex() ); @@ -336,7 +287,7 @@ void VCLXImageConsumer::setProperty( const ::rtl::OUString& PropertyName, const } } -::com::sun::star::uno::Any VCLXImageConsumer::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Any VCLXGraphicControl::getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException) { ::vos::OGuard aGuard( GetMutex() ); @@ -418,7 +369,7 @@ void VCLXButton::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) BASEPROPERTY_CONTEXT_WRITING_MODE, BASEPROPERTY_REFERENCE_DEVICE, 0); - VCLXImageConsumer::ImplGetPropertyIds( rIds ); + VCLXGraphicControl::ImplGetPropertyIds( rIds ); } VCLXButton::VCLXButton() @@ -444,7 +395,7 @@ void VCLXButton::dispose() throw(::com::sun::star::uno::RuntimeException) aObj.Source = (::cppu::OWeakObject*)this; maActionListeners.disposeAndClear( aObj ); maItemListeners.disposeAndClear( aObj ); - VCLXImageConsumer::dispose(); + VCLXGraphicControl::dispose(); } void VCLXButton::addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener > & l )throw(::com::sun::star::uno::RuntimeException) @@ -573,7 +524,7 @@ void VCLXButton::setProperty( const ::rtl::OUString& PropertyName, const ::com:: break; default: { - VCLXImageConsumer::setProperty( PropertyName, Value ); + VCLXGraphicControl::setProperty( PropertyName, Value ); } } } @@ -613,7 +564,7 @@ void VCLXButton::setProperty( const ::rtl::OUString& PropertyName, const ::com:: break; default: { - aProp <<= VCLXImageConsumer::getProperty( PropertyName ); + aProp <<= VCLXGraphicControl::getProperty( PropertyName ); } } } @@ -664,7 +615,7 @@ void VCLXButton::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) break; default: - VCLXImageConsumer::ProcessWindowEvent( rVclWindowEvent ); + VCLXGraphicControl::ProcessWindowEvent( rVclWindowEvent ); break; } } @@ -693,7 +644,7 @@ void VCLXImageControl::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) BASEPROPERTY_WRITING_MODE, BASEPROPERTY_CONTEXT_WRITING_MODE, 0); - VCLXImageConsumer::ImplGetPropertyIds( rIds ); + VCLXGraphicControl::ImplGetPropertyIds( rIds ); } VCLXImageControl::VCLXImageControl() @@ -770,7 +721,7 @@ void VCLXImageControl::setProperty( const ::rtl::OUString& PropertyName, const : break; default: - VCLXImageConsumer::setProperty( PropertyName, Value ); + VCLXGraphicControl::setProperty( PropertyName, Value ); break; } } @@ -794,7 +745,7 @@ void VCLXImageControl::setProperty( const ::rtl::OUString& PropertyName, const : break; default: - aProp = VCLXImageConsumer::getProperty( PropertyName ); + aProp = VCLXGraphicControl::getProperty( PropertyName ); break; } return aProp; @@ -831,7 +782,7 @@ void VCLXCheckBox::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) BASEPROPERTY_CONTEXT_WRITING_MODE, BASEPROPERTY_REFERENCE_DEVICE, 0); - VCLXImageConsumer::ImplGetPropertyIds( rIds ); + VCLXGraphicControl::ImplGetPropertyIds( rIds ); } VCLXCheckBox::VCLXCheckBox() : maActionListeners( *this ), maItemListeners( *this ) @@ -844,14 +795,14 @@ VCLXCheckBox::VCLXCheckBox() : maActionListeners( *this ), maItemListeners( *th ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, SAL_STATIC_CAST( ::com::sun::star::awt::XButton*, this ), SAL_STATIC_CAST( ::com::sun::star::awt::XCheckBox*, this ) ); - return (aRet.hasValue() ? aRet : VCLXImageConsumer::queryInterface( rType )); + return (aRet.hasValue() ? aRet : VCLXGraphicControl::queryInterface( rType )); } // ::com::sun::star::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXCheckBox ) getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XButton>* ) NULL ), getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XCheckBox>* ) NULL ), - VCLXImageConsumer::getTypes() + VCLXGraphicControl::getTypes() IMPL_XTYPEPROVIDER_END ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > VCLXCheckBox::CreateAccessibleContext() @@ -866,7 +817,7 @@ void VCLXCheckBox::dispose() throw(::com::sun::star::uno::RuntimeException) ::com::sun::star::lang::EventObject aObj; aObj.Source = (::cppu::OWeakObject*)this; maItemListeners.disposeAndClear( aObj ); - VCLXImageConsumer::dispose(); + VCLXGraphicControl::dispose(); } void VCLXCheckBox::addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener > & l ) throw(::com::sun::star::uno::RuntimeException) @@ -1028,7 +979,7 @@ void VCLXCheckBox::setProperty( const ::rtl::OUString& PropertyName, const ::com break; default: { - VCLXImageConsumer::setProperty( PropertyName, Value ); + VCLXGraphicControl::setProperty( PropertyName, Value ); } } } @@ -1056,7 +1007,7 @@ void VCLXCheckBox::setProperty( const ::rtl::OUString& PropertyName, const ::com break; default: { - aProp <<= VCLXImageConsumer::getProperty( PropertyName ); + aProp <<= VCLXGraphicControl::getProperty( PropertyName ); } } } @@ -1098,7 +1049,7 @@ void VCLXCheckBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) break; default: - VCLXImageConsumer::ProcessWindowEvent( rVclWindowEvent ); + VCLXGraphicControl::ProcessWindowEvent( rVclWindowEvent ); break; } } @@ -1131,7 +1082,7 @@ void VCLXRadioButton::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds ) BASEPROPERTY_CONTEXT_WRITING_MODE, BASEPROPERTY_REFERENCE_DEVICE, 0); - VCLXImageConsumer::ImplGetPropertyIds( rIds ); + VCLXGraphicControl::ImplGetPropertyIds( rIds ); } @@ -1145,14 +1096,14 @@ VCLXRadioButton::VCLXRadioButton() : maItemListeners( *this ), maActionListeners ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, SAL_STATIC_CAST( ::com::sun::star::awt::XRadioButton*, this ), SAL_STATIC_CAST( ::com::sun::star::awt::XButton*, this ) ); - return (aRet.hasValue() ? aRet : VCLXImageConsumer::queryInterface( rType )); + return (aRet.hasValue() ? aRet : VCLXGraphicControl::queryInterface( rType )); } // ::com::sun::star::lang::XTypeProvider IMPL_XTYPEPROVIDER_START( VCLXRadioButton ) getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRadioButton>* ) NULL ), getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XButton>* ) NULL ), - VCLXImageConsumer::getTypes() + VCLXGraphicControl::getTypes() IMPL_XTYPEPROVIDER_END ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > VCLXRadioButton::CreateAccessibleContext() @@ -1167,7 +1118,7 @@ void VCLXRadioButton::dispose() throw(::com::sun::star::uno::RuntimeException) ::com::sun::star::lang::EventObject aObj; aObj.Source = (::cppu::OWeakObject*)this; maItemListeners.disposeAndClear( aObj ); - VCLXImageConsumer::dispose(); + VCLXGraphicControl::dispose(); } void VCLXRadioButton::setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException) @@ -1206,7 +1157,7 @@ void VCLXRadioButton::setProperty( const ::rtl::OUString& PropertyName, const :: break; default: { - VCLXImageConsumer::setProperty( PropertyName, Value ); + VCLXGraphicControl::setProperty( PropertyName, Value ); } } } @@ -1234,7 +1185,7 @@ void VCLXRadioButton::setProperty( const ::rtl::OUString& PropertyName, const :: break; default: { - aProp <<= VCLXImageConsumer::getProperty( PropertyName ); + aProp <<= VCLXGraphicControl::getProperty( PropertyName ); } } } @@ -1366,7 +1317,7 @@ void VCLXRadioButton::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent break; default: - VCLXImageConsumer::ProcessWindowEvent( rVclWindowEvent ); + VCLXGraphicControl::ProcessWindowEvent( rVclWindowEvent ); break; } } diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx index acfbee0c5bb6..08e7898ac661 100644 --- a/toolkit/source/controls/roadmapcontrol.cxx +++ b/toolkit/source/controls/roadmapcontrol.cxx @@ -52,27 +52,6 @@ namespace toolkit // helper // ---------------------------------------------------- - static void lcl_knitImageComponents( const Reference< XControlModel >& _rxModel, - const Reference< XWindowPeer >& _rxPeer, - bool _bAdd ) - { - Reference< XImageProducer > xProducer( _rxModel, UNO_QUERY ); - if ( xProducer.is() ) - { - Reference< XImageConsumer > xConsumer( _rxPeer, UNO_QUERY ); - if ( xConsumer.is() ) - { - if ( _bAdd ) - { - xProducer->addConsumer( xConsumer ); - xProducer->startProduction(); - } - else - xProducer->removeConsumer( xConsumer ); - } - } - } - static void lcl_throwIllegalArgumentException( ) { // throwing is expensive (in terms of code size), thus we hope the compiler does not inline this .... throw IllegalArgumentException(); @@ -384,40 +363,6 @@ static void lcl_throwIndexOutOfBoundsException( ) maContainerListeners.removeInterface( xListener ); } - - void UnoControlRoadmapModel::addConsumer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer >& xConsumer ) throw (::com::sun::star::uno::RuntimeException) - { - maImageListeners.push_back( xConsumer ); - } - - - void UnoControlRoadmapModel::removeConsumer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer >& xConsumer ) throw (::com::sun::star::uno::RuntimeException) - { - maImageListeners.remove( xConsumer ); - } - - - void UnoControlRoadmapModel::startProduction( ) throw (::com::sun::star::uno::RuntimeException) - { - Sequence aArgs(1); - aArgs.getArray()[0] = getPropertyValue( GetPropertyName( BASEPROPERTY_IMAGEURL ) ); - Reference< XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory(); - Reference< XImageProducer > xImageProducer( xMSF->createInstanceWithArguments( ::rtl::OUString::createFromAscii( "com.sun.star.awt.ImageProducer" ), aArgs ), UNO_QUERY ); - if ( xImageProducer.is() ) - { - std::list< Reference< XImageConsumer > >::iterator aIter( maImageListeners.begin() ); - while ( aIter != maImageListeners.end() ) - { - xImageProducer->addConsumer( *aIter ); - aIter++; - } - xImageProducer->startProduction(); - } - } - - - - // =================================================================== // = UnoRoadmapControl // =================================================================== @@ -434,9 +379,6 @@ sal_Bool SAL_CALL UnoRoadmapControl::setModel(const Reference< XControlModel >& { - // remove the peer as image consumer from the model - lcl_knitImageComponents( getModel(), getPeer(), false ); - Reference< XContainer > xC( getModel(), UNO_QUERY ); if ( xC.is() ) xC->removeContainerListener( this ); @@ -447,9 +389,6 @@ sal_Bool SAL_CALL UnoRoadmapControl::setModel(const Reference< XControlModel >& if ( xC.is() ) xC->addContainerListener( this ); - // add the peer as image consumer to the model - lcl_knitImageComponents( getModel(), getPeer(), true ); - return bReturn; } @@ -462,18 +401,6 @@ sal_Bool SAL_CALL UnoRoadmapControl::setModel(const Reference< XControlModel >& - void SAL_CALL UnoRoadmapControl::createPeer( const Reference & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) throw(RuntimeException) - { - // remove the peer as image consumer from the model - lcl_knitImageComponents( getModel(), getPeer(), false ); - - UnoControl::createPeer( rxToolkit, rParentPeer ); - - lcl_knitImageComponents( getModel(), getPeer(), true ); - - } - - void UnoRoadmapControl::dispose() throw(RuntimeException) { EventObject aEvt; @@ -484,24 +411,6 @@ sal_Bool SAL_CALL UnoRoadmapControl::setModel(const Reference< XControlModel >& -void UnoRoadmapControl::ImplSetPeerProperty( const ::rtl::OUString& rPropName, const Any& rVal ) -{ - sal_uInt16 nType = GetPropertyId( rPropName ); - if ( getPeer().is() && ( nType == BASEPROPERTY_IMAGEURL ) ) - { - Reference < XImageProducer > xImgProd( getModel(), UNO_QUERY ); - Reference < XImageConsumer > xImgCons( getPeer(), UNO_QUERY ); - - if ( xImgProd.is() && xImgCons.is() ) - { - xImgProd->startProduction(); - } - } - else - UnoControlBase::ImplSetPeerProperty( rPropName, rVal ); -} - - void UnoRoadmapControl::elementInserted( const ContainerEvent& rEvent )throw(RuntimeException) { Reference< XInterface > xRoadmapItem; diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx index cfb71111e3dc..92a8a21a6c08 100644 --- a/toolkit/source/controls/unocontrols.cxx +++ b/toolkit/source/controls/unocontrols.cxx @@ -80,32 +80,6 @@ using ::com::sun::star::graphic::XGraphic; using ::com::sun::star::uno::Reference; using namespace ::toolkit; - -// ---------------------------------------------------- -// helper -// ---------------------------------------------------- - -static void lcl_knitImageComponents( const uno::Reference< awt::XControlModel >& _rxModel, - const uno::Reference< awt::XWindowPeer >& _rxPeer, - bool _bAdd ) -{ - uno::Reference< awt::XImageProducer > xProducer( _rxModel, uno::UNO_QUERY ); - if ( xProducer.is() ) - { - uno::Reference< awt::XImageConsumer > xConsumer( _rxPeer, uno::UNO_QUERY ); - if ( xConsumer.is() ) - { - if ( _bAdd ) - { - xProducer->addConsumer( xConsumer ); - xProducer->startProduction(); - } - else - xProducer->removeConsumer( xConsumer ); - } - } -} - // ---------------------------------------------------- // class UnoControlEditModel // ---------------------------------------------------- @@ -543,37 +517,16 @@ UnoFileControl::UnoFileControl() } // ---------------------------------------------------- -// class ImageProducerControlModel +// class GraphicControlModel // ---------------------------------------------------- -uno::Any SAL_CALL ImageProducerControlModel::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException) -{ - return UnoControlModel::queryInterface( rType ); -} - -uno::Any SAL_CALL ImageProducerControlModel::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException) -{ - uno::Any aRet = ::cppu::queryInterface( rType, SAL_STATIC_CAST( awt::XImageProducer*, this ) ); - return (aRet.hasValue() ? aRet : UnoControlModel::queryAggregation( rType )); -} - -void SAL_CALL ImageProducerControlModel::acquire() throw() -{ - UnoControlModel::acquire(); -} - -void SAL_CALL ImageProducerControlModel::release() throw() -{ - UnoControlModel::release(); -} - -uno::Any ImageProducerControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const +uno::Any GraphicControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const { if ( nPropId == BASEPROPERTY_GRAPHIC ) return uno::makeAny( uno::Reference< graphic::XGraphic >() ); return UnoControlModel::ImplGetDefaultValue( nPropId ); } - uno::Reference< graphic::XGraphic > ImageProducerControlModel::getGraphicFromURL_nothrow( const ::rtl::OUString& _rURL ) + uno::Reference< graphic::XGraphic > GraphicControlModel::getGraphicFromURL_nothrow( const ::rtl::OUString& _rURL ) { uno::Reference< graphic::XGraphic > xGraphic; @@ -611,7 +564,7 @@ uno::Any ImageProducerControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) co return xGraphic; } -void SAL_CALL ImageProducerControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception) +void SAL_CALL GraphicControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception) { UnoControlModel::setFastPropertyValue_NoBroadcast( nHandle, rValue ); @@ -665,90 +618,11 @@ void SAL_CALL ImageProducerControlModel::setFastPropertyValue_NoBroadcast( sal_I } catch( const ::com::sun::star::uno::Exception& ) { - OSL_ENSURE( sal_False, "ImageProducerControlModel::setFastPropertyValue_NoBroadcast: caught an exception while aligning the ImagePosition/ImageAlign properties!" ); + OSL_ENSURE( sal_False, "GraphicControlModel::setFastPropertyValue_NoBroadcast: caught an exception while aligning the ImagePosition/ImageAlign properties!" ); mbAdjustingImagePosition = sal_False; } } -void ImageProducerControlModel::addConsumer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer >& xConsumer ) throw (::com::sun::star::uno::RuntimeException) -{ - maListeners.push_back( xConsumer ); -} - -void ImageProducerControlModel::removeConsumer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer >& xConsumer ) throw (::com::sun::star::uno::RuntimeException) -{ - maListeners.remove( xConsumer ); -} - -void ImageProducerControlModel::startProduction( ) throw (::com::sun::star::uno::RuntimeException) -{ - uno::Sequence aArgs(1); - aArgs.getArray()[0] = getPropertyValue( GetPropertyName( BASEPROPERTY_IMAGEURL ) ); - uno::Reference< lang::XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory(); - uno::Reference< awt::XImageProducer > xImageProducer( xMSF->createInstanceWithArguments( ::rtl::OUString::createFromAscii( "com.sun.star.awt.ImageProducer" ), aArgs ), uno::UNO_QUERY ); - if ( xImageProducer.is() ) - { - std::list< uno::Reference< awt::XImageConsumer > >::iterator aIter( maListeners.begin() ); - while ( aIter != maListeners.end() ) - { - xImageProducer->addConsumer( *aIter ); - aIter++; - } - xImageProducer->startProduction(); - } -} - -// ---------------------------------------------------- -// class ImageConsumerControl -// ---------------------------------------------------- - -sal_Bool SAL_CALL ImageConsumerControl::setModel(const uno::Reference< awt::XControlModel >& _rModel) throw ( uno::RuntimeException ) -{ - // remove the peer as image consumer from the model - lcl_knitImageComponents( getModel(), getPeer(), false ); - - sal_Bool bReturn = UnoControlBase::setModel( _rModel ); - - // add the peer as image consumer to the model - lcl_knitImageComponents( getModel(), getPeer(), true ); - - return bReturn; -} - -void SAL_CALL ImageConsumerControl::createPeer( const uno::Reference< awt::XToolkit >& rxToolkit, const uno::Reference< awt::XWindowPeer >& rParentPeer ) throw(uno::RuntimeException) -{ - // remove the peer as image consumer from the model - lcl_knitImageComponents( getModel(), getPeer(), false ); - - UnoControlBase::createPeer( rxToolkit, rParentPeer ); - - // add the peer as image consumer to the model - lcl_knitImageComponents( getModel(), getPeer(), true ); -} - -void SAL_CALL ImageConsumerControl::dispose( ) throw(::com::sun::star::uno::RuntimeException) -{ - // remove the peer as image consumer from the model - lcl_knitImageComponents( getModel(), getPeer(), false ); - - UnoControlBase::dispose(); -} - -void ImageConsumerControl::ImplSetPeerProperty( const ::rtl::OUString& rPropName, const uno::Any& rVal ) -{ - sal_uInt16 nType = GetPropertyId( rPropName ); - if ( nType == BASEPROPERTY_IMAGEURL ) - { - uno::Reference < awt::XImageProducer > xImgProd( getModel(), uno::UNO_QUERY ); - uno::Reference < awt::XImageConsumer > xImgCons( getPeer(), uno::UNO_QUERY ); - - if ( xImgProd.is() && xImgCons.is() ) - xImgProd->startProduction(); - } - else - UnoControlBase::ImplSetPeerProperty( rPropName, rVal ); -} - // ---------------------------------------------------- // class UnoControlButtonModel // ---------------------------------------------------- @@ -784,7 +658,7 @@ uno::Any UnoControlButtonModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const return uno::makeAny( (sal_Bool)sal_True ); } - return ImageProducerControlModel::ImplGetDefaultValue( nPropId ); + return GraphicControlModel::ImplGetDefaultValue( nPropId ); } ::cppu::IPropertyArrayHelper& UnoControlButtonModel::getInfoHelper() @@ -847,12 +721,12 @@ void UnoButtonControl::dispose() throw(uno::RuntimeException) aEvt.Source = (::cppu::OWeakObject*)this; maActionListeners.disposeAndClear( aEvt ); maItemListeners.disposeAndClear( aEvt ); - ImageConsumerControl::dispose(); + UnoControlBase::dispose(); } void UnoButtonControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) throw(uno::RuntimeException) { - ImageConsumerControl::createPeer( rxToolkit, rParentPeer ); + UnoControlBase::createPeer( rxToolkit, rParentPeer ); uno::Reference < awt::XButton > xButton( getPeer(), uno::UNO_QUERY ); xButton->setActionCommand( maActionCommand ); @@ -896,7 +770,7 @@ void UnoButtonControl::removeItemListener(const uno::Reference< awt::XItemListen void SAL_CALL UnoButtonControl::disposing( const lang::EventObject& Source ) throw (uno::RuntimeException) { - ImageConsumerControl::disposing( Source ); + UnoControlBase::disposing( Source ); } void SAL_CALL UnoButtonControl::itemStateChanged( const awt::ItemEvent& rEvent ) throw (uno::RuntimeException) @@ -966,7 +840,7 @@ uno::Any UnoControlImageControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) if ( nPropId == BASEPROPERTY_IMAGE_SCALE_MODE ) return makeAny( awt::ImageScaleMode::Anisotropic ); - return ImageProducerControlModel::ImplGetDefaultValue( nPropId ); + return GraphicControlModel::ImplGetDefaultValue( nPropId ); } ::cppu::IPropertyArrayHelper& UnoControlImageControlModel::getInfoHelper() @@ -989,7 +863,7 @@ uno::Reference< beans::XPropertySetInfo > UnoControlImageControlModel::getProper void SAL_CALL UnoControlImageControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::uno::Exception) { - ImageProducerControlModel::setFastPropertyValue_NoBroadcast( _nHandle, _rValue ); + GraphicControlModel::setFastPropertyValue_NoBroadcast( _nHandle, _rValue ); // ScaleImage is an older (and less powerful) version of ScaleMode, but keep both in sync as far as possible try @@ -1093,7 +967,7 @@ uno::Any UnoControlRadioButtonModel::ImplGetDefaultValue( sal_uInt16 nPropId ) c return uno::makeAny( (sal_Int16)awt::VisualEffect::LOOK3D ); } - return ImageProducerControlModel::ImplGetDefaultValue( nPropId ); + return GraphicControlModel::ImplGetDefaultValue( nPropId ); } ::cppu::IPropertyArrayHelper& UnoControlRadioButtonModel::getInfoHelper() @@ -1136,7 +1010,7 @@ void UnoRadioButtonControl::dispose() throw(uno::RuntimeException) lang::EventObject aEvt; aEvt.Source = (::cppu::OWeakObject*)this; maItemListeners.disposeAndClear( aEvt ); - ImageConsumerControl::dispose(); + UnoControlBase::dispose(); } @@ -1147,7 +1021,7 @@ sal_Bool UnoRadioButtonControl::isTransparent() throw(uno::RuntimeException) void UnoRadioButtonControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) throw(uno::RuntimeException) { - ImageConsumerControl::createPeer( rxToolkit, rParentPeer ); + UnoControlBase::createPeer( rxToolkit, rParentPeer ); uno::Reference < awt::XRadioButton > xRadioButton( getPeer(), uno::UNO_QUERY ); xRadioButton->addItemListener( this ); @@ -1300,7 +1174,7 @@ uno::Any UnoControlCheckBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) cons return uno::makeAny( (sal_Int16)awt::VisualEffect::LOOK3D ); } - return ImageProducerControlModel::ImplGetDefaultValue( nPropId ); + return GraphicControlModel::ImplGetDefaultValue( nPropId ); } ::cppu::IPropertyArrayHelper& UnoControlCheckBoxModel::getInfoHelper() @@ -1343,7 +1217,7 @@ void UnoCheckBoxControl::dispose() throw(uno::RuntimeException) lang::EventObject aEvt; aEvt.Source = (::cppu::OWeakObject*)this; maItemListeners.disposeAndClear( aEvt ); - ImageConsumerControl::dispose(); + UnoControlBase::dispose(); } sal_Bool UnoCheckBoxControl::isTransparent() throw(uno::RuntimeException) @@ -1353,7 +1227,7 @@ sal_Bool UnoCheckBoxControl::isTransparent() throw(uno::RuntimeException) void UnoCheckBoxControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) throw(uno::RuntimeException) { - ImageConsumerControl::createPeer( rxToolkit, rParentPeer ); + UnoControlBase::createPeer( rxToolkit, rParentPeer ); uno::Reference < awt::XCheckBox > xCheckBox( getPeer(), uno::UNO_QUERY ); xCheckBox->addItemListener( this ); diff --git a/toolkit/source/helper/servicenames.cxx b/toolkit/source/helper/servicenames.cxx index 6a376391f46d..f57f52f13e57 100644 --- a/toolkit/source/helper/servicenames.cxx +++ b/toolkit/source/helper/servicenames.cxx @@ -77,7 +77,6 @@ const sal_Char __FAR_DATA szServiceName_UnoControlPatternFieldModel[] = "stardiv const sal_Char __FAR_DATA szServiceName_UnoControlFormattedField[] = "stardiv.vcl.control.FormattedField", szServiceName2_UnoControlFormattedField[] = "com.sun.star.awt.UnoControlFormattedField"; const sal_Char __FAR_DATA szServiceName_UnoControlFormattedFieldModel[] = "stardiv.vcl.controlmodel.FormattedField", szServiceName2_UnoControlFormattedFieldModel[] = "com.sun.star.awt.UnoControlFormattedFieldModel"; const sal_Char __FAR_DATA szServiceName_MVCIntrospection[] = "stardiv.vcl.MVCIntrospection", szServiceName2_MVCIntrospection[] = "com.sun.star.awt.MVCIntrospection"; -const sal_Char __FAR_DATA szServiceName_ImageProducer[] = "stardiv.vcl.ImageProducer", szServiceName2_ImageProducer[] = "com.sun.star.awt.ImageProducer"; const sal_Char __FAR_DATA szServiceName_PrinterServer[] = "stardiv.vcl.PrinterServer", szServiceName2_PrinterServer[] = "com.sun.star.awt.PrinterServer"; const sal_Char __FAR_DATA szServiceName_UnoControlProgressBar[] = "stardiv.vcl.control.ProgressBar", szServiceName2_UnoControlProgressBar[] = "com.sun.star.awt.UnoControlProgressBar"; const sal_Char __FAR_DATA szServiceName_UnoControlProgressBarModel[] = "stardiv.vcl.controlmodel.ProgressBar", szServiceName2_UnoControlProgressBarModel[] = "com.sun.star.awt.UnoControlProgressBarModel"; diff --git a/toolkit/source/layout/core/import.cxx b/toolkit/source/layout/core/import.cxx index daaa8c239f50..6d161cf1b07e 100644 --- a/toolkit/source/layout/core/import.cxx +++ b/toolkit/source/layout/core/import.cxx @@ -109,17 +109,6 @@ SAL_THROW (()) DBG_ERROR( "Fatal error: top node isn't a dialog" ); } -#if 0 - // Hack moved to proplist.cxx - OUString aGraphic; - if ( findAndRemove( "graphic", aProps, aGraphic ) ) - //if ( layout::FixedImage *i = dynamic_cast ( mpWidget->getPeer().get() ) ) - // FIXME: huh? XImageProducer::complete( XImageConsumer ) - //i->setImage( Image( loadGraphic( OUSTRING_CSTR( aGraphic ) ) ) ); - mpWidget->setProperty( OUString::createFromAscii( "graphic" ), - loadGraphic( OUSTRING_CSTR( aGraphic ) ) ); -#endif - OUString aOrdering; if ( findAndRemove( "ordering", aProps, aOrdering ) ) if ( DialogButtonHBox *b = dynamic_cast ( mpWidget->getPeer().get() ) ) -- cgit v1.2.1 From 8a6b7bad0288723d443c5597b9a7201594bb2c25 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Fri, 18 Jun 2010 15:44:36 +0200 Subject: unoawt2: get rid of the ImageConsumer class - it has no clients anymore --- toolkit/inc/pch/precompiled_toolkit.hxx | 1 - toolkit/inc/toolkit/awt/vclxwindows.hxx | 1 - toolkit/inc/toolkit/controls/unocontrols.hxx | 1 - vcl/inc/vcl/imgcons.hxx | 105 ----- vcl/prj/d.lst | 3 +- vcl/source/gdi/imgcons.cxx | 574 --------------------------- 6 files changed, 1 insertion(+), 684 deletions(-) delete mode 100644 vcl/inc/vcl/imgcons.hxx delete mode 100644 vcl/source/gdi/imgcons.cxx diff --git a/toolkit/inc/pch/precompiled_toolkit.hxx b/toolkit/inc/pch/precompiled_toolkit.hxx index affcf376b071..d0baff3b8343 100644 --- a/toolkit/inc/pch/precompiled_toolkit.hxx +++ b/toolkit/inc/pch/precompiled_toolkit.hxx @@ -326,7 +326,6 @@ #include "vcl/font.hxx" #include "vcl/gradient.hxx" #include "vcl/image.hxx" -#include "vcl/imgcons.hxx" #include "vcl/jobset.hxx" #include "vcl/mapunit.hxx" #include "vcl/menu.hxx" diff --git a/toolkit/inc/toolkit/awt/vclxwindows.hxx b/toolkit/inc/toolkit/awt/vclxwindows.hxx index 75085020ca7b..80e3a37279d3 100644 --- a/toolkit/inc/toolkit/awt/vclxwindows.hxx +++ b/toolkit/inc/toolkit/awt/vclxwindows.hxx @@ -92,7 +92,6 @@ #include #include -#include #include class Button; diff --git a/toolkit/inc/toolkit/controls/unocontrols.hxx b/toolkit/inc/toolkit/controls/unocontrols.hxx index fd775cd568c1..a0d34b0f8741 100644 --- a/toolkit/inc/toolkit/controls/unocontrols.hxx +++ b/toolkit/inc/toolkit/controls/unocontrols.hxx @@ -55,7 +55,6 @@ #include #include #include -#include #include #include #include diff --git a/vcl/inc/vcl/imgcons.hxx b/vcl/inc/vcl/imgcons.hxx deleted file mode 100644 index 2f582fec15c3..000000000000 --- a/vcl/inc/vcl/imgcons.hxx +++ /dev/null @@ -1,105 +0,0 @@ -/************************************************************************* - * - * 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 - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _IMGCONS_HXX -#define _IMGCONS_HXX - -#include - -#include - -// ----------------- -// - ImageConsumer - -// ----------------- - -class ImageProducer; -class ImplColorMapper; -class BitmapEx; -class Image; - -#define IMAGEERROR 1 -#define SINGLEFRAMEDONE 2 -#define STATICIMAGEDONE 3 -#define IMAGEABORTED 4 - -class VCL_DLLPUBLIC ImageConsumer -{ -private: - - Bitmap maBitmap; - Bitmap maMask; - Rectangle maChangedRect; - Size maSize; - ImplColorMapper* mpMapper; - Color* mpPal; - Link maChgLink; - Link maDoneLink; - sal_uInt32 mnFormat; - sal_uInt32 mnStatus; - BOOL mbTrans; - -protected: - - virtual void DataChanged(); - -public: - - ImageConsumer(); - virtual ~ImageConsumer(); - - BOOL GetData( BitmapEx& rBmpEx ) const; - BOOL GetData( Image& rImage ) const; - const Rectangle& GetChangedRect() const { return maChangedRect; } - sal_uInt32 GetStatus() const; - - void SetDataChangedLink( const Link& rLink ) { maChgLink = rLink; } - const Link& GetDataChangedLink() const { return maChgLink; } - - void SetDoneLink( const Link& rLink ) { maDoneLink = rLink; } - const Link& GetDoneLink() const { return maDoneLink; } - -public: - - virtual void Init( sal_uInt32 nWidth, sal_uInt32 nHeight ); - - virtual void SetColorModel( USHORT nBitCount, - sal_uInt32 nPalEntries, const sal_uInt32* pRGBAPal, - sal_uInt32 nRMask, sal_uInt32 nGMask, sal_uInt32 nBMask, sal_uInt32 nAMask ); - - virtual void SetPixelsByBytes( sal_uInt32 nConsX, sal_uInt32 nConsY, - sal_uInt32 nConsWidth, sal_uInt32 nConsHeight, - const BYTE* pProducerData, sal_uInt32 nOffset, sal_uInt32 nScanSize ); - - virtual void SetPixelsByLongs( sal_uInt32 nConsX, sal_uInt32 nConsY, - sal_uInt32 nConsWidth, sal_uInt32 nConsHeight, - const sal_uInt32* pProducerData, sal_uInt32 nOffset, sal_uInt32 nScanSize ); - - virtual void Completed( sal_uInt32 nStatus ); -// virtual void Completed( sal_uInt32 nStatus, ImageProducer& rProducer ); -}; - -#endif // _IMGCONS_HXX diff --git a/vcl/prj/d.lst b/vcl/prj/d.lst index 8345b155ce58..c1d649ab0c7c 100644 --- a/vcl/prj/d.lst +++ b/vcl/prj/d.lst @@ -1,4 +1,4 @@ -mkdir: %COMMON_DEST%\bin%_EXT%\hid +kdir: %COMMON_DEST%\bin%_EXT%\hid mkdir: %_DEST%\inc%_EXT%\vcl ..\%COMMON_OUTDIR%\bin\*.zip %COMMON_DEST%\bin%_EXT%\*.zip @@ -56,7 +56,6 @@ mkdir: %_DEST%\inc%_EXT%\vcl ..\inc\vcl\help.hxx %_DEST%\inc%_EXT%\vcl\help.hxx ..\inc\vcl\image.hxx %_DEST%\inc%_EXT%\vcl\image.hxx ..\inc\vcl\imagerepository.hxx %_DEST%\inc%_EXT%\vcl\imagerepository.hxx -..\inc\vcl\imgcons.hxx %_DEST%\inc%_EXT%\vcl\imgcons.hxx ..\inc\vcl\imgctrl.hxx %_DEST%\inc%_EXT%\vcl\imgctrl.hxx ..\inc\vcl\impdel.hxx %_DEST%\inc%_EXT%\vcl\impdel.hxx ..\inc\vcl\inputctx.hxx %_DEST%\inc%_EXT%\vcl\inputctx.hxx diff --git a/vcl/source/gdi/imgcons.cxx b/vcl/source/gdi/imgcons.cxx deleted file mode 100644 index 0826c5f2310b..000000000000 --- a/vcl/source/gdi/imgcons.cxx +++ /dev/null @@ -1,574 +0,0 @@ -/************************************************************************* - * - * 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 - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_vcl.hxx" - -#include -#include -#include -#include -#include - -// ------------------- -// - ImplColorMapper - -// ------------------- - -class ImplColorMapper -{ - Color maCol; - ULONG mnR; - ULONG mnG; - ULONG mnB; - ULONG mnT; - ULONG mnRShift; - ULONG mnGShift; - ULONG mnBShift; - ULONG mnTShift; - - ULONG ImplCalcMaskShift( ULONG nVal ); - -public: - - ImplColorMapper( ULONG nRMask, ULONG nGMask, ULONG nBMask, ULONG nTMask ); - ~ImplColorMapper(); - - const Color& ImplGetColor( ULONG nColor ) - { - maCol.SetRed( (UINT8) ( ( nColor & mnR ) >> mnRShift ) ); - maCol.SetGreen( (UINT8) ( ( nColor & mnG ) >> mnGShift ) ); - maCol.SetBlue( (UINT8) ( ( nColor & mnB ) >> mnBShift ) ); - maCol.SetTransparency( (UINT8) ( ( nColor & mnT ) >> mnTShift ) ); - return maCol; - } -}; - -// ----------------------------------------------------------------------------- - -ImplColorMapper::ImplColorMapper( ULONG nRMask, ULONG nGMask, ULONG nBMask, ULONG nTMask ) : - mnR( nRMask ), - mnG( nGMask ), - mnB( nBMask ), - mnT( nTMask ) -{ - mnRShift = ImplCalcMaskShift( mnR ); - mnGShift = ImplCalcMaskShift( mnG ); - mnBShift = ImplCalcMaskShift( mnB ); - mnTShift = ImplCalcMaskShift( mnT ); -} - -// ----------------------------------------------------------------------------- - -ImplColorMapper::~ImplColorMapper() -{ -} - -// ----------------------------------------------------------------------------- - -ULONG ImplColorMapper::ImplCalcMaskShift( ULONG nVal ) -{ - DBG_ASSERT( nVal > 0, "Mask has no value!" ); - - ULONG nRet = 0UL; - - for( ULONG i = 0UL; i < 32; i++ ) - { - if( nVal & ( 1UL << i ) ) - { - nRet = i; - break; - } - } - - return nRet; -} - -// ----------------- -// - ImageConsumer - -// ----------------- - -ImageConsumer::ImageConsumer() : - mpMapper( NULL ), - mpPal ( NULL ), - mnStatus( 0UL ), - mbTrans ( FALSE ) -{ -} - -// ----------------------------------------------------------------------------- - -ImageConsumer::~ImageConsumer() -{ - delete[] mpPal; - delete mpMapper; -} - -// ----------------------------------------------------------------------------- - -void ImageConsumer::Init( sal_uInt32 nWidth, sal_uInt32 nHeight ) -{ - maSize = Size( nWidth, nHeight ); - maBitmap = maMask = Bitmap(); - mnStatus = 0UL; - mbTrans = FALSE; -} - -// ----------------------------------------------------------------------------- - -void ImageConsumer::SetColorModel( USHORT nBitCount, - sal_uInt32 nPalEntries, const sal_uInt32* pRGBAPal, - sal_uInt32 nRMask, sal_uInt32 nGMask, sal_uInt32 nBMask, sal_uInt32 nAMask ) -{ - DBG_ASSERT( maSize.Width() && maSize.Height(), "Missing call to ImageConsumer::Init(...)!" ); - - BitmapPalette aPal( Min( (USHORT) nPalEntries, (USHORT) 256 ) ); - - if( nPalEntries ) - { - BitmapColor aCol; - const sal_Int32* pTmp = (sal_Int32*) pRGBAPal; - - delete mpMapper; - mpMapper = NULL; - - delete[] mpPal; - mpPal = new Color[ nPalEntries ]; - - for( ULONG i = 0; i < nPalEntries; i++, pTmp++ ) - { - Color& rCol = mpPal[ i ]; - BYTE cVal; - - cVal = (BYTE) ( ( *pTmp & 0xff000000UL ) >> 24L ); - rCol.SetRed( cVal ); - - if( i < (ULONG) aPal.GetEntryCount() ) - aPal[ (USHORT) i ].SetRed( cVal ); - - cVal = (BYTE) ( ( *pTmp & 0x00ff0000UL ) >> 16L ); - rCol.SetGreen( cVal ); - - if( i < (ULONG) aPal.GetEntryCount() ) - aPal[ (USHORT) i ].SetGreen( cVal ); - - cVal = (BYTE) ( ( *pTmp & 0x0000ff00UL ) >> 8L ); - rCol.SetBlue( cVal ); - - if( i < (ULONG) aPal.GetEntryCount() ) - aPal[ (USHORT) i ].SetBlue( cVal ); - - rCol.SetTransparency( (BYTE) ( ( *pTmp & 0x000000ffL ) ) ); - } - - if( nBitCount <= 1 ) - nBitCount = 1; - else if( nBitCount <= 4 ) - nBitCount = 4; - else if( nBitCount <= 8 ) - nBitCount = 8; - else - nBitCount = 24; - } - else - { - delete mpMapper; - mpMapper = new ImplColorMapper( nRMask, nGMask, nBMask, nAMask ); - - delete[] mpPal; - mpPal = NULL; - - nBitCount = 24; - } - - if( !maBitmap ) - { - - maBitmap = Bitmap( maSize, nBitCount, &aPal ); - maMask = Bitmap( maSize, 1 ); - maMask.Erase( COL_BLACK ); - mbTrans = FALSE; - } -} - -// ----------------------------------------------------------------------------- - -void ImageConsumer::SetPixelsByBytes( sal_uInt32 nConsX, sal_uInt32 nConsY, - sal_uInt32 nConsWidth, sal_uInt32 nConsHeight, - const BYTE* pData, sal_uInt32 nOffset, sal_uInt32 nScanSize ) -{ - DBG_ASSERT( !!maBitmap && !!maMask, "Missing call to ImageConsumer::SetColorModel(...)!" ); - - BitmapWriteAccess* pBmpAcc = maBitmap.AcquireWriteAccess(); - BitmapWriteAccess* pMskAcc = maMask.AcquireWriteAccess(); - sal_Bool bDataChanged = sal_False; - - if( pBmpAcc && pMskAcc ) - { - const long nWidth = pBmpAcc->Width(); - const long nHeight = pBmpAcc->Height(); - - maChangedRect = Rectangle( Point(), Size( nWidth, nHeight ) ); - maChangedRect.Intersection( Rectangle( Point( nConsX, nConsY ), Size( nConsWidth, nConsHeight ) ) ); - - if( !maChangedRect.IsEmpty() ) - { - const long nStartX = maChangedRect.Left(); - const long nEndX = maChangedRect.Right(); - const long nStartY = maChangedRect.Top(); - const long nEndY = maChangedRect.Bottom(); - - if( mpMapper && ( pBmpAcc->GetBitCount() > 8 ) ) - { - BitmapColor aCol; - BitmapColor aMskWhite( pMskAcc->GetBestMatchingColor( Color( COL_WHITE ) ) ); - - for( long nY = nStartY; nY <= nEndY; nY++ ) - { - const BYTE* pTmp = pData + ( nY - nStartY ) * nScanSize + nOffset; - - for( long nX = nStartX; nX <= nEndX; nX++ ) - { - const Color& rCol = mpMapper->ImplGetColor( *pTmp++ ); - - // 0: Transparent; >0: Non-Transparent - if( !rCol.GetTransparency() ) - { - pMskAcc->SetPixel( nY, nX, aMskWhite ); - mbTrans = TRUE; - } - else - { - aCol.SetRed( rCol.GetRed() ); - aCol.SetGreen( rCol.GetGreen() ); - aCol.SetBlue( rCol.GetBlue() ); - pBmpAcc->SetPixel( nY, nX, aCol ); - } - } - } - - bDataChanged = sal_True; - } - else if( mpPal && ( pBmpAcc->GetBitCount() <= 8 ) ) - { - BitmapColor aIndex( (BYTE) 0 ); - BitmapColor aMskWhite( pMskAcc->GetBestMatchingColor( Color( COL_WHITE ) ) ); - - for( long nY = nStartY; nY <= nEndY; nY++ ) - { - const BYTE* pTmp = pData + ( nY - nStartY ) * nScanSize + nOffset; - - for( long nX = nStartX; nX <= nEndX; nX++ ) - { - const BYTE cIndex = *pTmp++; - const Color& rCol = mpPal[ cIndex ]; - - // 0: Transparent; >0: Non-Transparent - if( !rCol.GetTransparency() ) - { - pMskAcc->SetPixel( nY, nX, aMskWhite ); - mbTrans = TRUE; - } - else - { - aIndex.SetIndex( cIndex ); - pBmpAcc->SetPixel( nY, nX, aIndex ); - } - } - } - - bDataChanged = sal_True; - } - else if( mpPal && ( pBmpAcc->GetBitCount() > 8 ) ) - { - BitmapColor aCol; - BitmapColor aMskWhite( pMskAcc->GetBestMatchingColor( Color( COL_WHITE ) ) ); - - for( long nY = nStartY; nY <= nEndY; nY++ ) - { - const BYTE* pTmp = pData + ( nY - nStartY ) * nScanSize + nOffset; - - for( long nX = nStartX; nX <= nEndX; nX++ ) - { - const BYTE cIndex = *pTmp++; - const Color& rCol = mpPal[ cIndex ]; - - // 0: Transparent; >0: Non-Transparent - if( !rCol.GetTransparency() ) - { - pMskAcc->SetPixel( nY, nX, aMskWhite ); - mbTrans = TRUE; - } - else - { - aCol.SetRed( rCol.GetRed() ); - aCol.SetGreen( rCol.GetGreen() ); - aCol.SetBlue( rCol.GetBlue() ); - pBmpAcc->SetPixel( nY, nX, aCol ); - } - } - } - - bDataChanged = sal_True; - } - else - { - DBG_ERROR( "Producer format error!" ); - maChangedRect.SetEmpty(); - } - } - } - else - maChangedRect.SetEmpty(); - - maBitmap.ReleaseAccess( pBmpAcc ); - maMask.ReleaseAccess( pMskAcc ); - - if( bDataChanged ) - DataChanged(); -} - -// ----------------------------------------------------------------------------- - -void ImageConsumer::SetPixelsByLongs( sal_uInt32 nConsX, sal_uInt32 nConsY, - sal_uInt32 nConsWidth, sal_uInt32 nConsHeight, - const sal_uInt32* pData, sal_uInt32 nOffset, sal_uInt32 nScanSize ) -{ - DBG_ASSERT( !!maBitmap && !!maMask, "Missing call to ImageConsumer::SetColorModel(...)!" ); - - BitmapWriteAccess* pBmpAcc = maBitmap.AcquireWriteAccess(); - BitmapWriteAccess* pMskAcc = maMask.AcquireWriteAccess(); - sal_Bool bDataChanged = sal_False; - - if( pBmpAcc && pMskAcc ) - { - const long nWidth = pBmpAcc->Width(); - const long nHeight = pBmpAcc->Height(); - - maChangedRect = Rectangle( Point(), Size( nWidth, nHeight ) ); - maChangedRect.Intersection( Rectangle( Point( nConsX, nConsY ), Size( nConsWidth, nConsHeight ) ) ); - - if( !maChangedRect.IsEmpty() ) - { - const long nStartX = maChangedRect.Left(); - const long nEndX = maChangedRect.Right(); - const long nStartY = maChangedRect.Top(); - const long nEndY = maChangedRect.Bottom(); - - if( mpMapper && ( pBmpAcc->GetBitCount() > 8 ) ) - { - BitmapColor aCol; - BitmapColor aMskWhite( pMskAcc->GetBestMatchingColor( Color( COL_WHITE ) ) ); - - for( long nY = nStartY; nY <= nEndY; nY++ ) - { - const sal_Int32* pTmp = (sal_Int32*) pData + ( nY - nStartY ) * nScanSize + nOffset; - - for( long nX = nStartX; nX <= nEndX; nX++ ) - { - const Color& rCol = mpMapper->ImplGetColor( *pTmp++ ); - - // 0: Transparent; >0: Non-Transparent - if( !rCol.GetTransparency() ) - { - pMskAcc->SetPixel( nY, nX, aMskWhite ); - mbTrans = TRUE; - } - else - { - aCol.SetRed( rCol.GetRed() ); - aCol.SetGreen( rCol.GetGreen() ); - aCol.SetBlue( rCol.GetBlue() ); - pBmpAcc->SetPixel( nY, nX, aCol ); - } - } - } - - bDataChanged = sal_True; - } - else if( mpPal && ( pBmpAcc->GetBitCount() <= 8 ) ) - { - BitmapColor aIndex( (BYTE) 0 ); - BitmapColor aMskWhite( pMskAcc->GetBestMatchingColor( Color( COL_WHITE ) ) ); - - for( long nY = nStartY; nY <= nEndY; nY++ ) - { - const sal_Int32* pTmp = (sal_Int32*) pData + ( nY - nStartY ) * nScanSize + nOffset; - - for( long nX = nStartX; nX <= nEndX; nX++ ) - { - const sal_Int32 nIndex = *pTmp++; - const Color& rCol = mpPal[ nIndex ]; - - // 0: Transparent; >0: Non-Transparent - if( !rCol.GetTransparency() ) - { - pMskAcc->SetPixel( nY, nX, aMskWhite ); - mbTrans = TRUE; - } - else - { - aIndex.SetIndex( (BYTE) nIndex ); - pBmpAcc->SetPixel( nY, nX, aIndex ); - } - } - } - - bDataChanged = sal_True; - } - else if( mpPal && ( pBmpAcc->GetBitCount() > 8 ) ) - { - BitmapColor aCol; - BitmapColor aMskWhite( pMskAcc->GetBestMatchingColor( Color( COL_WHITE ) ) ); - - for( long nY = nStartY; nY <= nEndY; nY++ ) - { - const sal_Int32* pTmp = (sal_Int32*) pData + ( nY - nStartY ) * nScanSize + nOffset; - - for( long nX = nStartX; nX <= nEndX; nX++ ) - { - const sal_Int32 nIndex = *pTmp++; - const Color& rCol = mpPal[ nIndex ]; - - // 0: Transparent; >0: Non-Transparent - if( !rCol.GetTransparency() ) - { - pMskAcc->SetPixel( nY, nX, aMskWhite ); - mbTrans = TRUE; - } - else - { - aCol.SetRed( rCol.GetRed() ); - aCol.SetGreen( rCol.GetGreen() ); - aCol.SetBlue( rCol.GetBlue() ); - pBmpAcc->SetPixel( nY, nX, aCol ); - } - } - } - - bDataChanged = sal_True; - } - else - { - DBG_ERROR( "Producer format error!" ); - maChangedRect.SetEmpty(); - } - } - } - else - maChangedRect.SetEmpty(); - - maBitmap.ReleaseAccess( pBmpAcc ); - maMask.ReleaseAccess( pMskAcc ); - - if( bDataChanged ) - DataChanged(); -} - -// ----------------------------------------------------------------------------- - -void ImageConsumer::Completed( sal_uInt32 nStatus /*, ImageProducer& rProducer */ ) -{ - delete mpMapper; - mpMapper = NULL; - delete[] mpPal; - mpPal = NULL; - maSize = Size(); - mnStatus = nStatus; - - switch( nStatus ) - { - case( SINGLEFRAMEDONE ): - case( STATICIMAGEDONE ): - { - if( !mbTrans ) - maMask = Bitmap(); - } - break; - - case( IMAGEERROR ): - case( IMAGEABORTED ): - maBitmap = maMask = Bitmap(); - break; - - default: - break; - } - -// rProducer.RemoveConsumer( *this ); - - if( maDoneLink.IsSet() ) - maDoneLink.Call( this ); -} - -// ----------------------------------------------------------------------------- - -void ImageConsumer::DataChanged() -{ - if( maChgLink.IsSet() ) - maChgLink.Call( this ); -} - -// ----------------------------------------------------------------------------- - -sal_uInt32 ImageConsumer::GetStatus() const -{ - return mnStatus; -} - -// ----------------------------------------------------------------------------- - -BOOL ImageConsumer::GetData( BitmapEx& rBmpEx ) const -{ - const BOOL bRet = ( SINGLEFRAMEDONE == mnStatus || STATICIMAGEDONE == mnStatus ); - - if( bRet ) - { - if( !!maMask ) - rBmpEx = BitmapEx( maBitmap, maMask ); - else - rBmpEx = BitmapEx( maBitmap ); - } - - return bRet; -} - -// ----------------------------------------------------------------------------- - -BOOL ImageConsumer::GetData( Image& rImage ) const -{ - const BOOL bRet = ( SINGLEFRAMEDONE == mnStatus || STATICIMAGEDONE == mnStatus ); - - if( bRet ) - { - if( !!maMask ) - rImage = Image( maBitmap, maMask ); - else - rImage = Image( maBitmap ); - } - - return bRet; -} -- cgit v1.2.1 From c2b0441a36d1214e5fd5902a32587fe4d28c745d Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Fri, 18 Jun 2010 15:44:36 +0200 Subject: unoawt2: get rid of the ImageConsumer class - it has no clients anymore --- sw/inc/pch/precompiled_sw.hxx | 1 - sw/source/filter/html/htmlform.cxx | 1 - 2 files changed, 2 deletions(-) diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx index 620fe0b00b63..39eb365b549c 100644 --- a/sw/inc/pch/precompiled_sw.hxx +++ b/sw/inc/pch/precompiled_sw.hxx @@ -921,7 +921,6 @@ #include "vcl/help.hxx" #include "vcl/image.hxx" #include "vcl/imagebtn.hxx" -#include "vcl/imgcons.hxx" #include "vcl/inputctx.hxx" #include "vcl/jobset.hxx" #include "vcl/keycod.hxx" diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index bb1567d978f6..2aebe27b36b2 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -32,7 +32,6 @@ #include #include #include -#include #include #include -- cgit v1.2.1 From afd9dd1a3e2a498245151a934b0906bb413c23d2 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Fri, 18 Jun 2010 23:41:14 +0200 Subject: unoawt2: spelling --- vcl/prj/d.lst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vcl/prj/d.lst b/vcl/prj/d.lst index c1d649ab0c7c..38c025b5a5af 100644 --- a/vcl/prj/d.lst +++ b/vcl/prj/d.lst @@ -1,4 +1,4 @@ -kdir: %COMMON_DEST%\bin%_EXT%\hid +mkdir: %COMMON_DEST%\bin%_EXT%\hid mkdir: %_DEST%\inc%_EXT%\vcl ..\%COMMON_OUTDIR%\bin\*.zip %COMMON_DEST%\bin%_EXT%\*.zip @@ -152,4 +152,4 @@ mkdir: %_DEST%\inc%_EXT%\vcl ..\inc\vcl\ppdparser.hxx %_DEST%\inc%_EXT%\vcl\ppdparser.hxx ..\inc\vcl\helper.hxx %_DEST%\inc%_EXT%\vcl\helper.hxx ..\inc\vcl\strhelper.hxx %_DEST%\inc%_EXT%\vcl\strhelper.hxx -..\inc\vcl\lazydelete.hxx %_DEST%\inc%_EXT%\vcl\lazydelete.hxx \ No newline at end of file +..\inc\vcl\lazydelete.hxx %_DEST%\inc%_EXT%\vcl\lazydelete.hxx -- cgit v1.2.1 From 00ce3f2859b6fc88402b2321e31e714f84a291ca Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Sat, 19 Jun 2010 00:33:50 +0200 Subject: unoawt: argh ... should remove the name of the removed file from makefile.mk, too --- vcl/source/gdi/makefile.mk | 1 - 1 file changed, 1 deletion(-) mode change 100644 => 100755 vcl/source/gdi/makefile.mk diff --git a/vcl/source/gdi/makefile.mk b/vcl/source/gdi/makefile.mk old mode 100644 new mode 100755 index f069828f25f9..430080643b95 --- a/vcl/source/gdi/makefile.mk +++ b/vcl/source/gdi/makefile.mk @@ -84,7 +84,6 @@ SLOFILES= $(EXCEPTIONSFILES) \ $(SLO)$/bitmap4.obj \ $(SLO)$/alpha.obj \ $(SLO)$/bitmapex.obj \ - $(SLO)$/imgcons.obj \ $(SLO)$/bmpacc.obj \ $(SLO)$/bmpacc2.obj \ $(SLO)$/bmpacc3.obj \ -- cgit v1.2.1 From b79aa65826172f959dc1c40b2d03bf139a96b8dd Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Sat, 19 Jun 2010 00:46:13 +0200 Subject: unoawt: when the ToolPanelViewShell does not yet exist, ask the resource framework to activate it, and postpone the tool panel activation --- sd/source/ui/dlg/PaneChildWindows.cxx | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/sd/source/ui/dlg/PaneChildWindows.cxx b/sd/source/ui/dlg/PaneChildWindows.cxx index 6a6d515822f8..181fc8433c22 100755 --- a/sd/source/ui/dlg/PaneChildWindows.cxx +++ b/sd/source/ui/dlg/PaneChildWindows.cxx @@ -45,6 +45,9 @@ namespace sd { +using ::com::sun::star::uno::Reference; +using ::com::sun::star::drawing::framework::XResourceId; + SFX_IMPL_DOCKINGWINDOW(LeftPaneImpressChildWindow, SID_LEFT_PANE_IMPRESS) SFX_IMPL_DOCKINGWINDOW(LeftPaneDrawChildWindow, SID_LEFT_PANE_DRAW) SFX_IMPL_DOCKINGWINDOW( ToolPanelChildWindow, SID_TASKPANE) @@ -150,6 +153,25 @@ ToolPanelChildWindow::ToolPanelChildWindow( ::Window* i_pParentWindow, USHORT i_ { } +//---------------------------------------------------------------------------------------------------------------------- +struct DelayedToolPanelActivation +{ + DelayedToolPanelActivation( ToolPanelChildWindow& i_rToolPanelWindow, const ::rtl::OUString& i_rPanelURL ) + :m_rToolPanelWindow( i_rToolPanelWindow ) + ,m_sPanelURL( i_rPanelURL ) + { + } + + void operator() (bool) + { + m_rToolPanelWindow.ActivateToolPanel( m_sPanelURL ); + } + +private: + ToolPanelChildWindow& m_rToolPanelWindow; + const ::rtl::OUString m_sPanelURL; +}; + //---------------------------------------------------------------------------------------------------------------------- void ToolPanelChildWindow::ActivateToolPanel( const ::rtl::OUString& i_rPanelURL ) { @@ -170,8 +192,16 @@ void ToolPanelChildWindow::ActivateToolPanel( const ::rtl::OUString& i_rPanelURL // extensions, too. As long as this is not the case, we need to take the direct way ... ::boost::shared_ptr< ViewShell > pViewShell = pFrameworkHelper->GetViewShell( framework::FrameworkHelper::msRightPaneURL ); toolpanel::ToolPanelViewShell* pToolPanelViewShell = dynamic_cast< toolpanel::ToolPanelViewShell* >( pViewShell.get() ); - ENSURE_OR_RETURN_VOID( pToolPanelViewShell != NULL, "ToolPanelChildWindow::ActivateToolPanel: no tool panel view shell access!" ); - pToolPanelViewShell->ActivatePanel( i_rPanelURL ); + if ( pToolPanelViewShell ) + { + pToolPanelViewShell->ActivatePanel( i_rPanelURL ); + } + else + { + Reference< XResourceId > xTaskPaneResource = pFrameworkHelper->RequestView( + framework::FrameworkHelper::msTaskPaneURL, framework::FrameworkHelper::msRightPaneURL ); + pFrameworkHelper->RunOnResourceActivation( xTaskPaneResource, DelayedToolPanelActivation( *this, i_rPanelURL ) ); + } } } -- cgit v1.2.1 From 723f54f1e70bd313e8e30d3a670176472ba75535 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Sat, 19 Jun 2010 01:26:41 +0200 Subject: unoawt2: #i10000# --- sw/source/filter/html/htmlform.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index 2aebe27b36b2..3067de67ce97 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -67,6 +67,7 @@ #include #include #include +#include #include #include #include @@ -598,7 +599,7 @@ void SwHTMLImageWatcher::complete( sal_Int32 Status, const uno::Reference< awt::XImageProducer >& ) throw( uno::RuntimeException ) { - if( IMAGEERROR == Status || IMAGEABORTED == Status ) + if( awt::ImageStatus::IMAGESTATUS_ERROR == Status || awt::ImageStatus::IMAGESTATUS_ABORTED == Status ) { // uns selbst abmelden und loeschen clear(); -- cgit v1.2.1 From ddc43ba8f731c103d24daf8537d5437800ae0c09 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Sun, 20 Jun 2010 22:36:14 +0200 Subject: unoawt: now that the image control/model are not connected via XImageProducer/Consumer anymore, ensure that images loaded from a database document are displayed, too --- forms/source/component/ImageControl.cxx | 11 +++++++++ forms/source/component/ImageControl.hxx | 2 ++ forms/source/component/imgprod.cxx | 43 +++++---------------------------- forms/source/component/imgprod.hxx | 22 +++-------------- 4 files changed, 23 insertions(+), 55 deletions(-) diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx index 72d22d3f30a5..f74e82135708 100644 --- a/forms/source/component/ImageControl.cxx +++ b/forms/source/component/ImageControl.cxx @@ -190,6 +190,7 @@ void OImageControlModel::implConstruct() { m_pImageProducer = new ImageProducer; m_xImageProducer = m_pImageProducer; + m_pImageProducer->SetDoneHdl( LINK( this, OImageControlModel, OnImageImportDone ) ); } //------------------------------------------------------------------ @@ -630,6 +631,16 @@ void SAL_CALL OImageControlModel::startProduction( ) throw (RuntimeException) GetImageProducer()->startProduction(); } +//------------------------------------------------------------------------------ +IMPL_LINK( OImageControlModel, OnImageImportDone, ::Graphic*, i_pGraphic ) +{ + ENSURE_OR_RETURN( i_pGraphic, "OImageControlModel::OnImageImportDone: illegal graphic!", 0L ); + setPropertyValue( + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Graphic" ) ), + makeAny( Image( i_pGraphic->GetBitmapEx() ).GetXGraphic() ) + ); + return 1L; +} //================================================================== // OImageControlControl diff --git a/forms/source/component/ImageControl.hxx b/forms/source/component/ImageControl.hxx index eb0e15660ca6..c31216fc8aca 100644 --- a/forms/source/component/ImageControl.hxx +++ b/forms/source/component/ImageControl.hxx @@ -140,6 +140,8 @@ protected: bound field, or the control itself if there is no bound field */ sal_Bool impl_updateStreamForURL_lck( const ::rtl::OUString& _rURL, ValueChangeInstigator _eInstigator ); + + DECL_LINK( OnImageImportDone, ::Graphic* ); }; //================================================================== diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx index 8bd02173fc3f..8ee2315f366b 100644 --- a/forms/source/component/imgprod.cxx +++ b/forms/source/component/imgprod.cxx @@ -190,11 +190,7 @@ ErrCode ImgProdLockBytes::Stat( SvLockBytesStat* pStat, SvLockBytesStatFlag eFla ImageProducer::ImageProducer() : mpStm ( NULL ), - mpFilter ( NULL ), - mnStatus ( 0UL ), - mbConsInit ( sal_False ), - mnLastError ( 0UL ), - mbAsync ( sal_False ) + mbConsInit ( sal_False ) { mpGraphic = new Graphic; DBG_ASSERT( Application::GetFilterHdl().IsSet(), "ImageProducer::ImageProducer(): No filter handler set" ); @@ -207,9 +203,6 @@ ImageProducer::~ImageProducer() delete mpGraphic; mpGraphic = NULL; - delete mpFilter; - mpFilter = NULL; - delete mpStm; mpStm = NULL; @@ -261,7 +254,6 @@ void ImageProducer::SetImage( const ::rtl::OUString& rPath ) maURL = rPath; mpGraphic->Clear(); mbConsInit = sal_False; - mbAsync = sal_False; delete mpStm; if ( ::svt::GraphicAccess::isSupportedURL( maURL ) ) @@ -284,7 +276,6 @@ void ImageProducer::SetImage( SvStream& rStm ) maURL = ::rtl::OUString(); mpGraphic->Clear(); mbConsInit = sal_False; - mbAsync = sal_False; delete mpStm; mpStm = new SvStream( new ImgProdLockBytes( &rStm, sal_False ) ); @@ -297,7 +288,6 @@ void ImageProducer::setImage( ::com::sun::star::uno::Reference< ::com::sun::star maURL = ::rtl::OUString(); mpGraphic->Clear(); mbConsInit = sal_False; - mbAsync = sal_False; delete mpStm; if( rInputStmRef.is() ) @@ -318,9 +308,7 @@ void ImageProducer::NewDataAvailable() void ImageProducer::startProduction() throw(::com::sun::star::uno::RuntimeException) { - ResetLastError(); - - if( maConsList.Count() ) + if( maConsList.Count() || maDoneHdl.IsSet() ) { bool bNotifyEmptyGraphics = false; @@ -331,8 +319,8 @@ void ImageProducer::startProduction() throw(::com::sun::star::uno::RuntimeExcept // graphic is cleared if a new Stream is set if( ( mpGraphic->GetType() == GRAPHIC_NONE ) || mpGraphic->GetContext() ) { - if( !ImplImportGraphic( *mpGraphic ) && maErrorHdl.IsSet() ) - maErrorHdl.Call( this ); + if ( ImplImportGraphic( *mpGraphic ) && maDoneHdl.IsSet() ) + maDoneHdl.Call( mpGraphic ); } if( mpGraphic->GetType() != GRAPHIC_NONE ) @@ -372,32 +360,17 @@ void ImageProducer::startProduction() throw(::com::sun::star::uno::RuntimeExcept sal_Bool ImageProducer::ImplImportGraphic( Graphic& rGraphic ) { USHORT nFilter = GRFILTER_FORMAT_DONTKNOW; - short nRet; - sal_Bool bRet = sal_False; if( ERRCODE_IO_PENDING == mpStm->GetError() ) mpStm->ResetError(); mpStm->Seek( 0UL ); - if( mpFilter ) - nRet = mpFilter->ImportGraphic( rGraphic, String(), *mpStm, nFilter ); - else - { - if( GraphicConverter::Import( *mpStm, rGraphic ) == ERRCODE_NONE ) - nRet = GRFILTER_OK; - else - nRet = GRFILTER_FILTERERROR; - } + sal_Bool bRet = GraphicConverter::Import( *mpStm, rGraphic ) == ERRCODE_NONE; if( ERRCODE_IO_PENDING == mpStm->GetError() ) mpStm->ResetError(); - if( nRet == GRFILTER_OK ) - bRet = sal_True; - else - mnLastError = nRet; - return bRet; } @@ -405,10 +378,6 @@ sal_Bool ImageProducer::ImplImportGraphic( Graphic& rGraphic ) void ImageProducer::ImplUpdateData( const Graphic& rGraphic ) { - // asynchronous? - if( mpGraphic->GetContext() ) - mbAsync = sal_True; - ImplInitConsumer( rGraphic ); if( mbConsInit && maConsList.Count() ) @@ -425,7 +394,7 @@ void ImageProducer::ImplUpdateData( const Graphic& rGraphic ) // iterate through interfaces for( pCons = aTmp.First(); pCons; pCons = aTmp.Next() ) - ( *(::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer > *) pCons )->complete( mnStatus = ::com::sun::star::awt::ImageStatus::IMAGESTATUS_STATICIMAGEDONE, this ); + ( *(::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer > *) pCons )->complete( ::com::sun::star::awt::ImageStatus::IMAGESTATUS_STATICIMAGEDONE, this ); // delete interfaces in temporary list for( pCons = aTmp.First(); pCons; pCons = aTmp.Next() ) diff --git a/forms/source/component/imgprod.hxx b/forms/source/component/imgprod.hxx index 0da5d04755df..170fc186fa73 100644 --- a/forms/source/component/imgprod.hxx +++ b/forms/source/component/imgprod.hxx @@ -64,20 +64,9 @@ private: List maConsList; Graphic* mpGraphic; SvStream* mpStm; - GraphicFilter* mpFilter; sal_uInt32 mnTransIndex; - sal_uInt32 mnStatus; sal_Bool mbConsInit; - sal_Bool mbStmDel; - Link maErrorHdl; - sal_uInt32 mnLastError; - - sal_uInt32 mnExtra2; - - sal_Bool mbAsync; - sal_Bool mbExtra1; - sal_Bool mbExtra2; - sal_Bool mbExtra3; + Link maDoneHdl; sal_Bool ImplImportGraphic( Graphic& rGraphic ); void ImplUpdateData( const Graphic& rGraphic ); @@ -92,14 +81,11 @@ public: void SetImage( const ::rtl::OUString& rPath ); void SetImage( SvStream& rStm ); - void SetErrorHandler( const Link& rErrorHdl ) { maErrorHdl = rErrorHdl; } - const Link& GetErrorHandler() const { return maErrorHdl; } - - sal_uInt32 GetLastError() const { return mnLastError; } - void ResetLastError() { mnLastError = 0; } - void NewDataAvailable(); + void SetDoneHdl( const Link& i_rHdl ) { maDoneHdl = i_rHdl; } + const Link& GetDoneHdl() const { return maDoneHdl; } + // ::com::sun::star::uno::XInterface ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL acquire() throw() { OWeakObject::acquire(); } -- cgit v1.2.1 From e2a42387547baf3915907981f13e2d1ae6ecc8a8 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Mon, 21 Jun 2010 11:21:54 +0200 Subject: unoawt2: derive the RoadmapControlModel from the GraphicControlModel base class, benefiting from that classes new image handling this way --- toolkit/inc/toolkit/controls/roadmapcontrol.hxx | 10 +++++----- toolkit/source/controls/roadmapcontrol.cxx | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/toolkit/inc/toolkit/controls/roadmapcontrol.hxx b/toolkit/inc/toolkit/controls/roadmapcontrol.hxx index 219231b02ad2..1b86d277fde2 100644 --- a/toolkit/inc/toolkit/controls/roadmapcontrol.hxx +++ b/toolkit/inc/toolkit/controls/roadmapcontrol.hxx @@ -48,7 +48,7 @@ #include -typedef UnoControlModel UnoControlRoadmapModel_Base; +typedef GraphicControlModel UnoControlRoadmapModel_Base; typedef ::cppu::ImplHelper3 < ::com::sun::star::lang::XSingleServiceFactory @@ -126,7 +126,7 @@ namespace toolkit{ ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - DECLIMPL_SERVICEINFO_DERIVED( UnoControlRoadmapModel, UnoControlModel, szServiceName2_UnoControlRoadmapModel ) + DECLIMPL_SERVICEINFO_DERIVED( UnoControlRoadmapModel, UnoControlRoadmapModel_Base, szServiceName2_UnoControlRoadmapModel ) sal_Int32 SAL_CALL getCount() throw (RuntimeException); virtual Any SAL_CALL getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException ); @@ -138,10 +138,10 @@ namespace toolkit{ virtual void SAL_CALL addContainerListener( const Reference< XContainerListener >& xListener ) throw (RuntimeException); virtual void SAL_CALL removeContainerListener( const Reference< XContainerListener >& xListener ) throw (RuntimeException); - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoControlModel::queryInterface(rType); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoControlRoadmapModel_Base::queryInterface(rType); } ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { UnoControlModel::acquire(); } - void SAL_CALL release() throw() { UnoControlModel::release(); } + void SAL_CALL acquire() throw() { UnoControlRoadmapModel_Base::acquire(); } + void SAL_CALL release() throw() { UnoControlRoadmapModel_Base::release(); } // ::com::sun::star::beans::XPropertySet diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx index 08e7898ac661..96f51b39dc72 100644 --- a/toolkit/source/controls/roadmapcontrol.cxx +++ b/toolkit/source/controls/roadmapcontrol.cxx @@ -76,6 +76,7 @@ static void lcl_throwIndexOutOfBoundsException( ) ImplRegisterProperty( BASEPROPERTY_HELPTEXT ); ImplRegisterProperty( BASEPROPERTY_HELPURL ); ImplRegisterProperty( BASEPROPERTY_IMAGEURL ); + ImplRegisterProperty( BASEPROPERTY_GRAPHIC ); ImplRegisterProperty( BASEPROPERTY_PRINTABLE ); ImplRegisterProperty( BASEPROPERTY_COMPLETE ); ImplRegisterProperty( BASEPROPERTY_ACTIVATED ); @@ -114,7 +115,7 @@ static void lcl_throwIndexOutOfBoundsException( ) case BASEPROPERTY_DEFAULTCONTROL: aReturn <<= ::rtl::OUString( ::rtl::OUString::createFromAscii( szServiceName_UnoControlRoadmap ) ); break; - default : aReturn = UnoControlModel::ImplGetDefaultValue( nPropId ); break; + default : aReturn = UnoControlRoadmapModel_Base::ImplGetDefaultValue( nPropId ); break; } return aReturn; -- cgit v1.2.1 From 73d0662d26f37eed86b549f86944b0a3d238755a Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Mon, 21 Jun 2010 14:47:21 +0200 Subject: unoawt2: if the DataPilotSource supports XComponent, dispose it, so it can free its resources --- sc/source/core/data/dpobject.cxx | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) mode change 100755 => 100644 sc/source/core/data/dpobject.cxx diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx old mode 100755 new mode 100644 index 5394605969d0..4b5c06748355 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -73,6 +73,7 @@ #include #include +#include #include // IsNumberFormat #include @@ -85,6 +86,8 @@ using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::uno::Any; +using ::com::sun::star::uno::Exception; +using ::com::sun::star::lang::XComponent; using ::com::sun::star::sheet::DataPilotTableHeaderData; using ::com::sun::star::sheet::DataPilotTablePositionData; using ::com::sun::star::beans::XPropertySet; @@ -215,6 +218,7 @@ ScDPObject::~ScDPObject() delete pImpDesc; delete pServDesc; mnCacheId = -1; // Wang Xu Ming - DataPilot migration + InvalidateSource(); } ScDataObject* ScDPObject::Clone() const @@ -530,6 +534,18 @@ void ScDPObject::InvalidateData() void ScDPObject::InvalidateSource() { + Reference< XComponent > xObjectComp( xSource, UNO_QUERY ); + if ( xObjectComp.is() ) + { + try + { + xObjectComp->dispose(); + } + catch( const Exception& ) + { + DBG_UNHANDLED_EXCEPTION(); + } + } xSource = NULL; mpTableData.reset(); } -- cgit v1.2.1 From 16138df5b0c608144e8701bcb1bbb8775703042d Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Tue, 22 Jun 2010 01:36:43 +0200 Subject: unoawt2: createDialogWithArguments: use NamedValues instead of PropertyValues --- offapi/com/sun/star/awt/XDialogProvider2.idl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/offapi/com/sun/star/awt/XDialogProvider2.idl b/offapi/com/sun/star/awt/XDialogProvider2.idl index 9cd203b7796a..c08508a58bfe 100644 --- a/offapi/com/sun/star/awt/XDialogProvider2.idl +++ b/offapi/com/sun/star/awt/XDialogProvider2.idl @@ -31,8 +31,8 @@ #ifndef __com_sun_star_awt_XDialogProvider_idl__ #include #endif -#ifndef __com_sun_star_beans_PropertyValue_idl__ -#include +#ifndef __com_sun_star_beans_NamedValue_idl__ +#include #endif @@ -125,7 +125,7 @@ interface XDialogProvider2 : ::com::sun::star::awt::XDialogProvider { XDialog createDialogWithArguments( [in] string URL, - [in] sequence< ::com::sun::star::beans::PropertyValue > Arguments + [in] sequence< ::com::sun::star::beans::NamedValue > Arguments ) raises ( com::sun::star::lang::IllegalArgumentException ); -- cgit v1.2.1 From 08839960ee1b13e181996b034827dd5391d69ebd Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Tue, 22 Jun 2010 01:36:43 +0200 Subject: unoawt2: createDialogWithArguments: use NamedValues instead of PropertyValues --- scripting/source/dlgprov/dlgprov.cxx | 2 +- scripting/source/dlgprov/dlgprov.hxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx index 48aac0c88f4e..0fc0778c71d9 100644 --- a/scripting/source/dlgprov/dlgprov.cxx +++ b/scripting/source/dlgprov/dlgprov.cxx @@ -767,7 +767,7 @@ static ::rtl::OUString aResourceResolverPropName = ::rtl::OUString::createFromAs } Reference < XDialog > DialogProviderImpl::createDialogWithArguments( - const ::rtl::OUString& URL, const Sequence< PropertyValue >& Arguments ) + const ::rtl::OUString& URL, const Sequence< NamedValue >& Arguments ) throw (IllegalArgumentException, RuntimeException) { ::comphelper::NamedValueCollection aArguments( Arguments ); diff --git a/scripting/source/dlgprov/dlgprov.hxx b/scripting/source/dlgprov/dlgprov.hxx index d8bd8782b9f1..bc15831d2ff1 100644 --- a/scripting/source/dlgprov/dlgprov.hxx +++ b/scripting/source/dlgprov/dlgprov.hxx @@ -140,7 +140,7 @@ namespace dlgprov virtual ::com::sun::star::uno::Reference < ::com::sun::star::awt::XDialog > SAL_CALL createDialogWithArguments( const ::rtl::OUString& URL, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) + const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Arguments ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createContainerWindow( -- cgit v1.2.1 From dce758a522b92d14e2256028cb843668f0b3f99e Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Tue, 22 Jun 2010 01:39:29 +0200 Subject: unoawt2: #i10000# --- forms/source/component/imgprod.cxx | 2 -- 1 file changed, 2 deletions(-) diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx index 8ee2315f366b..7e0293be334e 100644 --- a/forms/source/component/imgprod.cxx +++ b/forms/source/component/imgprod.cxx @@ -359,8 +359,6 @@ void ImageProducer::startProduction() throw(::com::sun::star::uno::RuntimeExcept sal_Bool ImageProducer::ImplImportGraphic( Graphic& rGraphic ) { - USHORT nFilter = GRFILTER_FORMAT_DONTKNOW; - if( ERRCODE_IO_PENDING == mpStm->GetError() ) mpStm->ResetError(); -- cgit v1.2.1 From 8bd016bc90501caa24bfae9be085e658bbc68858 Mon Sep 17 00:00:00 2001 From: Ingo Schmidt Date: Tue, 22 Jun 2010 17:21:43 +0200 Subject: kso45 #i110653# ooobaseversion globally available --- instsetoo_native/util/openoffice.lst | 14 +++++++------- solenv/inc/version.lst | 30 ++++++++++++++++++++++++++++++ solenv/inc/versionlist.mk | 30 ++++++++++++++++++++++++++++++ solenv/prj/d.lst | 2 ++ 4 files changed, 69 insertions(+), 7 deletions(-) create mode 100644 solenv/inc/version.lst create mode 100644 solenv/inc/versionlist.mk diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index 5fb95b4821f9..78d85e80b695 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -66,7 +66,7 @@ OpenOffice PCPFILENAME openoffice.pcp UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF - ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt + ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt ADDSYSTEMINTEGRATION 1 EVAL @@ -129,7 +129,7 @@ OpenOffice_wJRE BASEPRODUCTVERSION 3.3 UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF - ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt + ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt ADDSYSTEMINTEGRATION 1 EVAL @@ -201,7 +201,7 @@ OpenOffice_Dev SERVICETAG_URN urn:uuid:1680b00d-e45c-11de-82d6-080020a9ed93 UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF - ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt + ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst EVAL FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 @@ -277,7 +277,7 @@ URE STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/OpenOffice.org/templates.jsp?cid=926383 STARTCENTER_LAYOUT_STYLE 0 - ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk + ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,version.lst PACKAGEMAP package_names_ext.txt } active 1 @@ -405,7 +405,7 @@ BrOffice NATIVEPROGRESS UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF - ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt + ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt ADDSYSTEMINTEGRATION 1 EVAL @@ -474,7 +474,7 @@ BrOffice_wJRE NATIVEPROGRESS UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF - ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt + ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt ADDSYSTEMINTEGRATION 1 EVAL @@ -547,7 +547,7 @@ BrOffice_Dev SERVICETAG_URN urn:uuid:1680b00d-e45c-11de-82d6-080020a9ed93 UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF - ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt + ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst EVAL FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 diff --git a/solenv/inc/version.lst b/solenv/inc/version.lst new file mode 100644 index 000000000000..ec0bb1407ea2 --- /dev/null +++ b/solenv/inc/version.lst @@ -0,0 +1,30 @@ +/************************************************************************* + * + * 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 + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + *************************************************************************/ + +OOOBASEVERSIONMAJOR=3 +OOOBASEVERSIONMINOR=2 +OOOBASEVERSIONMICRO=1 diff --git a/solenv/inc/versionlist.mk b/solenv/inc/versionlist.mk new file mode 100644 index 000000000000..31a255e48be1 --- /dev/null +++ b/solenv/inc/versionlist.mk @@ -0,0 +1,30 @@ +#************************************************************************* +# +# 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 +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +.INCLUDE: version.lst + +.EXPORT : OOOBASEVERSIONMAJOR OOOBASEVERSIONMINOR OOOBASEVERSIONMICRO diff --git a/solenv/prj/d.lst b/solenv/prj/d.lst index e69de29bb2d1..011796a62903 100644 --- a/solenv/prj/d.lst +++ b/solenv/prj/d.lst @@ -0,0 +1,2 @@ +mkdir: %_DEST%\bin%_EXT +..\inc\version.lst %_DEST%\bin%_EXT%\version.lst -- cgit v1.2.1 From 92e466460bd66156679acd32a4eec2697a013559 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Tue, 22 Jun 2010 17:27:55 +0200 Subject: unoawt2: ImplBlendWithAlpha: properly calculate the destination color value --- vcl/source/gdi/outdev2.cxx | 71 ++++++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 43 deletions(-) diff --git a/vcl/source/gdi/outdev2.cxx b/vcl/source/gdi/outdev2.cxx index 3826a3dbc7b0..bea307a4c38d 100644 --- a/vcl/source/gdi/outdev2.cxx +++ b/vcl/source/gdi/outdev2.cxx @@ -1614,6 +1614,18 @@ void OutputDevice::DrawPixel( const Polygon& rPts, const Color& rColor ) // ------------------------------------------------------------------------ +namespace +{ + BYTE lcl_calcColor( const BYTE nSourceColor, const BYTE nSourceOpaq, const BYTE nDestColor ) + { + int c = ( (int)nDestColor * ( 255 - nSourceOpaq ) ) + + (int)nSourceOpaq * (int)nSourceColor; + return BYTE( c / 255 ); + } +} + +// ------------------------------------------------------------------------ + Bitmap OutputDevice::ImplBlendWithAlpha( Bitmap aBmp, BitmapReadAccess* pP, BitmapReadAccess* pA, @@ -1626,7 +1638,6 @@ Bitmap OutputDevice::ImplBlendWithAlpha( Bitmap aBmp, const long* pMapY ) { BitmapColor aDstCol,aSrcCol; - BYTE nSrcAlpha, nDstAlpha; Bitmap res; int nX, nOutX, nY, nOutY; @@ -1660,36 +1671,23 @@ Bitmap OutputDevice::ImplBlendWithAlpha( Bitmap aBmp, aSrcCol = pP->GetColor( nMapY, nMapX ); aDstCol = pB->GetColor( nY, nX ); - nSrcAlpha = 255 - pA->GetPixel( nMapY, nMapX ).GetBlueOrIndex(); - nDstAlpha = 255 - pAlphaW->GetPixel( nY, nX ).GetBlueOrIndex(); + const BYTE nSrcOpaq = 255 - pA->GetPixel( nMapY, nMapX ).GetBlueOrIndex(); + const BYTE nDstOpaq = 255 - pAlphaW->GetPixel( nY, nX ).GetBlueOrIndex(); - if( nSrcAlpha + nDstAlpha == 0 ) - { - // #i70653# zero alpha -> zero color values - aIndex.SetIndex( (BYTE) ( nVCLRLut[ ( nVCLLut[ 0 ] + nD ) >> 16UL ] + - nVCLGLut[ ( nVCLLut[ 0 ] + nD ) >> 16UL ] + - nVCLBLut[ ( nVCLLut[ 0 ] + nD ) >> 16UL ] ) ); - } - else - { - aDstCol.SetRed( (BYTE)(((int)(aSrcCol.GetRed())*nSrcAlpha + (int)(aDstCol.GetRed())*nDstAlpha) / - (nSrcAlpha+nDstAlpha)) ); - aDstCol.SetGreen( (BYTE)(((int)(aSrcCol.GetGreen())*nSrcAlpha + (int)(aDstCol.GetGreen())*nDstAlpha) / - (nSrcAlpha+nDstAlpha)) ); - aDstCol.SetBlue( (BYTE)(((int)(aSrcCol.GetBlue())*nSrcAlpha + (int)(aDstCol.GetBlue())*nDstAlpha) / - (nSrcAlpha+nDstAlpha)) ); - - aIndex.SetIndex( (BYTE) ( nVCLRLut[ ( nVCLLut[ aDstCol.GetRed() ] + nD ) >> 16UL ] + - nVCLGLut[ ( nVCLLut[ aDstCol.GetGreen() ] + nD ) >> 16UL ] + - nVCLBLut[ ( nVCLLut[ aDstCol.GetBlue() ] + nD ) >> 16UL ] ) ); - } + aDstCol.SetRed( lcl_calcColor( aSrcCol.GetRed(), nSrcOpaq, aDstCol.GetRed() ) ); + aDstCol.SetBlue( lcl_calcColor( aSrcCol.GetBlue(), nSrcOpaq, aDstCol.GetBlue() ) ); + aDstCol.SetGreen( lcl_calcColor( aSrcCol.GetGreen(), nSrcOpaq, aDstCol.GetGreen() ) ); + + aIndex.SetIndex( (BYTE) ( nVCLRLut[ ( nVCLLut[ aDstCol.GetRed() ] + nD ) >> 16UL ] + + nVCLGLut[ ( nVCLLut[ aDstCol.GetGreen() ] + nD ) >> 16UL ] + + nVCLBLut[ ( nVCLLut[ aDstCol.GetBlue() ] + nD ) >> 16UL ] ) ); pW->SetPixel( nY, nX, aIndex ); // Have to perform the compositing 'algebra' in // the inverse alpha space (with 255 meaning // opaque), otherwise, transitivity is not // achieved. - nSrcAlpha = 255-COLOR_CHANNEL_MERGE( 255, (BYTE)nDstAlpha, nSrcAlpha ); + const BYTE nSrcAlpha = 255-COLOR_CHANNEL_MERGE( 255, (BYTE)nDstOpaq, nSrcOpaq ); aIndex.SetIndex( (BYTE) ( nVCLRLut[ ( nVCLLut[ nSrcAlpha ] + nD ) >> 16UL ] + nVCLGLut[ ( nVCLLut[ nSrcAlpha ] + nD ) >> 16UL ] + @@ -1718,25 +1716,12 @@ Bitmap OutputDevice::ImplBlendWithAlpha( Bitmap aBmp, aSrcCol = pP->GetColor( nMapY, nMapX ); aDstCol = pB->GetColor( nY, nX ); - nSrcAlpha = 255 - pA->GetPixel( nMapY, nMapX ).GetBlueOrIndex(); - nDstAlpha = 255 - pAlphaW->GetPixel( nY, nX ).GetBlueOrIndex(); + const BYTE nSrcOpaq = 255 - pA->GetPixel( nMapY, nMapX ).GetBlueOrIndex(); + const BYTE nDstOpaq = 255 - pAlphaW->GetPixel( nY, nX ).GetBlueOrIndex(); - if( nSrcAlpha + nDstAlpha == 0 ) - { - // #i70653# zero alpha -> zero color values - aDstCol.SetRed(0); - aDstCol.SetGreen(0); - aDstCol.SetBlue(0); - } - else - { - aDstCol.SetRed( (BYTE)(((int)(aSrcCol.GetRed())*nSrcAlpha + (int)(aDstCol.GetRed())*nDstAlpha) / - (nSrcAlpha+nDstAlpha)) ); - aDstCol.SetGreen( (BYTE)(((int)(aSrcCol.GetGreen())*nSrcAlpha + (int)(aDstCol.GetGreen())*nDstAlpha) / - (nSrcAlpha+nDstAlpha)) ); - aDstCol.SetBlue( (BYTE)(((int)(aSrcCol.GetBlue())*nSrcAlpha + (int)(aDstCol.GetBlue())*nDstAlpha) / - (nSrcAlpha+nDstAlpha)) ); - } + aDstCol.SetRed( lcl_calcColor( aSrcCol.GetRed(), nSrcOpaq, aDstCol.GetRed() ) ); + aDstCol.SetBlue( lcl_calcColor( aSrcCol.GetBlue(), nSrcOpaq, aDstCol.GetBlue() ) ); + aDstCol.SetGreen( lcl_calcColor( aSrcCol.GetGreen(), nSrcOpaq, aDstCol.GetGreen() ) ); pB->SetPixel( nY, nX, aDstCol ); @@ -1744,7 +1729,7 @@ Bitmap OutputDevice::ImplBlendWithAlpha( Bitmap aBmp, // the inverse alpha space (with 255 meaning // opaque), otherwise, transitivity is not // achieved. - nSrcAlpha = 255-COLOR_CHANNEL_MERGE( 255, (BYTE)nDstAlpha, nSrcAlpha ); + const BYTE nSrcAlpha = 255-COLOR_CHANNEL_MERGE( 255, (BYTE)nDstOpaq, nSrcOpaq ); pAlphaW->SetPixel( nY, nX, Color(nSrcAlpha, nSrcAlpha, nSrcAlpha) ); } -- cgit v1.2.1 From 9a6cbed6c4de11b12ed3d7201d7774649ed28577 Mon Sep 17 00:00:00 2001 From: "Thomas Lange [tl]" Date: Wed, 23 Jun 2010 09:57:22 +0200 Subject: cws tl81: #i112363# patch for accessibility crash --- accessibility/source/extended/textwindowaccessibility.cxx | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx index 04b07215d372..8af1b240343e 100644 --- a/accessibility/source/extended/textwindowaccessibility.cxx +++ b/accessibility/source/extended/textwindowaccessibility.cxx @@ -1989,10 +1989,14 @@ void Document::handleParagraphNotifications() determineVisibleRange(); notifyVisibleRangeChanges(aOldVisibleBegin, aOldVisibleEnd, m_xParagraphs->end()); - Paragraphs::iterator aIt(m_xParagraphs->begin() + n); - ::rtl::Reference< ParagraphImpl > xParagraph(getParagraph(aIt)); - if (xParagraph.is()) - xParagraph->textChanged(); + + if (n < m_xParagraphs->size()) + { + Paragraphs::iterator aIt(m_xParagraphs->begin() + n); + ::rtl::Reference< ParagraphImpl > xParagraph(getParagraph(aIt)); + if (xParagraph.is()) + xParagraph->textChanged(); + } break; } default: -- cgit v1.2.1 From 7d00b8df2b5780299cf17109236767b5591fad83 Mon Sep 17 00:00:00 2001 From: Niklas Nebel Date: Wed, 23 Jun 2010 12:03:27 +0200 Subject: unoawt2: #i112622# convert cell style names to pointers after creating a style --- sc/inc/docpool.hxx | 1 + sc/source/core/data/docpool.cxx | 20 ++++++++++++++++++++ sc/source/ui/undo/undostyl.cxx | 4 ++++ sc/source/ui/unoobj/styleuno.cxx | 8 ++++++++ sc/source/ui/view/formatsh.cxx | 4 ++++ 5 files changed, 37 insertions(+) diff --git a/sc/inc/docpool.hxx b/sc/inc/docpool.hxx index d366ef1ec25a..59bd70592725 100644 --- a/sc/inc/docpool.hxx +++ b/sc/inc/docpool.hxx @@ -65,6 +65,7 @@ public: static void CheckRef( const SfxPoolItem& ); void StyleDeleted( ScStyleSheet* pStyle ); // Loeschen von Vorlagen im Organizer + void CellStyleCreated( const String& rName ); virtual SfxItemPresentation GetPresentation( const SfxPoolItem& rItem, SfxItemPresentation ePresentation, diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx index cd763cfc0787..8b2f48d8a2cc 100644 --- a/sc/source/core/data/docpool.cxx +++ b/sc/source/core/data/docpool.cxx @@ -651,6 +651,26 @@ void ScDocumentPool::StyleDeleted( ScStyleSheet* pStyle ) } } +void ScDocumentPool::CellStyleCreated( const String& rName ) +{ + // If a style was created, don't keep any pattern with its name string in the pool, + // because it would compare equal to a pattern with a pointer to the new style. + // Calling StyleSheetChanged isn't enough because the pool may still contain items + // for undo or clipboard content. + + sal_uInt16 nCount = GetItemCount(ATTR_PATTERN); + for (sal_uInt16 i=0; iGetStyleSheet() == NULL ) + { + const String* pStyleName = pPattern->GetStyleName(); + if ( pStyleName && *pStyleName == rName ) + pPattern->UpdateStyleSheet(); // find and store style pointer + } + } +} + SfxItemPool* __EXPORT ScDocumentPool::Clone() const { return new SfxItemPool (*this, TRUE); diff --git a/sc/source/ui/undo/undostyl.cxx b/sc/source/ui/undo/undostyl.cxx index 67a91baa38ee..b4ea7f35448c 100644 --- a/sc/source/ui/undo/undostyl.cxx +++ b/sc/source/ui/undo/undostyl.cxx @@ -37,6 +37,7 @@ #include "undostyl.hxx" #include "docsh.hxx" +#include "docpool.hxx" #include "stlpool.hxx" #include "printfun.hxx" #include "scmod.hxx" @@ -166,6 +167,9 @@ void ScUndoModifyStyle::DoChange( ScDocShell* pDocSh, const String& rName, { // create style (with new name) pStyle = &pStlPool->Make( aNewName, eStyleFamily, SFXSTYLEBIT_USERDEF ); + + if ( eStyleFamily == SFX_STYLE_FAMILY_PARA ) + pDoc->GetPool()->CellStyleCreated( aNewName ); } if ( pStyle ) diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx index 1ceaa424ecd6..50aecbe7f2e3 100644 --- a/sc/source/ui/unoobj/styleuno.cxx +++ b/sc/source/ui/unoobj/styleuno.cxx @@ -68,6 +68,7 @@ #include "docsh.hxx" #include "attrib.hxx" #include "stlpool.hxx" +#include "docpool.hxx" #include "unoguard.hxx" #include "miscuno.hxx" #include "convuno.hxx" @@ -830,6 +831,9 @@ void SAL_CALL ScStyleFamilyObj::insertByName( const rtl::OUString& aName, const { (void)pStylePool->Make( aNameStr, eFamily, SFXSTYLEBIT_USERDEF ); + if ( eFamily == SFX_STYLE_FAMILY_PARA && !pDoc->IsImportingXML() ) + pDoc->GetPool()->CellStyleCreated( aNameStr ); + pStyleObj->InitDoc( pDocShell, aNameStr ); // Objekt kann benutzt werden pDocShell->SetDocumentModified(); // verwendet wird der neue Style noch nicht @@ -1287,6 +1291,10 @@ void SAL_CALL ScStyleObj::setName( const rtl::OUString& aNewName ) { aStyleName = aString; //! notify other objects for this style? + ScDocument* pDoc = pDocShell->GetDocument(); + if ( eFamily == SFX_STYLE_FAMILY_PARA && !pDoc->IsImportingXML() ) + pDoc->GetPool()->CellStyleCreated( aString ); + // Zellvorlagen = 2, Seitenvorlagen = 4 UINT16 nId = ( eFamily == SFX_STYLE_FAMILY_PARA ) ? SID_STYLE_FAMILY2 : SID_STYLE_FAMILY4; diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index e364705f90b6..12a1bb87211b 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -551,6 +551,8 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq ) if ( bConvertBack ) // Namen zu Style-Pointer pDoc->UpdStlShtPtrsFrmNms(); + else + pDoc->GetPool()->CellStyleCreated( aStyleName ); // Attribute uebernehmen und Style anwenden pStyleSheet->GetItemSet().Put( aAttrSet ); @@ -839,6 +841,8 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq ) rNewSet.Put( SvxLanguageItem( pNew->GetLanguage(), ATTR_LANGUAGE_FORMAT ) ); } + + pDoc->GetPool()->CellStyleCreated( pStyleSheet->GetName() ); } else { -- cgit v1.2.1 From 6b8be900fb86c9c433e34db4e846002b49d82a7c Mon Sep 17 00:00:00 2001 From: Kai Sommerfeld Date: Wed, 23 Jun 2010 14:36:24 +0200 Subject: #i110653# - Fixed file header (c-style -> mk-file) --- solenv/inc/version.lst | 52 +++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/solenv/inc/version.lst b/solenv/inc/version.lst index ec0bb1407ea2..019af0e131ed 100644 --- a/solenv/inc/version.lst +++ b/solenv/inc/version.lst @@ -1,29 +1,29 @@ -/************************************************************************* - * - * 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 - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - *************************************************************************/ +#************************************************************************* +# +# 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 +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* OOOBASEVERSIONMAJOR=3 OOOBASEVERSIONMINOR=2 -- cgit v1.2.1 From 6cd261bd26504c664ae82ba4b13eb9b767d3e62b Mon Sep 17 00:00:00 2001 From: "Thomas Lange [tl]" Date: Thu, 24 Jun 2010 09:08:52 +0200 Subject: cws tl81: #i112179# dictionary issue with context menus fixed --- cui/source/options/optdict.cxx | 1 + 1 file changed, 1 insertion(+) mode change 100644 => 100755 cui/source/options/optdict.cxx diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx old mode 100644 new mode 100755 index 1c76da9212c1..c9ee53ca13fb --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -168,6 +168,7 @@ IMPL_LINK( SvxNewDictionaryDialog, OKHdl_Impl, Button *, EMPTYARG ) String aURL( linguistic::GetWritableDictionaryURL( sDict ) ); xNewDic = Reference< XDictionary > ( xDicList->createDictionary( sDict, aLocale, eType, aURL ) , UNO_QUERY ); + xNewDic->setActive( sal_True ); } DBG_ASSERT(xNewDic.is(), "NULL pointer"); } -- cgit v1.2.1 From ec157d542745beea628658e03a76ff1a3403112a Mon Sep 17 00:00:00 2001 From: "Thomas Lange [tl]" Date: Thu, 24 Jun 2010 09:08:52 +0200 Subject: cws tl81: #i112179# dictionary issue with context menus fixed --- sw/source/ui/lingu/olmenu.cxx | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx index 934cfc19e22b..1b00021943a8 100644 --- a/sw/source/ui/lingu/olmenu.cxx +++ b/sw/source/ui/lingu/olmenu.cxx @@ -398,7 +398,9 @@ bGrammarResults(false) { DBG_ASSERT(xSpellAlt.is(), "no spelling alternatives available"); - CreateAutoMnemonics(); +// CreateAutoMnemonics(); + SetMenuFlags(MENU_FLAG_NOAUTOMNEMONICS); + nCheckedLanguage = LANGUAGE_NONE; if (xSpellAlt.is()) { @@ -471,7 +473,8 @@ bGrammarResults(false) } pMenu = GetPopupMenu(MN_ADD_TO_DIC); - pMenu->CreateAutoMnemonics(); +// pMenu->CreateAutoMnemonics(); + pMenu->SetMenuFlags(MENU_FLAG_NOAUTOMNEMONICS); //! necessary to retrieve the correct dictionary name in 'Execute' below bEnable = FALSE; // enable MN_ADD_TO_DIC? uno::Reference< linguistic2::XDictionaryList > xDicList( SvxGetDictionaryList() ); if (xDicList.is()) @@ -572,7 +575,6 @@ bGrammarResults(false) ////////////////////////////////////////////////////////////////////////////////// RemoveDisabledEntries( TRUE, TRUE ); - SetMenuFlags(MENU_FLAG_NOAUTOMNEMONICS); } /*-------------------------------------------------------------------------- @@ -599,7 +601,8 @@ aInfo16( SW_RES(IMG_INFO_16) ) InsertItem( MN_SHORT_COMMENT, aMessageText, MIB_NOSELECT, nPos++ ); SetItemImage( MN_SHORT_COMMENT, aInfo16 ); - CreateAutoMnemonics(); +// CreateAutoMnemonics(); + SetMenuFlags(MENU_FLAG_NOAUTOMNEMONICS); InsertSeparator( nPos++ ); sal_Int32 nStringCount = aSuggestions.getLength(); @@ -705,7 +708,6 @@ aInfo16( SW_RES(IMG_INFO_16) ) ////////////////////////////////////////////////////////////////////////////////// RemoveDisabledEntries( TRUE, TRUE ); - SetMenuFlags(MENU_FLAG_NOAUTOMNEMONICS); } /*-------------------------------------------------------------------------- @@ -824,9 +826,16 @@ void SwSpellPopup::Execute( USHORT nId ) USHORT nDicIdx = nId - MN_DICTIONARIES_START; DBG_ASSERT( nDicIdx < aDics.getLength(), "dictionary index out of range" ); - if (nDicIdx < aDics.getLength()) + PopupMenu *pMenu = GetPopupMenu(MN_ADD_TO_DIC); + String aDicName ( pMenu->GetItemText(nId) ); + + uno::Reference< linguistic2::XDictionary > xDic; + uno::Reference< linguistic2::XDictionaryList > xDicList( SvxGetDictionaryList() ); + if (xDicList.is()) + xDic = xDicList->getDictionaryByName( aDicName ); + + if (xDic.is()) { - uno::Reference< linguistic2::XDictionary > xDic = aDics.getConstArray()[nDicIdx]; INT16 nAddRes = linguistic::AddEntryToDic( xDic, aWord, FALSE, aEmptyStr, LANGUAGE_NONE ); // save modified user-dictionary if it is persistent uno::Reference< frame::XStorable > xSavDic( xDic, uno::UNO_QUERY ); -- cgit v1.2.1 From 271727322f844a8b56d5f3054f0eb61a7e1484a9 Mon Sep 17 00:00:00 2001 From: "Thomas Lange [tl]" Date: Thu, 24 Jun 2010 09:08:52 +0200 Subject: cws tl81: #i112179# dictionary issue with context menus fixed --- editeng/source/editeng/editview.cxx | 11 +++++++++-- editeng/source/misc/unolingu.cxx | 3 +++ 2 files changed, 12 insertions(+), 2 deletions(-) mode change 100644 => 100755 editeng/source/misc/unolingu.cxx diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index 642b5e0d9f17..c07b84d0d0f2 100755 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -1044,7 +1044,8 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack ) { PopupMenu aPopupMenu( EditResId( RID_MENU_SPELL ) ); PopupMenu *pAutoMenu = aPopupMenu.GetPopupMenu( MN_AUTOCORR ); - PopupMenu *pInsertMenu = aPopupMenu.GetPopupMenu( MN_INSERT ); + PopupMenu *pInsertMenu = aPopupMenu.GetPopupMenu( MN_INSERT ); // add word to user-dictionaries + pInsertMenu->SetMenuFlags( MENU_FLAG_NOAUTOMNEMONICS ); //! necessary to retrieve the correct dictionary names later EditPaM aPaM2( aPaM ); aPaM2.GetIndex()++; @@ -1261,7 +1262,13 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack ) } else if ( nId >= MN_DICTSTART ) { - Reference< XDictionary > xDic( pDic[nId - MN_DICTSTART], UNO_QUERY ); + String aDicName ( pInsertMenu->GetItemText(nId) ); + + uno::Reference< linguistic2::XDictionary > xDic; + uno::Reference< linguistic2::XDictionaryList > xDicList( SvxGetDictionaryList() ); + if (xDicList.is()) + xDic = xDicList->getDictionaryByName( aDicName ); + if (xDic.is()) xDic->add( aSelected, sal_False, String() ); // save modified user-dictionary if it is persistent diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx old mode 100644 new mode 100755 index e95ce560023b..ae92fd1a01b8 --- a/editeng/source/misc/unolingu.cxx +++ b/editeng/source/misc/unolingu.cxx @@ -1197,7 +1197,10 @@ uno::Reference< XDictionary > LinguMgr::GetStandard() // add new dictionary to list if (xTmp.is()) + { xTmpDicList->addDictionary( xTmp ); + xTmp->setActive( sal_True ); + } xDic = uno::Reference< XDictionary > ( xTmp, UNO_QUERY ); } #if OSL_DEBUG_LEVEL > 1 -- cgit v1.2.1 From e56241c85b0afffb2ccdf64c29ef88d2df5f4909 Mon Sep 17 00:00:00 2001 From: "Thomas Lange [tl]" Date: Thu, 24 Jun 2010 09:27:08 +0200 Subject: cws tl81: #i112310# fixed duplicate short-cut problem --- cui/source/dialogs/thesdlg.src | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cui/source/dialogs/thesdlg.src b/cui/source/dialogs/thesdlg.src index 16d724473d20..6c6a6444b33d 100755 --- a/cui/source/dialogs/thesdlg.src +++ b/cui/source/dialogs/thesdlg.src @@ -59,7 +59,7 @@ ModalDialog RID_SVXDLG_THESAURUS { Pos = MAP_APPFONT ( 24 , 5 ) ; Size = MAP_APPFONT ( 143 , 8 ) ; - Text [ en-US ] = "Current ~word" ; + Text [ en-US ] = "~Current word" ; LEFT = TRUE ; }; ComboBox CB_WORD @@ -95,7 +95,7 @@ ModalDialog RID_SVXDLG_THESAURUS { Pos = MAP_APPFONT ( 5 , 173 ) ; Size = MAP_APPFONT ( 255 , 8 ) ; - Text [ en-US ] = "Replace ~with" ; + Text [ en-US ] = "~Replace with" ; LEFT = TRUE ; }; Edit ED_REPL @@ -120,7 +120,7 @@ ModalDialog RID_SVXDLG_THESAURUS { Pos = MAP_APPFONT ( 105 , 210 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; - Text [ en-US ] = "~Replace" ; + Text [ en-US ] = "Replace" ; DefButton = TRUE ; }; CancelButton BTN_THES_CANCEL -- cgit v1.2.1 From 32b60d0777e2420f9779af1771ac32ce8a7f9761 Mon Sep 17 00:00:00 2001 From: Kai Sommerfeld Date: Fri, 25 Jun 2010 09:56:19 +0200 Subject: #i110653# - use ooo base version supplied by build env. --- desktop/test/deployment/boxt/makefile.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/desktop/test/deployment/boxt/makefile.mk b/desktop/test/deployment/boxt/makefile.mk index 63f123fcc608..11d736448d44 100644 --- a/desktop/test/deployment/boxt/makefile.mk +++ b/desktop/test/deployment/boxt/makefile.mk @@ -33,11 +33,9 @@ ENABLE_EXCEPTIONS = TRUE .INCLUDE: settings.mk .INCLUDE: rtlbootstrap.mk +.INCLUDE: versionlist.mk -#TODO: The underlying OOo base version needed here is currently only available -# as instsetoo_native/util/openoffice.lst OOOBASEVERSION, so hard-coding it here -# for now (see issue 110653): -my_version = 3.3 +my_version = $(OOOBASEVERSIONMAJOR).$(OOOBASEVERSIONMINOR) DLLPRE = -- cgit v1.2.1 From bc9a2076300859ea109ec02329bfde4ea2920ecc Mon Sep 17 00:00:00 2001 From: "Ocke Janssen [oj]" Date: Fri, 25 Jun 2010 14:39:46 +0200 Subject: unoawt2: #i112683 localize string list --- toolkit/source/awt/vclxwindows.cxx | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index b79fee56e3d8..625ae4e4616b 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -42,6 +42,7 @@ #include #include #include +#include #include #include #include @@ -2163,11 +2164,29 @@ void SAL_CALL VCLXListBox::itemListChanged( const EventObject& i_rEvent ) throw pListBox->Clear(); + uno::Reference< beans::XPropertySet > xPropSet( i_rEvent.Source, uno::UNO_QUERY_THROW ); + uno::Reference< beans::XPropertySetInfo > xPSI( xPropSet->getPropertySetInfo(), uno::UNO_QUERY_THROW ); + bool localize = xPSI->hasPropertyByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ResourceResolver" ) ) ); + uno::Reference< resource::XStringResourceResolver > xStringResourceResolver; + if ( xPSI->hasPropertyByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ResourceResolver" ) ) ) ) + { + xStringResourceResolver.set( + xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ResourceResolver" ) ) ), + uno::UNO_QUERY + ); + } + + Reference< XItemList > xItemList( i_rEvent.Source, uno::UNO_QUERY_THROW ); uno::Sequence< beans::Pair< ::rtl::OUString, ::rtl::OUString > > aItems = xItemList->getAllItems(); for ( sal_Int32 i=0; iInsertEntry( aItems[i].First, lcl_getImageFromURL( aItems[i].Second ) ); + ::rtl::OUString aLocalizationKey( aItems[i].First ); + if ( xStringResourceResolver.is() && aLocalizationKey.getLength() != 0 && aLocalizationKey[0] == '&' ) + { + aLocalizationKey = xStringResourceResolver->resolveString(aLocalizationKey.copy( 1 )); + } + pListBox->InsertEntry( aLocalizationKey, lcl_getImageFromURL( aItems[i].Second ) ); } } -- cgit v1.2.1 From 04421ec5afe024feb9caf0d9a10c532ffe777fe2 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Fri, 25 Jun 2010 15:09:38 +0200 Subject: unoawt2: #i112684# let UNO Controls implement the (newly introduced) XStyleSettingsSupplier, giving access to their style, in particular, to the HC flag --- toolkit/inc/toolkit/awt/vclxwindow.hxx | 9 +- toolkit/inc/toolkit/controls/unocontrol.hxx | 9 +- toolkit/source/awt/makefile.mk | 1 + toolkit/source/awt/stylesettings.cxx | 987 ++++++++++++++++++++++++++++ toolkit/source/awt/stylesettings.hxx | 188 ++++++ toolkit/source/awt/vclxwindow.cxx | 41 +- toolkit/source/controls/unocontrol.cxx | 12 + 7 files changed, 1232 insertions(+), 15 deletions(-) create mode 100644 toolkit/source/awt/stylesettings.cxx create mode 100644 toolkit/source/awt/stylesettings.hxx diff --git a/toolkit/inc/toolkit/awt/vclxwindow.hxx b/toolkit/inc/toolkit/awt/vclxwindow.hxx index 6ad3c3ab6076..565691b97f09 100644 --- a/toolkit/inc/toolkit/awt/vclxwindow.hxx +++ b/toolkit/inc/toolkit/awt/vclxwindow.hxx @@ -41,9 +41,10 @@ #include #include #include +#include #include -#include +#include #include #include // Size @@ -71,7 +72,7 @@ namespace toolkit class UnoPropertyArrayHelper; class VCLXWindowImpl; -typedef ::cppu::ImplInheritanceHelper8 < VCLXDevice +typedef ::cppu::ImplInheritanceHelper9 < VCLXDevice , ::com::sun::star::awt::XWindow2 , ::com::sun::star::awt::XVclWindowPeer , ::com::sun::star::awt::XLayoutConstrains @@ -80,6 +81,7 @@ typedef ::cppu::ImplInheritanceHelper8 < VCLXDevice , ::com::sun::star::accessibility::XAccessible , ::com::sun::star::lang::XEventListener , ::com::sun::star::beans::XPropertySetInfo + , ::com::sun::star::awt::XStyleSettingsSupplier > VCLXWindow_Base; class TOOLKIT_DLLPUBLIC VCLXWindow : public VCLXWindow_Base @@ -232,6 +234,9 @@ public: ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties( ) throw (::com::sun::star::uno::RuntimeException); ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const ::rtl::OUString& aName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); ::sal_Bool SAL_CALL hasPropertyByName( const ::rtl::OUString& Name ) throw (::com::sun::star::uno::RuntimeException); + + // XStyleSettingsSupplier + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XStyleSettings > SAL_CALL getStyleSettings() throw (::com::sun::star::uno::RuntimeException); }; #endif // _TOOLKIT_AWT_VCLXWINDOW_HXX_ diff --git a/toolkit/inc/toolkit/controls/unocontrol.hxx b/toolkit/inc/toolkit/controls/unocontrol.hxx index 0515abe27128..6bcfa519ed3d 100644 --- a/toolkit/inc/toolkit/controls/unocontrol.hxx +++ b/toolkit/inc/toolkit/controls/unocontrol.hxx @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include @@ -47,7 +48,7 @@ #include #include #include -#include +#include #include #include @@ -74,7 +75,7 @@ struct UnoControl_Data; // ---------------------------------------------------- // class UnoControl // ---------------------------------------------------- -typedef ::cppu::WeakAggImplHelper8 < ::com::sun::star::awt::XControl +typedef ::cppu::WeakAggImplHelper9 < ::com::sun::star::awt::XControl , ::com::sun::star::awt::XWindow2 , ::com::sun::star::awt::XView , ::com::sun::star::beans::XPropertiesChangeListener @@ -82,6 +83,7 @@ typedef ::cppu::WeakAggImplHelper8 < ::com::sun::star::awt::XControl , ::com::sun::star::accessibility::XAccessible , ::com::sun::star::util::XModeChangeBroadcaster , ::com::sun::star::awt::XUnitConversion + , ::com::sun::star::awt::XStyleSettingsSupplier > UnoControl_Base; class TOOLKIT_DLLPUBLIC UnoControl : public UnoControl_Base @@ -228,6 +230,9 @@ public: virtual ::com::sun::star::awt::Size SAL_CALL convertSizeToLogic( const ::com::sun::star::awt::Size& aSize, ::sal_Int16 TargetUnit ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::awt::Size SAL_CALL convertSizeToPixel( const ::com::sun::star::awt::Size& aSize, ::sal_Int16 SourceUnit ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + // XStyleSettingsSupplier + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XStyleSettings > SAL_CALL getStyleSettings() throw (::com::sun::star::uno::RuntimeException); + private: // ::com::sun::star::beans::XPropertiesChangeListener void SAL_CALL propertiesChange( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyChangeEvent >& evt ) throw(::com::sun::star::uno::RuntimeException); diff --git a/toolkit/source/awt/makefile.mk b/toolkit/source/awt/makefile.mk index a53e9e22ba2d..88b40a597410 100644 --- a/toolkit/source/awt/makefile.mk +++ b/toolkit/source/awt/makefile.mk @@ -44,6 +44,7 @@ CFLAGSCXX+=$(OBJCXXFLAGS) .ENDIF # "$(GUIBASE)"=="aqua" SLOFILES= \ + $(SLO)$/stylesettings.obj \ $(SLO)$/vclxaccessiblecomponent.obj \ $(SLO)$/vclxbitmap.obj \ $(SLO)$/vclxcontainer.obj \ diff --git a/toolkit/source/awt/stylesettings.cxx b/toolkit/source/awt/stylesettings.cxx new file mode 100644 index 000000000000..fc3ec241101c --- /dev/null +++ b/toolkit/source/awt/stylesettings.cxx @@ -0,0 +1,987 @@ +/************************************************************************* + * 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 + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#include "precompiled_toolkit.hxx" + +#include "stylesettings.hxx" +#include +#include + +/** === begin UNO includes === **/ +#include +/** === end UNO includes === **/ + +#include +#include +#include +#include +#include + +//...................................................................................................................... +namespace toolkit +{ +//...................................................................................................................... + + /** === begin UNO using === **/ + using ::com::sun::star::uno::Reference; + using ::com::sun::star::uno::XInterface; + using ::com::sun::star::uno::UNO_QUERY; + using ::com::sun::star::uno::UNO_QUERY_THROW; + using ::com::sun::star::uno::UNO_SET_THROW; + using ::com::sun::star::uno::Exception; + using ::com::sun::star::uno::RuntimeException; + using ::com::sun::star::uno::Any; + using ::com::sun::star::uno::makeAny; + using ::com::sun::star::uno::Sequence; + using ::com::sun::star::uno::Type; + using ::com::sun::star::lang::DisposedException; + using ::com::sun::star::lang::EventObject; + using ::com::sun::star::awt::FontDescriptor; + using ::com::sun::star::awt::XStyleChangeListener; + using ::com::sun::star::awt::FontDescriptor; + /** === end UNO using === **/ + + //================================================================================================================== + //= WindowStyleSettings_Data + //================================================================================================================== + struct WindowStyleSettings_Data + { + ::vos::IMutex& rMutex; + VCLXWindow* pOwningWindow; + ::cppu::OInterfaceContainerHelper aStyleChangeListeners; + + WindowStyleSettings_Data( ::vos::IMutex& i_rWindowMutex, ::osl::Mutex& i_rListenerMutex, VCLXWindow& i_rOwningWindow ) + :rMutex( i_rWindowMutex ) + ,pOwningWindow( &i_rOwningWindow ) + ,aStyleChangeListeners( i_rListenerMutex ) + { + } + + DECL_LINK( OnWindowEvent, const VclWindowEvent* ); + }; + + //------------------------------------------------------------------------------------------------------------------ + IMPL_LINK( WindowStyleSettings_Data, OnWindowEvent, const VclWindowEvent*, i_pEvent ) + { + if ( !i_pEvent || ( i_pEvent->GetId() != VCLEVENT_WINDOW_DATACHANGED ) ) + return 0L; + const DataChangedEvent* pDataChangedEvent = static_cast< const DataChangedEvent* >( i_pEvent->GetData() ); + if ( !pDataChangedEvent || ( pDataChangedEvent->GetType() != DATACHANGED_SETTINGS ) ) + return 0L; + if ( ( pDataChangedEvent->GetFlags() & SETTINGS_STYLE ) == 0 ) + return 0L; + + EventObject aEvent( *pOwningWindow ); + aStyleChangeListeners.notifyEach( &XStyleChangeListener::styleSettingsChanged, aEvent ); + return 1L; + } + + //================================================================================================================== + //= StyleMethodGuard + //================================================================================================================== + class StyleMethodGuard + { + public: + StyleMethodGuard( WindowStyleSettings_Data& i_rData ) + :m_aGuard( i_rData.rMutex ) + { + if ( i_rData.pOwningWindow == NULL ) + throw DisposedException(); + } + + ~StyleMethodGuard() + { + } + + private: + ::vos::OGuard m_aGuard; + }; + + //================================================================================================================== + //= WindowStyleSettings + //================================================================================================================== + //------------------------------------------------------------------------------------------------------------------ + WindowStyleSettings::WindowStyleSettings( ::vos::IMutex& i_rWindowMutex, ::osl::Mutex& i_rListenerMutex, VCLXWindow& i_rOwningWindow ) + :m_pData( new WindowStyleSettings_Data( i_rWindowMutex, i_rListenerMutex, i_rOwningWindow ) ) + { + Window* pWindow = i_rOwningWindow.GetWindow(); + if ( !pWindow ) + throw new RuntimeException(); + pWindow->AddEventListener( LINK( m_pData.get(), WindowStyleSettings_Data, OnWindowEvent ) ); + } + + //------------------------------------------------------------------------------------------------------------------ + WindowStyleSettings::~WindowStyleSettings() + { + } + + //------------------------------------------------------------------------------------------------------------------ + void WindowStyleSettings::dispose() + { + StyleMethodGuard aGuard( *m_pData ); + + Window* pWindow = m_pData->pOwningWindow->GetWindow(); + OSL_ENSURE( pWindow, "WindowStyleSettings::dispose: window has been reset before we could revoke the listener!" ); + if ( pWindow ) + pWindow->RemoveEventListener( LINK( m_pData.get(), WindowStyleSettings_Data, OnWindowEvent ) ); + + EventObject aEvent( *this ); + m_pData->aStyleChangeListeners.disposeAndClear( aEvent ); + + m_pData->pOwningWindow = NULL; + } + + //------------------------------------------------------------------------------------------------------------------ + namespace + { + sal_Int32 lcl_getStyleColor( WindowStyleSettings_Data& i_rData, Color const & (StyleSettings::*i_pGetter)() const ) + { + const Window* pWindow = i_rData.pOwningWindow->GetWindow(); + const AllSettings aAllSettings = pWindow->GetSettings(); + const StyleSettings aStyleSettings = aAllSettings.GetStyleSettings(); + return (aStyleSettings.*i_pGetter)().GetColor(); + } + + void lcl_setStyleColor( WindowStyleSettings_Data& i_rData, void (StyleSettings::*i_pSetter)( Color const & ), const sal_Int32 i_nColor ) + { + Window* pWindow = i_rData.pOwningWindow->GetWindow(); + AllSettings aAllSettings = pWindow->GetSettings(); + StyleSettings aStyleSettings = aAllSettings.GetStyleSettings(); + (aStyleSettings.*i_pSetter)( Color( i_nColor ) ); + aAllSettings.SetStyleSettings( aStyleSettings ); + pWindow->SetSettings( aAllSettings ); + } + + FontDescriptor lcl_getStyleFont( WindowStyleSettings_Data& i_rData, Font const & (StyleSettings::*i_pGetter)() const ) + { + const Window* pWindow = i_rData.pOwningWindow->GetWindow(); + const AllSettings aAllSettings = pWindow->GetSettings(); + const StyleSettings aStyleSettings = aAllSettings.GetStyleSettings(); + return VCLUnoHelper::CreateFontDescriptor( (aStyleSettings.*i_pGetter)() ); + } + + void lcl_setStyleFont( WindowStyleSettings_Data& i_rData, void (StyleSettings::*i_pSetter)( Font const &), + Font const & (StyleSettings::*i_pGetter)() const, const FontDescriptor& i_rFont ) + { + Window* pWindow = i_rData.pOwningWindow->GetWindow(); + AllSettings aAllSettings = pWindow->GetSettings(); + StyleSettings aStyleSettings = aAllSettings.GetStyleSettings(); + const Font aNewFont = VCLUnoHelper::CreateFont( i_rFont, (aStyleSettings.*i_pGetter)() ); + (aStyleSettings.*i_pSetter)( aNewFont ); + aAllSettings.SetStyleSettings( aStyleSettings ); + pWindow->SetSettings( aAllSettings ); + } + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getActiveBorderColor() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleColor( *m_pData, &StyleSettings::GetActiveBorderColor ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setActiveBorderColor( ::sal_Int32 _activebordercolor ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleColor( *m_pData, &StyleSettings::SetActiveBorderColor, _activebordercolor ); + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getActiveColor() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleColor( *m_pData, &StyleSettings::GetActiveColor ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setActiveColor( ::sal_Int32 _activecolor ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleColor( *m_pData, &StyleSettings::SetActiveColor, _activecolor ); + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getActiveTabColor() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleColor( *m_pData, &StyleSettings::GetActiveTabColor ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setActiveTabColor( ::sal_Int32 _activetabcolor ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleColor( *m_pData, &StyleSettings::SetActiveTabColor, _activetabcolor ); + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getActiveTextColor() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleColor( *m_pData, &StyleSettings::GetActiveTextColor ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setActiveTextColor( ::sal_Int32 _activetextcolor ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleColor( *m_pData, &StyleSettings::SetActiveTextColor, _activetextcolor ); + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getButtonRolloverTextColor() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleColor( *m_pData, &StyleSettings::GetButtonRolloverTextColor ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setButtonRolloverTextColor( ::sal_Int32 _buttonrollovertextcolor ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleColor( *m_pData, &StyleSettings::SetButtonRolloverTextColor, _buttonrollovertextcolor ); + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getButtonTextColor() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleColor( *m_pData, &StyleSettings::GetButtonTextColor ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setButtonTextColor( ::sal_Int32 _buttontextcolor ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleColor( *m_pData, &StyleSettings::SetButtonTextColor, _buttontextcolor ); + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getCheckedColor() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleColor( *m_pData, &StyleSettings::GetCheckedColor ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setCheckedColor( ::sal_Int32 _checkedcolor ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleColor( *m_pData, &StyleSettings::SetCheckedColor, _checkedcolor ); + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getDarkShadowColor() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleColor( *m_pData, &StyleSettings::GetDarkShadowColor ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setDarkShadowColor( ::sal_Int32 _darkshadowcolor ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleColor( *m_pData, &StyleSettings::SetDarkShadowColor, _darkshadowcolor ); + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getDeactiveBorderColor() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleColor( *m_pData, &StyleSettings::GetDeactiveBorderColor ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setDeactiveBorderColor( ::sal_Int32 _deactivebordercolor ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleColor( *m_pData, &StyleSettings::SetDeactiveBorderColor, _deactivebordercolor ); + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getDeactiveColor() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleColor( *m_pData, &StyleSettings::GetDeactiveColor ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setDeactiveColor( ::sal_Int32 _deactivecolor ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleColor( *m_pData, &StyleSettings::SetDeactiveColor, _deactivecolor ); + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getDeactiveTextColor() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleColor( *m_pData, &StyleSettings::GetDeactiveTextColor ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setDeactiveTextColor( ::sal_Int32 _deactivetextcolor ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleColor( *m_pData, &StyleSettings::SetDeactiveTextColor, _deactivetextcolor ); + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getDialogColor() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleColor( *m_pData, &StyleSettings::GetDialogColor ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setDialogColor( ::sal_Int32 _dialogcolor ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleColor( *m_pData, &StyleSettings::SetDialogColor, _dialogcolor ); + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getDialogTextColor() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleColor( *m_pData, &StyleSettings::GetDialogTextColor ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setDialogTextColor( ::sal_Int32 _dialogtextcolor ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleColor( *m_pData, &StyleSettings::SetDialogTextColor, _dialogtextcolor ); + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getDisableColor() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleColor( *m_pData, &StyleSettings::GetDisableColor ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setDisableColor( ::sal_Int32 _disablecolor ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleColor( *m_pData, &StyleSettings::SetDisableColor, _disablecolor ); + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getFaceColor() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleColor( *m_pData, &StyleSettings::GetFaceColor ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setFaceColor( ::sal_Int32 _facecolor ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleColor( *m_pData, &StyleSettings::SetFaceColor, _facecolor ); + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getFaceGradientColor() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + const Window* pWindow = m_pData->pOwningWindow->GetWindow(); + const AllSettings aAllSettings = pWindow->GetSettings(); + const StyleSettings aStyleSettings = aAllSettings.GetStyleSettings(); + return aStyleSettings.GetFaceGradientColor().GetColor(); + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getFieldColor() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleColor( *m_pData, &StyleSettings::GetFieldColor ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setFieldColor( ::sal_Int32 _fieldcolor ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleColor( *m_pData, &StyleSettings::SetFieldColor, _fieldcolor ); + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getFieldRolloverTextColor() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleColor( *m_pData, &StyleSettings::GetFieldRolloverTextColor ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setFieldRolloverTextColor( ::sal_Int32 _fieldrollovertextcolor ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleColor( *m_pData, &StyleSettings::SetFieldRolloverTextColor, _fieldrollovertextcolor ); + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getFieldTextColor() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleColor( *m_pData, &StyleSettings::GetFieldTextColor ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setFieldTextColor( ::sal_Int32 _fieldtextcolor ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleColor( *m_pData, &StyleSettings::SetFieldTextColor, _fieldtextcolor ); + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getGroupTextColor() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleColor( *m_pData, &StyleSettings::GetGroupTextColor ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setGroupTextColor( ::sal_Int32 _grouptextcolor ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleColor( *m_pData, &StyleSettings::SetGroupTextColor, _grouptextcolor ); + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getHelpColor() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleColor( *m_pData, &StyleSettings::GetHelpColor ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setHelpColor( ::sal_Int32 _helpcolor ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleColor( *m_pData, &StyleSettings::SetHelpColor, _helpcolor ); + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getHelpTextColor() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleColor( *m_pData, &StyleSettings::GetHelpTextColor ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setHelpTextColor( ::sal_Int32 _helptextcolor ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleColor( *m_pData, &StyleSettings::SetHelpTextColor, _helptextcolor ); + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getHighlightColor() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleColor( *m_pData, &StyleSettings::GetHighlightColor ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setHighlightColor( ::sal_Int32 _highlightcolor ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleColor( *m_pData, &StyleSettings::SetHighlightColor, _highlightcolor ); + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getHighlightTextColor() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleColor( *m_pData, &StyleSettings::GetHighlightTextColor ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setHighlightTextColor( ::sal_Int32 _highlighttextcolor ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleColor( *m_pData, &StyleSettings::SetHighlightTextColor, _highlighttextcolor ); + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getInactiveTabColor() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleColor( *m_pData, &StyleSettings::GetInactiveTabColor ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setInactiveTabColor( ::sal_Int32 _inactivetabcolor ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleColor( *m_pData, &StyleSettings::SetInactiveTabColor, _inactivetabcolor ); + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getInfoTextColor() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleColor( *m_pData, &StyleSettings::GetInfoTextColor ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setInfoTextColor( ::sal_Int32 _infotextcolor ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleColor( *m_pData, &StyleSettings::SetInfoTextColor, _infotextcolor ); + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getLabelTextColor() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleColor( *m_pData, &StyleSettings::GetLabelTextColor ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setLabelTextColor( ::sal_Int32 _labeltextcolor ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleColor( *m_pData, &StyleSettings::SetLabelTextColor, _labeltextcolor ); + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getLightColor() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleColor( *m_pData, &StyleSettings::GetLightColor ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setLightColor( ::sal_Int32 _lightcolor ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleColor( *m_pData, &StyleSettings::SetLightColor, _lightcolor ); + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getMenuBarColor() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleColor( *m_pData, &StyleSettings::GetMenuBarColor ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setMenuBarColor( ::sal_Int32 _menubarcolor ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleColor( *m_pData, &StyleSettings::SetMenuBarColor, _menubarcolor ); + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getMenuBarTextColor() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleColor( *m_pData, &StyleSettings::GetMenuBarTextColor ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setMenuBarTextColor( ::sal_Int32 _menubartextcolor ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleColor( *m_pData, &StyleSettings::SetMenuBarTextColor, _menubartextcolor ); + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getMenuBorderColor() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleColor( *m_pData, &StyleSettings::GetMenuBorderColor ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setMenuBorderColor( ::sal_Int32 _menubordercolor ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleColor( *m_pData, &StyleSettings::SetMenuBorderColor, _menubordercolor ); + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getMenuColor() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleColor( *m_pData, &StyleSettings::GetMenuColor ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setMenuColor( ::sal_Int32 _menucolor ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleColor( *m_pData, &StyleSettings::SetMenuColor, _menucolor ); + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getMenuHighlightColor() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleColor( *m_pData, &StyleSettings::GetMenuHighlightColor ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setMenuHighlightColor( ::sal_Int32 _menuhighlightcolor ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleColor( *m_pData, &StyleSettings::SetMenuHighlightColor, _menuhighlightcolor ); + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getMenuHighlightTextColor() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleColor( *m_pData, &StyleSettings::GetMenuHighlightTextColor ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setMenuHighlightTextColor( ::sal_Int32 _menuhighlighttextcolor ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleColor( *m_pData, &StyleSettings::SetMenuHighlightTextColor, _menuhighlighttextcolor ); + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getMenuTextColor() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleColor( *m_pData, &StyleSettings::GetMenuTextColor ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setMenuTextColor( ::sal_Int32 _menutextcolor ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleColor( *m_pData, &StyleSettings::SetMenuTextColor, _menutextcolor ); + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getMonoColor() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleColor( *m_pData, &StyleSettings::GetMonoColor ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setMonoColor( ::sal_Int32 _monocolor ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleColor( *m_pData, &StyleSettings::SetMonoColor, _monocolor ); + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getRadioCheckTextColor() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleColor( *m_pData, &StyleSettings::GetRadioCheckTextColor ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setRadioCheckTextColor( ::sal_Int32 _radiochecktextcolor ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleColor( *m_pData, &StyleSettings::SetRadioCheckTextColor, _radiochecktextcolor ); + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getSeparatorColor() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + const Window* pWindow = m_pData->pOwningWindow->GetWindow(); + const AllSettings aAllSettings = pWindow->GetSettings(); + const StyleSettings aStyleSettings = aAllSettings.GetStyleSettings(); + return aStyleSettings.GetSeparatorColor().GetColor(); + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getShadowColor() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleColor( *m_pData, &StyleSettings::GetShadowColor ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setShadowColor( ::sal_Int32 _shadowcolor ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleColor( *m_pData, &StyleSettings::SetShadowColor, _shadowcolor ); + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getWindowColor() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleColor( *m_pData, &StyleSettings::GetWindowColor ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setWindowColor( ::sal_Int32 _windowcolor ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleColor( *m_pData, &StyleSettings::SetWindowColor, _windowcolor ); + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getWindowTextColor() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleColor( *m_pData, &StyleSettings::GetWindowTextColor ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setWindowTextColor( ::sal_Int32 _windowtextcolor ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleColor( *m_pData, &StyleSettings::SetWindowTextColor, _windowtextcolor ); + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getWorkspaceColor() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleColor( *m_pData, &StyleSettings::GetWorkspaceColor ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setWorkspaceColor( ::sal_Int32 _workspacecolor ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleColor( *m_pData, &StyleSettings::SetWorkspaceColor, _workspacecolor ); + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Bool SAL_CALL WindowStyleSettings::getHighContrastMode() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + const Window* pWindow = m_pData->pOwningWindow->GetWindow(); + const AllSettings aAllSettings = pWindow->GetSettings(); + const StyleSettings aStyleSettings = aAllSettings.GetStyleSettings(); + return aStyleSettings.GetHighContrastMode(); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setHighContrastMode( ::sal_Bool _highcontrastmode ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + Window* pWindow = m_pData->pOwningWindow->GetWindow(); + AllSettings aAllSettings = pWindow->GetSettings(); + StyleSettings aStyleSettings = aAllSettings.GetStyleSettings(); + aStyleSettings.SetHighContrastMode( _highcontrastmode ); + aAllSettings.SetStyleSettings( aStyleSettings ); + pWindow->SetSettings( aAllSettings ); + } + + //------------------------------------------------------------------------------------------------------------------ + FontDescriptor SAL_CALL WindowStyleSettings::getApplicationFont() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleFont( *m_pData, &StyleSettings::GetAppFont ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setApplicationFont( const FontDescriptor& _applicationfont ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleFont( *m_pData, &StyleSettings::SetAppFont, &StyleSettings::GetAppFont, _applicationfont ); + } + + //------------------------------------------------------------------------------------------------------------------ + FontDescriptor SAL_CALL WindowStyleSettings::getHelpFont() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleFont( *m_pData, &StyleSettings::GetHelpFont ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setHelpFont( const FontDescriptor& _helpfont ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleFont( *m_pData, &StyleSettings::SetHelpFont, &StyleSettings::GetHelpFont, _helpfont ); + } + + //------------------------------------------------------------------------------------------------------------------ + FontDescriptor SAL_CALL WindowStyleSettings::getTitleFont() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleFont( *m_pData, &StyleSettings::GetTitleFont ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setTitleFont( const FontDescriptor& _titlefont ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleFont( *m_pData, &StyleSettings::SetTitleFont, &StyleSettings::GetTitleFont, _titlefont ); + } + + //------------------------------------------------------------------------------------------------------------------ + FontDescriptor SAL_CALL WindowStyleSettings::getFloatTitleFont() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleFont( *m_pData, &StyleSettings::GetFloatTitleFont ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setFloatTitleFont( const FontDescriptor& _floattitlefont ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleFont( *m_pData, &StyleSettings::SetFloatTitleFont, &StyleSettings::GetFloatTitleFont, _floattitlefont ); + } + + //------------------------------------------------------------------------------------------------------------------ + FontDescriptor SAL_CALL WindowStyleSettings::getMenuFont() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleFont( *m_pData, &StyleSettings::GetMenuFont ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setMenuFont( const FontDescriptor& _menufont ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleFont( *m_pData, &StyleSettings::SetMenuFont, &StyleSettings::GetMenuFont, _menufont ); + } + + //------------------------------------------------------------------------------------------------------------------ + FontDescriptor SAL_CALL WindowStyleSettings::getToolFont() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleFont( *m_pData, &StyleSettings::GetToolFont ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setToolFont( const FontDescriptor& _toolfont ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleFont( *m_pData, &StyleSettings::SetToolFont, &StyleSettings::GetToolFont, _toolfont ); + } + + //------------------------------------------------------------------------------------------------------------------ + FontDescriptor SAL_CALL WindowStyleSettings::getGroupFont() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleFont( *m_pData, &StyleSettings::GetGroupFont ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setGroupFont( const FontDescriptor& _groupfont ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleFont( *m_pData, &StyleSettings::SetGroupFont, &StyleSettings::GetGroupFont, _groupfont ); + } + + //------------------------------------------------------------------------------------------------------------------ + FontDescriptor SAL_CALL WindowStyleSettings::getLabelFont() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleFont( *m_pData, &StyleSettings::GetLabelFont ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setLabelFont( const FontDescriptor& _labelfont ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleFont( *m_pData, &StyleSettings::SetLabelFont, &StyleSettings::GetLabelFont, _labelfont ); + } + + //------------------------------------------------------------------------------------------------------------------ + FontDescriptor SAL_CALL WindowStyleSettings::getInfoFont() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleFont( *m_pData, &StyleSettings::GetInfoFont ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setInfoFont( const FontDescriptor& _infofont ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleFont( *m_pData, &StyleSettings::SetInfoFont, &StyleSettings::GetInfoFont, _infofont ); + } + + //------------------------------------------------------------------------------------------------------------------ + FontDescriptor SAL_CALL WindowStyleSettings::getRadioCheckFont() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleFont( *m_pData, &StyleSettings::GetRadioCheckFont ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setRadioCheckFont( const FontDescriptor& _radiocheckfont ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleFont( *m_pData, &StyleSettings::SetRadioCheckFont, &StyleSettings::GetRadioCheckFont, _radiocheckfont ); + } + + //------------------------------------------------------------------------------------------------------------------ + FontDescriptor SAL_CALL WindowStyleSettings::getPushButtonFont() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleFont( *m_pData, &StyleSettings::GetPushButtonFont ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setPushButtonFont( const FontDescriptor& _pushbuttonfont ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleFont( *m_pData, &StyleSettings::SetPushButtonFont, &StyleSettings::GetPushButtonFont, _pushbuttonfont ); + } + + //------------------------------------------------------------------------------------------------------------------ + FontDescriptor SAL_CALL WindowStyleSettings::getFieldFont() throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + return lcl_getStyleFont( *m_pData, &StyleSettings::GetFieldFont ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setFieldFont( const FontDescriptor& _fieldfont ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + lcl_setStyleFont( *m_pData, &StyleSettings::SetFieldFont, &StyleSettings::GetFieldFont, _fieldfont ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::addStyleChangeListener( const Reference< XStyleChangeListener >& i_rListener ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + if ( i_rListener.is() ) + m_pData->aStyleChangeListeners.addInterface( i_rListener ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::removeStyleChangeListener( const Reference< XStyleChangeListener >& i_rListener ) throw (RuntimeException) + { + StyleMethodGuard aGuard( *m_pData ); + if ( i_rListener.is() ) + m_pData->aStyleChangeListeners.removeInterface( i_rListener ); + } + +//...................................................................................................................... +} // namespace toolkit +//...................................................................................................................... diff --git a/toolkit/source/awt/stylesettings.hxx b/toolkit/source/awt/stylesettings.hxx new file mode 100644 index 000000000000..466e50bad1f1 --- /dev/null +++ b/toolkit/source/awt/stylesettings.hxx @@ -0,0 +1,188 @@ +/************************************************************************* + * 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 + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef TOOLKIT_STYLESETTINGS_HXX +#define TOOLKIT_STYLESETTINGS_HXX + +/** === begin UNO includes === **/ +#include +/** === end UNO includes === **/ + +#include + +#include + +namespace vos +{ + class IMutex; +} +namespace osl +{ + class Mutex; +} + +class VCLXWindow; + +//...................................................................................................................... +namespace toolkit +{ +//...................................................................................................................... + + //================================================================================================================== + //= WindowStyleSettings + //================================================================================================================== + struct WindowStyleSettings_Data; + typedef ::cppu::WeakImplHelper1 < ::com::sun::star::awt::XStyleSettings + > WindowStyleSettings_Base; + class WindowStyleSettings : public WindowStyleSettings_Base + { + public: + WindowStyleSettings( ::vos::IMutex& i_rWindowMutex, ::osl::Mutex& i_rListenerMutex, VCLXWindow& i_rOwningWindow ); + ~WindowStyleSettings(); + + void dispose(); + + // XStyleSettings + virtual ::sal_Int32 SAL_CALL getActiveBorderColor() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setActiveBorderColor( ::sal_Int32 _activebordercolor ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getActiveColor() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setActiveColor( ::sal_Int32 _activecolor ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getActiveTabColor() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setActiveTabColor( ::sal_Int32 _activetabcolor ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getActiveTextColor() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setActiveTextColor( ::sal_Int32 _activetextcolor ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getButtonRolloverTextColor() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setButtonRolloverTextColor( ::sal_Int32 _buttonrollovertextcolor ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getButtonTextColor() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setButtonTextColor( ::sal_Int32 _buttontextcolor ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getCheckedColor() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setCheckedColor( ::sal_Int32 _checkedcolor ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getDarkShadowColor() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setDarkShadowColor( ::sal_Int32 _darkshadowcolor ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getDeactiveBorderColor() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setDeactiveBorderColor( ::sal_Int32 _deactivebordercolor ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getDeactiveColor() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setDeactiveColor( ::sal_Int32 _deactivecolor ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getDeactiveTextColor() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setDeactiveTextColor( ::sal_Int32 _deactivetextcolor ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getDialogColor() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setDialogColor( ::sal_Int32 _dialogcolor ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getDialogTextColor() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setDialogTextColor( ::sal_Int32 _dialogtextcolor ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getDisableColor() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setDisableColor( ::sal_Int32 _disablecolor ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getFaceColor() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setFaceColor( ::sal_Int32 _facecolor ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getFaceGradientColor() throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getFieldColor() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setFieldColor( ::sal_Int32 _fieldcolor ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getFieldRolloverTextColor() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setFieldRolloverTextColor( ::sal_Int32 _fieldrollovertextcolor ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getFieldTextColor() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setFieldTextColor( ::sal_Int32 _fieldtextcolor ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getGroupTextColor() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setGroupTextColor( ::sal_Int32 _grouptextcolor ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getHelpColor() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setHelpColor( ::sal_Int32 _helpcolor ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getHelpTextColor() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setHelpTextColor( ::sal_Int32 _helptextcolor ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getHighlightColor() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setHighlightColor( ::sal_Int32 _highlightcolor ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getHighlightTextColor() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setHighlightTextColor( ::sal_Int32 _highlighttextcolor ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getInactiveTabColor() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setInactiveTabColor( ::sal_Int32 _inactivetabcolor ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getInfoTextColor() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setInfoTextColor( ::sal_Int32 _infotextcolor ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getLabelTextColor() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setLabelTextColor( ::sal_Int32 _labeltextcolor ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getLightColor() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setLightColor( ::sal_Int32 _lightcolor ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getMenuBarColor() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setMenuBarColor( ::sal_Int32 _menubarcolor ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getMenuBarTextColor() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setMenuBarTextColor( ::sal_Int32 _menubartextcolor ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getMenuBorderColor() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setMenuBorderColor( ::sal_Int32 _menubordercolor ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getMenuColor() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setMenuColor( ::sal_Int32 _menucolor ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getMenuHighlightColor() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setMenuHighlightColor( ::sal_Int32 _menuhighlightcolor ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getMenuHighlightTextColor() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setMenuHighlightTextColor( ::sal_Int32 _menuhighlighttextcolor ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getMenuTextColor() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setMenuTextColor( ::sal_Int32 _menutextcolor ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getMonoColor() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setMonoColor( ::sal_Int32 _monocolor ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getRadioCheckTextColor() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setRadioCheckTextColor( ::sal_Int32 _radiochecktextcolor ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getSeparatorColor() throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getShadowColor() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setShadowColor( ::sal_Int32 _shadowcolor ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getWindowColor() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setWindowColor( ::sal_Int32 _windowcolor ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getWindowTextColor() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setWindowTextColor( ::sal_Int32 _windowtextcolor ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getWorkspaceColor() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setWorkspaceColor( ::sal_Int32 _workspacecolor ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL getHighContrastMode() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setHighContrastMode( ::sal_Bool _highcontrastmode ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::awt::FontDescriptor SAL_CALL getApplicationFont() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setApplicationFont( const ::com::sun::star::awt::FontDescriptor& _applicationfont ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::awt::FontDescriptor SAL_CALL getHelpFont() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setHelpFont( const ::com::sun::star::awt::FontDescriptor& _helpfont ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::awt::FontDescriptor SAL_CALL getTitleFont() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setTitleFont( const ::com::sun::star::awt::FontDescriptor& _titlefont ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::awt::FontDescriptor SAL_CALL getFloatTitleFont() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setFloatTitleFont( const ::com::sun::star::awt::FontDescriptor& _floattitlefont ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::awt::FontDescriptor SAL_CALL getMenuFont() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setMenuFont( const ::com::sun::star::awt::FontDescriptor& _menufont ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::awt::FontDescriptor SAL_CALL getToolFont() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setToolFont( const ::com::sun::star::awt::FontDescriptor& _toolfont ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::awt::FontDescriptor SAL_CALL getGroupFont() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setGroupFont( const ::com::sun::star::awt::FontDescriptor& _groupfont ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::awt::FontDescriptor SAL_CALL getLabelFont() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setLabelFont( const ::com::sun::star::awt::FontDescriptor& _labelfont ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::awt::FontDescriptor SAL_CALL getInfoFont() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setInfoFont( const ::com::sun::star::awt::FontDescriptor& _infofont ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::awt::FontDescriptor SAL_CALL getRadioCheckFont() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setRadioCheckFont( const ::com::sun::star::awt::FontDescriptor& _radiocheckfont ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::awt::FontDescriptor SAL_CALL getPushButtonFont() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPushButtonFont( const ::com::sun::star::awt::FontDescriptor& _pushbuttonfont ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::awt::FontDescriptor SAL_CALL getFieldFont() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setFieldFont( const ::com::sun::star::awt::FontDescriptor& _fieldfont ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addStyleChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XStyleChangeListener >& Listener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeStyleChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XStyleChangeListener >& Listener ) throw (::com::sun::star::uno::RuntimeException); + + private: + ::boost::scoped_ptr< WindowStyleSettings_Data > m_pData; + }; + +//...................................................................................................................... +} // namespace toolkit +//...................................................................................................................... + +#endif // TOOLKIT_STYLESETTINGS_HXX diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index dd4d56586b03..efc2c40c6baa 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -27,6 +27,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_toolkit.hxx" + #include #include #include @@ -41,6 +42,7 @@ #include #include #include +#include #include #include #include @@ -64,6 +66,7 @@ #include #include #include +#include "stylesettings.hxx" #include @@ -73,10 +76,13 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::UNO_QUERY; +using ::com::sun::star::uno::RuntimeException; using ::com::sun::star::lang::EventObject; using ::com::sun::star::awt::XWindowListener2; using ::com::sun::star::awt::XDockableWindowListener; using ::com::sun::star::awt::XDevice; +using ::com::sun::star::awt::XStyleSettings; +using ::com::sun::star::lang::DisposedException; using ::com::sun::star::style::VerticalAlignment; using ::com::sun::star::style::VerticalAlignment_TOP; using ::com::sun::star::style::VerticalAlignment_MIDDLE; @@ -164,6 +170,8 @@ public: mxAccessibleContext; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > mxViewGraphics; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XStyleSettings > + mxWindowStyleSettings; public: bool& getDrawingOntoParent_ref() { return mbDrawingOntoParent; } @@ -198,6 +206,8 @@ public: return maAccFactory; } + Reference< XStyleSettings > getStyleSettings(); + /** returns the container of registered XWindowListener2 listeners */ inline ::cppu::OInterfaceContainerHelper& getWindow2Listeners() { return maWindow2Listeners; } @@ -221,17 +231,6 @@ protected: private: DECL_LINK( OnProcessCallbacks, void* ); -private: -private: - /** determines whether the instance is already disposed - @precond - m_aMutex must be acquired - */ - inline bool impl_isDisposed() - { - return mbDisposed; - } - private: VCLXWindowImpl(); // never implemented VCLXWindowImpl( const VCLXWindowImpl& ); // never implemented @@ -298,6 +297,10 @@ void VCLXWindowImpl::disposing() maContainerListeners.disposeAndClear( aEvent ); maTopWindowListeners.disposeAndClear( aEvent ); + ::toolkit::WindowStyleSettings* pStyleSettings = static_cast< ::toolkit::WindowStyleSettings* >( mxWindowStyleSettings.get() ); + if ( pStyleSettings != NULL ) + pStyleSettings->dispose(); + mxWindowStyleSettings.clear(); } //-------------------------------------------------------------------- @@ -361,6 +364,17 @@ void SAL_CALL VCLXWindowImpl::release() mrAntiImpl.release(); } +//-------------------------------------------------------------------- +Reference< XStyleSettings > VCLXWindowImpl::getStyleSettings() +{ + ::vos::OGuard aGuard( mrMutex ); + if ( mbDisposed ) + throw DisposedException( ::rtl::OUString(), mrAntiImpl ); + if ( !mxWindowStyleSettings.is() ) + mxWindowStyleSettings = new ::toolkit::WindowStyleSettings( mrMutex, maListenerContainerMutex, mrAntiImpl ); + return mxWindowStyleSettings; +} + //==================================================================== //==================================================================== @@ -2651,3 +2665,8 @@ VCLXWindow::hasPropertyByName( const ::rtl::OUString& rName ) throw (::com::sun: { return GetPropHelper()->hasPropertyByName( rName ); } + +Reference< XStyleSettings > SAL_CALL VCLXWindow::getStyleSettings() throw (RuntimeException) +{ + return mpImpl->getStyleSettings(); +} diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx index 9254819f0b42..eb45dd521d9a 100644 --- a/toolkit/source/controls/unocontrol.cxx +++ b/toolkit/source/controls/unocontrol.cxx @@ -1587,3 +1587,15 @@ awt::Size SAL_CALL UnoControl::convertSizeToPixel( const awt::Size& i_Size, ::sa return awt::Size( ); } +//---------------------------------------------------------------------------------------------------------------------- +uno::Reference< awt::XStyleSettings > SAL_CALL UnoControl::getStyleSettings() throw (RuntimeException) +{ + Reference< awt::XStyleSettingsSupplier > xPeerSupplier; + { + ::osl::MutexGuard aGuard( GetMutex() ); + xPeerSupplier = xPeerSupplier.query( getPeer() ); + } + if ( xPeerSupplier.is() ) + return xPeerSupplier->getStyleSettings(); + return NULL; +} -- cgit v1.2.1 From b03a30dd5a90ac9e24b405c6b83d1ef989b9b6f7 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Fri, 25 Jun 2010 15:09:38 +0200 Subject: unoawt2: #i112684# let UNO Controls implement the (newly introduced) XStyleSettingsSupplier, giving access to their style, in particular, to the HC flag --- offapi/com/sun/star/awt/XStyleChangeListener.idl | 54 +++++ offapi/com/sun/star/awt/XStyleSettings.idl | 238 +++++++++++++++++++++ offapi/com/sun/star/awt/XStyleSettingsSupplier.idl | 53 +++++ offapi/com/sun/star/awt/makefile.mk | 5 +- offapi/com/sun/star/util/Color.idl | 8 +- 5 files changed, 353 insertions(+), 5 deletions(-) create mode 100644 offapi/com/sun/star/awt/XStyleChangeListener.idl create mode 100644 offapi/com/sun/star/awt/XStyleSettings.idl create mode 100644 offapi/com/sun/star/awt/XStyleSettingsSupplier.idl diff --git a/offapi/com/sun/star/awt/XStyleChangeListener.idl b/offapi/com/sun/star/awt/XStyleChangeListener.idl new file mode 100644 index 000000000000..819f211a737f --- /dev/null +++ b/offapi/com/sun/star/awt/XStyleChangeListener.idl @@ -0,0 +1,54 @@ +/************************************************************************* + * 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 + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef __com_sun_star_awt_XStyleChangeListener_idl__ +#define __com_sun_star_awt_XStyleChangeListener_idl__ + +#include + +//================================================================================================================== + +module com { module sun { module star { module awt { + +//================================================================================================================== + +/** to be implemented by components which wish to be notified about changes in the style of a component + + @see XStyleSettings + */ +interface XStyleChangeListener : ::com::sun::star::lang::XEventListener +{ + /// called when the style settings of the observed component changed + void styleSettingsChanged( [in] com::sun::star::lang::EventObject Event ); +}; + +//================================================================================================================== + +}; }; }; }; + +//================================================================================================================== + +#endif diff --git a/offapi/com/sun/star/awt/XStyleSettings.idl b/offapi/com/sun/star/awt/XStyleSettings.idl new file mode 100644 index 000000000000..48b8910e707e --- /dev/null +++ b/offapi/com/sun/star/awt/XStyleSettings.idl @@ -0,0 +1,238 @@ +/************************************************************************* + * 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 + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef __com_sun_star_awt_XStyleSettings_idl__ +#define __com_sun_star_awt_XStyleSettings_idl__ + +#include +#include + +//================================================================================================================== + +module com { module sun { module star { module awt { + +interface XStyleChangeListener; + +//================================================================================================================== + +/** provides access to certain style settings within an OpenOffice.org component, such as a window, or + within OpenOffice.org as a whole. + +

Note that there are constraints for those settings. For instance, if controls are drawn with the + native widget framework, i.e. in the desktop theme's look, then they won't necessarily respect all + their style settings, because those have a lesser priority than the native look.

+ +

On the other hand, some settings are respected only when rendering the controls in the native + desktop/theme look. For instance, without native theming, buttons do not support a "roll over" mode, + i.e., they're painted the same way, no matter if they mouse hovers over them or not. But with native + theming, this changes, as here the general button look is drawn by the system's theming engine, + while the text is drawn by OpenOffice.org. In this case, the button respects the + ButtonRolloverTextColor when painting its text.

+ */ +interface XStyleSettings +{ + /// specifies the color of the border of active windows + [attribute] ::com::sun::star::util::Color ActiveBorderColor; + + /// + [attribute] ::com::sun::star::util::Color ActiveColor; + + /// specifies the color of the active tab of a tab control + [attribute] ::com::sun::star::util::Color ActiveTabColor; + + /// specifies the text color for active UI components + [attribute] ::com::sun::star::util::Color ActiveTextColor; + + /// specifies the color to use for text on buttons which are hovered with the mouse + [attribute] ::com::sun::star::util::Color ButtonRolloverTextColor; + + /// specifies the color to use for text on buttons + [attribute] ::com::sun::star::util::Color ButtonTextColor; + + /// + [attribute] ::com::sun::star::util::Color CheckedColor; + + /// specifies the dark portion of the shadow to use for UI elements + [attribute] ::com::sun::star::util::Color DarkShadowColor; + + /// specifies the color of the border of inactive windows + [attribute] ::com::sun::star::util::Color DeactiveBorderColor; + + /// + [attribute] ::com::sun::star::util::Color DeactiveColor; + + /// specifies the text color for inactive UI components + [attribute] ::com::sun::star::util::Color DeactiveTextColor; + + /// specifies the background color of dialogs + [attribute] ::com::sun::star::util::Color DialogColor; + + /// specifies the text color of dialogs + [attribute] ::com::sun::star::util::Color DialogTextColor; + + /// specifies the text color for disabled UI elements + [attribute] ::com::sun::star::util::Color DisableColor; + + /// + [attribute] ::com::sun::star::util::Color FaceColor; + + /// + [attribute, readonly] ::com::sun::star::util::Color FaceGradientColor; + + /// specifies the background color for dialog input controls + [attribute] ::com::sun::star::util::Color FieldColor; + + /// specifies the text color for dialog input controls which are hovered with the mouse + [attribute] ::com::sun::star::util::Color FieldRolloverTextColor; + + /// specifies the text color for dialog input controls + [attribute] ::com::sun::star::util::Color FieldTextColor; + + /// specifies the text color for dialog elements used for grouping other elements + [attribute] ::com::sun::star::util::Color GroupTextColor; + + /// specifies the background color for dialog elements displaying help content + [attribute] ::com::sun::star::util::Color HelpColor; + + /// specifies the text color for dialog elements displaying help content + [attribute] ::com::sun::star::util::Color HelpTextColor; + + /// specifies the background color for UI elements which are highlighted + [attribute] ::com::sun::star::util::Color HighlightColor; + + /// specifies the text color for UI elements which are highlighted + [attribute] ::com::sun::star::util::Color HighlightTextColor; + + /// specifies the color of inactive tabs of a tab control + [attribute] ::com::sun::star::util::Color InactiveTabColor; + + /// specifies the text color of dialog elements displaying some info text + [attribute] ::com::sun::star::util::Color InfoTextColor; + + /// specifies the text color of label elements in dialogs + [attribute] ::com::sun::star::util::Color LabelTextColor; + + /// + [attribute] ::com::sun::star::util::Color LightColor; + + /// specifies the background color of menu bars + [attribute] ::com::sun::star::util::Color MenuBarColor; + + /// specifies the text color of menu bars + [attribute] ::com::sun::star::util::Color MenuBarTextColor; + + /// specifies the border color of menus + [attribute] ::com::sun::star::util::Color MenuBorderColor; + + // specifies the background color of menus + [attribute] ::com::sun::star::util::Color MenuColor; + + /// specifies the background color of highlighted menu items + [attribute] ::com::sun::star::util::Color MenuHighlightColor; + + /// specifies the text color of highlighted menu items + [attribute] ::com::sun::star::util::Color MenuHighlightTextColor; + + // specifies the text color of menus + [attribute] ::com::sun::star::util::Color MenuTextColor; + + /// specifies the color to use for monochrome control elements such as flat borders of controls + [attribute] ::com::sun::star::util::Color MonoColor; + + /// specifies the text color of radio buttons and check boxes + [attribute] ::com::sun::star::util::Color RadioCheckTextColor; + + /// specifies the color of separators between UI elements + [attribute, readonly] ::com::sun::star::util::Color SeparatorColor; + + /// specifies the color to use for UI elements + [attribute] ::com::sun::star::util::Color ShadowColor; + + /// specifies the background color to use for non-dialog windows + [attribute] ::com::sun::star::util::Color WindowColor; + + /// specifies the text color to use for non-dialog windows + [attribute] ::com::sun::star::util::Color WindowTextColor; + + /// specifies the background color to use for document workspaces + [attribute] ::com::sun::star::util::Color WorkspaceColor; + + /** controls whether the an UI component should use a high-contrast mode + */ + [attribute] boolean HighContrastMode; + + /// specifies the application font + [attribute] FontDescriptor ApplicationFont; + + /// specifies the help font + [attribute] FontDescriptor HelpFont; + + /// specifies the font to use for window titles + [attribute] FontDescriptor TitleFont; + + /// specifies the font to use the title of floating windows + [attribute] FontDescriptor FloatTitleFont; + + /// specifies the font to use for menus + [attribute] FontDescriptor MenuFont; + + /// specifies the font to use for tool elements + [attribute] FontDescriptor ToolFont; + + /// specifies the font for dialog elements used for grouping other elements + [attribute] FontDescriptor GroupFont; + + /// specifies the font for label controls + [attribute] FontDescriptor LabelFont; + + /// specifies the font of dialog elements displaying some info text + [attribute] FontDescriptor InfoFont; + + /// specifies the font of radio buttons and check boxes + [attribute] FontDescriptor RadioCheckFont; + + /// specifies the font of push buttons + [attribute] FontDescriptor PushButtonFont; + + /// specifies the font for dialog input controls + [attribute] FontDescriptor FieldFont; + + /// registers a listener to be notified when the style settings change + void addStyleChangeListener( + [in] XStyleChangeListener Listener ); + + /// registers a listener to be notified when the style settings change + void removeStyleChangeListener( + [in] XStyleChangeListener Listener ); +}; + +//================================================================================================================== + +}; }; }; }; + +//================================================================================================================== + +#endif diff --git a/offapi/com/sun/star/awt/XStyleSettingsSupplier.idl b/offapi/com/sun/star/awt/XStyleSettingsSupplier.idl new file mode 100644 index 000000000000..cb60994ff894 --- /dev/null +++ b/offapi/com/sun/star/awt/XStyleSettingsSupplier.idl @@ -0,0 +1,53 @@ +/************************************************************************* + * 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 + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef __com_sun_star_awt_XStyleSettingsSupplier_idl__ +#define __com_sun_star_awt_XStyleSettingsSupplier_idl__ + +#include + +//================================================================================================================== + +module com { module sun { module star { module awt { + + interface XStyleSettings; + +//================================================================================================================== + +/** provides access to the style settings of a component + */ +interface XStyleSettingsSupplier +{ + [attribute, readonly] XStyleSettings StyleSettings; +}; + +//================================================================================================================== + +}; }; }; }; + +//================================================================================================================== + +#endif + diff --git a/offapi/com/sun/star/awt/makefile.mk b/offapi/com/sun/star/awt/makefile.mk index 55734fd75ca6..a6357703500c 100644 --- a/offapi/com/sun/star/awt/makefile.mk +++ b/offapi/com/sun/star/awt/makefile.mk @@ -278,10 +278,13 @@ IDLFILES=\ XRequestCallback.idl\ XReschedule.idl\ XScrollBar.idl\ - XSimpleTabController.idl\ + XSimpleTabController.idl\ XSpinField.idl\ XSpinListener.idl\ XSpinValue.idl\ + XStyleChangeListener.idl\ + XStyleSettings.idl\ + XStyleSettingsSupplier.idl\ XSystemChildFactory.idl\ XSystemDependentMenuPeer.idl\ XSystemDependentWindowPeer.idl\ diff --git a/offapi/com/sun/star/util/Color.idl b/offapi/com/sun/star/util/Color.idl index f6585e0e5723..572324a10715 100644 --- a/offapi/com/sun/star/util/Color.idl +++ b/offapi/com/sun/star/util/Color.idl @@ -37,10 +37,10 @@ module com { module sun { module star { module util {

The byte order is from high to low:

    alpha channel -
  1. red -
  2. green -
  3. blue -
+
  • red
    • +
  • green
    • +
  • blue
    • +

    */ published typedef long Color; -- cgit v1.2.1 From 012f5686a3fe76a8262f0849f9d2ed11335f20ba Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Fri, 25 Jun 2010 16:35:28 +0200 Subject: unoawt2: #i10000# removed unused local variable --- toolkit/source/awt/vclxwindows.cxx | 1 - 1 file changed, 1 deletion(-) diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index 625ae4e4616b..4a68b4c80e3f 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -2166,7 +2166,6 @@ void SAL_CALL VCLXListBox::itemListChanged( const EventObject& i_rEvent ) throw uno::Reference< beans::XPropertySet > xPropSet( i_rEvent.Source, uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySetInfo > xPSI( xPropSet->getPropertySetInfo(), uno::UNO_QUERY_THROW ); - bool localize = xPSI->hasPropertyByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ResourceResolver" ) ) ); uno::Reference< resource::XStringResourceResolver > xStringResourceResolver; if ( xPSI->hasPropertyByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ResourceResolver" ) ) ) ) { -- cgit v1.2.1 From 414d7d423fa1edc68459e72c43e6d29f7e667ca2 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Fri, 25 Jun 2010 17:40:24 +0200 Subject: unoawt2: why the heck does the IDL compiler complain, but still build it? Fixed build breaker ... --- offapi/com/sun/star/awt/XStyleSettings.idl | 1 + 1 file changed, 1 insertion(+) diff --git a/offapi/com/sun/star/awt/XStyleSettings.idl b/offapi/com/sun/star/awt/XStyleSettings.idl index 48b8910e707e..67c3bba7d8f1 100644 --- a/offapi/com/sun/star/awt/XStyleSettings.idl +++ b/offapi/com/sun/star/awt/XStyleSettings.idl @@ -29,6 +29,7 @@ #include #include +#include //================================================================================================================== -- cgit v1.2.1 From 20f357091160225ee1891c6a86468633df6ff281 Mon Sep 17 00:00:00 2001 From: Kai Sommerfeld Date: Fri, 25 Jun 2010 17:56:38 +0200 Subject: #i110653# - Raised OOo version to 3.3.0 --- solenv/inc/version.lst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/solenv/inc/version.lst b/solenv/inc/version.lst index 019af0e131ed..ac49f6c6fcf6 100644 --- a/solenv/inc/version.lst +++ b/solenv/inc/version.lst @@ -26,5 +26,5 @@ #************************************************************************* OOOBASEVERSIONMAJOR=3 -OOOBASEVERSIONMINOR=2 -OOOBASEVERSIONMICRO=1 +OOOBASEVERSIONMINOR=3 +OOOBASEVERSIONMICRO=0 -- cgit v1.2.1 From e241751a75617bdc5208a6cff485985f1c2c7972 Mon Sep 17 00:00:00 2001 From: "Thomas Lange [tl]" Date: Mon, 28 Jun 2010 11:42:25 +0200 Subject: cws tl81: #i112697# spelling fixed --- starmath/source/smres.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/starmath/source/smres.src b/starmath/source/smres.src index 7d3525bd2a29..5af43400669d 100755 --- a/starmath/source/smres.src +++ b/starmath/source/smres.src @@ -3574,7 +3574,7 @@ StringArray RID_PRINTUIOPTIONS < "Reduces or enlarges the size of the printed formula by a specified enlargement factor."; >; < "Miscellaneous options"; >; < "Ig~nore ~~ and ` at the end of the line"; >; - < "Specfies that these space wildcards will be removed if they are at the end of a line."; >; + < "Specifies that these space wildcards will be removed if they are at the end of a line."; >; }; }; -- cgit v1.2.1 From 7cf95e512b371281073de2422aa30c5d3c35a3c0 Mon Sep 17 00:00:00 2001 From: "Thomas Lange [tl]" Date: Mon, 28 Jun 2010 13:58:27 +0200 Subject: cws tl81: #i112695# crash in synonym sub-menu fixed --- sfx2/source/menu/mnumgr.cxx | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx index b264a5b47861..bc765b95340c 100755 --- a/sfx2/source/menu/mnumgr.cxx +++ b/sfx2/source/menu/mnumgr.cxx @@ -578,6 +578,7 @@ SfxPopupMenuManager* SfxPopupMenuManager::Popup( const ResId& rResId, SfxViewFra return 0; } + void SfxPopupMenuManager::ExecutePopup( const ResId& rResId, SfxViewFrame* pFrame, const Point& rPoint, Window* pWindow ) { PopupMenu *pSVMenu = new PopupMenu( rResId ); @@ -622,6 +623,12 @@ void SfxPopupMenuManager::ExecutePopup( const ResId& rResId, SfxViewFrame* pFram SfxPopupMenuManager aPop( pSVMenu, pFrame->GetBindings() ); aPop.RemoveDisabledEntries(); aPop.Execute( rPoint, pWindow ); + + // #i112646 avoid crash when context menu is closed. + // the (manually inserted) sub-menu needs to be destroyed before + // aPop gets destroyed. + delete pThesSubMenu; + pThesSubMenu = 0; } delete pThesSubMenu; @@ -631,3 +638,4 @@ Menu* SfxPopupMenuManager::GetSVMenu() { return (Menu*) GetMenu()->GetSVMenu(); } + -- cgit v1.2.1 From 748cc4c7f3e05ef8d2cb90e33d311084a4d425dd Mon Sep 17 00:00:00 2001 From: "Thomas Lange [tl]" Date: Mon, 28 Jun 2010 15:25:14 +0200 Subject: cws tl81: #i112695# crash in synonym sub-menu fixed --- .../registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 9 --------- 1 file changed, 9 deletions(-) mode change 100644 => 100755 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu old mode 100644 new mode 100755 index ebed194fcffc..85bc336ddec0 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -2139,9 +2139,6 @@ ~Sentence case - - 1 -     @@ -2163,17 +2160,11 @@ ~Capitalize Every Word - - 1 - ~tOGGLE cASE - - 1 - -- cgit v1.2.1 From ce9c31ba3fe2cdf3eadc2114ddd619af24a147be Mon Sep 17 00:00:00 2001 From: "Thomas Lange [tl]" Date: Mon, 28 Jun 2010 15:51:46 +0200 Subject: cws tl81: #i112695# change in user data implementation for thesaurus dialog --- cui/source/dialogs/thesdlg.cxx | 64 ++++++++++++++++++++++++++++--------- cui/source/dialogs/thesdlg_impl.hxx | 27 ++++++++++------ 2 files changed, 67 insertions(+), 24 deletions(-) diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index bf617b126747..b2d0ed41474e 100755 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -172,12 +172,21 @@ void ReplaceEdit_Impl::SetText( const XubString& rStr, const Selection& rNewSele // class ThesaurusAlternativesCtrl_Impl ---------------------------------- +AlternativesString_Impl::AlternativesString_Impl( + ThesaurusAlternativesCtrl_Impl &rControl, + SvLBoxEntry* pEntry, USHORT nFlags, const String& rStr ) : + // + SvLBoxString( pEntry, nFlags, rStr ), + m_rControlImpl( rControl ) +{ +} + void AlternativesString_Impl::Paint( const Point& rPos, SvLBox& rDev, USHORT, SvLBoxEntry* pEntry ) { - AlternativesUserData_Impl* pData = (AlternativesUserData_Impl*)pEntry->GetUserData(); + AlternativesExtraData* pData = m_rControlImpl.GetExtraData( pEntry ); Point aPos( rPos ); Font aOldFont( rDev.GetFont()); if (pData && pData->IsHeader()) @@ -207,14 +216,40 @@ ThesaurusAlternativesCtrl_Impl::ThesaurusAlternativesCtrl_Impl( ThesaurusAlternativesCtrl_Impl::~ThesaurusAlternativesCtrl_Impl() { - ClearUserData(); + ClearExtraData(); +} + + +void ThesaurusAlternativesCtrl_Impl::ClearExtraData() +{ + UserDataMap_t aEmpty; + m_aUserData.swap( aEmpty ); +} + + +void ThesaurusAlternativesCtrl_Impl::SetExtraData( + const SvLBoxEntry *pEntry, + AlternativesExtraData &rData ) +{ + if (!pEntry) + return; + + UserDataMap_t::iterator aIt( m_aUserData.find( pEntry ) ); + if (aIt != m_aUserData.end()) + aIt->second = rData; + else + m_aUserData[ pEntry ] = rData; } -void ThesaurusAlternativesCtrl_Impl::ClearUserData() +AlternativesExtraData * ThesaurusAlternativesCtrl_Impl::GetExtraData( + const SvLBoxEntry *pEntry ) { - for (USHORT i = 0; i < GetEntryCount(); ++i) - delete (AlternativesUserData_Impl*)GetEntry(i)->GetUserData(); + AlternativesExtraData *pRes = NULL; + UserDataMap_t::iterator aIt( m_aUserData.find( pEntry ) ); + if (aIt != m_aUserData.end()) + pRes = &aIt->second; + return pRes; } @@ -230,10 +265,9 @@ SvLBoxEntry * ThesaurusAlternativesCtrl_Impl::AddEntry( sal_Int32 nVal, const St pEntry->AddItem( new SvLBoxString( pEntry, 0, String() ) ); // add empty column aText += rText; pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0 ) ); // otherwise crash - pEntry->AddItem( new AlternativesString_Impl( pEntry, 0, aText ) ); + pEntry->AddItem( new AlternativesString_Impl( *this, pEntry, 0, aText ) ); - AlternativesUserData_Impl* pUserData = new AlternativesUserData_Impl( rText, bIsHeader ); - pEntry->SetUserData( pUserData ); + SetExtraData( pEntry, AlternativesExtraData( rText, bIsHeader ) ); GetModel()->Insert( pEntry ); if (bIsHeader) @@ -365,7 +399,7 @@ bool SvxThesaurusDialog_Impl::UpdateAlternativesBox_Impl() m_pAlternativesCT->SetUpdateMode( FALSE ); // clear old user data of control before creating new ones via AddEntry below - m_pAlternativesCT->ClearUserData(); + m_pAlternativesCT->ClearExtraData(); m_pAlternativesCT->Clear(); for (sal_Int32 i = 0; i < nMeanings; ++i) @@ -468,9 +502,9 @@ IMPL_LINK( SvxThesaurusDialog_Impl, AlternativesSelectHdl_Impl, SvxCheckListBox SvLBoxEntry *pEntry = pBox ? pBox->GetCurEntry() : NULL; if (pEntry) { - AlternativesUserData_Impl * pData = (AlternativesUserData_Impl *) pEntry->GetUserData(); + AlternativesExtraData * pData = m_pAlternativesCT->GetExtraData( pEntry ); String aStr; - if (!pData->IsHeader()) + if (pData && !pData->IsHeader()) { aStr = pData->GetText(); GetReplaceEditString( aStr ); @@ -486,9 +520,9 @@ IMPL_LINK( SvxThesaurusDialog_Impl, AlternativesDoubleClickHdl_Impl, SvxCheckLis SvLBoxEntry *pEntry = pBox ? pBox->GetCurEntry() : NULL; if (pEntry) { - AlternativesUserData_Impl * pData = (AlternativesUserData_Impl *) pEntry->GetUserData(); + AlternativesExtraData * pData = m_pAlternativesCT->GetExtraData( pEntry ); String aStr; - if (!pData->IsHeader()) + if (pData && !pData->IsHeader()) { aStr = pData->GetText(); GetReplaceEditString( aStr ); @@ -509,8 +543,8 @@ IMPL_LINK( SvxThesaurusDialog_Impl, AlternativesDoubleClickHdl_Impl, SvxCheckLis IMPL_STATIC_LINK( SvxThesaurusDialog_Impl, SelectFirstHdl_Impl, SvxCheckListBox *, pBox ) { (void) pThis; - if (pBox && pBox->GetEntryCount() > 0) - pBox->SelectEntryPos( 0 ); + if (pBox && pBox->GetEntryCount() >= 2) + pBox->SelectEntryPos( 1 ); // pos 0 is a 'header' that is not selectable return 0; } diff --git a/cui/source/dialogs/thesdlg_impl.hxx b/cui/source/dialogs/thesdlg_impl.hxx index 70ce91391456..ca18325aab21 100755 --- a/cui/source/dialogs/thesdlg_impl.hxx +++ b/cui/source/dialogs/thesdlg_impl.hxx @@ -51,11 +51,16 @@ #include #include +#include #include using namespace ::com::sun::star; using ::rtl::OUString; +class SvLBoxEntry; +class ThesaurusAlternativesCtrl_Impl; + + // class LookUpComboBox_Impl -------------------------------------------------- class LookUpComboBox_Impl : public ComboBox @@ -105,17 +110,14 @@ public: // class ThesaurusAlternativesCtrl_Impl ---------------------------------- -class AlternativesUserData_Impl +class AlternativesExtraData { String sText; bool bHeader; - // disable copy c-tor and assignment operator - AlternativesUserData_Impl( const AlternativesUserData_Impl & ); - AlternativesUserData_Impl & operator = ( const AlternativesUserData_Impl & ); - public: - AlternativesUserData_Impl( const String &rText, bool bIsHeader ) : + AlternativesExtraData() : bHeader( false ) {} + AlternativesExtraData( const String &rText, bool bIsHeader ) : sText(rText), bHeader(bIsHeader) { @@ -128,10 +130,11 @@ public: class AlternativesString_Impl : public SvLBoxString { + ThesaurusAlternativesCtrl_Impl & m_rControlImpl; public: - AlternativesString_Impl( SvLBoxEntry* pEntry, USHORT nFlags, const String& rStr ) - : SvLBoxString( pEntry, nFlags, rStr ) {} + AlternativesString_Impl( ThesaurusAlternativesCtrl_Impl &rControl, + SvLBoxEntry* pEntry, USHORT nFlags, const String& rStr ); virtual void Paint( const Point& rPos, SvLBox& rDev, USHORT nFlags, SvLBoxEntry* pEntry); }; @@ -142,6 +145,9 @@ class ThesaurusAlternativesCtrl_Impl : { SvxThesaurusDialog_Impl & m_rDialogImpl; + typedef std::map< const SvLBoxEntry *, AlternativesExtraData > UserDataMap_t; + UserDataMap_t m_aUserData; + // disable copy c-tor and assignment operator ThesaurusAlternativesCtrl_Impl( const ThesaurusAlternativesCtrl_Impl & ); ThesaurusAlternativesCtrl_Impl & operator = ( const ThesaurusAlternativesCtrl_Impl & ); @@ -152,7 +158,10 @@ public: SvLBoxEntry * AddEntry( sal_Int32 nVal, const String &rText, bool bIsHeader ); - void ClearUserData(); + + void ClearExtraData(); + void SetExtraData( const SvLBoxEntry *pEntry, AlternativesExtraData &rData ); + AlternativesExtraData * GetExtraData( const SvLBoxEntry *pEntry ); virtual void KeyInput( const KeyEvent& rKEvt ); virtual void Paint( const Rectangle& rRect ); -- cgit v1.2.1 From 722441b99292269a42db1c0de6bce9351e8de933 Mon Sep 17 00:00:00 2001 From: "Ocke Janssen [oj]" Date: Mon, 28 Jun 2010 16:40:40 +0200 Subject: unoawt2: add missing TOOLKIT_DLLPUBLIC to access classes --- toolkit/inc/toolkit/controls/unocontrolbase.hxx | 2 +- toolkit/inc/toolkit/controls/unocontrolmodel.hxx | 2 +- toolkit/inc/toolkit/controls/unocontrols.hxx | 7 +++++-- toolkit/inc/toolkit/helper/listenermultiplexer.hxx | 2 +- toolkit/inc/toolkit/helper/property.hxx | 2 +- toolkit/inc/toolkit/helper/unopropertyarrayhelper.hxx | 3 ++- toolkit/prj/d.lst | 1 + toolkit/source/controls/unocontrols.cxx | 13 +++++++++++-- 8 files changed, 23 insertions(+), 9 deletions(-) diff --git a/toolkit/inc/toolkit/controls/unocontrolbase.hxx b/toolkit/inc/toolkit/controls/unocontrolbase.hxx index 60dcc040e0e7..f12dd23a5c67 100644 --- a/toolkit/inc/toolkit/controls/unocontrolbase.hxx +++ b/toolkit/inc/toolkit/controls/unocontrolbase.hxx @@ -36,7 +36,7 @@ // class UnoControlBase // ---------------------------------------------------- -class UnoControlBase : public UnoControl +class TOOLKIT_DLLPUBLIC UnoControlBase : public UnoControl { protected: sal_Bool ImplHasProperty( sal_uInt16 nProp ); diff --git a/toolkit/inc/toolkit/controls/unocontrolmodel.hxx b/toolkit/inc/toolkit/controls/unocontrolmodel.hxx index a443cb4d2d6b..5ac3c33aa1c9 100644 --- a/toolkit/inc/toolkit/controls/unocontrolmodel.hxx +++ b/toolkit/inc/toolkit/controls/unocontrolmodel.hxx @@ -53,7 +53,7 @@ class ImplPropertyTable; // class UnoControlModel // ---------------------------------------------------- -class UnoControlModel : public ::com::sun::star::awt::XControlModel, +class TOOLKIT_DLLPUBLIC UnoControlModel : public ::com::sun::star::awt::XControlModel, public ::com::sun::star::beans::XPropertyState, public ::com::sun::star::io::XPersistObject, public ::com::sun::star::lang::XComponent, diff --git a/toolkit/inc/toolkit/controls/unocontrols.hxx b/toolkit/inc/toolkit/controls/unocontrols.hxx index a0d34b0f8741..6223e47a6871 100644 --- a/toolkit/inc/toolkit/controls/unocontrols.hxx +++ b/toolkit/inc/toolkit/controls/unocontrols.hxx @@ -725,11 +725,12 @@ struct UnoControlListBoxModel_Data; typedef ::cppu::AggImplInheritanceHelper1 < UnoControlModel , ::com::sun::star::awt::XItemList > UnoControlListBoxModel_Base; -class UnoControlListBoxModel :public UnoControlListBoxModel_Base +class TOOLKIT_DLLPUBLIC UnoControlListBoxModel :public UnoControlListBoxModel_Base { public: UnoControlListBoxModel(); UnoControlListBoxModel( const UnoControlListBoxModel& i_rSource ); + ~UnoControlListBoxModel(); UnoControlModel* Clone() const { return new UnoControlListBoxModel( *this ); } @@ -820,7 +821,7 @@ typedef ::cppu::AggImplInheritanceHelper5 < UnoControlBase , ::com::sun::star::awt::XTextLayoutConstrains , ::com::sun::star::awt::XItemListListener > UnoListBoxControl_Base; -class UnoListBoxControl : public UnoListBoxControl_Base +class TOOLKIT_DLLPUBLIC UnoListBoxControl : public UnoListBoxControl_Base { public: UnoListBoxControl(); @@ -884,6 +885,8 @@ protected: virtual void ImplSetPeerProperty( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Any& rVal ); virtual void updateFromModel(); + ActionListenerMultiplexer& getActionListeners(); + ItemListenerMultiplexer& getItemListeners(); private: ActionListenerMultiplexer maActionListeners; ItemListenerMultiplexer maItemListeners; diff --git a/toolkit/inc/toolkit/helper/listenermultiplexer.hxx b/toolkit/inc/toolkit/helper/listenermultiplexer.hxx index b9fb82c3d4bb..b4151fe0f35e 100644 --- a/toolkit/inc/toolkit/helper/listenermultiplexer.hxx +++ b/toolkit/inc/toolkit/helper/listenermultiplexer.hxx @@ -171,7 +171,7 @@ DECL_LISTENERMULTIPLEXER_END // ---------------------------------------------------- // class ActionListenerMultiplexer // ---------------------------------------------------- -DECL_LISTENERMULTIPLEXER_START( ActionListenerMultiplexer, ::com::sun::star::awt::XActionListener ) +DECL_LISTENERMULTIPLEXER_START_DLLPUB( ActionListenerMultiplexer, ::com::sun::star::awt::XActionListener ) void SAL_CALL actionPerformed( const ::com::sun::star::awt::ActionEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException); DECL_LISTENERMULTIPLEXER_END diff --git a/toolkit/inc/toolkit/helper/property.hxx b/toolkit/inc/toolkit/helper/property.hxx index f8a1a703799c..837d283f4e8c 100644 --- a/toolkit/inc/toolkit/helper/property.hxx +++ b/toolkit/inc/toolkit/helper/property.hxx @@ -234,7 +234,7 @@ namespace rtl { TOOLKIT_DLLPUBLIC sal_uInt16 GetPropertyId( const ::rtl::OUString& rPropertyName ); const ::com::sun::star::uno::Type* GetPropertyType( sal_uInt16 nPropertyId ); -const ::rtl::OUString& GetPropertyName( sal_uInt16 nPropertyId ); +TOOLKIT_DLLPUBLIC const ::rtl::OUString& GetPropertyName( sal_uInt16 nPropertyId ); sal_Int16 GetPropertyAttribs( sal_uInt16 nPropertyId ); sal_uInt16 GetPropertyOrderNr( sal_uInt16 nPropertyId ); sal_Bool DoesDependOnOthers( sal_uInt16 nPropertyId ); diff --git a/toolkit/inc/toolkit/helper/unopropertyarrayhelper.hxx b/toolkit/inc/toolkit/helper/unopropertyarrayhelper.hxx index 2a42d05b72fd..77ba068943f1 100644 --- a/toolkit/inc/toolkit/helper/unopropertyarrayhelper.hxx +++ b/toolkit/inc/toolkit/helper/unopropertyarrayhelper.hxx @@ -33,11 +33,12 @@ #include #include +#include "toolkit/dllapi.h" // ---------------------------------------------------- // class UnoPropertyArrayHelper // ---------------------------------------------------- -class UnoPropertyArrayHelper : public ::cppu::IPropertyArrayHelper +class TOOLKIT_DLLPUBLIC UnoPropertyArrayHelper : public ::cppu::IPropertyArrayHelper { private: Table maIDs; diff --git a/toolkit/prj/d.lst b/toolkit/prj/d.lst index 0c62a083b330..fc6acef85b76 100644 --- a/toolkit/prj/d.lst +++ b/toolkit/prj/d.lst @@ -47,6 +47,7 @@ mkdir: %_DEST%\inc%_EXT%\toolkit\controls ..\inc\toolkit\helper\formpdfexport.hxx %_DEST%\inc%_EXT%\toolkit\helper/formpdfexport.hxx ..\inc\toolkit\helper\accessiblefactory.hxx %_DEST%\inc%_EXT%\toolkit\helper\accessiblefactory.hxx ..\inc\toolkit\helper\fixedhyperbase.hxx %_DEST%\inc%_EXT%\toolkit\helper\fixedhyperbase.hxx +..\inc\toolkit\helper\unopropertyarrayhelper.hxx %_DEST%\inc%_EXT%\toolkit\helper\unopropertyarrayhelper.hxx ..\inc\toolkit\helper\vclunohelper.hxx %_DEST%\inc%_EXT%\toolkit\unohlp.hxx ..\inc\toolkit\dllapi.h %_DEST%\inc%_EXT%\toolkit\dllapi.h diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx index 92a8a21a6c08..6599b039600f 100644 --- a/toolkit/source/controls/unocontrols.cxx +++ b/toolkit/source/controls/unocontrols.cxx @@ -1834,7 +1834,9 @@ UnoControlListBoxModel::UnoControlListBoxModel( const UnoControlListBoxModel& i_ ,m_aItemListListeners( GetMutex() ) { } - +UnoControlListBoxModel::~UnoControlListBoxModel() +{ +} // --------------------------------------------------------------------------------------------------------------------- ::rtl::OUString UnoControlListBoxModel::getServiceName() throw(::com::sun::star::uno::RuntimeException) { @@ -2674,7 +2676,14 @@ void SAL_CALL UnoListBoxControl::itemListChanged( const lang::EventObject& i_rEv if ( xPeerListener.is() ) xPeerListener->itemListChanged( i_rEvent ); } - +ActionListenerMultiplexer& UnoListBoxControl::getActionListeners() +{ + return maActionListeners; +} +ItemListenerMultiplexer& UnoListBoxControl::getItemListeners() +{ + return maItemListeners; +} // ---------------------------------------------------- // class UnoControlComboBoxModel // ---------------------------------------------------- -- cgit v1.2.1 From ff963981470616f9d43448ed6237e85648d3698a Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Mon, 28 Jun 2010 17:36:56 +0200 Subject: #i112758# changed static BitmapEx to static pointers --- sd/source/ui/inc/view/viewoverlaymanager.hxx | 4 ++-- sd/source/ui/view/viewoverlaymanager.cxx | 31 +++++++++++++++++----------- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/sd/source/ui/inc/view/viewoverlaymanager.hxx b/sd/source/ui/inc/view/viewoverlaymanager.hxx index 0693d1faea7a..ea6b27dc09f3 100755 --- a/sd/source/ui/inc/view/viewoverlaymanager.hxx +++ b/sd/source/ui/inc/view/viewoverlaymanager.hxx @@ -59,8 +59,8 @@ public: virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); - static BitmapEx maLargeButtonImages[BMP_PLACEHOLDER_LARGE_END - BMP_PLACEHOLDER_LARGE_START]; - static BitmapEx maSmallButtonImages[BMP_PLACEHOLDER_SMALL_END - BMP_PLACEHOLDER_SMALL_START]; + static BitmapEx* maLargeButtonImages[BMP_PLACEHOLDER_LARGE_END - BMP_PLACEHOLDER_LARGE_START]; + static BitmapEx* maSmallButtonImages[BMP_PLACEHOLDER_SMALL_END - BMP_PLACEHOLDER_SMALL_START]; private: void UpdateImages(); diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index ab165eea600b..106cfb4f6d51 100755 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -79,8 +79,8 @@ class ImageButtonHdl; // -------------------------------------------------------------------- -BitmapEx ViewOverlayManager::maSmallButtonImages[BMP_PLACEHOLDER_SMALL_END - BMP_PLACEHOLDER_SMALL_START]; -BitmapEx ViewOverlayManager::maLargeButtonImages[BMP_PLACEHOLDER_LARGE_END - BMP_PLACEHOLDER_LARGE_START]; +BitmapEx* ViewOverlayManager::maSmallButtonImages[BMP_PLACEHOLDER_SMALL_END - BMP_PLACEHOLDER_SMALL_START] = { 0, 0, 0, 0 }; +BitmapEx* ViewOverlayManager::maLargeButtonImages[BMP_PLACEHOLDER_LARGE_END - BMP_PLACEHOLDER_LARGE_START] = { 0, 0, 0, 0 }; static USHORT gButtonSlots[] = { SID_INSERT_TABLE, SID_INSERT_DIAGRAM, SID_INSERT_GRAPHIC, SID_INSERT_AVMEDIA }; static USHORT gButtonToolTips[] = { STR_INSERT_TABLE, STR_INSERT_CHART, STR_INSERT_PICTURE, STR_INSERT_MOVIE }; @@ -374,20 +374,20 @@ BitmapEx ChangePlaceholderTag::createOverlayImage( int nHighlight ) Size aShapeSizePix = pDev->LogicToPixel(rSnapRect.GetSize()); long nShapeSizePix = std::min(aShapeSizePix.Width(),aShapeSizePix.Height()); - BitmapEx* pImages = (nShapeSizePix > 250) ? &ViewOverlayManager::maLargeButtonImages[0] : &ViewOverlayManager::maSmallButtonImages[0]; + BitmapEx** ppImages = (nShapeSizePix > 250) ? &ViewOverlayManager::maLargeButtonImages[0] : &ViewOverlayManager::maSmallButtonImages[0]; - Size aSize( pImages->GetSizePixel() ); + Size aSize( ppImages[0]->GetSizePixel() ); aRet.SetSizePixel( Size( aSize.Width() << 1, aSize.Height() << 1 ) ); const Rectangle aRectSrc( Point( 0, 0 ), aSize ); - aRet = pImages[(nHighlight == 0) ? 4 : 0]; + aRet = *(ppImages[(nHighlight == 0) ? 4 : 0]); aRet.Expand( aSize.Width(), aSize.Height(), NULL, TRUE ); - aRet.CopyPixel( Rectangle( Point( aSize.Width(), 0 ), aSize ), aRectSrc, &pImages[(nHighlight == 1) ? 5 : 1] ); - aRet.CopyPixel( Rectangle( Point( 0, aSize.Height() ), aSize ), aRectSrc, &pImages[(nHighlight == 2) ? 6 : 2] ); - aRet.CopyPixel( Rectangle( Point( aSize.Width(), aSize.Height() ), aSize ), aRectSrc, &pImages[(nHighlight == 3) ? 7 : 3] ); + aRet.CopyPixel( Rectangle( Point( aSize.Width(), 0 ), aSize ), aRectSrc, ppImages[(nHighlight == 1) ? 5 : 1] ); + aRet.CopyPixel( Rectangle( Point( 0, aSize.Height() ), aSize ), aRectSrc, ppImages[(nHighlight == 2) ? 6 : 2] ); + aRet.CopyPixel( Rectangle( Point( aSize.Width(), aSize.Height() ), aSize ), aRectSrc, ppImages[(nHighlight == 3) ? 7 : 3] ); } return aRet; @@ -411,9 +411,9 @@ void ChangePlaceholderTag::addCustomHandles( SdrHdlList& rHandlerList ) if( 50 > nShapeSizePix ) return; - BitmapEx* pImages = (nShapeSizePix > 250) ? &ViewOverlayManager::maLargeButtonImages[0] : &ViewOverlayManager::maSmallButtonImages[0]; + BitmapEx* pImages = (nShapeSizePix > 250) ? ViewOverlayManager::maLargeButtonImages[0] : ViewOverlayManager::maSmallButtonImages[0]; - Size aButtonSize( pDev->PixelToLogic(pImages[0].GetSizePixel()) ); + Size aButtonSize( pDev->PixelToLogic(pImages->GetSizePixel()) ); const int nColumns = 2; const int nRows = 2; @@ -494,8 +494,15 @@ void ViewOverlayManager::UpdateImages() { for( sal_uInt16 i = 0; i < (BMP_PLACEHOLDER_SMALL_END-BMP_PLACEHOLDER_SMALL_START); i++ ) { - maSmallButtonImages[i] = loadImageResource( BMP_PLACEHOLDER_SMALL_START + i ); - maLargeButtonImages[i] = loadImageResource( BMP_PLACEHOLDER_LARGE_START + i ); + if( maSmallButtonImages[i] ) + delete maSmallButtonImages[i]; + + maSmallButtonImages[i] = new BitmapEx( loadImageResource( BMP_PLACEHOLDER_SMALL_START + i ) ); + + if( maLargeButtonImages[i] ) + delete maLargeButtonImages[i]; + + maLargeButtonImages[i] = new BitmapEx( loadImageResource( BMP_PLACEHOLDER_LARGE_START + i ) ); } } -- cgit v1.2.1 From 9b8213e2fadbc3c59f7e445098ae38cf266119cc Mon Sep 17 00:00:00 2001 From: Keith Stribley Date: Tue, 29 Jun 2010 14:14:34 +0630 Subject: graphite03: #i112730# updated graphite patch and improvements to glyph metric caching --- vcl/inc/vcl/graphite_adaptors.hxx | 4 +- vcl/inc/vcl/graphite_cache.hxx | 34 +++++++++++++---- vcl/inc/vcl/graphite_layout.hxx | 15 +++++++- vcl/source/glyphs/graphite_adaptors.cxx | 56 ++++++++++++++++----------- vcl/source/glyphs/graphite_cache.cxx | 2 +- vcl/source/glyphs/graphite_layout.cxx | 67 +++++++++++++++++++++++---------- vcl/source/glyphs/graphite_textsrc.hxx | 1 + vcl/win/source/gdi/winlayout.cxx | 2 +- 8 files changed, 127 insertions(+), 54 deletions(-) mode change 100644 => 100755 vcl/win/source/gdi/winlayout.cxx diff --git a/vcl/inc/vcl/graphite_adaptors.hxx b/vcl/inc/vcl/graphite_adaptors.hxx index 43c2e37a5fb2..e58881c9f463 100644 --- a/vcl/inc/vcl/graphite_adaptors.hxx +++ b/vcl/inc/vcl/graphite_adaptors.hxx @@ -86,8 +86,8 @@ namespace grutils // class VCL_DLLPUBLIC GraphiteFontAdaptor : public gr::Font { -typedef std::map > GlyphMetricMap; - + typedef std::map > GlyphMetricMap; + friend class GrFontHasher; public: static bool IsGraphiteEnabledFont(ServerFont &) throw(); diff --git a/vcl/inc/vcl/graphite_cache.hxx b/vcl/inc/vcl/graphite_cache.hxx index 5472b32dd62f..af1392ed4d4b 100644 --- a/vcl/inc/vcl/graphite_cache.hxx +++ b/vcl/inc/vcl/graphite_cache.hxx @@ -105,15 +105,16 @@ typedef std::pair GrRMEntr */ class GraphiteSegmentCache { +public: enum { // not really sure what good values are here, // bucket size should be >> cache size - SEG_BUCKET_SIZE = 4096, - SEG_CACHE_SIZE = 255 + SEG_BUCKET_FACTOR = 4, + SEG_DEFAULT_CACHE_SIZE = 2047 }; -public: - GraphiteSegmentCache() - : m_segMap(SEG_BUCKET_SIZE), + GraphiteSegmentCache(sal_uInt32 nSegCacheSize) + : m_segMap(nSegCacheSize * SEG_BUCKET_FACTOR), + m_nSegCacheSize(nSegCacheSize), m_oldestKey(NULL) {}; ~GraphiteSegmentCache() { @@ -224,6 +225,7 @@ public: private: GraphiteSegMap m_segMap; GraphiteRopeMap m_ropeMap; + sal_uInt32 m_nSegCacheSize; const xub_Unicode * m_oldestKey; const xub_Unicode * m_prevKey; }; @@ -236,7 +238,24 @@ typedef std::hash_map > GraphiteCach class GraphiteCacheHandler { public: - GraphiteCacheHandler() : m_cacheMap(255) {}; + GraphiteCacheHandler() : m_cacheMap(255) + { + const char * pEnvCache = getenv( "SAL_GRAPHITE_CACHE_SIZE" ); + if (pEnvCache != NULL) + { + int envCacheSize = atoi(pEnvCache); + if (envCacheSize <= 0) + m_nSegCacheSize = GraphiteSegmentCache::SEG_DEFAULT_CACHE_SIZE; + else + { + m_nSegCacheSize = envCacheSize; + } + } + else + { + m_nSegCacheSize = GraphiteSegmentCache::SEG_DEFAULT_CACHE_SIZE; + } + }; ~GraphiteCacheHandler() { GraphiteCacheMap::iterator i = m_cacheMap.begin(); @@ -257,12 +276,13 @@ public: { return m_cacheMap.find(fontHash)->second; } - GraphiteSegmentCache *pCache = new GraphiteSegmentCache(); + GraphiteSegmentCache *pCache = new GraphiteSegmentCache(m_nSegCacheSize); m_cacheMap[fontHash] = pCache; return pCache; } private: GraphiteCacheMap m_cacheMap; + sal_uInt32 m_nSegCacheSize; }; #endif diff --git a/vcl/inc/vcl/graphite_layout.hxx b/vcl/inc/vcl/graphite_layout.hxx index 520f4620cd90..765a154a9898 100644 --- a/vcl/inc/vcl/graphite_layout.hxx +++ b/vcl/inc/vcl/graphite_layout.hxx @@ -65,6 +65,19 @@ class GraphiteFontAdaptor; class GrSegRecord; // SAL/VCL types class ServerFont; + +#ifdef WNT +// The GraphiteWinFont is just a wrapper to enable GrFontHasher to be a friend +// so that UniqueCacheInfo can be called. +#include +class GraphiteWinFont : public gr::WinFont +{ + friend class GrFontHasher; +public: + GraphiteWinFont(HDC hdc) : gr::WinFont(hdc) {}; + virtual ~GraphiteWinFont() {}; +}; +#endif // Graphite types namespace gr { class Segment; class GlyphIterator; } namespace grutils { class GrFeatureParser; } @@ -98,7 +111,7 @@ public: iterator_pair_t neighbour_clusters(const_iterator) const; private: std::pair appendCluster(gr::Segment & rSeg, ImplLayoutArgs & rArgs, - bool bRtl, int nFirstCharInCluster, int nNextChar, + bool bRtl, float fSegmentAdvance, int nFirstCharInCluster, int nNextChar, int nFirstGlyphInCluster, int nNextGlyph, float fScaling, std::vector & rChar2Base, std::vector & rGlyph2Char, std::vector & rCharDxs, long & rDXOffset); diff --git a/vcl/source/glyphs/graphite_adaptors.cxx b/vcl/source/glyphs/graphite_adaptors.cxx index f66f5b48e39e..f82e3afe39c8 100644 --- a/vcl/source/glyphs/graphite_adaptors.cxx +++ b/vcl/source/glyphs/graphite_adaptors.cxx @@ -99,12 +99,18 @@ FontProperties::FontProperties(const FreetypeServerFont &font) throw() fItalic = false; } - // Get the font name. + // Get the font name, but prefix with file name hash in case + // there are 2 fonts on the system with the same face name + sal_Int32 nHashCode = font.GetFontFileName()->hashCode(); + ::rtl::OUStringBuffer nHashFaceName; + nHashFaceName.append(nHashCode, 16); const sal_Unicode * name = font.GetFontSelData().maName.GetBuffer(); - const size_t name_sz = std::min(sizeof szFaceName/sizeof(wchar_t)-1, - size_t(font.GetFontSelData().maName.Len())); + nHashFaceName.append(name); - std::copy(name, name + name_sz, szFaceName); + const size_t name_sz = std::min(sizeof szFaceName/sizeof(wchar_t)-1, + static_cast(nHashFaceName.getLength())); + + std::copy(nHashFaceName.getStr(), nHashFaceName.getStr() + name_sz, szFaceName); szFaceName[name_sz] = '\0'; } @@ -120,13 +126,13 @@ GraphiteFontAdaptor::GraphiteFontAdaptor(ServerFont & sfont, const sal_Int32 dpi mfEmUnits(static_cast(sfont).GetMetricsFT().y_ppem), mpFeatures(NULL) { - //std::wstring face_name(maFontProperties.szFaceName); const rtl::OString aLang = MsLangId::convertLanguageToIsoByteString( sfont.GetFontSelData().meLanguage ); -#ifdef DEBUG - printf("GraphiteFontAdaptor %lx\n", (long)this); -#endif rtl::OString name = rtl::OUStringToOString( sfont.GetFontSelData().maTargetName, RTL_TEXTENCODING_UTF8 ); +#ifdef DEBUG + printf("GraphiteFontAdaptor %lx %s italic=%u bold=%u\n", (long)this, name.getStr(), + maFontProperties.fItalic, maFontProperties.fBold); +#endif sal_Int32 nFeat = name.indexOf(grutils::GrFeatureParser::FEAT_PREFIX) + 1; if (nFeat > 0) { @@ -259,21 +265,24 @@ const void * GraphiteFontAdaptor::getTable(gr::fontTableId32 table_id, size_t * // Return the glyph's metrics in pixels. void GraphiteFontAdaptor::getGlyphMetrics(gr::gid16 nGlyphId, gr::Rect & aBounding, gr::Point & advances) { - // Graphite gets really confused if the glyphs have been transformed, so - // if orientation has been set we can't use the font's glyph cache - // unfortunately the font selection data, doesn't always have the orientation - // set, even if it was when the glyphs were cached, so we use our own cache. - -// const GlyphMetric & metric = mrFont.GetGlyphMetric(nGlyphId); -// -// aBounding.right = aBounding.left = metric.GetOffset().X(); -// aBounding.bottom = aBounding.top = -metric.GetOffset().Y(); -// aBounding.right += metric.GetSize().Width(); -// aBounding.bottom -= metric.GetSize().Height(); -// -// advances.x = metric.GetDelta().X(); -// advances.y = -metric.GetDelta().Y(); - + // There used to be problems when orientation was set however, this no + // longer seems to be the case and the Glyph Metric cache in + // FreetypeServerFont is more efficient since it lasts between calls to VCL +#if 1 + const GlyphMetric & metric = mrFont.GetGlyphMetric(nGlyphId); + + aBounding.right = aBounding.left = metric.GetOffset().X(); + aBounding.bottom = aBounding.top = -metric.GetOffset().Y(); + aBounding.right += metric.GetSize().Width(); + aBounding.bottom -= metric.GetSize().Height(); + + advances.x = metric.GetDelta().X(); + advances.y = -metric.GetDelta().Y(); + +#else + // The problem with the code below is that the cache only lasts + // as long as the life time of the GraphiteFontAdaptor, which + // is created once per call to X11SalGraphics::GetTextLayout GlyphMetricMap::const_iterator gm_itr = maGlyphMetricMap.find(nGlyphId); if (gm_itr != maGlyphMetricMap.end()) { @@ -321,6 +330,7 @@ void GraphiteFontAdaptor::getGlyphMetrics(gr::gid16 nGlyphId, gr::Rect & aBoundi // Now add an entry to our metrics map. maGlyphMetricMap[nGlyphId] = std::make_pair(aBounding, advances); } +#endif } #endif diff --git a/vcl/source/glyphs/graphite_cache.cxx b/vcl/source/glyphs/graphite_cache.cxx index 64bbb0a38d60..389accd631f0 100644 --- a/vcl/source/glyphs/graphite_cache.cxx +++ b/vcl/source/glyphs/graphite_cache.cxx @@ -105,7 +105,7 @@ GrSegRecord * GraphiteSegmentCache::cacheSegment(TextSourceAdaptor * adapter, gr // when the next key is added, the record for the prevKey's m_nextKey field // is updated to the newest key so that m_oldestKey can be updated to the // next oldest key when the record for m_oldestKey is deleted - if (m_segMap.size() > SEG_CACHE_SIZE) + if (m_segMap.size() > m_nSegCacheSize) { GraphiteSegMap::iterator oldestPair = m_segMap.find(reinterpret_cast(m_oldestKey)); // oldest record may no longer exist if a buffer was changed diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx index ff2fd8f306b1..ae7ec8246e33 100644 --- a/vcl/source/glyphs/graphite_layout.cxx +++ b/vcl/source/glyphs/graphite_layout.cxx @@ -56,6 +56,10 @@ #include #endif +#ifdef UNX +#include +#endif + #include #include @@ -175,7 +179,8 @@ GraphiteLayout::Glyphs::fill_from(gr::Segment & rSegment, ImplLayoutArgs &rArgs, glyph_range_t iGlyphs = rSegment.glyphs(); int nGlyphs = iGlyphs.second - iGlyphs.first; gr::GlyphIterator prevBase = iGlyphs.second; - float fMinX = rSegment.advanceWidth(); + float fSegmentAdvance = rSegment.advanceWidth(); + float fMinX = fSegmentAdvance; float fMaxX = 0.0f; rGlyph2Char.assign(nGlyphs, -1); long nDxOffset = 0; @@ -222,7 +227,8 @@ GraphiteLayout::Glyphs::fill_from(gr::Segment & rSegment, ImplLayoutArgs &rArgs, nFirstGlyphInCluster != nGlyphIndex) { std::pair aBounds = - appendCluster(rSegment, rArgs, bRtl, nFirstCharInCluster, + appendCluster(rSegment, rArgs, bRtl, + fSegmentAdvance, nFirstCharInCluster, nNextChar, nFirstGlyphInCluster, nGlyphIndex, fScaling, rChar2Base, rGlyph2Char, rCharDxs, nDxOffset); fMinX = std::min(aBounds.first, fMinX); @@ -285,7 +291,8 @@ GraphiteLayout::Glyphs::fill_from(gr::Segment & rSegment, ImplLayoutArgs &rArgs, nFirstGlyphInCluster != nGlyphIndex) { std::pair aBounds = - appendCluster(rSegment, rArgs, bRtl, nFirstCharInCluster, nNextChar, + appendCluster(rSegment, rArgs, bRtl, fSegmentAdvance, + nFirstCharInCluster, nNextChar, nFirstGlyphInCluster, nGlyphIndex, fScaling, rChar2Base, rGlyph2Char, rCharDxs, nDxOffset); fMinX = std::min(aBounds.first, fMinX); @@ -334,11 +341,11 @@ GraphiteLayout::Glyphs::fill_from(gr::Segment & rSegment, ImplLayoutArgs &rArgs, } } -std::pair GraphiteLayout::Glyphs::appendCluster(gr::Segment & rSeg, - ImplLayoutArgs & rArgs, bool bRtl, int nFirstCharInCluster, int nNextChar, - int nFirstGlyphInCluster, int nNextGlyph, float fScaling, - std::vector & rChar2Base, std::vector & rGlyph2Char, - std::vector & rCharDxs, long & rDXOffset) +std::pair GraphiteLayout::Glyphs::appendCluster(gr::Segment& rSeg, + ImplLayoutArgs & rArgs, bool bRtl,float fSegmentAdvance, + int nFirstCharInCluster, int nNextChar, int nFirstGlyphInCluster, + int nNextGlyph, float fScaling, std::vector & rChar2Base, + std::vector & rGlyph2Char, std::vector & rCharDxs, long & rDXOffset) { glyph_range_t iGlyphs = rSeg.glyphs(); int nGlyphs = iGlyphs.second - iGlyphs.first; @@ -402,9 +409,9 @@ std::pair GraphiteLayout::Glyphs::appendCluster(gr::Segment & rSeg, gr::GlyphInfo aGlyph = *(iGlyphs.first + j); if (j + nDelta >= nGlyphs || j + nDelta < 0) // at rhs ltr,rtl { - fNextOrigin = rSeg.advanceWidth(); - nNextOrigin = round(rSeg.advanceWidth() * fScaling + rDXOffset); - aBounds.second = std::max(rSeg.advanceWidth(), aBounds.second); + fNextOrigin = fSegmentAdvance; + nNextOrigin = round(fSegmentAdvance * fScaling + rDXOffset); + aBounds.second = std::max(fSegmentAdvance, aBounds.second); } else { @@ -546,7 +553,7 @@ GraphiteLayout::GraphiteLayout(const gr::Font & font, const grutils::GrFeaturePa // If true, it can cause end of line spaces to be hidden e.g. Doulos SIL maLayout.setStartOfLine(false); maLayout.setEndOfLine(false); -// maLayout.setDumbFallback(false); + maLayout.setDumbFallback(true); // trailing ws doesn't seem to always take affect if end of line is true maLayout.setTrailingWs(gr::ktwshAll); #ifdef GRLAYOUT_DEBUG @@ -598,6 +605,8 @@ bool GraphiteLayout::LayoutText(ImplLayoutArgs & rArgs) else delete pSegment; #else gr::Segment * pSegment = CreateSegment(rArgs); + if (!pSegment) + return false; bool success = LayoutGlyphs(rArgs, pSegment); delete pSegment; #endif @@ -649,7 +658,19 @@ public: #endif return hash; }; - +protected: + virtual void UniqueCacheInfo(std::wstring & stuFace, bool & fBold, bool & fItalic) + { +#ifdef WIN32 + dynamic_cast(mrRealFont).UniqueCacheInfo(stuFace, fBold, fItalic); +#else +#ifdef UNX + dynamic_cast(mrRealFont).UniqueCacheInfo(stuFace, fBold, fItalic); +#else +#error Unknown base type for gr::Font::UniqueCacheInfo +#endif +#endif + } private: gr::Font & mrRealFont; }; @@ -738,6 +759,14 @@ gr::Segment * GraphiteLayout::CreateSegment(ImplLayoutArgs& rArgs) } else { +#ifdef GRLAYOUT_DEBUG + fprintf(grLog(), "Gr::LayoutText failed: "); + for (int i = mnMinCharPos; i < limit; i++) + { + fprintf(grLog(), "%04x ", rArgs.mpStr[i]); + } + fprintf(grLog(), "\n"); +#endif clear(); return NULL; } @@ -897,7 +926,7 @@ long GraphiteLayout::FillDXArray( sal_Int32* pDXArray ) const if (i > 0) pDXArray[i] -= mvCharDxs[i-1]; } #ifdef GRLAYOUT_DEBUG - fprintf(grLog(),"%d,%d,%ld ", (int)i, (int)mvCharDxs[i], pDXArray[i]); + fprintf(grLog(),"%d,%d,%d ", (int)i, (int)mvCharDxs[i], pDXArray[i]); #endif } //std::adjacent_difference(mvCharDxs.begin(), mvCharDxs.end(), pDXArray); @@ -1020,7 +1049,7 @@ void GraphiteLayout::ApplyDXArray(ImplLayoutArgs &args, std::vector & rDelt #ifdef GRLAYOUT_DEBUG for (size_t iDx = 0; iDx < mvCharDxs.size(); iDx++) - fprintf(grLog(),"%d,%d,%ld ", (int)iDx, (int)mvCharDxs[iDx], args.mpDXArray[iDx]); + fprintf(grLog(),"%d,%d,%d ", (int)iDx, (int)mvCharDxs[iDx], args.mpDXArray[iDx]); fprintf(grLog(),"ApplyDx\n"); #endif bool bRtl = mnLayoutFlags & SAL_LAYOUT_BIDI_RTL; @@ -1090,7 +1119,7 @@ void GraphiteLayout::ApplyDXArray(ImplLayoutArgs &args, std::vector & rDelt } long nDWidth = nNewClusterWidth - nOrigClusterWidth; #ifdef GRLAYOUT_DEBUG - fprintf(grLog(), "c%d last glyph %d/%d\n", i, nLastGlyph, mvGlyphs.size()); + fprintf(grLog(), "c%lu last glyph %d/%lu\n", i, nLastGlyph, mvGlyphs.size()); #endif assert((nLastGlyph > -1) && (nLastGlyph < (signed)mvGlyphs.size())); mvGlyphs[nLastGlyph].mnNewWidth += nDWidth; @@ -1128,7 +1157,7 @@ void GraphiteLayout::ApplyDXArray(ImplLayoutArgs &args, std::vector & rDelt std::copy(args.mpDXArray, args.mpDXArray + nChars, mvCharDxs.begin() + (args.mnMinCharPos - mnMinCharPos)); #ifdef GRLAYOUT_DEBUG - fprintf(grLog(),"ApplyDx %ld(%ld)\n", args.mpDXArray[nChars - 1], mnWidth); + fprintf(grLog(),"ApplyDx %d(%ld)\n", args.mpDXArray[nChars - 1], mnWidth); #endif mnWidth = args.mpDXArray[nChars - 1]; } @@ -1170,7 +1199,7 @@ void GraphiteLayout::kashidaJustify(std::vector& rDeltaWidths, sal_GlyphId } nKashidaCount = 1 + (nGapWidth / nKashidaWidth); #ifdef GRLAYOUT_DEBUG - printf("inserting %d kashidas at %ld\n", nKashidaCount, (*i).mnGlyphIndex); + printf("inserting %d kashidas at %u\n", nKashidaCount, (*i).mnGlyphIndex); #endif GlyphItem glyphItem = *i; Point aPos(0, 0); @@ -1309,7 +1338,7 @@ void GraphiteLayout::GetCaretPositions( int nArraySize, sal_Int32* pCaretXArray pCaretXArray[i] = pCaretXArray[i+1] = 0; } #ifdef GRLAYOUT_DEBUG - fprintf(grLog(),"%d,%ld-%ld\t", nCharSlot, pCaretXArray[i], pCaretXArray[i+1]); + fprintf(grLog(),"%d,%d-%d\t", nCharSlot, pCaretXArray[i], pCaretXArray[i+1]); #endif } #ifdef GRLAYOUT_DEBUG diff --git a/vcl/source/glyphs/graphite_textsrc.hxx b/vcl/source/glyphs/graphite_textsrc.hxx index 2b9c705a5ea7..3912977cc9be 100644 --- a/vcl/source/glyphs/graphite_textsrc.hxx +++ b/vcl/source/glyphs/graphite_textsrc.hxx @@ -93,6 +93,7 @@ public: virtual ext_std::pair propertyRange(gr::toffset ich); virtual size_t getFontFeatures(gr::toffset ich, gr::FeatureSetting * prgfset); virtual bool sameSegment(gr::toffset ich1, gr::toffset ich2); + virtual bool featureVariations() { return false; } operator ImplLayoutArgs & () throw(); void setFeatures(const grutils::GrFeatureParser * pFeatures); diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx old mode 100644 new mode 100755 index ba19f2255646..6f0c98279e7b --- a/vcl/win/source/gdi/winlayout.cxx +++ b/vcl/win/source/gdi/winlayout.cxx @@ -2821,7 +2821,7 @@ sal_GlyphId GraphiteLayoutWinImpl::getKashidaGlyph(int & rWidth) class GraphiteWinLayout : public WinLayout { private: - mutable gr::WinFont mpFont; + mutable GraphiteWinFont mpFont; grutils::GrFeatureParser * mpFeatures; mutable GraphiteLayoutWinImpl maImpl; public: -- cgit v1.2.1 From 226e11dc0d822c203f2f0ed29f14b20dc53c5e00 Mon Sep 17 00:00:00 2001 From: Keith Stribley Date: Tue, 29 Jun 2010 14:14:34 +0630 Subject: graphite03: #i112730# updated graphite patch and improvements to glyph metric caching --- graphite/graphite-2.3.1.patch | 414 ++++++++++++++++++++++++++++++++++++++++-- graphite/makefile.mk | 17 +- 2 files changed, 409 insertions(+), 22 deletions(-) diff --git a/graphite/graphite-2.3.1.patch b/graphite/graphite-2.3.1.patch index badbd92ae740..934eb8eaad49 100644 --- a/graphite/graphite-2.3.1.patch +++ b/graphite/graphite-2.3.1.patch @@ -67,7 +67,7 @@ +###CPPFLAGS= /Zc:wchar_t- /nologo /W4 /GR /EHsc /I "./src/font" /I "./src/painter" /I "./src/segment" /I "./src/textsource" /I "./src/generic" /I "./include/graphite" /I "../wrappers/win32" /D "GR_NAMESPACE" /D "WIN32" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /D "TRACING" /Fp"$(INTDIR)\graphite.pch" /Fd"$(INTDIR)\\" /FD /c +### HDU: because for full binary compatibility with the rest of OOo all compile flags must match exactly +### which is especially true for template-heavy C++ code with non-default config (e.g. _STLP_DEBUG enabled) -+CPPFLAGS= $(CFLAGS4MSC) /nologo /W4 /I "./src/font" /I "./src/painter" /I "./src/segment" /I "./src/textsource" /I "./src/generic" /I "./include/graphite" /I "../wrappers/win32" /D "GR_NAMESPACE" /D "WIN32" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /D "TRACING" /Fp"$(INTDIR)\graphite.pch" /Fd"$(INTDIR)\\" /FD /c ++CPPFLAGS= $(CFLAGS4MSC) /nologo /W4 /I "./src/font" /I "./src/painter" /I "./src/segment" /I "./src/textsource" /I "./src/generic" /I "./include/graphite" /I "../wrappers/win32" /D "GR_NAMESPACE" /D "WIN32" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /D "TRACING" /Fp"$(INTDIR)\graphite.pch" /FD /c + # /Wp62 @@ -77,7 +77,33 @@ BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\\$(TARGET).bsc" -@@ -48,11 +52,7 @@ +@@ -24,21 +29,21 @@ + SBREXT = .sbr + + !IF "$(CFG)" == "DEBUG" +-CPP_DEBUG=/D "DEBUG" /Gm /GR /ZI /Od /RTC1 /FR"$(INTDIR)\\" /$(MLIB)d ++CPP_DEBUG=/D "DEBUG" /Gm /GR /Od /RTC1 /FR"$(INTDIR)\\" + # CPP_DEBUG=/D "DEBUG" /Gm /GR /ZI /Od /RTC1 /FR"$(INTDIR)\\" /MDd + + OUTDIR=.\debug + INTDIR=.\debug_temp +-LINK_DEBUG= MSVCRTD.lib /debug /incremental:yes #/pdbtype:sept ++LINK_DEBUG= /debug + + all : lib lib_dll bsc + + !ELSE +-CPP_DEBUG=/D "NDEBUG" /O2 /$(MLIB) ++CPP_DEBUG=/D "NDEBUG" /O2 + # CPP_DEBUG=/D "NDEBUG" /O2 /MD + OUTDIR=.\release + INTDIR=.\release_temp +-LINK_DEBUG= MSVCRT.lib /incremental:no /NODEFAULTLIB:libc ++LINK_DEBUG= /incremental:no /NODEFAULTLIB:libc + + all : lib lib_dll + +@@ -48,11 +53,7 @@ CPP_DEBUG=/D "TRACING" $(CPP_DEBUG) !ENDIF @@ -89,7 +115,7 @@ clean : @- rd /s/q .\release_temp -@@ -779,7 +779,7 @@ +@@ -779,7 +780,7 @@ @- $(CPP) $(CPPFLAGS) $(CPP_DEBUG) /Fo"$(INTDIR)\FileFont$(OBJEXT)" $? "$(INTDIR)\FileFont_dll$(OBJEXT)" : "src/font/FileFont.cpp" @@ -1200,39 +1226,51 @@ bool fSkipChunkStart, int cslotReprocess, bool fBackingUp) { Assert(AssertValid()); -@@ -1863,7 +1872,7 @@ +@@ -1863,7 +1872,11 @@ Ensure that the chunk maps for a pair of streams match properly. The recipient is the input stream. ----------------------------------------------------------------------------------------------*/ --void GrSlotStream::AssertChunkMapsValid(GrSlotStream * psstrmOut) -+void GrSlotStream::AssertChunkMapsValid(GrSlotStream * /*psstrmOut*/) ++#ifdef _DEBUG + void GrSlotStream::AssertChunkMapsValid(GrSlotStream * psstrmOut) ++#else ++void GrSlotStream::AssertChunkMapsValid(GrSlotStream * ) ++#endif { #ifdef _DEBUG GrSlotStream * psstrmIn = this; -@@ -1915,7 +1924,7 @@ +@@ -1915,7 +1924,11 @@ Ensure that corresponding items in the streams of a positioning pass have matching stream indices. The recipient is the output stream. ----------------------------------------------------------------------------------------------*/ --void GrSlotStream::AssertStreamIndicesValid(GrSlotStream * psstrmIn) -+void GrSlotStream::AssertStreamIndicesValid(GrSlotStream * /*psstrmIn*/) ++#ifdef _DEBUG + void GrSlotStream::AssertStreamIndicesValid(GrSlotStream * psstrmIn) ++#else ++void GrSlotStream::AssertStreamIndicesValid(GrSlotStream * ) ++#endif { #ifdef _DEBUG if (!GotIndexOffset()) -@@ -1939,7 +1948,7 @@ +@@ -1939,7 +1948,11 @@ in the output stream. (Currently the compiler ensures this by making it an error to write rules that don't do this.) ----------------------------------------------------------------------------------------------*/ --void GrSlotStream::AssertAttachmentsInOutput(int islotMin, int islotLim) -+void GrSlotStream::AssertAttachmentsInOutput(int /*islotMin*/, int /*islotLim*/) ++#ifdef _DEBUG + void GrSlotStream::AssertAttachmentsInOutput(int islotMin, int islotLim) ++#else ++void GrSlotStream::AssertAttachmentsInOutput(int , int ) ++#endif { #ifdef _DEBUG for (int islot = islotMin; islot < islotLim; islot++) -@@ -2007,7 +2016,7 @@ +@@ -2007,7 +2016,11 @@ Record the number of slots in the stream that are previous to the official start of the segment. ----------------------------------------------------------------------------------------------*/ --void GrSlotStream::CalcIndexOffset(GrTableManager * ptman) -+void GrSlotStream::CalcIndexOffset(GrTableManager * /*ptman*/) ++#ifdef _DEBUG + void GrSlotStream::CalcIndexOffset(GrTableManager * ptman) ++#else ++void GrSlotStream::CalcIndexOffset(GrTableManager * ) ++#endif { if (GotIndexOffset()) return; // already figured it @@ -1990,6 +2028,94 @@ *pclrBack = kclrTransparent; --- misc/silgraphite-2.3.1/wrappers/win32/WinFont.cpp Thu Jan 29 10:33:19 2009 +++ misc/build/silgraphite-2.3.1/wrappers/win32/WinFont.cpp Sat Aug 22 19:36:36 2009 +@@ -70,6 +72,7 @@ + // But don't store m_hfont, because we don't really "own" it; the client is + // responsible for releasing it. + m_hfont = 0; ++ m_pGlyphMetricMap = NULL; + memset(&m_fpropSet, 0, sizeof(m_fpropSet)); + + m_pbCmapTbl = NULL; +@@ -196,6 +198,7 @@ + m_hdc = 0; + m_hfont = 0; + m_hfontClient = 0; ++ m_pGlyphMetricMap = NULL; + memset(&m_fpropSet, 0, sizeof(FontProps)); + + m_pbCmapTbl = NULL; +@@ -408,7 +410,7 @@ + if (pPolyCurve->wType == TT_PRIM_QSPLINE && + // test if this is the last curve + pPolyHdr->cb - (int)((byte *)(&pPolyCurve->apfx[j]) - (byte *)(pPolyHdr)) +- == sizeof POINTFX && ++ == sizeof (POINTFX) && + // and the two points are identical + CompareFixed(pPolyCurve->apfx[j].x, pPolyHdr->pfxStart.x) && + CompareFixed(pPolyCurve->apfx[j].y, pPolyHdr->pfxStart.y)) +@@ -457,6 +459,16 @@ + ----------------------------------------------------------------------------------------------*/ + void WinFont::getGlyphMetrics(gid16 chw, gr::Rect & boundingBox, gr::Point & advances) + { ++ if (m_pGlyphMetricMap) ++ { ++ GlyphMetricMap::iterator i = m_pGlyphMetricMap->find(chw); ++ if (i != m_pGlyphMetricMap->end()) ++ { ++ boundingBox = i->second.first; ++ advances = i->second.second; ++ return; ++ } ++ } + GLYPHMETRICS gm; + const MAT2 mat2 = {{0,1}, {0,0}, {0,0}, {0,1}}; + if (GDI_ERROR == ::GetGlyphOutline(m_hdc, chw, GGO_GLYPH_INDEX | GGO_METRICS, +@@ -474,6 +476,10 @@ + boundingBox.bottom = (float)gm.gmptGlyphOrigin.y - gm.gmBlackBoxY; + advances.x = gm.gmCellIncX; + advances.y = gm.gmCellIncY; ++ if (m_pGlyphMetricMap) ++ { ++ (*m_pGlyphMetricMap)[chw] = std::pair(boundingBox, advances); ++ } + } + + /*---------------------------------------------------------------------------------------------- +@@ -618,7 +620,10 @@ + + static int cCreateFontCalls = 0; + static int cCreateFontZero = 0; +- HFONT hfont = g_fhc.GetFont(lf); ++ FontHandleCache::FontCacheValue cache = g_fhc.GetCache(lf); ++ HFONT hfont = cache.hfont; ++ m_pGlyphMetricMap = cache.pGlyphMetricMap; ++ //HFONT hfont = g_fhc.GetFont(lf); + //char ch1[200]; + //if (hfont == 0) + //{ +@@ -731,7 +733,7 @@ + @param lf LOGFONT value that describes the desired font + @return Font handle + ----------------------------------------------------------------------------------------------*/ +-HFONT WinFont::FontHandleCache::GetFont(LOGFONT & lf) ++WinFont::FontHandleCache::FontCacheValue WinFont::FontHandleCache::GetCache(LOGFONT & lf) + { + FontCacheValue fcv; + FontHandleHashMap::iterator itFound = m_hmlffcv.find(lf); +@@ -752,11 +754,12 @@ + THROW(kresFail); + + fcv.nRefs = 1; ++ fcv.pGlyphMetricMap = new GlyphMetricMap(); + + m_hmlffcv.insert(std::pair(lf, fcv)); + } + +- return fcv.hfont; ++ return fcv; + } + + /*---------------------------------------------------------------------------------------------- @@ -767,7 +767,7 @@ ----------------------------------------------------------------------------------------------*/ void WinFont::FontHandleCache::DeleteFont(HFONT hfont) @@ -1999,11 +2125,31 @@ return; // find the font in the hash map +@@ -782,6 +784,8 @@ + { + // delete font + ::DeleteObject(hfont); ++ if (fcv.pGlyphMetricMap) ++ delete fcv.pGlyphMetricMap; + m_hmlffcv.erase(it); + } + else +@@ -832,7 +832,8 @@ + bool WinFont::LogFontHashFuncs::operator() (const WinFont::LogFontWrapper & key1, + const WinFont::LogFontWrapper & key2) const + { +- return (key1 == key2); ++ // return true if key1 should be ordered before key2 ++ return (operator()(key1) < operator()(key2)); + } + + /*-------------------------------------------------------------------------------------- --- misc/silgraphite-2.3.1/wrappers/win32/WinFont.h Thu Jan 29 10:33:19 2009 +++ misc/build/silgraphite-2.3.1/wrappers/win32/WinFont.h Sat Aug 22 19:36:36 2009 -@@ -27,6 +27,10 @@ +@@ -27,7 +27,13 @@ #include "GrClient.h" #include "Font.h" ++#include +#ifdef _STLPORT_VERSION +namespace stdext = _STLP_STD; @@ -2011,4 +2157,240 @@ + namespace gr { ++typedef std::map > GlyphMetricMap; + + class FontFace; +@@ -100,6 +110,7 @@ + HFONT m_hfontClient; // need to replace this HFONT into the DC when we are finished + // with it + ++ GlyphMetricMap * m_pGlyphMetricMap; + // Debugging: + //OLECHAR m_rgchTemp[32]; + +@@ -185,11 +196,13 @@ + class FontHandleCache // hungarian: fhc + { + public: +- struct FontCacheValue ++ struct FontCacheValue + { + int nRefs; // reference count + HFONT hfont; // font handle + ++ GlyphMetricMap * pGlyphMetricMap; // glyph metrics ++ + bool operator==(const FontCacheValue & val) const + { + return (hfont == val.hfont); +@@ -199,7 +212,8 @@ + FontHandleCache() : m_bValid(true) {}; + ~FontHandleCache(); + +- HFONT GetFont(LOGFONT & lf); ++ //HFONT GetFont(LOGFONT & lf); ++ FontCacheValue GetCache(LOGFONT & lf); + void DeleteFont(HFONT hfont); + + typedef stdext::hash_map FontHandleHashMap; +--- misc/build/silgraphite-2.3.1/engine/test/RegressionTest/RtTextSrc.h~ 2009-01-22 05:06:42.000000000 +0630 ++++ misc/build/silgraphite-2.3.1/engine/test/RegressionTest/RtTextSrc.h 2010-04-30 23:14:49.000000000 +0630 +@@ -44,18 +44,18 @@ + } + } + +- virtual size_t getFontFeatures(toffset ich, FeatureSetting * prgfset) ++ virtual size_t getFontFeatures(toffset /*ich*/, FeatureSetting * prgfset) + { + // Note: size of prgfset buffer = gr::kMaxFeatures = 64 + std::copy(m_fset, m_fset + MAXFEAT, prgfset); + return m_cFeats; + } + +- virtual bool getRightToLeft(toffset ich) ++ virtual bool getRightToLeft(toffset /*ich*/) + { + return m_fRtl; + } +- virtual unsigned int getDirectionDepth(toffset ich) ++ virtual unsigned int getDirectionDepth(toffset /*ich*/) + { + return ((m_fRtl == 1) ? 1 : 0); + } + +--- misc/build/silgraphite-2.3.1/engine/test/RegressionTest/GrJustifier.cpp 2010-06-21 12:55:34.000000000 +0630 ++++ misc/build/silgraphite-2.3.1/engine/test/RegressionTest/GrJustifier.cpp 2010-06-21 13:16:59.000000000 +0630 +@@ -16,8 +16,9 @@ + //:> Include files + //:>******************************************************************************************** + //#include "main.h" // This is used by clients, so main.h is not available +- ++#ifdef _MSC_VER + #pragma hdrstop ++#endif + // any other headers (not precompiled) + #include "GrClient.h" + #include "ITextSource.h" +@@ -31,9 +32,6 @@ + #include + #endif + +-#undef THIS_FILE +-DEFINE_THIS_FILE +- + //:>******************************************************************************************** + //:> Global constants + //:>******************************************************************************************** +@@ -327,9 +325,9 @@ + &dxStretchAchieved); + for (int iiiGlyph = 0; iiiGlyph < cStretchable; iiiGlyph++) + { +- iiGlyph = viiGlyphsRem[iiiGlyph]; +- vdxStretchLeft[iiGlyph] = vdxStretchRem[iiiGlyph]; +- vdxWidth[iiGlyph] = vdxWidthRem[iiiGlyph]; ++ int ivGlyph = viiGlyphsRem[iiiGlyph]; ++ vdxStretchLeft[ivGlyph] = vdxStretchRem[iiiGlyph]; ++ vdxWidth[ivGlyph] = vdxWidthRem[iiiGlyph]; + } + } + else +@@ -366,12 +364,12 @@ + { + #ifdef WIN32 + wchar_t rgchw[20]; +- std::fill_n(rgchw, 20, 0); ++ std::fill_n(rgchw, 20, L'\0'); + _itow(dxStretchNeeded - dxStretchAchieved, rgchw, 10); + std::wstring strTmp(L"justification failed by "); + strTmp += rgchw; + strTmp += L" units (width needed = "; +- std::fill_n(rgchw, 10, 0); ++ std::fill_n(rgchw, 10, L'\0'); + _itow(dxDesiredWidth, rgchw, 10); + strTmp += rgchw; + strTmp += L")\n"; +--- misc/build/silgraphite-2.3.1/engine/test/RegressionTest/GrJustifier.h 2009-01-22 05:06:42.000000000 +0630 ++++ misc/build/silgraphite-2.3.1/engine/test/RegressionTest/GrJustifier.h 2010-06-21 13:16:49.000000000 +0630 +@@ -11,7 +11,9 @@ + Description: + A default justification agent for Graphite. + -------------------------------------------------------------------------------*//*:End Ignore*/ ++#ifdef _MSC_VER + #pragma once ++#endif + #ifndef GRJUSTIFIER_INCLUDED + #define GRJUSTIFIER_INCLUDED + +--- misc/build/silgraphite-2.3.1/engine/test/RegressionTest/SimpleTextSrc.h 2010-06-21 12:55:34.000000000 +0630 ++++ misc/build/silgraphite-2.3.1/engine/test/RegressionTest/SimpleTextSrc.h 2010-06-21 13:18:12.000000000 +0630 +@@ -11,7 +11,9 @@ + Description: + A simple text source that shows how to use this interface within Graphite. + -------------------------------------------------------------------------------*//*:End Ignore*/ ++#ifdef _MSC_VER + #pragma once ++#endif + #ifndef GRTXTSRC_INCLUDED + #define GRTXTSRC_INCLUDED + + +--- misc/build/silgraphite-2.3.1/engine/test/RegressionTest/SimpleTextSrc.cpp 2010-06-21 12:55:34.000000000 +0630 ++++ misc/build/silgraphite-2.3.1/engine/test/RegressionTest/SimpleTextSrc.cpp 2010-06-21 13:18:24.000000000 +0630 +@@ -15,7 +15,9 @@ + //:>******************************************************************************************** + //:> Include files + //:>******************************************************************************************** ++#ifdef _MSC_VER + #pragma hdrstop ++#endif + // any other headers (not precompiled) + + #include "GrClient.h" +@@ -23,9 +25,6 @@ + #include "ITextSource.h" + #include "SimpleTextSrc.h" + +-#undef THIS_FILE +-DEFINE_THIS_FILE +- + //:>******************************************************************************************** + //:> Initialization and destruction + //:>******************************************************************************************** +--- misc/build/silgraphite-2.3.1/engine/src/segment/MemoryUsage.cpp 2009-01-22 05:06:42.000000000 +0630 ++++ misc/build/silgraphite-2.3.1/engine/src/segment/MemoryUsage.cpp 2010-06-21 13:36:36.000000000 +0630 +@@ -11,10 +11,10 @@ + Description: + Calculates memory usage for the engine and segments. + ----------------------------------------------------------------------------------------------*/ +- ++#ifdef _MSC_VER + #pragma warning(disable: 4244) // conversion from wchar_t to char + #pragma warning(disable: 4702) // unreachable code +- ++#endif + //:>******************************************************************************************** + //:> Include files + //:>******************************************************************************************** +@@ -54,8 +54,6 @@ + #ifdef _MSC_VER + #pragma hdrstop + #endif +-#undef THIS_FILE +-DEFINE_THIS_FILE + + //:End Ignore + +--- misc/build/silgraphite-2.3.1/engine/src/segment/GrSlotState.h 2010-06-23 19:52:56.429060400 +0700 ++++ misc/build/silgraphite-2.3.1/engine/src/segment/GrSlotState.h 2010-05-25 11:51:15.195066300 +0700 +@@ -48,7 +48,7 @@ + { + } + +- ~GrSlotAbstract() ++ virtual ~GrSlotAbstract() + { + // the table manager is responsible for destroying the contents of m_prgnVarLenBuf + } +@@ -231,7 +231,7 @@ + ZapCompositeMetrics(); + } + +- ~GrSlotState() ++ virtual ~GrSlotState() + { + } + +--- misc/build/silgraphite-2.3.1/engine/src/segment/Segment.cpp.bak 2010-06-23 19:59:54.611660400 +0700 ++++ misc/build/silgraphite-2.3.1/engine/src/segment/Segment.cpp 2010-06-23 21:30:16.335460400 +0700 +@@ -246,6 +246,8 @@ + + m_dxsVisibleWidth = -1; + m_dxsTotalWidth = -1; ++ m_ichwAssocsMin = 0; ++ m_ichwAssocsLim = 0; + + // m_psstrm = NULL; + m_prgslout = NULL; +@@ -2988,9 +2988,10 @@ + return kresOk; + } + +- ++#ifdef __GNUC__ + // suppress GCC 4.3 warning for optimized min()/max() when called with (ich, ich+1) or similar + #pragma GCC diagnostic ignored "-Wstrict-overflow" ++#endif + + /*---------------------------------------------------------------------------------------------- + Merge the given characters into the same Uniscribe cluster. This means merging any +--- misc/build/silgraphite-2.3.1/wrappers/win32/win32_dll.cpp.bak 2008-05-09 18:10:30.000000000 +0700 ++++ misc/build/silgraphite-2.3.1/wrappers/win32/win32_dll.cpp 2010-05-10 15:46:54.291818000 +0700 +@@ -14,7 +14,7 @@ + DllMain. This is the main DLL entry point for a non-MFC DLL. For an MFC DLL, DllMain is + in DllModul.cpp. Both DllMains call ModuleEntry::DllMain. + ----------------------------------------------------------------------------------------------*/ +-extern "C" BOOL WINAPI DllMain(HMODULE hmod, DWORD dwReason, PVOID pvReserved) ++extern "C" BOOL WINAPI DllMain(HMODULE hmod, DWORD dwReason, PVOID /*pvReserved*/) + { + bool fRet = true; diff --git a/graphite/makefile.mk b/graphite/makefile.mk index 2f4ff2535442..58735e1d6a7d 100644 --- a/graphite/makefile.mk +++ b/graphite/makefile.mk @@ -51,7 +51,8 @@ PATCH_FILES=graphite-2.3.1.patch # convert line-endings to avoid problems when patching CONVERTFILES=\ - engine/makefile.vc8 + engine/makefile.vc8 \ + engine/test/RegressionTest/RtTextSrc.h #.IF "$(OS)"=="WNT" && "$(COM)"!="GCC" #CONFIGURE_DIR=win32 @@ -72,14 +73,18 @@ EXT_USE_STLPORT=TRUE BUILD_ACTION=nmake VERBOSE=1 .IF "$(debug)"=="true" BUILD_FLAGS= "CFG=DEBUG" +CFLAGSWITHPATH= $(CFLAGS:s!-Fd.!-Fd../../../../../!) +.ELSE +# Speed Optimization is really needed for Graphite +CFLAGSWITHPATH= $(CFLAGS) /O2 .ENDIF ### convert CFLAGS as cl.exe cannot handle OOO"s generic ones directly ### TODO: use "guw.exe" instead? -ALLCFLAGS= $(CFLAGS) $(CFLAGSCXX) $(CFLAGSEXCEPTIONS) $(CDEFS) +ALLCFLAGS= $(CFLAGSWITHPATH) $(CFLAGSCXX) $(CFLAGSEXCEPTIONS) $(CDEFS) JUSTASLASH= / CFLAGS2MSC= $(ALLCFLAGS:s/-Z/$(JUSTASLASH)Z/) CFLAGS4MSC= $(CFLAGS2MSC:s/ -/ $(JUSTASLASH)/) -BUILD_FLAGS+= "MLIB=MD" "CFLAGS4MSC=$(CFLAGS4MSC)" /F makefile.vc$(VCNUM) dll +BUILD_FLAGS+= "CFLAGS4MSC=$(CFLAGS4MSC)" /F makefile.vc$(VCNUM) lib_dll .ENDIF .IF "$(COM)"=="GCC" @@ -138,11 +143,11 @@ OUT2LIB+=src$/.libs$/libgraphite.*.dylib #OUT2LIB+=engine$/src$/.libs$/libgraphite*.dll .IF "$(debug)"=="true" OUT2BIN= \ - engine$/debug$/*.dll \ +# engine$/debug$/*.dll \ engine$/debug$/*.pdb .ELSE -OUT2BIN= \ - engine$/release$/*.dll +OUT2BIN= +# engine$/release$/*.dll # engine$/release$/*.pdb .ENDIF .ELSE -- cgit v1.2.1 From 7e954cc28b29865b3495fe496ed3010e89e04d3d Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Tue, 29 Jun 2010 14:58:20 +0200 Subject: #i112758# better fix to free static bitmaps on vcl deinit --- sd/source/ui/inc/view/viewoverlaymanager.hxx | 3 -- sd/source/ui/view/viewoverlaymanager.cxx | 76 +++++++++++++++++----------- 2 files changed, 47 insertions(+), 32 deletions(-) diff --git a/sd/source/ui/inc/view/viewoverlaymanager.hxx b/sd/source/ui/inc/view/viewoverlaymanager.hxx index ea6b27dc09f3..32820c1f27a7 100755 --- a/sd/source/ui/inc/view/viewoverlaymanager.hxx +++ b/sd/source/ui/inc/view/viewoverlaymanager.hxx @@ -59,9 +59,6 @@ public: virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); - static BitmapEx* maLargeButtonImages[BMP_PLACEHOLDER_LARGE_END - BMP_PLACEHOLDER_LARGE_START]; - static BitmapEx* maSmallButtonImages[BMP_PLACEHOLDER_SMALL_END - BMP_PLACEHOLDER_SMALL_START]; - private: void UpdateImages(); diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index 106cfb4f6d51..eb75a7a60f14 100755 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -45,6 +45,7 @@ #include #include +#include #include #include @@ -79,8 +80,17 @@ class ImageButtonHdl; // -------------------------------------------------------------------- -BitmapEx* ViewOverlayManager::maSmallButtonImages[BMP_PLACEHOLDER_SMALL_END - BMP_PLACEHOLDER_SMALL_START] = { 0, 0, 0, 0 }; -BitmapEx* ViewOverlayManager::maLargeButtonImages[BMP_PLACEHOLDER_LARGE_END - BMP_PLACEHOLDER_LARGE_START] = { 0, 0, 0, 0 }; +static BitmapEx ** getLargeButtonImages() +{ + for( sal_uInt16 i = 0; i < (BMP_PLACEHOLDER_SMALL_END-BMP_PLACEHOLDER_SMALL_START); i++ ) + { + delete getSmallButtonImages()[i].set( new BitmapEx( loadImageResource( BMP_PLACEHOLDER_SMALL_START + i ) ) ); + delete getLargeButtonImages()[i].set( new BitmapEx( loadImageResource( BMP_PLACEHOLDER_LARGE_START + i ) ) ); + } + return &gLargeButtonImages[0]; +} + +// -------------------------------------------------------------------- static USHORT gButtonSlots[] = { SID_INSERT_TABLE, SID_INSERT_DIAGRAM, SID_INSERT_GRAPHIC, SID_INSERT_AVMEDIA }; static USHORT gButtonToolTips[] = { STR_INSERT_TABLE, STR_INSERT_CHART, STR_INSERT_PICTURE, STR_INSERT_MOVIE }; @@ -97,6 +107,32 @@ static BitmapEx loadImageResource( USHORT nId ) // -------------------------------------------------------------------- +static BitmapEx* getButtonImage( int index, bool large ) +{ + static vcl::DeleteOnDeinit< BitmapEx > gSmallButtonImages[BMP_PLACEHOLDER_SMALL_END - BMP_PLACEHOLDER_SMALL_START] = { 0, 0, 0, 0, 0, 0, 0, 0 }; + static vcl::DeleteOnDeinit< BitmapEx > gLargeButtonImages[BMP_PLACEHOLDER_LARGE_END - BMP_PLACEHOLDER_LARGE_START] = { 0, 0, 0, 0, 0, 0, 0, 0 }; + + if( !gSmallButtonImages[0].get() ) + { + for( sal_uInt16 i = 0; i < (BMP_PLACEHOLDER_SMALL_END-BMP_PLACEHOLDER_SMALL_START); i++ ) + { + gSmallButtonImages[i].set( new BitmapEx( loadImageResource( BMP_PLACEHOLDER_SMALL_START + i ) ) ); + gLargeButtonImages[i].set( new BitmapEx( loadImageResource( BMP_PLACEHOLDER_LARGE_START + i ) ) ); + } + } + + if( large ) + { + return gLargeButtonImages[index].get(); + } + else + { + return gSmallButtonImages[index].get(); + } +} + +// -------------------------------------------------------------------- + const sal_uInt32 SMART_TAG_HDL_NUM = SAL_MAX_UINT32; class ChangePlaceholderTag : public SmartTag @@ -374,20 +410,20 @@ BitmapEx ChangePlaceholderTag::createOverlayImage( int nHighlight ) Size aShapeSizePix = pDev->LogicToPixel(rSnapRect.GetSize()); long nShapeSizePix = std::min(aShapeSizePix.Width(),aShapeSizePix.Height()); - BitmapEx** ppImages = (nShapeSizePix > 250) ? &ViewOverlayManager::maLargeButtonImages[0] : &ViewOverlayManager::maSmallButtonImages[0]; + bool bLarge = (nShapeSizePix > 250; - Size aSize( ppImages[0]->GetSizePixel() ); + Size aSize( ppImages[0].get()->GetSizePixel() ); aRet.SetSizePixel( Size( aSize.Width() << 1, aSize.Height() << 1 ) ); const Rectangle aRectSrc( Point( 0, 0 ), aSize ); - aRet = *(ppImages[(nHighlight == 0) ? 4 : 0]); + aRet = *(ppImages[(nHighlight == 0) ? 4 : 0].get()); aRet.Expand( aSize.Width(), aSize.Height(), NULL, TRUE ); - aRet.CopyPixel( Rectangle( Point( aSize.Width(), 0 ), aSize ), aRectSrc, ppImages[(nHighlight == 1) ? 5 : 1] ); - aRet.CopyPixel( Rectangle( Point( 0, aSize.Height() ), aSize ), aRectSrc, ppImages[(nHighlight == 2) ? 6 : 2] ); - aRet.CopyPixel( Rectangle( Point( aSize.Width(), aSize.Height() ), aSize ), aRectSrc, ppImages[(nHighlight == 3) ? 7 : 3] ); + aRet.CopyPixel( Rectangle( Point( aSize.Width(), 0 ), aSize ), aRectSrc, ppImages[(nHighlight == 1) ? 5 : 1].get() ); + aRet.CopyPixel( Rectangle( Point( 0, aSize.Height() ), aSize ), aRectSrc, ppImages[(nHighlight == 2) ? 6 : 2].get() ); + aRet.CopyPixel( Rectangle( Point( aSize.Width(), aSize.Height() ), aSize ), aRectSrc, ppImages[(nHighlight == 3) ? 7 : 3].get() ); } return aRet; @@ -411,9 +447,9 @@ void ChangePlaceholderTag::addCustomHandles( SdrHdlList& rHandlerList ) if( 50 > nShapeSizePix ) return; - BitmapEx* pImages = (nShapeSizePix > 250) ? ViewOverlayManager::maLargeButtonImages[0] : ViewOverlayManager::maSmallButtonImages[0]; + vcl::DeleteOnDeinit< BitmapEx >* pImages = (nShapeSizePix > 250) ? getLargeButtonImages() : getSmallButtonImages(); - Size aButtonSize( pDev->PixelToLogic(pImages->GetSizePixel()) ); + Size aButtonSize( pDev->PixelToLogic(pImages[0].get()->GetSizePixel()) ); const int nColumns = 2; const int nRows = 2; @@ -490,24 +526,6 @@ ViewOverlayManager::~ViewOverlayManager() // -------------------------------------------------------------------- -void ViewOverlayManager::UpdateImages() -{ - for( sal_uInt16 i = 0; i < (BMP_PLACEHOLDER_SMALL_END-BMP_PLACEHOLDER_SMALL_START); i++ ) - { - if( maSmallButtonImages[i] ) - delete maSmallButtonImages[i]; - - maSmallButtonImages[i] = new BitmapEx( loadImageResource( BMP_PLACEHOLDER_SMALL_START + i ) ); - - if( maLargeButtonImages[i] ) - delete maLargeButtonImages[i]; - - maLargeButtonImages[i] = new BitmapEx( loadImageResource( BMP_PLACEHOLDER_LARGE_START + i ) ); - } -} - -// -------------------------------------------------------------------- - void ViewOverlayManager::Notify(SfxBroadcaster&, const SfxHint& rHint) { const SfxSimpleHint* pSimpleHint = dynamic_cast(&rHint); @@ -555,7 +573,7 @@ bool ViewOverlayManager::CreateTags() if( pPage ) { - if( !maSmallButtonImages[0] ) + if( !getSmallButtonImages()[0].get() ) UpdateImages(); const std::list< SdrObject* >& rShapes = pPage->GetPresentationShapeList().getList(); -- cgit v1.2.1 From c3761bf385210caa80817f5fd1610f4464642740 Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Tue, 29 Jun 2010 15:57:13 +0200 Subject: #i112758# final fix for static BitmapEx --- sd/source/ui/inc/view/viewoverlaymanager.hxx | 2 -- sd/source/ui/view/viewoverlaymanager.cxx | 31 +++++++--------------------- 2 files changed, 8 insertions(+), 25 deletions(-) diff --git a/sd/source/ui/inc/view/viewoverlaymanager.hxx b/sd/source/ui/inc/view/viewoverlaymanager.hxx index 32820c1f27a7..9b56267ff327 100755 --- a/sd/source/ui/inc/view/viewoverlaymanager.hxx +++ b/sd/source/ui/inc/view/viewoverlaymanager.hxx @@ -60,8 +60,6 @@ public: virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); private: - void UpdateImages(); - ViewShellBase& mrBase; ULONG mnUpdateTagsEvent; diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index eb75a7a60f14..447f50ec2222 100755 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -80,18 +80,6 @@ class ImageButtonHdl; // -------------------------------------------------------------------- -static BitmapEx ** getLargeButtonImages() -{ - for( sal_uInt16 i = 0; i < (BMP_PLACEHOLDER_SMALL_END-BMP_PLACEHOLDER_SMALL_START); i++ ) - { - delete getSmallButtonImages()[i].set( new BitmapEx( loadImageResource( BMP_PLACEHOLDER_SMALL_START + i ) ) ); - delete getLargeButtonImages()[i].set( new BitmapEx( loadImageResource( BMP_PLACEHOLDER_LARGE_START + i ) ) ); - } - return &gLargeButtonImages[0]; -} - -// -------------------------------------------------------------------- - static USHORT gButtonSlots[] = { SID_INSERT_TABLE, SID_INSERT_DIAGRAM, SID_INSERT_GRAPHIC, SID_INSERT_AVMEDIA }; static USHORT gButtonToolTips[] = { STR_INSERT_TABLE, STR_INSERT_CHART, STR_INSERT_PICTURE, STR_INSERT_MOVIE }; @@ -410,20 +398,20 @@ BitmapEx ChangePlaceholderTag::createOverlayImage( int nHighlight ) Size aShapeSizePix = pDev->LogicToPixel(rSnapRect.GetSize()); long nShapeSizePix = std::min(aShapeSizePix.Width(),aShapeSizePix.Height()); - bool bLarge = (nShapeSizePix > 250; + bool bLarge = nShapeSizePix > 250; - Size aSize( ppImages[0].get()->GetSizePixel() ); + Size aSize( getButtonImage( 0, bLarge )->GetSizePixel() ); aRet.SetSizePixel( Size( aSize.Width() << 1, aSize.Height() << 1 ) ); const Rectangle aRectSrc( Point( 0, 0 ), aSize ); - aRet = *(ppImages[(nHighlight == 0) ? 4 : 0].get()); + aRet = *(getButtonImage((nHighlight == 0) ? 4 : 0, bLarge)); aRet.Expand( aSize.Width(), aSize.Height(), NULL, TRUE ); - aRet.CopyPixel( Rectangle( Point( aSize.Width(), 0 ), aSize ), aRectSrc, ppImages[(nHighlight == 1) ? 5 : 1].get() ); - aRet.CopyPixel( Rectangle( Point( 0, aSize.Height() ), aSize ), aRectSrc, ppImages[(nHighlight == 2) ? 6 : 2].get() ); - aRet.CopyPixel( Rectangle( Point( aSize.Width(), aSize.Height() ), aSize ), aRectSrc, ppImages[(nHighlight == 3) ? 7 : 3].get() ); + aRet.CopyPixel( Rectangle( Point( aSize.Width(), 0 ), aSize ), aRectSrc, getButtonImage((nHighlight == 1) ? 5 : 1, bLarge) ); + aRet.CopyPixel( Rectangle( Point( 0, aSize.Height() ), aSize ), aRectSrc, getButtonImage((nHighlight == 2) ? 6 : 2, bLarge) ); + aRet.CopyPixel( Rectangle( Point( aSize.Width(), aSize.Height() ), aSize ), aRectSrc, getButtonImage((nHighlight == 3) ? 7 : 3, bLarge) ); } return aRet; @@ -447,9 +435,9 @@ void ChangePlaceholderTag::addCustomHandles( SdrHdlList& rHandlerList ) if( 50 > nShapeSizePix ) return; - vcl::DeleteOnDeinit< BitmapEx >* pImages = (nShapeSizePix > 250) ? getLargeButtonImages() : getSmallButtonImages(); + bool bLarge = nShapeSizePix > 250; - Size aButtonSize( pDev->PixelToLogic(pImages[0].get()->GetSizePixel()) ); + Size aButtonSize( pDev->PixelToLogic( getButtonImage(0, bLarge )->GetSizePixel()) ); const int nColumns = 2; const int nRows = 2; @@ -573,9 +561,6 @@ bool ViewOverlayManager::CreateTags() if( pPage ) { - if( !getSmallButtonImages()[0].get() ) - UpdateImages(); - const std::list< SdrObject* >& rShapes = pPage->GetPresentationShapeList().getList(); for( std::list< SdrObject* >::const_iterator iter( rShapes.begin() ); iter != rShapes.end(); iter++ ) -- cgit v1.2.1 From b6e30719dde5f67290a1b77891d3435ee7da2f9e Mon Sep 17 00:00:00 2001 From: Andre Fischer Date: Tue, 29 Jun 2010 16:13:34 +0200 Subject: impress193: #i112647# Integrated diff from MAV. --- sfx2/source/view/frame2.cxx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx index d99ad8733e03..d43512ac791d 100644 --- a/sfx2/source/view/frame2.cxx +++ b/sfx2/source/view/frame2.cxx @@ -280,10 +280,7 @@ SfxFrame* SfxFrame::Create( SfxObjectShell& rDoc, Window& rWindow, USHORT nViewI aLoadArgs = aArgs.getPropertyValues(); // load the doc into that frame - ::rtl::OUString sLoaderURL( rDoc.GetModel()->getURL() ); - if ( sLoaderURL.getLength() == 0 ) - sLoaderURL = rDoc.GetFactory().GetFactoryURL(); - + ::rtl::OUString sLoaderURL( RTL_CONSTASCII_USTRINGPARAM( "private:object" ) ); Reference< XComponentLoader > xLoader( xFrame, UNO_QUERY_THROW ); xLoader->loadComponentFromURL( sLoaderURL, -- cgit v1.2.1 From bed0ccb3f6678949b506de0b0f703b3109cf0f35 Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Tue, 29 Jun 2010 17:05:06 +0200 Subject: #i112791# disable slide layout on master pages --- sd/source/ui/view/drviews7.cxx | 2 +- sd/source/ui/view/viewoverlaymanager.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index e853d3944ce0..5166c392292c 100755 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -301,7 +301,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) { SdPage* pPage = dynamic_cast< SdPage* >( pPageView->GetPage() ); - if( pPage ) + if( pPage && !pPage->IsMasterPage() ) { rSet.Put( SfxUInt32Item( SID_ASSIGN_LAYOUT, static_cast< sal_uInt32 >(pPage->GetAutoLayout()) ) ); bDisable = false; diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index 447f50ec2222..c1e1d9634844 100755 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -559,7 +559,7 @@ bool ViewOverlayManager::CreateTags() SdPage* pPage = mrBase.GetMainViewShell()->getCurrentPage(); - if( pPage ) + if( pPage && !pPage->IsMasterPage() && (pPage->GetPageKind() == PK_STANDARD) ) { const std::list< SdrObject* >& rShapes = pPage->GetPresentationShapeList().getList(); -- cgit v1.2.1 From cda79d479c7e49216e9dd1fc175c20dd93b15640 Mon Sep 17 00:00:00 2001 From: Andre Fischer Date: Tue, 29 Jun 2010 17:20:41 +0200 Subject: impress193: #i112301# Guarding againts missing view. --- sd/source/ui/view/Outliner.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index 356c03b82387..7c94e7b27b07 100755 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -942,7 +942,9 @@ void Outliner::RestoreStartPosition (void) else if (mpViewShell->ISA(OutlineViewShell)) { // Set cursor to its old position. - GetView(0)->SetSelection (maStartSelection); + OutlinerView* pView = GetView(0); + if (pView != NULL) + pView->SetSelection (maStartSelection); } } } -- cgit v1.2.1 From 54c602060aea164028ad3cfeebc0d2eb1daa6db4 Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Tue, 29 Jun 2010 17:52:44 +0200 Subject: #i112601# paint the correct page background --- sd/source/ui/func/fupage.cxx | 10 ++++++++++ sd/source/ui/inc/fupage.hxx | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) mode change 100644 => 100755 sd/source/ui/func/fupage.cxx mode change 100644 => 100755 sd/source/ui/inc/fupage.hxx diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx old mode 100644 new mode 100755 index 9fb0007cc72c..3dea67412fac --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -449,6 +449,16 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) } + // if background filling is set to master pages then clear from page set + if( mbMasterPage || bSetToAllPages ) + { + for( USHORT nWhich = XATTR_FILL_FIRST; nWhich <= XATTR_FILL_LAST; nWhich++ ) + { + pTempSet->ClearItem( nWhich ); + } + pTempSet->Put(XFillStyleItem(XFILL_NONE)); + } + const SfxPoolItem *pItem; if( SFX_ITEM_SET == pTempSet->GetItemState( EE_PARA_WRITINGDIR, sal_False, &pItem ) ) { diff --git a/sd/source/ui/inc/fupage.hxx b/sd/source/ui/inc/fupage.hxx old mode 100644 new mode 100755 index 6752e0421806..a0cd7b4d2e0a --- a/sd/source/ui/inc/fupage.hxx +++ b/sd/source/ui/inc/fupage.hxx @@ -50,7 +50,6 @@ class FuPage virtual void Deactivate(); // Function deaktivieren const SfxItemSet* ExecuteDialog( Window* pParent ); - void ApplyItemSet( const SfxItemSet* pArgs ); protected: virtual ~FuPage (void); @@ -63,6 +62,8 @@ private: SdDrawDocument* pDoc, SfxRequest& rReq ); + void ApplyItemSet( const SfxItemSet* pArgs ); + SfxRequest& mrReq; const SfxItemSet* mpArgs; SdBackgroundObjUndoAction* mpBackgroundObjUndoAction; -- cgit v1.2.1 From 1cad7ac9a61f02d6eeb4053c93f7a8d01a7eff52 Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Tue, 29 Jun 2010 17:52:44 +0200 Subject: #i112601# paint the correct page background --- svx/inc/svx/sdrmasterpagedescriptor.hxx | 3 +++ svx/inc/svx/svdpage.hxx | 1 + .../contact/viewcontactofmasterpagedescriptor.cxx | 18 +---------------- svx/source/svdraw/sdrmasterpagedescriptor.cxx | 23 ++++++++++++++++++++++ svx/source/svdraw/svdpage.cxx | 12 +++++++++++ svx/source/unodraw/UnoGraphicExporter.cxx | 14 +++++++++---- 6 files changed, 50 insertions(+), 21 deletions(-) diff --git a/svx/inc/svx/sdrmasterpagedescriptor.hxx b/svx/inc/svx/sdrmasterpagedescriptor.hxx index 612f2ab927ec..3a31c3d11206 100644 --- a/svx/inc/svx/sdrmasterpagedescriptor.hxx +++ b/svx/inc/svx/sdrmasterpagedescriptor.hxx @@ -35,6 +35,7 @@ // predeclarations class SdrObject; class SfxItemSet; +class SdrPageProperties; namespace sdr { @@ -89,6 +90,8 @@ namespace sdr // operators sal_Bool operator==(const MasterPageDescriptor& rCandidate) const; sal_Bool operator!=(const MasterPageDescriptor& rCandidate) const; + + const SdrPageProperties* getCorrectSdrPageProperties() const; }; } // end of namespace sdr diff --git a/svx/inc/svx/svdpage.hxx b/svx/inc/svx/svdpage.hxx index c601fddef181..784598d7d544 100644 --- a/svx/inc/svx/svdpage.hxx +++ b/svx/inc/svx/svdpage.hxx @@ -448,6 +448,7 @@ private: public: SdrPageProperties& getSdrPageProperties() { return *mpSdrPageProperties; } const SdrPageProperties& getSdrPageProperties() const { return *mpSdrPageProperties; } + const SdrPageProperties* getCorrectSdrPageProperties() const; protected: // new MasterPageDescriptorVector diff --git a/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx b/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx index cbe9c4a9c615..6ca5f1c4d172 100644 --- a/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx +++ b/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx @@ -62,23 +62,7 @@ namespace sdr { drawinglayer::primitive2d::Primitive2DSequence xRetval; drawinglayer::attribute::SdrFillAttribute aFill; - const SdrPage* pCorrectPage = &GetMasterPageDescriptor().GetOwnerPage(); - const SdrPageProperties* pCorrectProperties = &pCorrectPage->getSdrPageProperties(); - - if(XFILL_NONE == ((const XFillStyleItem&)pCorrectProperties->GetItemSet().Get(XATTR_FILLSTYLE)).GetValue()) - { - pCorrectPage = &GetMasterPageDescriptor().GetUsedPage(); - pCorrectProperties = &pCorrectPage->getSdrPageProperties(); - } - - if(pCorrectPage->IsMasterPage() && !pCorrectProperties->GetStyleSheet()) - { - // #i110846# Suppress SdrPage FillStyle for MasterPages without StyleSheets, - // else the PoolDefault (XFILL_COLOR and Blue8) will be used. Normally, all - // MasterPages should have a StyleSheet excactly for this reason, but historically - // e.g. the Notes MasterPage has no StyleSheet set (and there maybe others). - pCorrectProperties = 0; - } + const SdrPageProperties* pCorrectProperties = GetMasterPageDescriptor().getCorrectSdrPageProperties(); if(pCorrectProperties) { diff --git a/svx/source/svdraw/sdrmasterpagedescriptor.cxx b/svx/source/svdraw/sdrmasterpagedescriptor.cxx index 67b2de8b693c..eb757a8ee41c 100644 --- a/svx/source/svdraw/sdrmasterpagedescriptor.cxx +++ b/svx/source/svdraw/sdrmasterpagedescriptor.cxx @@ -113,6 +113,29 @@ namespace sdr || &maUsedPage != &rCandidate.maUsedPage || maVisibleLayers != rCandidate.maVisibleLayers); } + + const SdrPageProperties* MasterPageDescriptor::getCorrectSdrPageProperties() const + { + const SdrPage* pCorrectPage = &GetOwnerPage(); + const SdrPageProperties* pCorrectProperties = &pCorrectPage->getSdrPageProperties(); + + if(XFILL_NONE == ((const XFillStyleItem&)pCorrectProperties->GetItemSet().Get(XATTR_FILLSTYLE)).GetValue()) + { + pCorrectPage = &GetUsedPage(); + pCorrectProperties = &pCorrectPage->getSdrPageProperties(); + } + + if(pCorrectPage->IsMasterPage() && !pCorrectProperties->GetStyleSheet()) + { + // #i110846# Suppress SdrPage FillStyle for MasterPages without StyleSheets, + // else the PoolDefault (XFILL_COLOR and Blue8) will be used. Normally, all + // MasterPages should have a StyleSheet excactly for this reason, but historically + // e.g. the Notes MasterPage has no StyleSheet set (and there maybe others). + pCorrectProperties = 0; + } + + return pCorrectProperties; + } } // end of namespace sdr ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index 8da0b248f38b..592f41543132 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -1979,6 +1979,18 @@ void SdrPage::ReplaceCommentByIndex(sal_uInt32 nIndex, const sdr::Comment& rNew) } } +const SdrPageProperties* SdrPage::getCorrectSdrPageProperties() const +{ + if(mpMasterPageDescriptor) + { + return mpMasterPageDescriptor->getCorrectSdrPageProperties(); + } + else + { + return &getSdrPageProperties(); + } +} + ////////////////////////////////////////////////////////////////////////////// // use new redirector instead of pPaintProc diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index b80be1076b7e..c58e86f77fc3 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -634,10 +634,16 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic, { if( rSettings.mbExportOnlyBackground ) { - pTempBackgroundShape = new SdrRectObj(Rectangle(Point(0,0), pPage->GetSize())); - pTempBackgroundShape->SetMergedItemSet(pPage->getSdrPageProperties().GetItemSet()); - pTempBackgroundShape->SetMergedItem(XLineStyleItem(XLINE_NONE)); - aShapes.push_back(pTempBackgroundShape); + const SdrPageProperties* pCorrectProperties = pPage->getCorrectSdrPageProperties(); + + if(pCorrectProperties) + { + pTempBackgroundShape = new SdrRectObj(Rectangle(Point(0,0), pPage->GetSize())); + pTempBackgroundShape->SetMergedItemSet(pCorrectProperties->GetItemSet()); + pTempBackgroundShape->SetMergedItem(XLineStyleItem(XLINE_NONE)); + pTempBackgroundShape->NbcSetStyleSheet(pCorrectProperties->GetStyleSheet(), true); + aShapes.push_back(pTempBackgroundShape); + } } else { -- cgit v1.2.1 From e639921d24254e2496849d7393edcda81589a096 Mon Sep 17 00:00:00 2001 From: "Thomas Lange [tl]" Date: Wed, 30 Jun 2010 12:04:28 +0200 Subject: cws tl81: #i112813# missing thesaurus entrsy in Tools/Language --- sd/uiconfig/sdraw/menubar/menubar.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml index c03c6ce435cd..176f25cb06ff 100644 --- a/sd/uiconfig/sdraw/menubar/menubar.xml +++ b/sd/uiconfig/sdraw/menubar/menubar.xml @@ -213,7 +213,7 @@ - + -- cgit v1.2.1 From 9b0e62544b3ef60377c04943f211f4543f2c3a7c Mon Sep 17 00:00:00 2001 From: "Herbert Duerr [hdu]" Date: Wed, 30 Jun 2010 13:26:06 +0200 Subject: #i112365# ignore missing fc_local.conf files but complain about parse error in them --- vcl/unx/source/fontmanager/fontconfig.cxx | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/vcl/unx/source/fontmanager/fontconfig.cxx b/vcl/unx/source/fontmanager/fontconfig.cxx index 816c8fb0b4c4..69c5330977bd 100644 --- a/vcl/unx/source/fontmanager/fontconfig.cxx +++ b/vcl/unx/source/fontmanager/fontconfig.cxx @@ -854,19 +854,22 @@ bool PrintFontManager::addFontconfigDir( const rtl::OString& rDirName ) fprintf( stderr, "FcConfigAppFontAddDir( \"%s\") => %d\n", pDirName, bRet ); #endif - if( bDirOk ) + if( !bDirOk ) + return false; + + // load dir-specific fc-config file too if available + const rtl::OString aConfFileName = rDirName + "/fc_local.conf"; + FILE* pCfgFile = fopen( aConfFileName.getStr(), "rb" ); + if( pCfgFile ) { - const rtl::OString aConfFileName = rDirName + "/fc_local.conf"; + fclose( pCfgFile); bool bCfgOk = rWrapper.FcConfigParseAndLoad( rWrapper.FcConfigGetCurrent(), - (FcChar8*)aConfFileName.getStr(), FcTrue ); - (void)bCfgOk; // silence compiler warning - -#if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, "FcConfigParseAndLoad( \"%s\") => %d\n", aConfFileName.getStr(), bCfgOk ); -#endif + (FcChar8*)aConfFileName.getStr(), FcTrue ); + if( !bCfgOk ) + fprintf( stderr, "FcConfigParseAndLoad( \"%s\") => %d\n", aConfFileName.getStr(), bCfgOk ); } - return bDirOk; + return true; } static void addtopattern(FontCfgWrapper& rWrapper, FcPattern *pPattern, -- cgit v1.2.1 From f22687dd640b780ef17d00969c9918e0f073502d Mon Sep 17 00:00:00 2001 From: sj Date: Wed, 30 Jun 2010 13:51:07 +0200 Subject: impress193: #i112792,i112794# fixed crash (resulting from merge conflict), fixed zero sized/placed placeholder objects --- oox/inc/oox/ppt/pptshape.hxx | 5 - oox/source/ppt/pptshapecontext.cxx | 197 +++++++++++++++++-------------------- 2 files changed, 90 insertions(+), 112 deletions(-) diff --git a/oox/inc/oox/ppt/pptshape.hxx b/oox/inc/oox/ppt/pptshape.hxx index 09c7830a96bb..3376e5bb1ace 100644 --- a/oox/inc/oox/ppt/pptshape.hxx +++ b/oox/inc/oox/ppt/pptshape.hxx @@ -61,15 +61,10 @@ public: ShapeLocation getShapeLocation() const { return meShapeLocation; }; sal_Bool isReferenced() const { return mbReferenced; }; void setReferenced( sal_Bool bReferenced ){ mbReferenced = bReferenced; }; - void setPlaceholder( oox::drawingml::ShapePtr pPlaceholder ) { mpPlaceholder = pPlaceholder; } static oox::drawingml::ShapePtr findPlaceholder( const sal_Int32 nMasterPlaceholder, std::vector< oox::drawingml::ShapePtr >& rShapes ); static oox::drawingml::ShapePtr findPlaceholderByIndex( const sal_Int32 nIdx, std::vector< oox::drawingml::ShapePtr >& rShapes ); static oox::drawingml::ShapePtr findPlaceholder( sal_Int32 nFirstPlaceholder, sal_Int32 nSecondPlaceholder, std::vector< oox::drawingml::ShapePtr >& rShapes ); - -protected: - - oox::drawingml::ShapePtr mpPlaceholder; }; } } diff --git a/oox/source/ppt/pptshapecontext.cxx b/oox/source/ppt/pptshapecontext.cxx index 86e254088041..01681b6b404a 100644 --- a/oox/source/ppt/pptshapecontext.cxx +++ b/oox/source/ppt/pptshapecontext.cxx @@ -100,124 +100,107 @@ Reference< XFastContextHandler > PPTShapeContext::createFastChildContext( sal_In switch( aElementToken ) { - // nvSpPr CT_ShapeNonVisual begin -// case NMSP_PPT|XML_drElemPr: -// break; - case NMSP_PPT|XML_cNvPr: - mpShapePtr->setId( xAttribs->getOptionalValue( XML_id ) ); - mpShapePtr->setName( xAttribs->getOptionalValue( XML_name ) ); - break; - case NMSP_PPT|XML_ph: - { - sal_Int32 nSubType( xAttribs->getOptionalValueToken( XML_type, XML_obj ) ); - mpShapePtr->setSubType( nSubType ); - OUString sIdx( xAttribs->getOptionalValue( XML_idx ) ); - sal_Bool bHasIdx = sIdx.getLength() > 0; - sal_Int32 nIdx = sIdx.toInt32(); - mpShapePtr->setSubTypeIndex( nIdx ); - - if ( nSubType || bHasIdx ) + // nvSpPr CT_ShapeNonVisual begin + // case NMSP_PPT|XML_drElemPr: + // break; + case NMSP_PPT|XML_cNvPr: + mpShapePtr->setId( xAttribs->getOptionalValue( XML_id ) ); + mpShapePtr->setName( xAttribs->getOptionalValue( XML_name ) ); + break; + case NMSP_PPT|XML_ph: { - PPTShape* pPPTShapePtr = dynamic_cast< PPTShape* >( mpShapePtr.get() ); - if ( pPPTShapePtr ) + sal_Int32 nSubType( xAttribs->getOptionalValueToken( XML_type, XML_obj ) ); + mpShapePtr->setSubType( nSubType ); + mpShapePtr->setSubTypeIndex( xAttribs->getOptionalValue( XML_idx ).toInt32() ); + if ( nSubType ) { - oox::ppt::ShapeLocation eShapeLocation = pPPTShapePtr->getShapeLocation(); - oox::drawingml::ShapePtr pPlaceholder; - - if ( bHasIdx && eShapeLocation == Slide ) + PPTShape* pPPTShapePtr = dynamic_cast< PPTShape* >( mpShapePtr.get() ); + if ( pPPTShapePtr ) { - // TODO: use id to shape map - SlidePersistPtr pMasterPersist( mpSlidePersistPtr->getMasterPersist() ); - if ( pMasterPersist.get() ) - pPlaceholder = PPTShape::findPlaceholderByIndex( nIdx, pMasterPersist->getShapes()->getChildren() ); - } - if ( !pPlaceholder.get() && ( ( eShapeLocation == Slide ) || ( eShapeLocation == Layout ) ) ) - { - // inheriting properties from placeholder objects by cloning shape - - sal_Int32 nFirstPlaceholder = 0; - sal_Int32 nSecondPlaceholder = 0; - switch( nSubType ) + oox::ppt::ShapeLocation eShapeLocation = pPPTShapePtr->getShapeLocation(); + if ( ( eShapeLocation == Slide ) || ( eShapeLocation == Layout ) ) { - case XML_ctrTitle : // slide/layout - nFirstPlaceholder = XML_ctrTitle; - nSecondPlaceholder = XML_title; - break; - case XML_subTitle : // slide/layout - nFirstPlaceholder = XML_subTitle; - nSecondPlaceholder = XML_title; - break; - case XML_obj : // slide/layout - nFirstPlaceholder = XML_obj; - nSecondPlaceholder = XML_body; - break; - case XML_dt : // slide/layout/master/notes/notesmaster/handoutmaster - case XML_sldNum : // slide/layout/master/notes/notesmaster/handoutmaster - case XML_ftr : // slide/layout/master/notes/notesmaster/handoutmaster - case XML_hdr : // notes/notesmaster/handoutmaster - case XML_body : // slide/layout/master/notes/notesmaster - case XML_title : // slide/layout/master/ - case XML_chart : // slide/layout - case XML_tbl : // slide/layout - case XML_clipArt : // slide/layout - case XML_dgm : // slide/layout - case XML_media : // slide/layout - case XML_sldImg : // notes/notesmaster - case XML_pic : // slide/layout - nFirstPlaceholder = nSubType; - default: - break; - } - if ( nFirstPlaceholder ) - { - if ( eShapeLocation == Layout ) // for layout objects the referenced object can be found within the same shape tree - pPlaceholder = findPlaceholder( nFirstPlaceholder, nSecondPlaceholder, -1, mpSlidePersistPtr->getShapes()->getChildren() ); - else if ( eShapeLocation == Slide ) // normal slide shapes have to search within the corresponding master tree for referenced objects + // inheriting properties from placeholder objects by cloning shape + sal_Int32 nFirstPlaceholder = 0; + sal_Int32 nSecondPlaceholder = 0; + switch( nSubType ) { - SlidePersistPtr pMasterPersist( mpSlidePersistPtr->getMasterPersist() ); - if ( pMasterPersist.get() ) - pPlaceholder = findPlaceholder( nFirstPlaceholder, nSecondPlaceholder, - pPPTShapePtr->getSubTypeIndex(), pMasterPersist->getShapes()->getChildren() ); - } - if ( pPlaceholder.get() ) - { - mpShapePtr->applyShapeReference( *pPlaceholder.get() ); - PPTShape* pPPTShape = dynamic_cast< PPTShape* >( pPlaceholder.get() ); - if ( pPPTShape ) - pPPTShape->setReferenced( sal_True ); + case XML_ctrTitle : // slide/layout + nFirstPlaceholder = XML_ctrTitle; + nSecondPlaceholder = XML_title; + break; + + case XML_subTitle : // slide/layout + nFirstPlaceholder = XML_subTitle; + nSecondPlaceholder = XML_title; + break; + + case XML_obj : // slide/layout + nFirstPlaceholder = XML_obj; + nSecondPlaceholder = XML_body; + break; + + case XML_dt : // slide/layout/master/notes/notesmaster/handoutmaster + case XML_sldNum : // slide/layout/master/notes/notesmaster/handoutmaster + case XML_ftr : // slide/layout/master/notes/notesmaster/handoutmaster + case XML_hdr : // notes/notesmaster/handoutmaster + case XML_body : // slide/layout/master/notes/notesmaster + case XML_title : // slide/layout/master/ + case XML_chart : // slide/layout + case XML_tbl : // slide/layout + case XML_clipArt : // slide/layout + case XML_dgm : // slide/layout + case XML_media : // slide/layout + case XML_sldImg : // notes/notesmaster + case XML_pic : // slide/layout + nFirstPlaceholder = nSubType; + default: + break; } + if ( nFirstPlaceholder ) + { + oox::drawingml::ShapePtr pPlaceholder; + if ( eShapeLocation == Layout ) // for layout objects the referenced object can be found within the same shape tree + pPlaceholder = findPlaceholder( nFirstPlaceholder, nSecondPlaceholder, -1, mpSlidePersistPtr->getShapes()->getChildren() ); + else if ( eShapeLocation == Slide ) // normal slide shapes have to search within the corresponding master tree for referenced objects + { + SlidePersistPtr pMasterPersist( mpSlidePersistPtr->getMasterPersist() ); + if ( pMasterPersist.get() ) + pPlaceholder = findPlaceholder( nFirstPlaceholder, nSecondPlaceholder, + pPPTShapePtr->getSubTypeIndex(), pMasterPersist->getShapes()->getChildren() ); + } + if ( pPlaceholder.get() ) + { + mpShapePtr->applyShapeReference( *pPlaceholder.get() ); + PPTShape* pPPTShape = dynamic_cast< PPTShape* >( pPlaceholder.get() ); + if ( pPPTShape ) + pPPTShape->setReferenced( sal_True ); + } + } } - } - if ( pPlaceholder.get() ) - { - mpShapePtr->applyShapeReference( *pPlaceholder.get() ); - PPTShape* pPPTShape = dynamic_cast< PPTShape* >( pPlaceholder.get() ); - if ( pPPTShape ) - pPPTShape->setReferenced( sal_True ); - pPPTShapePtr->setPlaceholder( pPlaceholder ); - } - } + } + } + break; } - break; - } - // nvSpPr CT_ShapeNonVisual end - case NMSP_PPT|XML_spPr: - xRet = new PPTShapePropertiesContext( *this, *mpShapePtr ); - break; + // nvSpPr CT_ShapeNonVisual end - case NMSP_PPT|XML_style: - xRet = new oox::drawingml::ShapeStyleContext( *this, *mpShapePtr ); - break; + case NMSP_PPT|XML_spPr: + xRet = new PPTShapePropertiesContext( *this, *mpShapePtr ); + break; - case NMSP_PPT|XML_txBody: - { - oox::drawingml::TextBodyPtr xTextBody( new oox::drawingml::TextBody ); - xTextBody->getTextProperties().maPropertyMap[ PROP_FontIndependentLineSpacing ] <<= static_cast< sal_Bool >( sal_True ); - mpShapePtr->setTextBody( xTextBody ); - xRet = new oox::drawingml::TextBodyContext( *this, *xTextBody ); - break; - } + case NMSP_PPT|XML_style: + xRet = new oox::drawingml::ShapeStyleContext( *this, *mpShapePtr ); + break; + + case NMSP_PPT|XML_txBody: + { + oox::drawingml::TextBodyPtr xTextBody( new oox::drawingml::TextBody ); + xTextBody->getTextProperties().maPropertyMap[ PROP_FontIndependentLineSpacing ] <<= static_cast< sal_Bool >( sal_True ); + mpShapePtr->setTextBody( xTextBody ); + xRet = new oox::drawingml::TextBodyContext( *this, *xTextBody ); + break; + } } if( !xRet.is() ) -- cgit v1.2.1 From f6708992a050b6b2b84d7783e52916161637dde8 Mon Sep 17 00:00:00 2001 From: Andre Fischer Date: Thu, 1 Jul 2010 14:05:39 +0200 Subject: impress193 #i112841# Prevent marquee text from crashing when too wide. --- canvas/source/tools/pagemanager.cxx | 42 +++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/canvas/source/tools/pagemanager.cxx b/canvas/source/tools/pagemanager.cxx index b867b432857c..b2a71bf86cd3 100644 --- a/canvas/source/tools/pagemanager.cxx +++ b/canvas/source/tools/pagemanager.cxx @@ -70,7 +70,8 @@ namespace canvas { maPages.push_back(pPage); FragmentSharedPtr pFragment(pPage->allocateSpace(rSize)); - maFragments.push_back(pFragment); + if (pFragment) + maFragments.push_back(pFragment); return pFragment; } @@ -124,34 +125,39 @@ namespace canvas FragmentContainer_t::const_iterator candidate(maFragments.begin()); while(candidate != aEnd) { - if(!((*candidate)->isNaked())) + if(*candidate && !((*candidate)->isNaked())) break; ++candidate; } - const ::basegfx::B2ISize& rSize((*candidate)->getSize()); - sal_uInt32 nMaxArea(rSize.getX()*rSize.getY()); - - FragmentContainer_t::const_iterator it(candidate); - while(it != aEnd) + if (candidate != aEnd) { - if(!((*it)->isNaked())) + const ::basegfx::B2ISize& rSize((*candidate)->getSize()); + sal_uInt32 nMaxArea(rSize.getX()*rSize.getY()); + + FragmentContainer_t::const_iterator it(candidate); + while(it != aEnd) { - const ::basegfx::B2ISize& rCandidateSize((*it)->getSize()); - const sal_uInt32 nArea(rCandidateSize.getX()*rCandidateSize.getY()); - if(nArea > nMaxArea) + if (*it && !((*it)->isNaked())) { - candidate=it; - nMaxArea=nArea; + const ::basegfx::B2ISize& rCandidateSize((*it)->getSize()); + const sal_uInt32 nArea(rCandidateSize.getX()*rCandidateSize.getY()); + if(nArea > nMaxArea) + { + candidate=it; + nMaxArea=nArea; + } } + + ++it; } - ++it; + // this does not erase the candidate, + // but makes it 'naked'... + (*candidate)->free(*candidate); } - - // this does not erase the candidate, - // but makes it 'naked'... - (*candidate)->free(*candidate); + else + break; } } -- cgit v1.2.1 From 6e819dc904924498d55857ec7d585bf7055a6953 Mon Sep 17 00:00:00 2001 From: "Thomas Lange [tl]" Date: Thu, 1 Jul 2010 15:19:53 +0200 Subject: cws tl81: #i112788# patch was broken, old code restored --- editeng/source/editeng/impedit2.cxx | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index 778942730e71..148ca08816ae 100755 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -4209,18 +4209,8 @@ long ImpEditEngine::GetXPos( ParaPortion* pParaPortion, EditLine* pLine, USHORT DBG_ERROR("svx::ImpEditEngine::GetXPos(), index out of range!"); } -#if 0 + // old code restored see #i112788 (which leaves #i74188 unfixed again) long nPosInPortion = pLine->GetCharPosArray().GetObject( nPos ); -#else - // #i74188# (positioning the cursor after deleting components of combined indic characters) - SvxFont aTmpFont( pParaPortion->GetNode()->GetCharAttribs().GetDefFont() ); - SeekCursor( pParaPortion->GetNode(), nPos+1, aTmpFont ); - aTmpFont.SetPhysFont( GetRefDevice() ); - ImplInitDigitMode( GetRefDevice(), 0, 0, 0, aTmpFont.GetLanguage() ); - String sSegment(*pParaPortion->GetNode(), pLine->GetStart(), nPos+1); - long nPosInPortion = aTmpFont.QuickGetTextSize( GetRefDevice(), - sSegment, 0, nPos+1, NULL ).Width(); -#endif if ( !pPortion->IsRightToLeft() ) { -- cgit v1.2.1 From a1e23a5bc46a35405cd5c547e3e12ed06fc5144d Mon Sep 17 00:00:00 2001 From: Andre Fischer Date: Fri, 2 Jul 2010 11:06:25 +0200 Subject: impress193: #i112422# Applied patch that fixes clipping error. --- slideshow/source/engine/slide/layer.cxx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/slideshow/source/engine/slide/layer.cxx b/slideshow/source/engine/slide/layer.cxx index be67b220962e..65f52f3b823f 100644 --- a/slideshow/source/engine/slide/layer.cxx +++ b/slideshow/source/engine/slide/layer.cxx @@ -36,6 +36,8 @@ #include #include #include +#include +#include #include "layer.hxx" @@ -288,6 +290,8 @@ namespace slideshow // clipping, and render each shape that intersects with // the calculated update area ::basegfx::B2DPolyPolygon aClip( maUpdateAreas.solveCrossovers() ); + aClip = ::basegfx::tools::stripNeutralPolygons(aClip); + aClip = ::basegfx::tools::stripDispensablePolygons(aClip, false); // actually, if there happen to be shapes with zero // update area in the maUpdateAreas vector, the -- cgit v1.2.1 From 558e6bbbcdd73af926e1156990825e7660a1f852 Mon Sep 17 00:00:00 2001 From: sj Date: Fri, 2 Jul 2010 13:35:53 +0200 Subject: impress193: #162822# fixed font size problem with presentation objects --- oox/inc/oox/drawingml/shape.hxx | 1 + oox/source/drawingml/shape.cxx | 4 ++-- oox/source/drawingml/shapegroupcontext.cxx | 5 +++++ oox/source/drawingml/textliststyle.cxx | 4 ++-- oox/source/ppt/pptshape.cxx | 4 ++-- oox/source/ppt/pptshapecontext.cxx | 8 +++++++- oox/source/ppt/pptshapegroupcontext.cxx | 5 +++++ oox/source/ppt/slidemastertextstylescontext.cxx | 6 +++++- oox/source/ppt/slidepersist.cxx | 1 - 9 files changed, 29 insertions(+), 9 deletions(-) diff --git a/oox/inc/oox/drawingml/shape.hxx b/oox/inc/oox/drawingml/shape.hxx index f4228ab24790..d6cab48f6bb5 100644 --- a/oox/inc/oox/drawingml/shape.hxx +++ b/oox/inc/oox/drawingml/shape.hxx @@ -127,6 +127,7 @@ public: ::rtl::OUString getName( ) { return msName; } void setId( const rtl::OUString& rId ) { msId = rId; } void setHidden( sal_Bool bHidden ) { mbHidden = bHidden; } + sal_Bool getHidden() const { return mbHidden; }; void setSubType( sal_Int32 nSubType ) { mnSubType = nSubType; } sal_Int32 getSubType() const { return mnSubType; } void setSubTypeIndex( sal_uInt32 nSubTypeIndex ) { mnSubTypeIndex = nSubTypeIndex; } diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 50ded9b2753b..97c3b4a5374a 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -374,8 +374,8 @@ Reference< XShape > Shape::createAndInsert( if ( mbHidden ) { - const OUString sHidden( CREATE_OUSTRING( "NumberingLevel" ) ); - xSet->setPropertyValue( sHidden, Any( mbHidden ) ); + const OUString sHidden( CREATE_OUSTRING( "Visible" ) ); + xSet->setPropertyValue( sHidden, Any( !mbHidden ) ); } Reference< document::XActionLockable > xLockable( mxShape, UNO_QUERY ); diff --git a/oox/source/drawingml/shapegroupcontext.cxx b/oox/source/drawingml/shapegroupcontext.cxx index 56ce53767641..e1bd51f852ad 100644 --- a/oox/source/drawingml/shapegroupcontext.cxx +++ b/oox/source/drawingml/shapegroupcontext.cxx @@ -29,6 +29,7 @@ #include #include +#include "oox/helper/attributelist.hxx" #include "oox/drawingml/shapegroupcontext.hxx" #include "oox/drawingml/connectorshapecontext.hxx" #include "oox/drawingml/graphicshapecontext.hxx" @@ -70,9 +71,13 @@ Reference< XFastContextHandler > ShapeGroupContext::createFastChildContext( sal_ switch( getToken( aElementToken ) ) { case XML_cNvPr: + { + AttributeList aAttribs( xAttribs ); + mpGroupShapePtr->setHidden( aAttribs.getBool( XML_hidden, false ) ); mpGroupShapePtr->setId( xAttribs->getOptionalValue( XML_id ) ); mpGroupShapePtr->setName( xAttribs->getOptionalValue( XML_name ) ); break; + } case XML_ph: mpGroupShapePtr->setSubType( xAttribs->getOptionalValueToken( XML_type, FastToken::DONTKNOW ) ); mpGroupShapePtr->setSubTypeIndex( xAttribs->getOptionalValue( XML_idx ).toInt32() ); diff --git a/oox/source/drawingml/textliststyle.cxx b/oox/source/drawingml/textliststyle.cxx index 07a71c0855a1..901db49802d9 100644 --- a/oox/source/drawingml/textliststyle.cxx +++ b/oox/source/drawingml/textliststyle.cxx @@ -33,8 +33,8 @@ TextListStyle::TextListStyle() { for ( int i = 0; i < 9; i++ ) { - maListStyle.push_back( TextParagraphPropertiesPtr( new TextParagraphProperties ) ); - maAggregationListStyle.push_back( TextParagraphPropertiesPtr( new TextParagraphProperties ) ); + maListStyle.push_back( TextParagraphPropertiesPtr( new TextParagraphProperties() ) ); + maAggregationListStyle.push_back( TextParagraphPropertiesPtr( new TextParagraphProperties() ) ); } } diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx index eb3b3503452e..bfe3ead6ca04 100644 --- a/oox/source/ppt/pptshape.cxx +++ b/oox/source/ppt/pptshape.cxx @@ -169,6 +169,7 @@ void PPTShape::addShape( } } +/* // use placeholder index if possible if( mnSubType && getSubTypeIndex() && rSlidePersist.getMasterPersist().get() ) { oox::drawingml::ShapePtr pPlaceholder = PPTShape::findPlaceholderByIndex( getSubTypeIndex(), rSlidePersist.getMasterPersist()->getShapes()->getChildren() ); @@ -182,8 +183,7 @@ void PPTShape::addShape( aMasterTextListStyle = pNewTextListStyle; } } - - +*/ if ( sServiceName.getLength() ) { if ( !aMasterTextListStyle.get() ) diff --git a/oox/source/ppt/pptshapecontext.cxx b/oox/source/ppt/pptshapecontext.cxx index 01681b6b404a..c59638553018 100644 --- a/oox/source/ppt/pptshapecontext.cxx +++ b/oox/source/ppt/pptshapecontext.cxx @@ -31,6 +31,7 @@ #include #include +#include "oox/helper/attributelist.hxx" #include "oox/ppt/pptshape.hxx" #include "oox/ppt/pptshapecontext.hxx" #include "oox/ppt/pptshapepropertiescontext.hxx" @@ -104,9 +105,13 @@ Reference< XFastContextHandler > PPTShapeContext::createFastChildContext( sal_In // case NMSP_PPT|XML_drElemPr: // break; case NMSP_PPT|XML_cNvPr: + { + AttributeList aAttribs( xAttribs ); + mpShapePtr->setHidden( aAttribs.getBool( XML_hidden, false ) ); mpShapePtr->setId( xAttribs->getOptionalValue( XML_id ) ); mpShapePtr->setName( xAttribs->getOptionalValue( XML_name ) ); break; + } case NMSP_PPT|XML_ph: { sal_Int32 nSubType( xAttribs->getOptionalValueToken( XML_type, XML_obj ) ); @@ -140,7 +145,7 @@ Reference< XFastContextHandler > PPTShapeContext::createFastChildContext( sal_In nSecondPlaceholder = XML_body; break; - case XML_dt : // slide/layout/master/notes/notesmaster/handoutmaster + case XML_dt : // slide/layout/master/notes/notesmaster/handoutmaster case XML_sldNum : // slide/layout/master/notes/notesmaster/handoutmaster case XML_ftr : // slide/layout/master/notes/notesmaster/handoutmaster case XML_hdr : // notes/notesmaster/handoutmaster @@ -179,6 +184,7 @@ Reference< XFastContextHandler > PPTShapeContext::createFastChildContext( sal_In } } } + } break; } diff --git a/oox/source/ppt/pptshapegroupcontext.cxx b/oox/source/ppt/pptshapegroupcontext.cxx index ef8dbeedcd6c..074393874264 100644 --- a/oox/source/ppt/pptshapegroupcontext.cxx +++ b/oox/source/ppt/pptshapegroupcontext.cxx @@ -29,6 +29,7 @@ #include #include +#include "oox/helper/attributelist.hxx" #include "oox/ppt/pptshape.hxx" #include "oox/ppt/pptshapecontext.hxx" #include "oox/ppt/pptshapegroupcontext.hxx" @@ -71,9 +72,13 @@ Reference< XFastContextHandler > PPTShapeGroupContext::createFastChildContext( s switch( aElementToken ) { case NMSP_PPT|XML_cNvPr: + { + AttributeList aAttribs( xAttribs ); + mpGroupShapePtr->setHidden( aAttribs.getBool( XML_hidden, false ) ); mpGroupShapePtr->setId( xAttribs->getOptionalValue( XML_id ) ); mpGroupShapePtr->setName( xAttribs->getOptionalValue( XML_name ) ); break; + } case NMSP_PPT|XML_ph: mpGroupShapePtr->setSubType( xAttribs->getOptionalValueToken( XML_type, FastToken::DONTKNOW ) ); mpGroupShapePtr->setSubTypeIndex( xAttribs->getOptionalValue( XML_idx ).toInt32() ); diff --git a/oox/source/ppt/slidemastertextstylescontext.cxx b/oox/source/ppt/slidemastertextstylescontext.cxx index b771998922cc..773730417a27 100644 --- a/oox/source/ppt/slidemastertextstylescontext.cxx +++ b/oox/source/ppt/slidemastertextstylescontext.cxx @@ -75,8 +75,12 @@ Reference< XFastContextHandler > SlideMasterTextStylesContext::createFastChildCo break; } } - if ( aTextListStylePtr ) + if ( aTextListStylePtr ) // sj: the master list style is the last instance of from where properties + { // are obtained. i got some documents without having the textsize set at + for ( int i = 0; i < 9; i++ ) // any point, the master reference application is using 18pt then + aTextListStylePtr->getListStyle()[ i ]->getTextCharacterProperties().moHeight = 1800; xRet.set( new oox::drawingml::TextListStyleContext( *this, *aTextListStylePtr ) ); + } if( !xRet.is() ) xRet.set( this ); diff --git a/oox/source/ppt/slidepersist.cxx b/oox/source/ppt/slidepersist.cxx index 39540335cf13..ce99ffc49f19 100644 --- a/oox/source/ppt/slidepersist.cxx +++ b/oox/source/ppt/slidepersist.cxx @@ -148,7 +148,6 @@ void SlidePersist::createXShapes( const XmlFilterBase& rFilterBase ) pPPTShape->addShape( rFilterBase, *this, getTheme().get(), xShapes, 0, &getShapeMap() ); else (*aChildIter)->addShape( rFilterBase, getTheme().get(), xShapes, 0, &getShapeMap() ); - aChildIter++; } } -- cgit v1.2.1 From de432231c123abae12659a4776047f11205f23db Mon Sep 17 00:00:00 2001 From: "Thomas Lange [tl]" Date: Fri, 2 Jul 2010 14:45:29 +0200 Subject: cws tl81: warning-free code --- editeng/source/editeng/editview.cxx | 1 - 1 file changed, 1 deletion(-) mode change 100755 => 100644 editeng/source/editeng/editview.cxx diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx old mode 100755 new mode 100644 index c07b84d0d0f2..664512df414e --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -1265,7 +1265,6 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack ) String aDicName ( pInsertMenu->GetItemText(nId) ); uno::Reference< linguistic2::XDictionary > xDic; - uno::Reference< linguistic2::XDictionaryList > xDicList( SvxGetDictionaryList() ); if (xDicList.is()) xDic = xDicList->getDictionaryByName( aDicName ); -- cgit v1.2.1 From 96c2ec57493d647197befcb540bc59e85b2530a1 Mon Sep 17 00:00:00 2001 From: sj Date: Fri, 2 Jul 2010 16:52:34 +0200 Subject: impress193: #162822# fixed font size problem with presentation objects and flipping problem of freeform shapes --- oox/inc/oox/drawingml/customshapeproperties.hxx | 4 ++++ oox/source/drawingml/customshapeproperties.cxx | 5 ++++- oox/source/drawingml/shape.cxx | 11 +++++++++-- oox/source/token/properties.txt | 2 ++ 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/oox/inc/oox/drawingml/customshapeproperties.hxx b/oox/inc/oox/drawingml/customshapeproperties.hxx index 171437095f03..282e0c6009b5 100644 --- a/oox/inc/oox/drawingml/customshapeproperties.hxx +++ b/oox/inc/oox/drawingml/customshapeproperties.hxx @@ -133,6 +133,8 @@ public: OptValue< GeomRect >& getTextRect(){ return maTextRect; }; std::vector< Path2D >& getPath2DList(){ return maPath2DList; }; std::vector< com::sun::star::drawing::EnhancedCustomShapeSegment >& getSegments(){ return maSegments; }; + void setMirroredX( sal_Bool bMirroredX ) { mbMirroredX = bMirroredX; }; + void setMirroredY( sal_Bool bMirroredY ) { mbMirroredY = bMirroredY; }; double getValue( const std::vector< CustomShapeGuide >&, sal_uInt32 nIndex ) const; static sal_Int32 SetCustomShapeGuideValue( std::vector< CustomShapeGuide >& rGuideList, const CustomShapeGuide& rGuide ); @@ -150,6 +152,8 @@ private: std::vector< com::sun::star::drawing::EnhancedCustomShapeSegment > maSegments; + sal_Bool mbMirroredX; + sal_Bool mbMirroredY; }; } } diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx index 62e42701b273..d296a4041fb9 100644 --- a/oox/source/drawingml/customshapeproperties.cxx +++ b/oox/source/drawingml/customshapeproperties.cxx @@ -50,6 +50,8 @@ using namespace ::com::sun::star::drawing; namespace oox { namespace drawingml { CustomShapeProperties::CustomShapeProperties() +: mbMirroredX ( sal_False ) +, mbMirroredY ( sal_False ) { } CustomShapeProperties::~CustomShapeProperties() @@ -149,7 +151,8 @@ void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFi sal_uInt32 i; PropertyMap aPropertyMap; aPropertyMap[ PROP_Type ] <<= CREATE_OUSTRING( "non-primitive" ); - + aPropertyMap[ PROP_MirroredX ] <<= Any( mbMirroredX ); + aPropertyMap[ PROP_MirroredY ] <<= Any( mbMirroredY ); awt::Size aSize( xShape->getSize() ); awt::Rectangle aViewBox( 0, 0, aSize.Width * 360, aSize.Height * 360 ); if ( maPath2DList.size() ) diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 97c3b4a5374a..f0ae2ec2a7a3 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -260,6 +260,7 @@ Reference< XShape > Shape::createAndInsert( OUString aServiceName = rServiceName; if( mxCreateCallback.get() ) aServiceName = mxCreateCallback->onCreateXShape( aServiceName, awt::Rectangle( aPosition.X / 360, aPosition.Y / 360, aSize.Width / 360, aSize.Height / 360 ) ); + sal_Bool bIsCustomShape = aServiceName == OUString::createFromAscii( "com.sun.star.drawing.CustomShape" ); basegfx::B2DHomMatrix aTransformation; if( aSize.Width != 1 || aSize.Height != 1) @@ -279,7 +280,7 @@ Reference< XShape > Shape::createAndInsert( // center object at origin aTransformation.translate( -aCenter.getX(), -aCenter.getY() ); - if( mbFlipH || mbFlipV) + if( !bIsCustomShape && ( mbFlipH || mbFlipV ) ) { // mirror around object's center aTransformation.scale( mbFlipH ? -1.0 : 1.0, mbFlipV ? -1.0 : 1.0 ); @@ -469,8 +470,14 @@ Reference< XShape > Shape::createAndInsert( if( aServiceName != OUString::createFromAscii( "com.sun.star.drawing.GroupShape" ) ) aPropSet.setProperties( aShapeProperties ); - if( aServiceName == OUString::createFromAscii( "com.sun.star.drawing.CustomShape" ) ) + if( bIsCustomShape ) + { + if ( mbFlipH ) + mpCustomShapePropertiesPtr->setMirroredX( sal_True ); + if ( mbFlipV ) + mpCustomShapePropertiesPtr->setMirroredY( sal_True ); mpCustomShapePropertiesPtr->pushToPropSet( rFilterBase, xSet, mxShape ); + } // in some cases, we don't have any text body. if( getTextBody() ) diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt index 2b32b0a14d91..3fbcb7e1deb0 100644 --- a/oox/source/token/properties.txt +++ b/oox/source/token/properties.txt @@ -257,6 +257,8 @@ MaxFieldCount MaxTextLen MediaType MinorTickmarks +MirroredX +MirroredY MissingValueTreatment Model MultiLine -- cgit v1.2.1 From d66c407d55c485552a47ce0a4951e64083460773 Mon Sep 17 00:00:00 2001 From: Kai Sommerfeld Date: Sun, 4 Jul 2010 11:38:02 +0200 Subject: #i110653# - bumped minor version to 3 --- desktop/util/ooverinfo2.rc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/desktop/util/ooverinfo2.rc b/desktop/util/ooverinfo2.rc index f149ec6474e7..8bc39767f04a 100644 --- a/desktop/util/ooverinfo2.rc +++ b/desktop/util/ooverinfo2.rc @@ -1,7 +1,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,26 +25,26 @@ * *************************************************************************/ -#define VERSION 3 -#define SUBVERSION 2 -//#define VERVARIANT 0 +#define VERSION 3 +#define SUBVERSION 3 +//#define VERVARIANT 0 // .0 + VER_CONCEPT // .100 + VER_ALPHA // .200 + VER_BETA // .300 + VER_GAMMA // .500 + VER_FINAL -//#define VER_CONCEPT 0 -//#define VER_BETA 6 -#define VER_FINAL 0 +//#define VER_CONCEPT 0 +//#define VER_BETA 6 +#define VER_FINAL 0 -#define VER_DAY 1 -#define VER_MONTH 9 -#define VER_YEAR 2009 +#define VER_DAY 1 +#define VER_MONTH 1 +#define VER_YEAR 2010 // ----------------------------------------------------------------------- // ----------------------------------------------------------------------- -// language/character set specification table +// language/character set specification table // ----------------------------------------------------------------------- -- cgit v1.2.1 From 49aafa184a89d4ba04a2cbf0840f757cee142f7e Mon Sep 17 00:00:00 2001 From: Kai Sommerfeld Date: Sun, 4 Jul 2010 11:38:46 +0200 Subject: #i110653# - bumped minor version to 3 --- solenv/inc/version.hrc | 6 +++--- solenv/inc/version_so.hrc | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/solenv/inc/version.hrc b/solenv/inc/version.hrc index d4c205f942b9..9c2b9be4189a 100644 --- a/solenv/inc/version.hrc +++ b/solenv/inc/version.hrc @@ -26,14 +26,14 @@ *************************************************************************/ #define VERSION 3 -#define SUBVERSION 2 +#define SUBVERSION 3 //#define VERVARIANT 0 // never define this one, will be provided by build environment (BUILD_ID) // .0 + VER_CONCEPT // .100 + VER_ALPHA // .200 + VER_BETA // .300 + VER_GAMMA // .500 + VER_FINAL -//#define VER_CONCEPT 0 +//#define VER_CONCEPT 0 //#define VER_BETA 6 #define VER_FINAL 0 @@ -54,7 +54,7 @@ #endif // ----------------------------------------------------------------------- -// language/character set specification table +// language/character set specification table // ----------------------------------------------------------------------- RCD_LANGUAGE rcdata diff --git a/solenv/inc/version_so.hrc b/solenv/inc/version_so.hrc index 70ea1c193ee6..9773f10fdddf 100644 --- a/solenv/inc/version_so.hrc +++ b/solenv/inc/version_so.hrc @@ -26,14 +26,14 @@ *************************************************************************/ #define VERSION 9 -#define SUBVERSION 2 +#define SUBVERSION 3 //#define VERVARIANT 0 // never define this one, will be provided by build environment (BUILD_ID) // .0 + VER_CONCEPT // .100 + VER_ALPHA // .200 + VER_BETA // .300 + VER_GAMMA // .500 + VER_FINAL -//#define VER_CONCEPT 0 +//#define VER_CONCEPT 0 //#define VER_BETA 6 #define VER_FINAL 0 @@ -54,7 +54,7 @@ #endif // ----------------------------------------------------------------------- -// language/character set specification table +// language/character set specification table // ----------------------------------------------------------------------- RCD_LANGUAGE rcdata -- cgit v1.2.1 From 5914f1a08b1ca5d0b9fe59b8a12403d9a65d3430 Mon Sep 17 00:00:00 2001 From: "Thomas Lange [tl]" Date: Mon, 5 Jul 2010 10:45:58 +0200 Subject: cws tl81: warning-free code --- cui/source/dialogs/thesdlg.cxx | 2 +- cui/source/dialogs/thesdlg_impl.hxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) mode change 100755 => 100644 cui/source/dialogs/thesdlg.cxx mode change 100755 => 100644 cui/source/dialogs/thesdlg_impl.hxx diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx old mode 100755 new mode 100644 index b2d0ed41474e..ec04362b488d --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -229,7 +229,7 @@ void ThesaurusAlternativesCtrl_Impl::ClearExtraData() void ThesaurusAlternativesCtrl_Impl::SetExtraData( const SvLBoxEntry *pEntry, - AlternativesExtraData &rData ) + const AlternativesExtraData &rData ) { if (!pEntry) return; diff --git a/cui/source/dialogs/thesdlg_impl.hxx b/cui/source/dialogs/thesdlg_impl.hxx old mode 100755 new mode 100644 index ca18325aab21..b682c8d0c129 --- a/cui/source/dialogs/thesdlg_impl.hxx +++ b/cui/source/dialogs/thesdlg_impl.hxx @@ -160,7 +160,7 @@ public: SvLBoxEntry * AddEntry( sal_Int32 nVal, const String &rText, bool bIsHeader ); void ClearExtraData(); - void SetExtraData( const SvLBoxEntry *pEntry, AlternativesExtraData &rData ); + void SetExtraData( const SvLBoxEntry *pEntry, const AlternativesExtraData &rData ); AlternativesExtraData * GetExtraData( const SvLBoxEntry *pEntry ); virtual void KeyInput( const KeyEvent& rKEvt ); -- cgit v1.2.1 From e85d5ae7ccf19269de77ee84c86990989511bbfe Mon Sep 17 00:00:00 2001 From: "Thomas Lange [tl]" Date: Mon, 5 Jul 2010 10:55:16 +0200 Subject: cws tl81: warning-free code --- sw/source/ui/lingu/olmenu.cxx | 1 - 1 file changed, 1 deletion(-) diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx index 1b00021943a8..0c7d7909ad7a 100644 --- a/sw/source/ui/lingu/olmenu.cxx +++ b/sw/source/ui/lingu/olmenu.cxx @@ -823,7 +823,6 @@ void SwSpellPopup::Execute( USHORT nId ) else if (MN_DICTIONARIES_START <= nId && nId <= MN_DICTIONARIES_END) { OUString aWord( xSpellAlt->getWord() ); - USHORT nDicIdx = nId - MN_DICTIONARIES_START; DBG_ASSERT( nDicIdx < aDics.getLength(), "dictionary index out of range" ); PopupMenu *pMenu = GetPopupMenu(MN_ADD_TO_DIC); -- cgit v1.2.1 From 0b14f73f86f9ff80515b5979443dbbd88b09fcfa Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Tue, 6 Jul 2010 09:02:45 +0200 Subject: unoawt2: removed unused file --- .../source/standard/vclxaccessiblelistboxlist.cxx | 335 --------------------- 1 file changed, 335 deletions(-) delete mode 100644 accessibility/source/standard/vclxaccessiblelistboxlist.cxx diff --git a/accessibility/source/standard/vclxaccessiblelistboxlist.cxx b/accessibility/source/standard/vclxaccessiblelistboxlist.cxx deleted file mode 100644 index df37c3239667..000000000000 --- a/accessibility/source/standard/vclxaccessiblelistboxlist.cxx +++ /dev/null @@ -1,335 +0,0 @@ -/************************************************************************* - * - * 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 - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_accessibility.hxx" -#include -#include -#include - -#include - -#include -#include -#include -#include -#include -#include - -#include -#include - -#include -#include -#include - -using namespace ::com::sun::star; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::accessibility; - - -namespace -{ - void checkSelection_Impl( sal_Int32 _nIndex, const ListBox& _rListBox, sal_Bool bSelected ) - throw (::com::sun::star::lang::IndexOutOfBoundsException) - { - sal_Int32 nCount = bSelected ? (sal_Int32)_rListBox.GetSelectEntryCount() - : (sal_Int32)_rListBox.GetEntryCount(); - if ( _nIndex < 0 || _nIndex >= nCount ) - throw ::com::sun::star::lang::IndexOutOfBoundsException(); - } -} - - -VCLXAccessibleListBoxList::VCLXAccessibleListBoxList (VCLXWindow* pVCLWindow, - BoxType aBoxType,const Reference< XAccessible >& _xParent) - : VCLXAccessibleList (pVCLWindow, aBoxType, _xParent) -{ -} - - - - -VCLXAccessibleListBoxList::~VCLXAccessibleListBoxList (void) -{ -} - - - - -void VCLXAccessibleListBoxList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent) -{ - switch ( rVclWindowEvent.GetId() ) - { - case VCLEVENT_LISTBOX_SCROLLED: - UpdateEntryRange_Impl(); - break; - - case VCLEVENT_LISTBOX_SELECT: - if ( !m_bDisableProcessEvent ) - UpdateSelection_Impl(); - break; - - default: - VCLXAccessibleList::ProcessWindowEvent (rVclWindowEvent); - } -} - -IMPLEMENT_FORWARD_XINTERFACE2(VCLXAccessibleListBoxList, VCLXAccessibleList, VCLXAccessibleListBoxList_BASE) -IMPLEMENT_FORWARD_XTYPEPROVIDER2(VCLXAccessibleListBoxList, VCLXAccessibleList, VCLXAccessibleListBoxList_BASE) - - - -//===== XServiceInfo ======================================================== - -::rtl::OUString VCLXAccessibleListBoxList::getImplementationName (void) - throw (RuntimeException) -{ - return ::rtl::OUString::createFromAscii("com.sun.star.comp.toolkit.AccessibleListBoxList"); -} - - - - -Sequence< ::rtl::OUString > VCLXAccessibleListBoxList::getSupportedServiceNames (void) - throw (RuntimeException) -{ - Sequence< ::rtl::OUString > aNames = VCLXAccessibleList::getSupportedServiceNames(); - sal_Int32 nLength = aNames.getLength(); - aNames.realloc( nLength + 1 ); - aNames[nLength] = ::rtl::OUString::createFromAscii( - "com.sun.star.accessibility.AccessibleListBoxList"); - return aNames; -} -// ----------------------------------------------------------------------------- - -void VCLXAccessibleListBoxList::UpdateSelection_Impl() -{ - uno::Any aOldValue, aNewValue; - - { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); - ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - Reference< XAccessible > xNewAcc; - - ListBox* pListBox = static_cast< ListBox* >( GetWindow() ); - if ( pListBox ) - { - USHORT nPos = 0; - ListItems::iterator aEnd = m_aAccessibleChildren.end(); - for ( ListItems::iterator aIter = m_aAccessibleChildren.begin(); - aIter != aEnd; ++aIter,++nPos) - { - if ( aIter->is() ) - { - VCLXAccessibleListItem* pItem = static_cast< VCLXAccessibleListItem* >( aIter->get() ); - // Retrieve the item's index from the list entry. - BOOL bNowSelected = pListBox->IsEntryPosSelected (nPos); - - if ( bNowSelected && !pItem->IsSelected() ) - { - xNewAcc = *aIter; - aNewValue <<= xNewAcc; - m_nLastSelectedPos = nPos; - } - - pItem->SetSelected( bNowSelected ); - } - else - { // it could happen that a child was not created before - checkEntrySelected(pListBox,nPos,aNewValue,xNewAcc); - } - } - - USHORT nCount = pListBox->GetEntryCount(); - if ( nPos < nCount ) // here we have to check the if any other listbox entry is selected - { - for (; nPos < nCount && !checkEntrySelected(pListBox,nPos,aNewValue,xNewAcc) ;++nPos ) - ; - } - } - - if ( xNewAcc.is() && pListBox->HasFocus() ) - { - if ( m_nLastSelectedPos != LISTBOX_ENTRY_NOTFOUND ) - aOldValue <<= getAccessibleChild( (sal_Int32)m_nLastSelectedPos ); - aNewValue <<= xNewAcc; - } - } - - if ( aNewValue.hasValue() || aOldValue.hasValue() ) - NotifyAccessibleEvent( - AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, - aOldValue, - aNewValue ); - - NotifyAccessibleEvent( AccessibleEventId::SELECTION_CHANGED, Any(), Any() ); -} - -// ----------------------------------------------------------------------------- -// XAccessibleSelection -// ----------------------------------------------------------------------------- -void SAL_CALL VCLXAccessibleListBoxList::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) -{ - sal_Bool bNotify = sal_False; - - { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); - ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - - ListBox* pListBox = static_cast< ListBox* >( GetWindow() ); - if ( pListBox ) - { - checkSelection_Impl( nChildIndex, *pListBox, sal_False ); - pListBox->SelectEntryPos( (USHORT)nChildIndex, TRUE ); - // call the select handler, don't handle events in this time - m_bDisableProcessEvent = true; - pListBox->Select(); - m_bDisableProcessEvent = false; - bNotify = sal_True; - } - } - - if ( bNotify ) - UpdateSelection_Impl(); -} -// ----------------------------------------------------------------------------- -sal_Bool SAL_CALL VCLXAccessibleListBoxList::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) -{ - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); - ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - - sal_Bool bRet = sal_False; - ListBox* pListBox = static_cast< ListBox* >( GetWindow() ); - if ( pListBox ) - { - checkSelection_Impl( nChildIndex, *pListBox, sal_False ); - bRet = pListBox->IsEntryPosSelected( (USHORT)nChildIndex ); - } - return bRet; -} -// ----------------------------------------------------------------------------- -void SAL_CALL VCLXAccessibleListBoxList::clearAccessibleSelection( ) throw (RuntimeException) -{ - sal_Bool bNotify = sal_False; - - { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); - ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - - ListBox* pListBox = static_cast< ListBox* >( GetWindow() ); - if ( pListBox ) - { - pListBox->SetNoSelection(); - bNotify = sal_True; - } - } - - if ( bNotify ) - UpdateSelection_Impl(); -} -// ----------------------------------------------------------------------------- -void SAL_CALL VCLXAccessibleListBoxList::selectAllAccessibleChildren( ) throw (RuntimeException) -{ - sal_Bool bNotify = sal_False; - - { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); - ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - - ListBox* pListBox = static_cast< ListBox* >( GetWindow() ); - if ( pListBox ) - { - USHORT nCount = pListBox->GetEntryCount(); - for ( USHORT i = 0; i < nCount; ++i ) - pListBox->SelectEntryPos( i, TRUE ); - // call the select handler, don't handle events in this time - m_bDisableProcessEvent = true; - pListBox->Select(); - m_bDisableProcessEvent = false; - bNotify = sal_True; - } - } - - if ( bNotify ) - UpdateSelection_Impl(); -} -// ----------------------------------------------------------------------------- -sal_Int32 SAL_CALL VCLXAccessibleListBoxList::getSelectedAccessibleChildCount( ) throw (RuntimeException) -{ - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); - ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - - sal_Int32 nCount = 0; - ListBox* pListBox = static_cast< ListBox* >( GetWindow() ); - if ( pListBox ) - nCount = pListBox->GetSelectEntryCount(); - return nCount; -} -// ----------------------------------------------------------------------------- -Reference< XAccessible > SAL_CALL VCLXAccessibleListBoxList::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) -{ - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); - ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - - ListBox* pListBox = static_cast< ListBox* >( GetWindow() ); - if ( pListBox ) - { - checkSelection_Impl( nSelectedChildIndex, *pListBox, sal_True ); - return getAccessibleChild( (sal_Int32)pListBox->GetSelectEntryPos( (USHORT)nSelectedChildIndex ) ); - } - - return NULL; -} -// ----------------------------------------------------------------------------- -void SAL_CALL VCLXAccessibleListBoxList::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) -{ - sal_Bool bNotify = sal_False; - - { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); - ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - - ListBox* pListBox = static_cast< ListBox* >( GetWindow() ); - if ( pListBox ) - { - checkSelection_Impl( nSelectedChildIndex, *pListBox, sal_False ); - pListBox->SelectEntryPos( (USHORT)nSelectedChildIndex, FALSE ); - // call the select handler, don't handle events in this time - m_bDisableProcessEvent = true; - pListBox->Select(); - m_bDisableProcessEvent = false; - bNotify = sal_True; - } - } - - if ( bNotify ) - UpdateSelection_Impl(); -} -// ----------------------------------------------------------------------------- - -- cgit v1.2.1 From 7afdc1af091ee3c55d5c5da889557daeda20164b Mon Sep 17 00:00:00 2001 From: "Ocke Janssen [oj]" Date: Tue, 6 Jul 2010 15:20:20 +0200 Subject: dba33g: #i112520# don't use getBestRowIdent.. --- dbaccess/source/core/api/KeySet.cxx | 4 +++- dbaccess/source/core/api/OptimisticSet.cxx | 3 ++- dbaccess/source/core/api/RowSetCache.cxx | 3 ++- dbaccess/source/core/api/WrappedResultSet.cxx | 20 +++++++++----------- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx index 9c7fdb4bbdd4..08c782f05656 100644 --- a/dbaccess/source/core/api/KeySet.cxx +++ b/dbaccess/source/core/api/KeySet.cxx @@ -358,15 +358,17 @@ void OKeySet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::O xTableProp->getPropertyValue(PROPERTY_NAME) >>= sTable; ::std::vector< ::rtl::OUString> aBestRowColumnNames; + /* doesn't work with hsqldb Reference xBestRes(xMeta->getBestRowIdentifier(aCatalog,sSchema,sTable,0,sal_False)); Reference xBestRow(xBestRes,uno::UNO_QUERY); while ( xBestRes->next() ) { aBestRowColumnNames.push_back(xBestRow->getString(2)); } - + */ Sequence< ::rtl::OUString> aBestColumnNames; if ( !aBestRowColumnNames.empty() ) + { aBestColumnNames = Sequence< ::rtl::OUString>(&aBestRowColumnNames[0],aBestRowColumnNames.size()); ::dbaccess::getColumnPositions(xSup->getColumns(),aBestColumnNames,m_sUpdateTableName,(*m_pKeyColumnNames)); diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx index 23a83d3df67a..09a763d08c71 100644 --- a/dbaccess/source/core/api/OptimisticSet.cxx +++ b/dbaccess/source/core/api/OptimisticSet.cxx @@ -1303,13 +1303,14 @@ void OptimisticSet::findTableColumnsMatching_throw(const Any& i_aTable // first ask the database itself for the best columns which can be used ::std::vector< ::rtl::OUString> aBestRowColumnNames; + /* Reference xBestRes(i_xMeta->getBestRowIdentifier(aCatalog,sSchema,sTable,0,sal_False)); Reference xBestRow(xBestRes,uno::UNO_QUERY); while ( xBestRes->next() ) { aBestRowColumnNames.push_back(xBestRow->getString(2)); } - + */ Sequence< ::rtl::OUString> aBestColumnNames; if ( aBestRowColumnNames.empty() ) { diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx index 0bdc83c93f79..72cb67209e9f 100644 --- a/dbaccess/source/core/api/RowSetCache.cxx +++ b/dbaccess/source/core/api/RowSetCache.cxx @@ -167,8 +167,9 @@ ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs, m_pCacheSet->construct(_xRs,i_sRowSetFilter); return; } - catch(const Exception&) + catch(const Exception& ex) { + (void)ex; } _xRs->beforeFirst(); diff --git a/dbaccess/source/core/api/WrappedResultSet.cxx b/dbaccess/source/core/api/WrappedResultSet.cxx index 074da2faf46e..606715254e17 100644 --- a/dbaccess/source/core/api/WrappedResultSet.cxx +++ b/dbaccess/source/core/api/WrappedResultSet.cxx @@ -64,43 +64,41 @@ void WrappedResultSet::construct(const Reference< XResultSet>& _xDriverSet,const Any SAL_CALL WrappedResultSet::getBookmark() throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "WrappedResultSet::getBookmark" ); + if ( m_xRowLocate.is() ) + { + return m_xRowLocate->getBookmark( ); + } return makeAny(m_xDriverSet->getRow()); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL WrappedResultSet::moveToBookmark( const Any& bookmark ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "WrappedResultSet::moveToBookmark" ); - sal_Int32 nPos = 1; - bookmark >>= nPos; - return m_xDriverSet->absolute(nPos); + return m_xRowLocate->moveToBookmark( bookmark ); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL WrappedResultSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "WrappedResultSet::moveRelativeToBookmark" ); - sal_Int32 nPos = 1; - bookmark >>= nPos; - return m_xDriverSet->absolute(nPos + rows); + return m_xRowLocate->moveRelativeToBookmark( bookmark,rows ); } // ------------------------------------------------------------------------- sal_Int32 SAL_CALL WrappedResultSet::compareBookmarks( const Any& _first, const Any& _second ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "WrappedResultSet::compareBookmarks" ); - return _first != _second; + return m_xRowLocate->compareBookmarks( _first,_second ); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL WrappedResultSet::hasOrderedBookmarks( ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "WrappedResultSet::hasOrderedBookmarks" ); - return sal_True; + return m_xRowLocate->hasOrderedBookmarks(); } // ------------------------------------------------------------------------- sal_Int32 SAL_CALL WrappedResultSet::hashBookmark( const Any& bookmark ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "WrappedResultSet::hashBookmark" ); - sal_Int32 nPos = 1; - bookmark >>= nPos; - return nPos; + return m_xRowLocate->hashBookmark(bookmark); } // ------------------------------------------------------------------------- // ::com::sun::star::sdbcx::XDeleteRows -- cgit v1.2.1 From 5110f7d154632f7a70fe390832ed90e72b993d8c Mon Sep 17 00:00:00 2001 From: "Ocke Janssen [oj]" Date: Wed, 7 Jul 2010 08:07:40 +0200 Subject: dba33g: #i112609# do not limited tables to the selection --- dbaccess/source/ui/browser/brwctrlr.cxx | 1 + dbaccess/source/ui/browser/unodatbr.cxx | 4 +--- dbaccess/source/ui/inc/unodatbr.hxx | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index c14e5a514298..6a2161b1c291 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -2751,6 +2751,7 @@ void SbaXDataBrowserController::unloading(const EventObject& /*aEvent*/) throw( void SbaXDataBrowserController::unloaded(const EventObject& /*aEvent*/) throw( RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::unloaded" ); + m_xParser.clear(); InvalidateAll(); // do this asynchron, there are other listeners reacting on this message ... // (it's a little hack : the grid columns are listening to this event, too, and their bound field may diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 46d0c847b503..c65055c582fc 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -1106,9 +1106,7 @@ SvLBoxEntry* SbaTableQueryBrowser::getObjectEntry(const ::rtl::OUString& _rDataS // expand if required so if (_bExpandAncestors) { - m_sToBeLoaded = _rCommand; m_pTreeView->getListBox().Expand(pCommandType); - m_sToBeLoaded = ::rtl::OUString(); } // look for the object @@ -2054,7 +2052,7 @@ void SbaTableQueryBrowser::populateTree(const Reference& _xNameAcce const ::rtl::OUString* pEnd = pIter + aNames.getLength(); for (; pIter != pEnd; ++pIter) { - if( (!m_sToBeLoaded.getLength() || m_sToBeLoaded == *pIter) && !m_pTreeView->getListBox().GetEntryPosByName(*pIter,_pParent)) + if( !m_pTreeView->getListBox().GetEntryPosByName(*pIter,_pParent)) { Reference xChild(_xNameAccess->getByName(*pIter),UNO_QUERY); DBTreeListUserData* pEntryData = new DBTreeListUserData; diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx index 448764b641e4..0448cef602e6 100644 --- a/dbaccess/source/ui/inc/unodatbr.hxx +++ b/dbaccess/source/ui/inc/unodatbr.hxx @@ -157,7 +157,7 @@ namespace dbaui OTableCopyHelper m_aTableCopyHelper; ::rtl::OUString m_sQueryCommand; // the command of the query currently loaded (if any) - ::rtl::OUString m_sToBeLoaded; // contains the element name which should be loaded if any + //::rtl::OUString m_sToBeLoaded; // contains the element name which should be loaded if any DBTreeView* m_pTreeView; Splitter* m_pSplitter; -- cgit v1.2.1 From d98c5119b4f4211167c919e7bf0bc32875dafbf5 Mon Sep 17 00:00:00 2001 From: "Ocke Janssen [oj]" Date: Wed, 7 Jul 2010 08:25:19 +0200 Subject: dba33g: clear warnings when free resource to avoid disposed exception when reloaded --- dbaccess/source/core/api/RowSet.cxx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index 27abc75da747..829155709119 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -580,6 +580,9 @@ void ORowSet::freeResources( bool _bComplete ) m_xComposer = NULL; } + // let our warnings container forget the reference to the (possibly disposed) old result set + m_aWarnings.setExternalWarnings( NULL ); + DELETEZ(m_pCache); impl_resetTables_nothrow(); -- cgit v1.2.1 From 556abb108ee99bc2690c3ba08b501ba2483e9a8e Mon Sep 17 00:00:00 2001 From: "Ocke Janssen [oj]" Date: Wed, 7 Jul 2010 08:52:16 +0200 Subject: dba33g:#i111828# add lft part to count function --- hsqldb/patches/i96823.patch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hsqldb/patches/i96823.patch b/hsqldb/patches/i96823.patch index 9803bc619e47..a48f61b97af1 100644 --- a/hsqldb/patches/i96823.patch +++ b/hsqldb/patches/i96823.patch @@ -9,8 +9,9 @@ + return buf.toString(); case COUNT : - buf.append(' ').append(Token.T_COUNT).append('('); +- buf.append(' ').append(Token.T_COUNT).append('('); - break; ++ buf.append(' ').append(Token.T_COUNT).append(left); + return buf.toString(); case SUM : -- cgit v1.2.1 From 9b3ed7aa9162094b99fd3341c0432c94e659420b Mon Sep 17 00:00:00 2001 From: "Ocke Janssen [oj]" Date: Wed, 7 Jul 2010 09:07:34 +0200 Subject: dba33g: handle of next and prior for count function corrected --- connectivity/source/drivers/file/FResultSet.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx index 265084be697f..421225b34935 100644 --- a/connectivity/source/drivers/file/FResultSet.cxx +++ b/connectivity/source/drivers/file/FResultSet.cxx @@ -1200,7 +1200,9 @@ BOOL OResultSet::Move(IResultSetHelper::Movement eCursorPosition, INT32 nOffset, break; } - if (m_nRowPos == 0) + if ( m_nRowPos < 0 ) + goto Error; + else if (m_nRowPos == 0) { // COUNT(*) in Ergebnisrow packen // (muss die erste und einzige Variable in der Row sein) -- cgit v1.2.1 From 67b452a0ba3b50f8a42e6b5f65a5e2de943b5221 Mon Sep 17 00:00:00 2001 From: "Ocke Janssen [oj]" Date: Wed, 7 Jul 2010 10:24:51 +0200 Subject: dba33g: #i112440# make teh version final for 33 --- mysqlc/version.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysqlc/version.mk b/mysqlc/version.mk index e9bc6495288f..5713d5265258 100644 --- a/mysqlc/version.mk +++ b/mysqlc/version.mk @@ -35,4 +35,4 @@ MYSQLC_TITLE=MySQL Connector # the status of the extension # if this is different from "final", it will be appended to the title displayed in the Extension Manager # and also added to the file name of the resulting .oxt file -MYSQLC_STATUS=Alpha +MYSQLC_STATUS=final -- cgit v1.2.1 From ec88ba28a7fe69927c23700261ff064b79df8654 Mon Sep 17 00:00:00 2001 From: "Ocke Janssen [oj]" Date: Wed, 7 Jul 2010 12:40:38 +0200 Subject: dba33g: #i112620# add new namespace for chartooo --- reportbuilder/java/com/sun/star/report/pentaho/OfficeNamespaces.java | 2 ++ .../sun/star/report/pentaho/output/OfficeDocumentReportTarget.java | 4 +++- .../java/com/sun/star/report/pentaho/output/StylesWriter.java | 4 +++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/reportbuilder/java/com/sun/star/report/pentaho/OfficeNamespaces.java b/reportbuilder/java/com/sun/star/report/pentaho/OfficeNamespaces.java index 45e5f64c4670..823bf6540f47 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/OfficeNamespaces.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/OfficeNamespaces.java @@ -46,6 +46,7 @@ public class OfficeNamespaces public static final String DATASTYLE_NS = "urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"; public static final String SVG_NS = "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"; public static final String CHART_NS = "urn:oasis:names:tc:opendocument:xmlns:chart:1.0"; + public static final String CHARTOOO_NS = "http://openoffice.org/2010/chart"; public static final String DR3D_NS = "urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"; public static final String MATHML_NS = "http://www.w3.org/1998/Math/MathML"; public static final String FORM_NS = "urn:oasis:names:tc:opendocument:xmlns:form:1.0"; @@ -58,6 +59,7 @@ public class OfficeNamespaces public static final String XSD_NS = "http://www.w3.org/2001/XMLSchema"; public static final String XSI_NS = "http://www.w3.org/2001/XMLSchema-instance"; public static final String OOREPORT_NS = "http://openoffice.org/2005/report"; + public static final String GRDDL_NS = "http://www.w3.org/2003/g/data-view#"; public static final String CONFIG = "urn:oasis:names:tc:opendocument:xmlns:config:1.0"; /** * @deprecated diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java b/reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java index a3a54f119847..d4046424e07d 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/output/OfficeDocumentReportTarget.java @@ -363,6 +363,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget rootAttributes.addNamespaceDeclaration("number", OfficeNamespaces.DATASTYLE_NS); rootAttributes.addNamespaceDeclaration("svg", OfficeNamespaces.SVG_NS); rootAttributes.addNamespaceDeclaration("chart", OfficeNamespaces.CHART_NS); + rootAttributes.addNamespaceDeclaration("chartooo", OfficeNamespaces.CHARTOOO_NS); rootAttributes.addNamespaceDeclaration("dr3d", OfficeNamespaces.DR3D_NS); rootAttributes.addNamespaceDeclaration("math", OfficeNamespaces.MATHML_NS); rootAttributes.addNamespaceDeclaration("form", OfficeNamespaces.FORM_NS); @@ -374,7 +375,8 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget rootAttributes.addNamespaceDeclaration("xforms", OfficeNamespaces.XFORMS_NS); rootAttributes.addNamespaceDeclaration("xsd", OfficeNamespaces.XSD_NS); rootAttributes.addNamespaceDeclaration("xsi", OfficeNamespaces.XSI_NS); - rootAttributes.setAttribute(OfficeNamespaces.OFFICE_NS, "version", "1.0"); + rootAttributes.addNamespaceDeclaration("grddl", OfficeNamespaces.GRDDL_NS); + rootAttributes.setAttribute(OfficeNamespaces.OFFICE_NS, "version", "1.2"); this.rootXmlWriter.writeXmlDeclaration("UTF-8"); this.rootXmlWriter.writeTag(OfficeNamespaces.OFFICE_NS, "document-content", rootAttributes, XmlWriterSupport.OPEN); diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java b/reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java index b931ec80820c..9b2e6b33b5f7 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java @@ -358,6 +358,7 @@ public class StylesWriter OfficeNamespaces.DATASTYLE_NS); rootAttributes.addNamespaceDeclaration("svg", OfficeNamespaces.SVG_NS); rootAttributes.addNamespaceDeclaration("chart", OfficeNamespaces.CHART_NS); + rootAttributes.addNamespaceDeclaration("chartooo", OfficeNamespaces.CHARTOOO_NS); rootAttributes.addNamespaceDeclaration("dr3d", OfficeNamespaces.DR3D_NS); rootAttributes.addNamespaceDeclaration("math", OfficeNamespaces.MATHML_NS); rootAttributes.addNamespaceDeclaration("form", OfficeNamespaces.FORM_NS); @@ -372,7 +373,8 @@ public class StylesWriter OfficeNamespaces.XFORMS_NS); rootAttributes.addNamespaceDeclaration("xsd", OfficeNamespaces.XSD_NS); rootAttributes.addNamespaceDeclaration("xsi", OfficeNamespaces.XSI_NS); - rootAttributes.setAttribute(OfficeNamespaces.OFFICE_NS, "version", "1.0"); + rootAttributes.addNamespaceDeclaration("grddl", OfficeNamespaces.GRDDL_NS); + rootAttributes.setAttribute(OfficeNamespaces.OFFICE_NS, "version", "1.2"); this.xmlWriter.writeXmlDeclaration("UTF-8"); this.xmlWriter.writeTag(OfficeNamespaces.OFFICE_NS, -- cgit v1.2.1 From f550379188d5f14e87e5452e79fa64d0c9cf0cd3 Mon Sep 17 00:00:00 2001 From: "Ocke Janssen [oj]" Date: Wed, 7 Jul 2010 12:43:22 +0200 Subject: dba33g: #i112620# modified state is not set correctly at sdrmodel --- reportdesign/source/core/api/ReportDefinition.cxx | 1 + reportdesign/source/ui/report/FormattedFieldBeautifier.cxx | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index bcc90b54b8b6..2cf848dc0c84 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -1299,6 +1299,7 @@ void SAL_CALL OReportDefinition::close( ::sal_Bool _bDeliverOwnership ) throw (u ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); ::comphelper::MediaDescriptor aDescriptor( _aArguments ); fillArgs(aDescriptor); + m_pImpl->m_pReportModel->SetModified(sal_False); return sal_True; } // ----------------------------------------------------------------------------- diff --git a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx index e44325dec05f..fdfdad6cb55f 100644 --- a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx +++ b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx @@ -88,11 +88,10 @@ namespace rptui void FormattedFieldBeautifier::setPlaceholderText( const uno::Reference< uno::XInterface >& _rxComponent ) { ::rtl::OUString sDataField; - uno::Reference< report::XReportComponent > xComponent( _rxComponent, uno::UNO_QUERY ); try { - uno::Reference< report::XReportControlModel > xControlModel( xComponent, uno::UNO_QUERY ); + uno::Reference< report::XFormattedField > xControlModel( _rxComponent, uno::UNO_QUERY ); if ( xControlModel.is() ) { sDataField = xControlModel->getDataField(); @@ -119,8 +118,8 @@ namespace rptui } } - if ( xComponent.is() ) - setPlaceholderText( getVclWindowPeer( xComponent ), sDataField ); + if ( xControlModel.is() ) + setPlaceholderText( getVclWindowPeer( xControlModel.get() ), sDataField ); } catch (uno::Exception) { -- cgit v1.2.1 From 4283794ec5f1738f714defcec5e47c6ee1bdde22 Mon Sep 17 00:00:00 2001 From: Oliver-Rainer Wittmann Date: Wed, 7 Jul 2010 13:05:22 +0200 Subject: sw33bf07: #i112181# method - assure that internal flag indicating existence of non-footnote-anchor portion is updated in all cases. --- sw/source/core/text/itrform2.cxx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx index c7527b372554..0ae80fb5306f 100644 --- a/sw/source/core/text/itrform2.cxx +++ b/sw/source/core/text/itrform2.cxx @@ -335,8 +335,14 @@ void SwTxtFormatter::InsertPortion( SwTxtFormatInfo &rInf, // bei dem LineLayout ist allerdings alles anders... if( pPor == pCurr ) { - if( pCurr->GetPortion() ) + if ( pCurr->GetPortion() ) + { pPor = pCurr->GetPortion(); + } + + // --> OD 2010-07-07 #i112181# + rInf.SetOtherThanFtnInside( rInf.IsOtherThanFtnInside() || !pPor->IsFtnPortion() ); + // <-- } else { -- cgit v1.2.1 From 976f6be2e65ba681b70d91943265baaec75398c5 Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Wed, 7 Jul 2010 14:32:15 +0200 Subject: #i112791# add missing update for SID_INSERTPAGE slot on slide change --- sd/source/ui/view/drviews1.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 98d0b7551705..5fbd400d7520 100755 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -1244,6 +1244,7 @@ BOOL DrawViewShell::SwitchPage(USHORT nSelectedPage) rBindings.Invalidate(SID_DELETE_MASTER_PAGE, TRUE, FALSE); rBindings.Invalidate(SID_DELETE_PAGE, TRUE, FALSE); rBindings.Invalidate(SID_ASSIGN_LAYOUT,TRUE,FALSE); + rBindings.Invalidate(SID_INSERTPAGE,TRUE,FALSE); UpdatePreview( mpActualPage ); mpDrawView->AdjustMarkHdl(); -- cgit v1.2.1 From 78ce81b376371b23759f0b67e5664fd1faf7dbee Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Wed, 7 Jul 2010 15:53:12 +0200 Subject: #i112791# add missing update for SID_INSERTPAGE slot on slide change --- sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index 6c1123abc031..e571a765bdad 100755 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -614,6 +614,17 @@ void SlotManager::GetMenuState ( SfxItemSet& rSet) break; } } + + PageKind ePageKind = mrSlideSorter.GetModel().GetPageType(); + if( (eEditMode == EM_MASTERPAGE) && (ePageKind != PK_HANDOUT ) ) + { + rSet.DisableItem(SID_ASSIGN_LAYOUT); + } + + if( (eEditMode == EM_MASTERPAGE) || (ePageKind==PK_NOTES) ) + { + rSet.DisableItem(SID_INSERTPAGE); + } } -- cgit v1.2.1 From dbc44685373378412f1c20aa4d21336bfddd35cd Mon Sep 17 00:00:00 2001 From: "Ocke Janssen [oj]" Date: Thu, 8 Jul 2010 10:08:55 +0200 Subject: dba33g: #i111828# * is handled differently --- hsqldb/patches/i96823.patch | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hsqldb/patches/i96823.patch b/hsqldb/patches/i96823.patch index a48f61b97af1..bea4a2b7e4f5 100644 --- a/hsqldb/patches/i96823.patch +++ b/hsqldb/patches/i96823.patch @@ -9,10 +9,9 @@ + return buf.toString(); case COUNT : -- buf.append(' ').append(Token.T_COUNT).append('('); + buf.append(' ').append(Token.T_COUNT).append('('); - break; -+ buf.append(' ').append(Token.T_COUNT).append(left); -+ return buf.toString(); ++ if ( "(*)".equals(left))buf.append('*');else buf.append(left); buf.append(')'); return buf.toString(); case SUM : buf.append(' ').append(Token.T_SUM).append('('); -- cgit v1.2.1 From 42584318cc4a396d31d980504397f3f8b9814a45 Mon Sep 17 00:00:00 2001 From: "Ocke Janssen [oj]" Date: Thu, 8 Jul 2010 12:21:55 +0200 Subject: dba33g: #i111205# handle filter for key and update and insert row --- dbaccess/source/core/api/KeySet.cxx | 523 ++++++++-------- dbaccess/source/core/api/KeySet.hxx | 24 +- dbaccess/source/core/api/OptimisticSet.cxx | 940 +---------------------------- dbaccess/source/core/api/OptimisticSet.hxx | 95 +-- dbaccess/source/core/api/makefile.mk | 1 + 5 files changed, 278 insertions(+), 1305 deletions(-) diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx index 08c782f05656..2580733deba5 100644 --- a/dbaccess/source/core/api/KeySet.cxx +++ b/dbaccess/source/core/api/KeySet.cxx @@ -53,9 +53,6 @@ #ifndef _COM_SUN_STAR_SDBC_XGENERATEDRESULTSET_HPP_ #include #endif -#ifndef _COM_SUN_STAR_SDB_XSINGLESELECTQUERYCOMPOSER_HPP_ -#include -#endif #ifndef _COM_SUN_STAR_SDBC_XCOLUMNLOCATE_HPP_ #include #endif @@ -112,6 +109,7 @@ #endif #include #include +#include "PrivateRow.hxx" using namespace dbaccess; using namespace ::connectivity; @@ -148,134 +146,6 @@ namespace } } } - class OPrivateRow : public ::cppu::WeakImplHelper1 - { - ORowSetValueVector::Vector m_aRow; - sal_Int32 m_nPos; - public: - OPrivateRow(const ORowSetValueVector::Vector& i_aRow) : m_aRow(i_aRow),m_nPos(0) - { - } - virtual ::sal_Bool SAL_CALL wasNull( ) throw (SQLException, RuntimeException); - virtual ::rtl::OUString SAL_CALL getString( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException); - virtual ::sal_Bool SAL_CALL getBoolean( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException); - virtual ::sal_Int8 SAL_CALL getByte( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException); - virtual ::sal_Int16 SAL_CALL getShort( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException); - virtual ::sal_Int32 SAL_CALL getInt( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException); - virtual ::sal_Int64 SAL_CALL getLong( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException); - virtual float SAL_CALL getFloat( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException); - virtual double SAL_CALL getDouble( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException); - virtual Sequence< ::sal_Int8 > SAL_CALL getBytes( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException); - virtual ::com::sun::star::util::Date SAL_CALL getDate( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException); - virtual ::com::sun::star::util::Time SAL_CALL getTime( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException); - virtual ::com::sun::star::util::DateTime SAL_CALL getTimestamp( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException); - virtual Reference< ::com::sun::star::io::XInputStream > SAL_CALL getBinaryStream( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException); - virtual Reference< ::com::sun::star::io::XInputStream > SAL_CALL getCharacterStream( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException); - virtual Any SAL_CALL getObject( ::sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw (SQLException, RuntimeException); - virtual Reference< XRef > SAL_CALL getRef( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException); - virtual Reference< XBlob > SAL_CALL getBlob( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException); - virtual Reference< XClob > SAL_CALL getClob( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException); - virtual Reference< XArray > SAL_CALL getArray( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException); - }; - ::sal_Bool SAL_CALL OPrivateRow::wasNull( ) throw (SQLException, RuntimeException) - { - return m_aRow[m_nPos].isNull(); - } - ::rtl::OUString SAL_CALL OPrivateRow::getString( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException) - { - m_nPos = columnIndex; - return m_aRow[m_nPos]; - } - ::sal_Bool SAL_CALL OPrivateRow::getBoolean( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException) - { - m_nPos = columnIndex; - return m_aRow[m_nPos]; - } - ::sal_Int8 SAL_CALL OPrivateRow::getByte( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException) - { - m_nPos = columnIndex; - return m_aRow[m_nPos]; - } - ::sal_Int16 SAL_CALL OPrivateRow::getShort( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException) - { - m_nPos = columnIndex; - return m_aRow[m_nPos]; - } - ::sal_Int32 SAL_CALL OPrivateRow::getInt( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException) - { - m_nPos = columnIndex; - return m_aRow[m_nPos]; - } - ::sal_Int64 SAL_CALL OPrivateRow::getLong( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException) - { - m_nPos = columnIndex; - return m_aRow[m_nPos]; - } - float SAL_CALL OPrivateRow::getFloat( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException) - { - m_nPos = columnIndex; - return m_aRow[m_nPos]; - } - double SAL_CALL OPrivateRow::getDouble( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException) - { - m_nPos = columnIndex; - return m_aRow[m_nPos]; - } - Sequence< ::sal_Int8 > SAL_CALL OPrivateRow::getBytes( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException) - { - m_nPos = columnIndex; - return m_aRow[m_nPos]; - } - ::com::sun::star::util::Date SAL_CALL OPrivateRow::getDate( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException) - { - m_nPos = columnIndex; - return m_aRow[m_nPos]; - } - ::com::sun::star::util::Time SAL_CALL OPrivateRow::getTime( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException) - { - m_nPos = columnIndex; - return m_aRow[m_nPos]; - } - ::com::sun::star::util::DateTime SAL_CALL OPrivateRow::getTimestamp( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException) - { - m_nPos = columnIndex; - return m_aRow[m_nPos]; - } - Reference< ::com::sun::star::io::XInputStream > SAL_CALL OPrivateRow::getBinaryStream( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException) - { - m_nPos = columnIndex; - return Reference< ::com::sun::star::io::XInputStream >(m_aRow[m_nPos].makeAny(),UNO_QUERY); - } - Reference< ::com::sun::star::io::XInputStream > SAL_CALL OPrivateRow::getCharacterStream( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException) - { - m_nPos = columnIndex; - return Reference< ::com::sun::star::io::XInputStream >(m_aRow[m_nPos].makeAny(),UNO_QUERY); - } - Any SAL_CALL OPrivateRow::getObject( ::sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& ) throw (SQLException, RuntimeException) - { - m_nPos = columnIndex; - return m_aRow[m_nPos].makeAny(); - } - Reference< XRef > SAL_CALL OPrivateRow::getRef( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException) - { - m_nPos = columnIndex; - return Reference< XRef >(m_aRow[m_nPos].makeAny(),UNO_QUERY); - } - Reference< XBlob > SAL_CALL OPrivateRow::getBlob( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException) - { - m_nPos = columnIndex; - return Reference< XBlob >(m_aRow[m_nPos].makeAny(),UNO_QUERY); - } - Reference< XClob > SAL_CALL OPrivateRow::getClob( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException) - { - m_nPos = columnIndex; - return Reference< XClob >(m_aRow[m_nPos].makeAny(),UNO_QUERY); - } - Reference< XArray > SAL_CALL OPrivateRow::getArray( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException) - { - m_nPos = columnIndex; - return Reference< XArray >(m_aRow[m_nPos].makeAny(),UNO_QUERY); - } } DBG_NAME(OKeySet) // ------------------------------------------------------------------------- @@ -315,117 +185,106 @@ OKeySet::~OKeySet() OSL_ENSURE(0,"Unknown Exception occured"); } m_xComposer = NULL; - delete m_pKeyColumnNames; - delete m_pColumnNames; - delete m_pParameterNames; - delete m_pForeignColumnNames; DBG_DTOR(OKeySet,NULL); } -// ----------------------------------------------------------------------------- -void OKeySet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::OUString& i_sRowSetFilter) +void OKeySet::initColumns() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::construct" ); - OCacheSet::construct(_xDriverSet,i_sRowSetFilter); - Reference xMeta = m_xConnection->getMetaData(); bool bCase = (xMeta.is() && xMeta->storesMixedCaseQuotedIdentifiers()) ? true : false; - m_pKeyColumnNames = new SelectColumnsMetaData(bCase); - m_pColumnNames = new SelectColumnsMetaData(bCase); - m_pParameterNames = new SelectColumnsMetaData(bCase); - m_pForeignColumnNames = new SelectColumnsMetaData(bCase); - - Reference xKeyColumns = getKeyColumns(); - Reference xSup(m_xComposer,UNO_QUERY); - Reference xSourceColumns = m_xTable->getColumns(); - // locate parameter in select columns - Reference xParaSup(m_xComposer,UNO_QUERY); - Reference xQueryParameters = xParaSup->getParameters(); - const sal_Int32 nParaCount = xQueryParameters->getCount(); - Sequence< ::rtl::OUString> aParameterColumns(nParaCount); - for(sal_Int32 i = 0; i< nParaCount;++i) - { - Reference xPara(xQueryParameters->getByIndex(i),UNO_QUERY_THROW); - xPara->getPropertyValue(PROPERTY_REALNAME) >>= aParameterColumns[i]; - } - + m_pKeyColumnNames.reset( new SelectColumnsMetaData(bCase) ); + m_pColumnNames.reset( new SelectColumnsMetaData(bCase) ); + m_pParameterNames.reset( new SelectColumnsMetaData(bCase) ); + m_pForeignColumnNames.reset( new SelectColumnsMetaData(bCase) ); +} +void OKeySet::findTableColumnsMatching_throw(const Any& i_aTable + ,const Reference& i_xMeta + ,const Reference& i_xQueryColumns) +{ ::rtl::OUString sCatalog,sSchema,sTable; - - Reference xTableProp(m_xTable,UNO_QUERY); + Reference xTableProp(i_aTable,UNO_QUERY); Any aCatalog = xTableProp->getPropertyValue(PROPERTY_CATALOGNAME); aCatalog >>= sCatalog; xTableProp->getPropertyValue(PROPERTY_SCHEMANAME) >>= sSchema; xTableProp->getPropertyValue(PROPERTY_NAME) >>= sTable; - ::std::vector< ::rtl::OUString> aBestRowColumnNames; - /* doesn't work with hsqldb - Reference xBestRes(xMeta->getBestRowIdentifier(aCatalog,sSchema,sTable,0,sal_False)); - Reference xBestRow(xBestRes,uno::UNO_QUERY); - while ( xBestRes->next() ) - { - aBestRowColumnNames.push_back(xBestRow->getString(2)); - } - */ + // first ask the database itself for the best columns which can be used Sequence< ::rtl::OUString> aBestColumnNames; - if ( !aBestRowColumnNames.empty() ) + Reference xKeyColumns = getPrimaryKeyColumns_throw(i_aTable); + if ( xKeyColumns.is() ) + aBestColumnNames = xKeyColumns->getElementNames(); - { - aBestColumnNames = Sequence< ::rtl::OUString>(&aBestRowColumnNames[0],aBestRowColumnNames.size()); - ::dbaccess::getColumnPositions(xSup->getColumns(),aBestColumnNames,m_sUpdateTableName,(*m_pKeyColumnNames)); - } + const Reference xTblColSup(i_aTable,UNO_QUERY_THROW); + const Reference xTblColumns = xTblColSup->getColumns(); + const ::rtl::OUString sComposedUpdateTableName = dbtools::composeTableName( i_xMeta, sCatalog, sSchema, sTable, sal_False, ::dbtools::eInDataManipulation ); + ::dbaccess::getColumnPositions(i_xQueryColumns,aBestColumnNames,sComposedUpdateTableName,(*m_pKeyColumnNames),true); + ::dbaccess::getColumnPositions(i_xQueryColumns,xTblColumns->getElementNames(),sComposedUpdateTableName,(*m_pColumnNames),true); - if (m_pKeyColumnNames->empty() && xKeyColumns.is()) + // locate parameter in select columns + Reference xParaSup(m_xComposer,UNO_QUERY); + Reference xQueryParameters = xParaSup->getParameters(); + const sal_Int32 nParaCount = xQueryParameters->getCount(); + Sequence< ::rtl::OUString> aParameterColumns(nParaCount); + for(sal_Int32 i = 0; i< nParaCount;++i) { - aBestColumnNames = xKeyColumns->getElementNames(); - ::dbaccess::getColumnPositions(xSup->getColumns(),aBestColumnNames,m_sUpdateTableName,(*m_pKeyColumnNames)); + Reference xPara(xQueryParameters->getByIndex(i),UNO_QUERY_THROW); + xPara->getPropertyValue(PROPERTY_REALNAME) >>= aParameterColumns[i]; } - ::dbaccess::getColumnPositions(xSup->getColumns(),xSourceColumns->getElementNames(),m_sUpdateTableName,(*m_pColumnNames)); - ::dbaccess::getColumnPositions(xSup->getColumns(),aParameterColumns,m_sUpdateTableName,(*m_pParameterNames)); + ::dbaccess::getColumnPositions(i_xQueryColumns,aParameterColumns,sComposedUpdateTableName,(*m_pParameterNames),true); - SelectColumnsMetaData::const_iterator aPosIter = (*m_pKeyColumnNames).begin(); - SelectColumnsMetaData::const_iterator aPosEnd = (*m_pKeyColumnNames).end(); + SelectColumnsMetaData::const_iterator aPosIter = m_pKeyColumnNames->begin(); + SelectColumnsMetaData::const_iterator aPosEnd = m_pKeyColumnNames->end(); for(;aPosIter != aPosEnd;++aPosIter) { - if(xSourceColumns->hasByName(aPosIter->first)) + if ( xTblColumns->hasByName(aPosIter->second.sRealName) ) { - Reference xProp(xSourceColumns->getByName(aPosIter->first),UNO_QUERY); - sal_Bool bAuto = sal_Bool(); + Reference xProp(xTblColumns->getByName(aPosIter->second.sRealName),UNO_QUERY); + sal_Bool bAuto = sal_False; if( (xProp->getPropertyValue(PROPERTY_ISAUTOINCREMENT) >>= bAuto) && bAuto) m_aAutoColumns.push_back(aPosIter->first); } } - - // the first row is empty because it's now easier for us to distinguish when we are beforefirst or first - // without extra varaible to be set - m_aKeyMap.insert(OKeySetMatrix::value_type(0,OKeySetValue(NULL,::std::pair >(0,NULL)))); - - m_aKeyIter = m_aKeyMap.begin(); - +} +::rtl::OUStringBuffer OKeySet::createKeyFilter() +{ static ::rtl::OUString aAnd = ::rtl::OUString::createFromAscii(" AND "); - Reference xMetaData = m_xConnection->getMetaData(); const ::rtl::OUString aQuote = getIdentifierQuoteString(); - m_aSelectComposedTableName = getComposedTableName(sCatalog,sSchema,sTable); - - ::rtl::OUString sComposedName; - sCatalog = sSchema = sTable = ::rtl::OUString(); - ::dbtools::qualifiedNameComponents(xMetaData,m_sUpdateTableName,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation); - sComposedName = ::dbtools::composeTableName( xMetaData, sCatalog, sSchema, sTable, sal_True, ::dbtools::eInDataManipulation ); - ::rtl::OUStringBuffer aFilter; static ::rtl::OUString s_sDot(RTL_CONSTASCII_USTRINGPARAM(".")); static ::rtl::OUString s_sParam(RTL_CONSTASCII_USTRINGPARAM(" = ?")); // create the where clause - aPosEnd = (*m_pKeyColumnNames).end(); - for(aPosIter = (*m_pKeyColumnNames).begin();aPosIter != aPosEnd;) + SelectColumnsMetaData::iterator aPosEnd = m_pKeyColumnNames->end(); + for(SelectColumnsMetaData::iterator aPosIter = m_pKeyColumnNames->begin();aPosIter != aPosEnd;) { - aFilter.append(sComposedName); + aFilter.append(::dbtools::quoteName( aQuote,aPosIter->second.sTableName)); aFilter.append(s_sDot); - aFilter.append(::dbtools::quoteName( aQuote,aPosIter->first)); + aFilter.append(::dbtools::quoteName( aQuote,aPosIter->second.sRealName)); aFilter.append(s_sParam); ++aPosIter; if(aPosIter != aPosEnd) aFilter.append(aAnd); } + return aFilter; +} +// ----------------------------------------------------------------------------- +void OKeySet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::OUString& i_sRowSetFilter) +{ + RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::construct" ); + OCacheSet::construct(_xDriverSet,i_sRowSetFilter); + initColumns(); + + Reference xKeyColumns = getKeyColumns(); + Reference xMeta = m_xConnection->getMetaData(); + Reference xQueryColSup(m_xComposer,UNO_QUERY); + const Reference xQueryColumns = xQueryColSup->getColumns(); + findTableColumnsMatching_throw(makeAny(m_xTable),xMeta,xQueryColumns); + + // the first row is empty because it's now easier for us to distinguish when we are beforefirst or first + // without extra varaible to be set + m_aKeyMap.insert(OKeySetMatrix::value_type(0,OKeySetValue(NULL,::std::pair >(0,NULL)))); + m_aKeyIter = m_aKeyMap.begin(); + + ::rtl::OUStringBuffer aFilter = createKeyFilter(); Reference< XSingleSelectQueryComposer> xSourceComposer(m_xComposer,UNO_QUERY); Reference< XMultiServiceFactory > xFactory(m_xConnection, UNO_QUERY_THROW); @@ -436,6 +295,10 @@ void OKeySet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::O const Sequence< ::rtl::OUString> aSeq = xSelectTables->getElementNames(); if ( aSeq.getLength() > 1 ) // special handling for join { + static ::rtl::OUString aAnd = ::rtl::OUString::createFromAscii(" AND "); + const ::rtl::OUString aQuote = getIdentifierQuoteString(); + static ::rtl::OUString s_sDot(RTL_CONSTASCII_USTRINGPARAM(".")); + static ::rtl::OUString s_sParam(RTL_CONSTASCII_USTRINGPARAM(" = ?")); const ::rtl::OUString* pIter = aSeq.getConstArray(); const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); for(;pIter != pEnd;++pIter) @@ -444,13 +307,12 @@ void OKeySet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::O { connectivity::OSQLTable xSelColSup(xSelectTables->getByName(*pIter),uno::UNO_QUERY); Reference xProp(xSelColSup,uno::UNO_QUERY); - ::rtl::OUString sSelectTableName = ::dbtools::composeTableName( xMetaData, xProp, ::dbtools::eInDataManipulation, false, false, false ); - Reference xSelectColumns = xSup->getColumns(); + ::rtl::OUString sSelectTableName = ::dbtools::composeTableName( xMeta, xProp, ::dbtools::eInDataManipulation, false, false, false ); - ::dbaccess::getColumnPositions(xSelectColumns,xSelColSup->getColumns()->getElementNames(),sSelectTableName,(*m_pForeignColumnNames)); + ::dbaccess::getColumnPositions(xQueryColumns,xSelColSup->getColumns()->getElementNames(),sSelectTableName,(*m_pForeignColumnNames)); - aPosEnd = (*m_pForeignColumnNames).end(); - for(aPosIter = (*m_pForeignColumnNames).begin();aPosIter != aPosEnd;++aPosIter) + SelectColumnsMetaData::iterator aPosEnd = (*m_pForeignColumnNames).end(); + for(SelectColumnsMetaData::iterator aPosIter = (*m_pForeignColumnNames).begin();aPosIter != aPosEnd;++aPosIter) { // look for columns not in the source columns to use them as filter as well // if ( !xSourceColumns->hasByName(aPosIter->first) ) @@ -459,7 +321,7 @@ void OKeySet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::O aFilter.append(aAnd); aFilter.append(::dbtools::quoteName( aQuote,sSelectTableName)); aFilter.append(s_sDot); - aFilter.append(::dbtools::quoteName( aQuote,aPosIter->first)); + aFilter.append(::dbtools::quoteName( aQuote,aPosIter->second.sRealName)); aFilter.append(s_sParam); } } @@ -467,17 +329,40 @@ void OKeySet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::O } } } // if ( aSeq.getLength() > 1 ) // special handling for join - - if ( i_sRowSetFilter.getLength() ) + executeStatement(aFilter,i_sRowSetFilter,xAnalyzer); +} +void OKeySet::executeStatement(::rtl::OUStringBuffer& io_aFilter,const ::rtl::OUString& i_sRowSetFilter,Reference& io_xAnalyzer) +{ + bool bFilterSet = i_sRowSetFilter.getLength() != 0; + if ( bFilterSet ) { FilterCreator aFilterCreator; aFilterCreator.append( i_sRowSetFilter ); - aFilterCreator.append( aFilter.makeStringAndClear() ); - aFilter = aFilterCreator.getComposedAndClear(); + aFilterCreator.append( io_aFilter.makeStringAndClear() ); + io_aFilter = aFilterCreator.getComposedAndClear(); } - xAnalyzer->setFilter(aFilter.makeStringAndClear()); - m_xStatement = m_xConnection->prepareStatement(xAnalyzer->getQueryWithSubstitution()); - ::comphelper::disposeComponent(xAnalyzer); + io_xAnalyzer->setFilter(io_aFilter.makeStringAndClear()); + if ( bFilterSet ) + { + Sequence< Sequence< PropertyValue > > aFilter2 = io_xAnalyzer->getStructuredFilter(); + const Sequence< PropertyValue >* pOr = aFilter2.getConstArray(); + const Sequence< PropertyValue >* pOrEnd = pOr + aFilter2.getLength(); + for(;pOr != pOrEnd;++pOr) + { + const PropertyValue* pAnd = pOr->getConstArray(); + const PropertyValue* pAndEnd = pAnd + pOr->getLength(); + for(;pAnd != pAndEnd;++pAnd) + { + ::rtl::OUString sValue; + if ( !(pAnd->Value >>= sValue) || !(sValue.equalsAscii("?") || sValue.matchAsciiL(":",1,0)) ) + { // we have a criteria which has to be taken into account for updates + m_aFilterColumns.push_back(pAnd->Name); + } + } + } + } + m_xStatement = m_xConnection->prepareStatement(io_xAnalyzer->getQueryWithSubstitution()); + ::comphelper::disposeComponent(io_xAnalyzer); } // ------------------------------------------------------------------------- Any SAL_CALL OKeySet::getBookmark() throw(SQLException, RuntimeException) @@ -560,7 +445,7 @@ Sequence< sal_Int32 > SAL_CALL OKeySet::deleteRows( const Sequence< Any >& rows SelectColumnsMetaData::const_iterator aPosEnd = (*m_pKeyColumnNames).end(); for(;aIter != aPosEnd;++aIter) { - aCondition.append(::dbtools::quoteName( aQuote,aIter->first)); + aCondition.append(::dbtools::quoteName( aQuote,aIter->second.sRealName)); aCondition.append(aEqual); aCondition.append(aAnd); } @@ -665,7 +550,7 @@ void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow //if(xKeyColumns.is() && xKeyColumns->hasByName(aIter->first)) if ( m_pKeyColumnNames->find(aIter->first) != m_pKeyColumnNames->end() ) { - sKeyCondition.append(::dbtools::quoteName( aQuote,aIter->first)); + sKeyCondition.append(::dbtools::quoteName( aQuote,aIter->second.sRealName)); if((_rOrginalRow->get())[aIter->second.nPosition].isNull()) sKeyCondition.append(sIsNull); else @@ -680,7 +565,7 @@ void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow { if((*aIndexIter)->hasByName(aIter->first)) { - sIndexCondition.append(::dbtools::quoteName( aQuote,aIter->first)); + sIndexCondition.append(::dbtools::quoteName( aQuote,aIter->second.sRealName)); if((_rOrginalRow->get())[aIter->second.nPosition].isNull()) sIndexCondition.append(sIsNull); else @@ -695,7 +580,7 @@ void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow } if((_rInsertRow->get())[aIter->second.nPosition].isModified()) { - aSql.append(::dbtools::quoteName( aQuote,aIter->first)); + aSql.append(::dbtools::quoteName( aQuote,aIter->second.sRealName)); aSql.append(aPara); } } @@ -729,62 +614,74 @@ void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_CONDITION_FOR_PK ), SQL_GENERAL_ERROR, m_xConnection ); // now create end execute the prepared statement - Reference< XPreparedStatement > xPrep(m_xConnection->prepareStatement(aSql.makeStringAndClear())); + + ::rtl::OUString sEmpty; + executeUpdate(_rInsertRow ,_rOrginalRow,aSql.makeStringAndClear(),sEmpty,aIndexColumnPositions); +} +// ----------------------------------------------------------------------------- +void OKeySet::executeUpdate(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOrginalRow,const ::rtl::OUString& i_sSQL,const ::rtl::OUString& i_sTableName,const ::std::vector& _aIndexColumnPositions) +{ + // now create end execute the prepared statement + Reference< XPreparedStatement > xPrep(m_xConnection->prepareStatement(i_sSQL)); Reference< XParameters > xParameter(xPrep,UNO_QUERY); - i = 1; - // first the set values bool bRefetch = true; - aIter = m_pColumnNames->begin(); - sal_uInt16 j = 0; Reference xRow; + sal_Int32 i = 1; + // first the set values + SelectColumnsMetaData::const_iterator aIter = m_pColumnNames->begin(); + SelectColumnsMetaData::const_iterator aEnd = m_pColumnNames->end(); + sal_uInt16 j = 0; for(;aIter != aEnd;++aIter,++j) { - sal_Int32 nPos = aIter->second.nPosition; - if((_rInsertRow->get())[nPos].isModified()) + if ( !i_sTableName.getLength() || aIter->second.sTableName == i_sTableName ) { - if ( bRefetch ) + sal_Int32 nPos = aIter->second.nPosition; + if((_rInsertRow->get())[nPos].isModified()) { - bRefetch = ::std::find(m_aFilterColumns.begin(),m_aFilterColumns.end(),aIter->first) == m_aFilterColumns.end(); - if ( !bRefetch ) + if ( bRefetch ) { - xRow = new OPrivateRow(_rInsertRow->get()); + bRefetch = ::std::find(m_aFilterColumns.begin(),m_aFilterColumns.end(),aIter->second.sRealName) == m_aFilterColumns.end(); } + impl_convertValue_throw(_rInsertRow,aIter->second); + (_rInsertRow->get())[nPos].setSigned((_rOrginalRow->get())[nPos].isSigned()); + setParameter(i++,xParameter,(_rInsertRow->get())[nPos],aIter->second.nType,aIter->second.nScale); } - - impl_convertValue_throw(_rInsertRow,aIter->second); - (_rInsertRow->get())[nPos].setSigned((_rOrginalRow->get())[nPos].isSigned()); - setParameter(i++,xParameter,(_rInsertRow->get())[nPos],aIter->second.nType,aIter->second.nScale); } } // and then the values of the where condition - aIter = (*m_pKeyColumnNames).begin(); - aEnd = (*m_pKeyColumnNames).end(); + aIter = m_pKeyColumnNames->begin(); + aEnd = m_pKeyColumnNames->end(); j = 0; - for(;aIter != aEnd;++aIter,++i,++j) + for(;aIter != aEnd;++aIter,++j) { - setParameter(i,xParameter,(_rOrginalRow->get())[aIter->second.nPosition],aIter->second.nType,aIter->second.nScale); + if ( !i_sTableName.getLength() || aIter->second.sTableName == i_sTableName ) + { + setParameter(i++,xParameter,(_rOrginalRow->get())[aIter->second.nPosition],aIter->second.nType,aIter->second.nScale); + } } - - // now we have to set the index values - ::std::vector::iterator aIdxColIter = aIndexColumnPositions.begin(); - ::std::vector::iterator aIdxColEnd = aIndexColumnPositions.end(); - j = 0; - aIter = m_pColumnNames->begin(); - for(;aIdxColIter != aIdxColEnd;++aIdxColIter,++i,++j,++aIter) + if ( !_aIndexColumnPositions.empty() ) { - setParameter(i,xParameter,(_rOrginalRow->get())[*aIdxColIter],(_rOrginalRow->get())[*aIdxColIter].getTypeKind(),aIter->second.nScale); + // now we have to set the index values + ::std::vector::const_iterator aIdxColIter = _aIndexColumnPositions.begin(); + ::std::vector::const_iterator aIdxColEnd = _aIndexColumnPositions.end(); + j = 0; + aIter = m_pColumnNames->begin(); + for(;aIdxColIter != aIdxColEnd;++aIdxColIter,++i,++j,++aIter) + { + setParameter(i,xParameter,(_rOrginalRow->get())[*aIdxColIter],(_rOrginalRow->get())[*aIdxColIter].getTypeKind(),aIter->second.nScale); + } } - - m_bUpdated = xPrep->executeUpdate() > 0; + const sal_Int32 nRowsUpdated = xPrep->executeUpdate(); + m_bUpdated = nRowsUpdated > 0; if(m_bUpdated) { const sal_Int32 nBookmark = ::comphelper::getINT32((_rInsertRow->get())[0].getAny()); m_aKeyIter = m_aKeyMap.find(nBookmark); m_aKeyIter->second.second.first = 2; m_aKeyIter->second.second.second = xRow; - copyRowValue(_rInsertRow,m_aKeyIter->second.first,nBookmark); + tryRefetch(_rInsertRow,bRefetch); } } // ------------------------------------------------------------------------- @@ -806,12 +703,17 @@ void SAL_CALL OKeySet::insertRow( const ORowSetRow& _rInsertRow,const connectivi SelectColumnsMetaData::const_iterator aIter = m_pColumnNames->begin(); SelectColumnsMetaData::const_iterator aEnd = m_pColumnNames->end(); sal_Int32 j = 1; + bool bRefetch = true; sal_Bool bModified = sal_False; for(;aIter != aEnd;++aIter,++j) { if((_rInsertRow->get())[aIter->second.nPosition].isModified()) { - aSql.append(::dbtools::quoteName( aQuote,aIter->first)); + if ( bRefetch ) + { + bRefetch = ::std::find(m_aFilterColumns.begin(),m_aFilterColumns.end(),aIter->second.sRealName) == m_aFilterColumns.end(); + } + aSql.append(::dbtools::quoteName( aQuote,aIter->second.sRealName)); aSql.append(aComma); aValues.append(aPara); bModified = sal_True; @@ -824,22 +726,33 @@ void SAL_CALL OKeySet::insertRow( const ORowSetRow& _rInsertRow,const connectivi aValues.setCharAt(aValues.getLength()-1,')'); aSql.append(aValues.makeStringAndClear()); // now create,fill and execute the prepared statement - Reference< XPreparedStatement > xPrep(m_xConnection->prepareStatement(aSql.makeStringAndClear())); + ::rtl::OUString sEmpty; + executeInsert(_rInsertRow,aSql.makeStringAndClear(),sEmpty,bRefetch); +} +// ------------------------------------------------------------------------- +void OKeySet::executeInsert( const ORowSetRow& _rInsertRow,const ::rtl::OUString& i_sSQL,const ::rtl::OUString& i_sTableName,bool bRefetch ) +{ + // now create,fill and execute the prepared statement + Reference< XPreparedStatement > xPrep(m_xConnection->prepareStatement(i_sSQL)); Reference< XParameters > xParameter(xPrep,UNO_QUERY); - aIter = m_pColumnNames->begin(); + SelectColumnsMetaData::const_iterator aIter = m_pColumnNames->begin(); + SelectColumnsMetaData::const_iterator aEnd = m_pColumnNames->end(); for(sal_Int32 i = 1;aIter != aEnd;++aIter) { - const sal_Int32 nPos = aIter->second.nPosition; - if((_rInsertRow->get())[nPos].isModified()) + if ( !i_sTableName.getLength() || aIter->second.sTableName == i_sTableName ) { - if((_rInsertRow->get())[nPos].isNull()) - xParameter->setNull(i++,(_rInsertRow->get())[nPos].getTypeKind()); - else + const sal_Int32 nPos = aIter->second.nPosition; + if((_rInsertRow->get())[nPos].isModified()) { - impl_convertValue_throw(_rInsertRow,aIter->second); - (_rInsertRow->get())[nPos].setSigned(m_aSignedFlags[nPos-1]); - setParameter(i++,xParameter,(_rInsertRow->get())[nPos],aIter->second.nType,aIter->second.nScale); + if((_rInsertRow->get())[nPos].isNull()) + xParameter->setNull(i++,(_rInsertRow->get())[nPos].getTypeKind()); + else + { + impl_convertValue_throw(_rInsertRow,aIter->second); + (_rInsertRow->get())[nPos].setSigned(m_aSignedFlags[nPos-1]); + setParameter(i++,xParameter,(_rInsertRow->get())[nPos],aIter->second.nType,aIter->second.nScale); + } } } } @@ -890,7 +803,7 @@ void SAL_CALL OKeySet::insertRow( const ORowSetRow& _rInsertRow,const connectivi ::comphelper::disposeComponent(xPrep); - if ( !bAutoValuesFetched && m_bInserted ) + if ( !i_sTableName.getLength() && !bAutoValuesFetched && m_bInserted ) { // first check if all key column values were set const ::rtl::OUString sMax(RTL_CONSTASCII_USTRINGPARAM(" MAX(")); @@ -947,13 +860,67 @@ void SAL_CALL OKeySet::insertRow( const ORowSetRow& _rInsertRow,const connectivi { OKeySetMatrix::iterator aKeyIter = m_aKeyMap.end(); --aKeyIter; - ORowSetRow aKeyRow = new connectivity::ORowVector< ORowSetValue >((*m_pKeyColumnNames).size()); + ORowSetRow aKeyRow = new connectivity::ORowVector< ORowSetValue >(m_pKeyColumnNames->size()); copyRowValue(_rInsertRow,aKeyRow,aKeyIter->first + 1); - m_aKeyIter = m_aKeyMap.insert(OKeySetMatrix::value_type(aKeyIter->first + 1,OKeySetValue(aKeyRow,::std::pair >(1,NULL)))).first; // now we set the bookmark for this row (_rInsertRow->get())[0] = makeAny((sal_Int32)m_aKeyIter->first); + tryRefetch(_rInsertRow,bRefetch); + } +} +void OKeySet::tryRefetch(const ORowSetRow& _rInsertRow,bool bRefetch) +{ + if ( bRefetch ) + { + // we just areassign the base members + try + { + Reference< XParameters > xParameter(m_xStatement,UNO_QUERY); + OSL_ENSURE(xParameter.is(),"No Parameter interface!"); + xParameter->clearParameters(); + + sal_Int32 nPos=1; + connectivity::ORowVector< ORowSetValue >::Vector::const_iterator aParaIter; + connectivity::ORowVector< ORowSetValue >::Vector::const_iterator aParaEnd; + OUpdatedParameter::iterator aUpdateFind = m_aUpdatedParameter.find(m_aKeyIter->first); + if ( aUpdateFind == m_aUpdatedParameter.end() ) + { + aParaIter = m_aParameterValueForCache.get().begin(); + aParaEnd = m_aParameterValueForCache.get().end(); + } + else + { + aParaIter = aUpdateFind->second.get().begin(); + aParaEnd = aUpdateFind->second.get().end(); + } + + for(++aParaIter;aParaIter != aParaEnd;++aParaIter,++nPos) + { + ::dbtools::setObjectWithInfo( xParameter, nPos, aParaIter->makeAny(), aParaIter->getTypeKind() ); + } + connectivity::ORowVector< ORowSetValue >::Vector::const_iterator aIter2 = m_aKeyIter->second.first->get().begin(); + SelectColumnsMetaData::const_iterator aPosIter = (*m_pKeyColumnNames).begin(); + SelectColumnsMetaData::const_iterator aPosEnd = (*m_pKeyColumnNames).end(); + for(;aPosIter != aPosEnd;++aPosIter,++aIter2,++nPos) + setParameter(nPos,xParameter,*aIter2,aPosIter->second.nType,aPosIter->second.nScale); + aPosIter = (*m_pForeignColumnNames).begin(); + aPosEnd = (*m_pForeignColumnNames).end(); + for(;aPosIter != aPosEnd;++aPosIter,++aIter2,++nPos) + setParameter(nPos,xParameter,*aIter2,aPosIter->second.nType,aPosIter->second.nScale); + + m_xSet = m_xStatement->executeQuery(); + OSL_ENSURE(m_xSet.is(),"No resultset form statement!"); + bRefetch = m_xSet->next(); + } + catch(Exception) + { + bRefetch = false; + } + } + if ( !bRefetch ) + { + m_aKeyIter->second.second.second = new OPrivateRow(_rInsertRow->get()); } } // ----------------------------------------------------------------------------- @@ -992,6 +959,7 @@ void OKeySet::copyRowValue(const ORowSetRow& _rInsertRow,ORowSetRow& _rKeyRow,sa for(;aPosIter != aPosEnd;++aPosIter,++aIter) { *aIter = (_rInsertRow->get())[aPosIter->second.nPosition]; + impl_convertValue_throw(_rKeyRow,aPosIter->second); aIter->setTypeKind(aPosIter->second.nType); } } @@ -1033,7 +1001,7 @@ void SAL_CALL OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivit { if ( m_pKeyColumnNames->find(aIter->first) != m_pKeyColumnNames->end() ) { - aSql.append(::dbtools::quoteName( aQuote,aIter->first)); + aSql.append(::dbtools::quoteName( aQuote,aIter->second.sRealName)); if((_rDeleteRow->get())[aIter->second.nPosition].isNull()) { OSL_ENSURE(0,"can a primary key be null"); @@ -1051,7 +1019,7 @@ void SAL_CALL OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivit { if((*aIndexIter)->hasByName(aIter->first)) { - sIndexCondition.append(::dbtools::quoteName( aQuote,aIter->first)); + sIndexCondition.append(::dbtools::quoteName( aQuote,aIter->second.sRealName)); if((_rDeleteRow->get())[aIter->second.nPosition].isNull()) sIndexCondition.append(::rtl::OUString::createFromAscii(" IS NULL")); else @@ -1215,8 +1183,8 @@ void SAL_CALL OKeySet::beforeFirst( ) throw(SQLException, RuntimeException) RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::beforeFirst" ); m_bInserted = m_bUpdated = m_bDeleted = sal_False; m_aKeyIter = m_aKeyMap.begin(); - m_xSet = NULL; - ::comphelper::disposeComponent(m_xRow); + m_xRow = NULL; + ::comphelper::disposeComponent(m_xSet); } // ----------------------------------------------------------------------------- void SAL_CALL OKeySet::afterLast( ) throw(SQLException, RuntimeException) @@ -1225,8 +1193,8 @@ void SAL_CALL OKeySet::afterLast( ) throw(SQLException, RuntimeException) m_bInserted = m_bUpdated = m_bDeleted = sal_False; fillAllRows(); m_aKeyIter = m_aKeyMap.end(); - m_xSet = NULL; - ::comphelper::disposeComponent(m_xRow); + m_xRow = NULL; + ::comphelper::disposeComponent(m_xSet); } // ----------------------------------------------------------------------------- sal_Bool SAL_CALL OKeySet::first( ) throw(SQLException, RuntimeException) @@ -1330,8 +1298,14 @@ void SAL_CALL OKeySet::refreshRow() throw(SQLException, RuntimeException) if(isBeforeFirst() || isAfterLast() || !m_xStatement.is()) return; - m_xSet = NULL; - ::comphelper::disposeComponent(m_xRow); + m_xRow = NULL; + ::comphelper::disposeComponent(m_xSet); + + if ( m_aKeyIter->second.second.second.is() ) + { + m_xRow = m_aKeyIter->second.second.second; + return; + } // we just areassign the base members Reference< XParameters > xParameter(m_xStatement,UNO_QUERY); OSL_ENSURE(xParameter.is(),"No Parameter interface!"); @@ -1343,7 +1317,6 @@ void SAL_CALL OKeySet::refreshRow() throw(SQLException, RuntimeException) OUpdatedParameter::iterator aUpdateFind = m_aUpdatedParameter.find(m_aKeyIter->first); if ( aUpdateFind == m_aUpdatedParameter.end() ) { - aParaIter = m_aParameterValueForCache.get().begin(); aParaEnd = m_aParameterValueForCache.get().end(); } @@ -1357,6 +1330,8 @@ void SAL_CALL OKeySet::refreshRow() throw(SQLException, RuntimeException) { ::dbtools::setObjectWithInfo( xParameter, nPos, aParaIter->makeAny(), aParaIter->getTypeKind() ); } + + // now set the primary key column values connectivity::ORowVector< ORowSetValue >::Vector::const_iterator aIter = m_aKeyIter->second.first->get().begin(); SelectColumnsMetaData::const_iterator aPosIter = (*m_pKeyColumnNames).begin(); SelectColumnsMetaData::const_iterator aPosEnd = (*m_pKeyColumnNames).end(); diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx index bf4b2e6dd786..694593e6c608 100644 --- a/dbaccess/source/core/api/KeySet.hxx +++ b/dbaccess/source/core/api/KeySet.hxx @@ -35,14 +35,14 @@ #ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include #endif +#include #include #ifndef _COM_SUN_STAR_LANG_XUNOTUNNEL_HPP_ #include #endif -#ifndef _COM_SUN_STAR_SDB_XSINGLESELECTQUERYANALYZER_HPP_ #include -#endif +#include #ifndef _COMPHELPER_STLTYPES_HXX_ #include #endif @@ -93,6 +93,7 @@ namespace dbaccess // is used when the source supports keys class OKeySet : public OCacheSet { + protected: OKeySetMatrix m_aKeyMap; OKeySetMatrix::iterator m_aKeyIter; @@ -100,10 +101,10 @@ namespace dbaccess OUpdatedParameter m_aUpdatedParameter; // contains all parameter which have been updated and are needed for refetching ORowSetValueVector m_aParameterValueForCache; - SelectColumnsMetaData* m_pKeyColumnNames; // contains all key column names - SelectColumnsMetaData* m_pColumnNames; // contains all column names - SelectColumnsMetaData* m_pParameterNames; // contains all parameter names - SelectColumnsMetaData* m_pForeignColumnNames; // contains all column names of the rest + ::std::auto_ptr m_pKeyColumnNames; // contains all key column names + ::std::auto_ptr m_pColumnNames; // contains all column names + ::std::auto_ptr m_pParameterNames; // contains all parameter names + ::std::auto_ptr m_pForeignColumnNames; // contains all column names of the rest connectivity::OSQLTable m_xTable; // reference to our table ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess> m_xTableKeys; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement> m_xStatement; @@ -141,7 +142,16 @@ namespace dbaccess sal_Bool fetchRow(); void impl_convertValue_throw(const ORowSetRow& _rInsertRow,const SelectColumnDescription& i_aMetaData); - protected: + void initColumns(); + void findTableColumnsMatching_throw( const ::com::sun::star::uno::Any& i_aTable + ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& i_xMeta + ,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& i_xQueryColumns); + ::rtl::OUStringBuffer createKeyFilter(); + void tryRefetch(const ORowSetRow& _rInsertRow,bool bRefetch); + void executeUpdate(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOrginalRow,const ::rtl::OUString& i_sSQL,const ::rtl::OUString& i_sTableName,const ::std::vector& _aIndexColumnPositions = ::std::vector()); + void executeInsert( const ORowSetRow& _rInsertRow,const ::rtl::OUString& i_sSQL,const ::rtl::OUString& i_sTableName = ::rtl::OUString(),bool bRefetch = false); + void executeStatement(::rtl::OUStringBuffer& io_aFilter,const ::rtl::OUString& i_sRowSetFilter,::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer>& io_xAnalyzer); + virtual ~OKeySet(); public: OKeySet(const connectivity::OSQLTable& _xTable, diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx index 09a763d08c71..2a9ac96ce82b 100644 --- a/dbaccess/source/core/api/OptimisticSet.cxx +++ b/dbaccess/source/core/api/OptimisticSet.cxx @@ -84,23 +84,6 @@ using namespace ::osl; DECLARE_STL_USTRINGACCESS_MAP(::rtl::OUStringBuffer,TSQLStatements); namespace { - void lcl_fillIndexColumns(const Reference& _xIndexes, ::std::vector< Reference >& _rAllIndexColumns) - { - if ( _xIndexes.is() ) - { - Reference xIndexColsSup; - sal_Int32 nCount = _xIndexes->getCount(); - for(sal_Int32 j = 0 ; j < nCount ; ++j) - { - xIndexColsSup.set(_xIndexes->getByIndex(j),UNO_QUERY); - if( xIndexColsSup.is() - && comphelper::getBOOL(xIndexColsSup->getPropertyValue(PROPERTY_ISUNIQUE)) - && !comphelper::getBOOL(xIndexColsSup->getPropertyValue(PROPERTY_ISPRIMARYKEYINDEX)) - ) - _rAllIndexColumns.push_back(Reference(xIndexColsSup,UNO_QUERY)->getColumns()); - } - } - } void lcl_fillKeyCondition(const ::rtl::OUString& i_sTableName,const ::rtl::OUString& i_sQuotedColumnName,const ORowSetValue& i_aValue,TSQLStatements& io_aKeyConditions) { ::rtl::OUStringBuffer& rKeyCondition = io_aKeyConditions[i_sTableName]; @@ -120,14 +103,9 @@ OptimisticSet::OptimisticSet(const ::comphelper::ComponentContext& _rContext, const Reference< XConnection>& i_xConnection, const Reference< XSingleSelectQueryAnalyzer >& _xComposer, const ORowSetValueVector& _aParameterValueForCache) - :m_aSqlParser( _rContext.getLegacyServiceFactory() ) + :OKeySet(NULL,NULL,::rtl::OUString(),_xComposer,_aParameterValueForCache) + ,m_aSqlParser( _rContext.getLegacyServiceFactory() ) ,m_aSqlIterator( i_xConnection, Reference(_xComposer,UNO_QUERY)->getTables(), m_aSqlParser, NULL ) - ,m_aParameterValueForCache(_aParameterValueForCache) - ,m_pKeyColumnNames(NULL) - ,m_pColumnNames(NULL) - ,m_pParameterNames(NULL) - ,m_xComposer(_xComposer) - ,m_bRowCountFinal(sal_False) ,m_bResultSetChanged(false) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::OptimisticSet" ); @@ -136,20 +114,6 @@ OptimisticSet::OptimisticSet(const ::comphelper::ComponentContext& _rContext, // ----------------------------------------------------------------------------- OptimisticSet::~OptimisticSet() { - try - { - ::comphelper::disposeComponent(m_xStatement); - } - catch(Exception&) - { - m_xStatement.clear(); - } - catch(...) - { - OSL_ENSURE(0,"Unknown Exception occured"); - } - m_xComposer.clear(); - DBG_DTOR(OptimisticSet,NULL); } // ----------------------------------------------------------------------------- @@ -157,14 +121,9 @@ void OptimisticSet::construct(const Reference< XResultSet>& _xDriverSet,const :: { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::construct" ); OCacheSet::construct(_xDriverSet,i_sRowSetFilter); + initColumns(); Reference xMeta = m_xConnection->getMetaData(); - bool bCase = (xMeta.is() && xMeta->storesMixedCaseQuotedIdentifiers()) ? true : false; - - m_pKeyColumnNames.reset( new SelectColumnsMetaData(bCase) ); - m_pColumnNames.reset( new SelectColumnsMetaData(bCase) ); - m_pParameterNames.reset( new SelectColumnsMetaData(bCase) ); - Reference xQueryColSup(m_xComposer,UNO_QUERY); const Reference xQueryColumns = xQueryColSup->getColumns(); const Reference xTabSup(m_xComposer,UNO_QUERY); @@ -182,29 +141,13 @@ void OptimisticSet::construct(const Reference< XResultSet>& _xDriverSet,const :: m_aKeyMap.insert(OKeySetMatrix::value_type(0,OKeySetValue(NULL,::std::pair >(0,NULL)))); m_aKeyIter = m_aKeyMap.begin(); - static ::rtl::OUString aAnd = ::rtl::OUString::createFromAscii(" AND "); - const ::rtl::OUString aQuote = getIdentifierQuoteString(); - ::rtl::OUStringBuffer aFilter; - static ::rtl::OUString s_sDot(RTL_CONSTASCII_USTRINGPARAM(".")); - static ::rtl::OUString s_sParam(RTL_CONSTASCII_USTRINGPARAM(" = ?")); - // create the where clause - SelectColumnsMetaData::iterator aPosEnd = m_pKeyColumnNames->end(); - for(SelectColumnsMetaData::iterator aPosIter = m_pKeyColumnNames->begin();aPosIter != aPosEnd;) - { - aFilter.append(::dbtools::quoteName( aQuote,aPosIter->second.sTableName)); - aFilter.append(s_sDot); - aFilter.append(::dbtools::quoteName( aQuote,aPosIter->second.sRealName)); - aFilter.append(s_sParam); - ++aPosIter; - if(aPosIter != aPosEnd) - aFilter.append(aAnd); - } + ::rtl::OUStringBuffer aFilter = createKeyFilter(); + Reference< XSingleSelectQueryComposer> xSourceComposer(m_xComposer,UNO_QUERY); Reference< XMultiServiceFactory > xFactory(m_xConnection, UNO_QUERY_THROW); Reference xAnalyzer(xFactory->createInstance(SERVICE_NAME_SINGLESELECTQUERYCOMPOSER),UNO_QUERY); - Reference xComp2(m_xComposer,UNO_QUERY_THROW); - ::rtl::OUString sQuery = xComp2->getQuery(); - xAnalyzer->setQuery(sQuery); + ::rtl::OUString sQuery = xSourceComposer->getQuery(); + xAnalyzer->setElementaryQuery(xSourceComposer->getElementaryQuery()); // check for joins ::rtl::OUString aErrorMsg; ::std::auto_ptr pStatementNode( m_aSqlParser.parseTree( aErrorMsg, sQuery ) ); @@ -227,58 +170,6 @@ void OptimisticSet::construct(const Reference< XResultSet>& _xDriverSet,const :: ::comphelper::disposeComponent(xAnalyzer); } // ------------------------------------------------------------------------- -Any SAL_CALL OptimisticSet::getBookmark() throw(SQLException, RuntimeException) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::getBookmark" ); - OSL_ENSURE(m_aKeyIter != m_aKeyMap.end() && m_aKeyIter != m_aKeyMap.begin(), - "getBookmark is only possible when we stand on a valid row!"); - return makeAny(m_aKeyIter->first); -} - -// ------------------------------------------------------------------------- -sal_Bool SAL_CALL OptimisticSet::moveToBookmark( const Any& bookmark ) throw(SQLException, RuntimeException) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::moveToBookmark" ); - m_bInserted = m_bUpdated = m_bDeleted = sal_False; - m_aKeyIter = m_aKeyMap.find(::comphelper::getINT32(bookmark)); - return m_aKeyIter != m_aKeyMap.end(); -} -// ------------------------------------------------------------------------- -sal_Bool SAL_CALL OptimisticSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw(SQLException, RuntimeException) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::moveRelativeToBookmark" ); - m_bInserted = m_bUpdated = m_bDeleted = sal_False; - m_aKeyIter = m_aKeyMap.find(::comphelper::getINT32(bookmark)); - if(m_aKeyIter != m_aKeyMap.end()) - { - relative(rows); - } - - return !isBeforeFirst() && !isAfterLast(); -} -// ------------------------------------------------------------------------- -sal_Int32 SAL_CALL OptimisticSet::compareBookmarks( const Any& _first, const Any& _second ) throw(SQLException, RuntimeException) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::compareBookmarks" ); - sal_Int32 nFirst = 0, nSecond = 0; - _first >>= nFirst; - _second >>= nSecond; - - return (nFirst != nSecond) ? CompareBookmark::NOT_EQUAL : CompareBookmark::EQUAL; -} -// ------------------------------------------------------------------------- -sal_Bool SAL_CALL OptimisticSet::hasOrderedBookmarks( ) throw(SQLException, RuntimeException) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::hasOrderedBookmarks" ); - return sal_True; -} -// ------------------------------------------------------------------------- -sal_Int32 SAL_CALL OptimisticSet::hashBookmark( const Any& bookmark ) throw(SQLException, RuntimeException) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::hashBookmark" ); - return ::comphelper::getINT32(bookmark); -} -// ------------------------------------------------------------------------- // ::com::sun::star::sdbcx::XDeleteRows Sequence< sal_Int32 > SAL_CALL OptimisticSet::deleteRows( const Sequence< Any >& /*rows*/ ,const connectivity::OSQLTable& /*_xTable*/) throw(SQLException, RuntimeException) { @@ -485,202 +376,6 @@ void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const conn } } // ------------------------------------------------------------------------- -void OptimisticSet::executeInsert( const ORowSetRow& _rInsertRow,const ::rtl::OUString& i_sSQL,const ::rtl::OUString& i_sTableName ) -{ - // now create,fill and execute the prepared statement - Reference< XPreparedStatement > xPrep(m_xConnection->prepareStatement(i_sSQL)); - Reference< XParameters > xParameter(xPrep,UNO_QUERY); - - SelectColumnsMetaData::const_iterator aIter = m_pColumnNames->begin(); - SelectColumnsMetaData::const_iterator aEnd = m_pColumnNames->end(); - for(sal_Int32 i = 1;aIter != aEnd;++aIter) - { - if ( aIter->second.sTableName == i_sTableName ) - { - const sal_Int32 nPos = aIter->second.nPosition; - if((_rInsertRow->get())[nPos].isModified()) - { - if((_rInsertRow->get())[nPos].isNull()) - xParameter->setNull(i++,(_rInsertRow->get())[nPos].getTypeKind()); - else - { - impl_convertValue_throw(_rInsertRow,aIter->second); - (_rInsertRow->get())[nPos].setSigned(m_aSignedFlags[nPos-1]); - setParameter(i++,xParameter,(_rInsertRow->get())[nPos],aIter->second.nType,aIter->second.nScale); - } - } - } - } - - m_bInserted = xPrep->executeUpdate() > 0; - sal_Bool bAutoValuesFetched = sal_False; - if ( m_bInserted ) - { - // first insert the default values into the insertrow - aIter = m_pColumnNames->begin(); - for(;aIter != aEnd;++aIter) - { - if ( !(_rInsertRow->get())[aIter->second.nPosition].isModified() ) - (_rInsertRow->get())[aIter->second.nPosition] = aIter->second.sDefaultValue; - } - try - { - Reference< XGeneratedResultSet > xGRes(xPrep, UNO_QUERY); - if ( xGRes.is() ) - { - Reference< XResultSet > xRes = xGRes->getGeneratedValues(); - Reference< XRow > xRow(xRes,UNO_QUERY); - if ( xRow.is() && xRes->next() ) - { - Reference< XResultSetMetaDataSupplier > xMdSup(xRes,UNO_QUERY); - Reference< XResultSetMetaData > xMd = xMdSup->getMetaData(); - sal_Int32 nColumnCount = xMd->getColumnCount(); - ::std::vector< ::rtl::OUString >::iterator aAutoIter = m_aAutoColumns.begin(); - ::std::vector< ::rtl::OUString >::iterator aAutoEnd = m_aAutoColumns.end(); - for (sal_Int32 i = 1;aAutoIter != aAutoEnd && i <= nColumnCount; ++aAutoIter,++i) - { -#if OSL_DEBUG_LEVEL > 1 - ::rtl::OUString sColumnName( xMd->getColumnName(i) ); -#endif - SelectColumnsMetaData::iterator aFind = m_pKeyColumnNames->find(*aAutoIter); - if ( aFind != m_pKeyColumnNames->end() ) - (_rInsertRow->get())[aFind->second.nPosition].fill(i,aFind->second.nType,aFind->second.bNullable,xRow); - } - bAutoValuesFetched = sal_True; - } - } - } - catch(Exception&) - { - OSL_ENSURE(0,"Could not execute GeneratedKeys() stmt"); - } - } - - ::comphelper::disposeComponent(xPrep); -/* - if ( !bAutoValuesFetched && m_bInserted ) - { - // first check if all key column values were set - const ::rtl::OUString sMax(RTL_CONSTASCII_USTRINGPARAM(" MAX(")); - const ::rtl::OUString sMaxEnd(RTL_CONSTASCII_USTRINGPARAM("),")); - const ::rtl::OUString sQuote = getIdentifierQuoteString(); - ::rtl::OUString sMaxStmt; - aEnd = m_pKeyColumnNames->end(); - ::std::vector< ::rtl::OUString >::iterator aAutoIter = m_aAutoColumns.begin(); - ::std::vector< ::rtl::OUString >::iterator aAutoEnd = m_aAutoColumns.end(); - for (;aAutoIter != aAutoEnd; ++aAutoIter) - { - // we will only fetch values which are keycolumns - if ( m_pKeyColumnNames->find(*aAutoIter) != aEnd ) - { - sMaxStmt += sMax; - sMaxStmt += ::dbtools::quoteName( sQuote,*aAutoIter); - sMaxStmt += sMaxEnd; - } - } - - if(sMaxStmt.getLength()) - { - sMaxStmt = sMaxStmt.replaceAt(sMaxStmt.getLength()-1,1,::rtl::OUString::createFromAscii(" ")); - ::rtl::OUString sStmt = ::rtl::OUString::createFromAscii("SELECT "); - sStmt += sMaxStmt; - sStmt += ::rtl::OUString::createFromAscii("FROM "); - sStmt += m_aSelectComposedTableName; - try - { - // now fetch the autoincrement values - Reference xStatement = m_xConnection->createStatement(); - Reference xRes = xStatement->executeQuery(sStmt); - Reference xRow(xRes,UNO_QUERY); - if(xRow.is() && xRes->next()) - { - aAutoIter = m_aAutoColumns.begin(); - for (sal_Int32 i=1;aAutoIter != aAutoEnd; ++aAutoIter,++i) - { - // we will only fetch values which are keycolumns - SelectColumnsMetaData::iterator aFind = m_pKeyColumnNames->find(*aAutoIter); - if ( aFind != aEnd ) - (_rInsertRow->get())[aFind->second.nPosition].fill(i,aFind->second.nType,aFind->second.bNullable,xRow); - } - } - ::comphelper::disposeComponent(xStatement); - } - catch(SQLException&) - { - OSL_ENSURE(0,"Could not fetch with MAX() "); - } - } - } - */ - if ( m_bInserted ) - { - OKeySetMatrix::iterator aKeyIter = m_aKeyMap.end(); - --aKeyIter; - ORowSetRow aKeyRow = new connectivity::ORowVector< ORowSetValue >(m_pKeyColumnNames->size()); - copyRowValue(_rInsertRow,aKeyRow,aKeyIter->first + 1); - - m_aKeyIter = m_aKeyMap.insert(OKeySetMatrix::value_type(aKeyIter->first + 1,OKeySetValue(aKeyRow,::std::pair >(1,NULL)))).first; - // now we set the bookmark for this row - (_rInsertRow->get())[0] = makeAny((sal_Int32)m_aKeyIter->first); - } -} -// ----------------------------------------------------------------------------- -void OptimisticSet::copyRowValue(const ORowSetRow& _rInsertRow,ORowSetRow& _rKeyRow,sal_Int32 i_nBookmark) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::copyRowValue" ); - connectivity::ORowVector< ORowSetValue >::Vector::iterator aIter = _rKeyRow->get().begin(); - - // check the if the parameter values have been changed - OSL_ENSURE((m_aParameterValueForCache.get().size()-1) == m_pParameterNames->size(),"OptimisticSet::copyRowValue: Parameter values and names differ!"); - connectivity::ORowVector< ORowSetValue >::Vector::const_iterator aParaValuesIter = m_aParameterValueForCache.get().begin() +1; - - bool bChanged = false; - SelectColumnsMetaData::const_iterator aParaIter = (*m_pParameterNames).begin(); - SelectColumnsMetaData::const_iterator aParaEnd = (*m_pParameterNames).end(); - for(sal_Int32 i = 1;aParaIter != aParaEnd;++aParaIter,++aParaValuesIter,++i) - { - ORowSetValue aValue(*aParaValuesIter); - aValue.setSigned(m_aSignedFlags[aParaIter->second.nPosition]); - if ( (_rInsertRow->get())[aParaIter->second.nPosition] != aValue ) - { - ORowSetValueVector aCopy(m_aParameterValueForCache); - (aCopy.get())[i] = (_rInsertRow->get())[aParaIter->second.nPosition]; - m_aUpdatedParameter[i_nBookmark] = aCopy; - bChanged = true; - } - } - if ( !bChanged ) - { - m_aUpdatedParameter.erase(i_nBookmark); - } - - // update the key values - SelectColumnsMetaData::const_iterator aPosIter = m_pKeyColumnNames->begin(); - SelectColumnsMetaData::const_iterator aPosEnd = m_pKeyColumnNames->end(); - for(;aPosIter != aPosEnd;++aPosIter,++aIter) - { - ORowSetValue aValue((_rInsertRow->get())[aPosIter->second.nPosition]); - switch(aPosIter->second.nType) - { - case DataType::DECIMAL: - case DataType::NUMERIC: - { - ::rtl::OUString sValue = aValue.getString(); - sal_Int32 nIndex = sValue.indexOf('.'); - if ( nIndex != -1 ) - { - aValue = sValue.copy(0,nIndex + (aPosIter->second.nScale > 0 ? aPosIter->second.nScale + 1 : 0)); - } - } - break; - default: - break; - } - *aIter = aValue; - aIter->setTypeKind(aPosIter->second.nType); - } -} -// ------------------------------------------------------------------------- void SAL_CALL OptimisticSet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException) { ::rtl::OUString sParam(RTL_CONSTASCII_USTRINGPARAM(" = ?")); @@ -754,432 +449,6 @@ void OptimisticSet::executeDelete(const ORowSetRow& _rDeleteRow,const ::rtl::OUS m_bDeleted = sal_True; } } -// ------------------------------------------------------------------------- -void SAL_CALL OptimisticSet::cancelRowUpdates( ) throw(SQLException, RuntimeException) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::cancelRowUpdates" ); - m_bInserted = m_bUpdated = m_bDeleted = sal_False; -} -// ------------------------------------------------------------------------- -void SAL_CALL OptimisticSet::moveToInsertRow( ) throw(SQLException, RuntimeException) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::moveToInsertRow" ); -} -// ------------------------------------------------------------------------- -void SAL_CALL OptimisticSet::moveToCurrentRow( ) throw(SQLException, RuntimeException) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::moveToCurrentRow" ); -} -// ----------------------------------------------------------------------------- -sal_Bool SAL_CALL OptimisticSet::next( ) throw(SQLException, RuntimeException) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::next" ); - m_bInserted = m_bUpdated = m_bDeleted = sal_False; - - if(isAfterLast()) - return sal_False; - if(!m_bRowCountFinal) // not yet all records fetched - { - ++m_aKeyIter; // this is possible because we stand on begin() and this is the "beforefirst" row - if(m_aKeyIter == m_aKeyMap.end() && !fetchRow()) - m_aKeyIter = m_aKeyMap.end(); - } - else if(!isAfterLast()) - ++m_aKeyIter; - - refreshRow(); - return !isAfterLast(); -} -// ----------------------------------------------------------------------------- -sal_Bool SAL_CALL OptimisticSet::isBeforeFirst( ) throw(SQLException, RuntimeException) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::isBeforeFirst" ); - return m_aKeyIter == m_aKeyMap.begin(); -} -// ----------------------------------------------------------------------------- -sal_Bool SAL_CALL OptimisticSet::isAfterLast( ) throw(SQLException, RuntimeException) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::isAfterLast" ); - return m_bRowCountFinal && m_aKeyIter == m_aKeyMap.end(); -} -// ----------------------------------------------------------------------------- -sal_Bool SAL_CALL OptimisticSet::isFirst( ) throw(SQLException, RuntimeException) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::isFirst" ); - OKeySetMatrix::iterator aTemp = m_aKeyMap.begin(); - ++aTemp; - return m_aKeyIter == aTemp && m_aKeyIter != m_aKeyMap.end(); -} -// ----------------------------------------------------------------------------- -sal_Bool SAL_CALL OptimisticSet::isLast( ) throw(SQLException, RuntimeException) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::isLast" ); - if(!m_bRowCountFinal) - return sal_False; - - OKeySetMatrix::iterator aTemp = m_aKeyMap.end(); - --aTemp; - return m_aKeyIter == aTemp; -} -// ----------------------------------------------------------------------------- -void SAL_CALL OptimisticSet::beforeFirst( ) throw(SQLException, RuntimeException) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::beforeFirst" ); - m_bInserted = m_bUpdated = m_bDeleted = sal_False; - m_aKeyIter = m_aKeyMap.begin(); - m_xSet = NULL; - ::comphelper::disposeComponent(m_xRow); -} -// ----------------------------------------------------------------------------- -void SAL_CALL OptimisticSet::afterLast( ) throw(SQLException, RuntimeException) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::afterLast" ); - m_bInserted = m_bUpdated = m_bDeleted = sal_False; - fillAllRows(); - m_aKeyIter = m_aKeyMap.end(); - m_xSet = NULL; - ::comphelper::disposeComponent(m_xRow); -} -// ----------------------------------------------------------------------------- -sal_Bool SAL_CALL OptimisticSet::first( ) throw(SQLException, RuntimeException) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::first" ); - m_bInserted = m_bUpdated = m_bDeleted = sal_False; - m_aKeyIter = m_aKeyMap.begin(); - ++m_aKeyIter; - if(m_aKeyIter == m_aKeyMap.end() && !fetchRow()) - m_aKeyIter = m_aKeyMap.end(); - - refreshRow(); - return m_aKeyIter != m_aKeyMap.end() && m_aKeyIter != m_aKeyMap.begin(); -} -// ----------------------------------------------------------------------------- -sal_Bool SAL_CALL OptimisticSet::last( ) throw(SQLException, RuntimeException) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::last" ); - m_bInserted = m_bUpdated = m_bDeleted = sal_False; - fillAllRows(); - - m_aKeyIter = m_aKeyMap.end(); - --m_aKeyIter; - refreshRow(); - return m_aKeyIter != m_aKeyMap.end() && m_aKeyIter != m_aKeyMap.begin(); -} -// ----------------------------------------------------------------------------- -sal_Int32 SAL_CALL OptimisticSet::getRow( ) throw(SQLException, RuntimeException) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::getRow" ); - OSL_ENSURE(!isAfterLast(),"getRow is not allowed when afterlast record!"); - OSL_ENSURE(!isBeforeFirst(),"getRow is not allowed when beforefirst record!"); - - return ::std::distance(m_aKeyMap.begin(),m_aKeyIter); -} -// ----------------------------------------------------------------------------- -sal_Bool SAL_CALL OptimisticSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::absolute" ); - m_bInserted = m_bUpdated = m_bDeleted = sal_False; - OSL_ENSURE(row,"absolute(0) isn't allowed!"); - if(row < 0) - { - if(!m_bRowCountFinal) - fillAllRows(); - - for(;row < 0 && m_aKeyIter != m_aKeyMap.begin();++row) - m_aKeyIter--; - } - else - { - if(row >= (sal_Int32)m_aKeyMap.size()) - { - if(!m_bRowCountFinal) - { - sal_Bool bNext = sal_True; - for(sal_Int32 i=m_aKeyMap.size()-1;i < row && bNext;++i) - bNext = fetchRow(); - } - else - m_aKeyIter = m_aKeyMap.end(); - } - else - { - m_aKeyIter = m_aKeyMap.begin(); - for(;row > 0 && m_aKeyIter != m_aKeyMap.end();--row) - ++m_aKeyIter; - } - } - refreshRow(); - - return m_aKeyIter != m_aKeyMap.end() && m_aKeyIter != m_aKeyMap.begin(); -} -// ----------------------------------------------------------------------------- -sal_Bool SAL_CALL OptimisticSet::relative( sal_Int32 rows ) throw(SQLException, RuntimeException) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::relative" ); - if(!rows) - { - refreshRow(); - return sal_True; - } - return absolute(getRow()+rows); -} -// ----------------------------------------------------------------------------- -sal_Bool SAL_CALL OptimisticSet::previous( ) throw(SQLException, RuntimeException) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::previous" ); - m_bInserted = m_bUpdated = m_bDeleted = sal_False; - if(m_aKeyIter != m_aKeyMap.begin()) - { - --m_aKeyIter; - refreshRow(); - } - return m_aKeyIter != m_aKeyMap.begin(); -} -// ----------------------------------------------------------------------------- -void SAL_CALL OptimisticSet::refreshRow() throw(SQLException, RuntimeException) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::refreshRow" ); - if(isBeforeFirst() || isAfterLast() || !m_xStatement.is()) - return; - - m_xSet.clear(); - ::comphelper::disposeComponent(m_xRow); - // we just reassign the base members - Reference< XParameters > xParameter(m_xStatement,UNO_QUERY); - OSL_ENSURE(xParameter.is(),"No Parameter interface!"); - xParameter->clearParameters(); - - sal_Int32 nPos=1; - connectivity::ORowVector< ORowSetValue >::Vector::const_iterator aParaIter; - connectivity::ORowVector< ORowSetValue >::Vector::const_iterator aParaEnd; - OUpdatedParameter::iterator aUpdateFind = m_aUpdatedParameter.find(m_aKeyIter->first); - if ( aUpdateFind == m_aUpdatedParameter.end() ) - { - aParaIter = m_aParameterValueForCache.get().begin(); - aParaEnd = m_aParameterValueForCache.get().end(); - } - else - { - aParaIter = aUpdateFind->second.get().begin(); - aParaEnd = aUpdateFind->second.get().end(); - } - - // first put the parameters set by the outer rowset - for(++aParaIter;aParaIter != aParaEnd;++aParaIter,++nPos) - { - ::dbtools::setObjectWithInfo( xParameter, nPos, aParaIter->makeAny(), aParaIter->getTypeKind() ); - } - - // now set the primary key column values - connectivity::ORowVector< ORowSetValue >::Vector::const_iterator aIter = m_aKeyIter->second.first->get().begin(); - SelectColumnsMetaData::const_iterator aPosIter = m_pKeyColumnNames->begin(); - SelectColumnsMetaData::const_iterator aPosEnd = m_pKeyColumnNames->end(); - for(;aPosIter != aPosEnd;++aPosIter,++aIter,++nPos) - setParameter(nPos,xParameter,*aIter,aPosIter->second.nType,aPosIter->second.nScale); - - m_xSet = m_xStatement->executeQuery(); - OSL_ENSURE(m_xSet.is(),"No resultset form statement!"); - sal_Bool bOK = m_xSet->next(); - if ( !bOK ) - m_aKeyIter = m_aKeyMap.end(); - m_xRow.set(m_xSet,UNO_QUERY); - OSL_ENSURE(m_xRow.is(),"No row form statement!"); -} -// ----------------------------------------------------------------------------- -sal_Bool OptimisticSet::fetchRow() -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::fetchRow" ); - // fetch the next row and append on the OptimisticSet - sal_Bool bRet = sal_False; - if ( !m_bRowCountFinal ) - bRet = m_xDriverSet->next(); - if ( bRet ) - { - ORowSetRow aKeyRow = new connectivity::ORowVector< ORowSetValue >(m_pKeyColumnNames->size()); - connectivity::ORowVector< ORowSetValue >::Vector::iterator aIter = aKeyRow->get().begin(); - // first fetch the values needed for the key column - SelectColumnsMetaData::const_iterator aPosIter = m_pKeyColumnNames->begin(); - SelectColumnsMetaData::const_iterator aPosEnd = m_pKeyColumnNames->end(); - for(;aPosIter != aPosEnd;++aPosIter,++aIter) - { - const SelectColumnDescription& rColDesc = aPosIter->second; - aIter->fill(rColDesc.nPosition,rColDesc.nType,rColDesc.bNullable,m_xDriverRow); - } - m_aKeyIter = m_aKeyMap.insert(OKeySetMatrix::value_type(m_aKeyMap.rbegin()->first+1,OKeySetValue(aKeyRow,::std::pair >(0,NULL)))).first; - } - else - m_bRowCountFinal = sal_True; - return bRet; -} -// ------------------------------------------------------------------------- -void OptimisticSet::fillAllRows() -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::fillAllRows" ); - if(!m_bRowCountFinal) - { - while(fetchRow()) - ; - } -} -// XRow -sal_Bool SAL_CALL OptimisticSet::wasNull( ) throw(SQLException, RuntimeException) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::wasNull" ); - return m_xRow->wasNull(); -} -// ------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OptimisticSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::getString" ); - OSL_ENSURE(m_xRow.is(),"m_xRow is null!"); - return m_xRow->getString(columnIndex); -} -// ------------------------------------------------------------------------- -sal_Bool SAL_CALL OptimisticSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::getBoolean" ); - OSL_ENSURE(m_xRow.is(),"m_xRow is null!"); - return m_xRow->getBoolean(columnIndex); -} -// ------------------------------------------------------------------------- -sal_Int8 SAL_CALL OptimisticSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::getByte" ); - OSL_ENSURE(m_xRow.is(),"m_xRow is null!"); - return m_xRow->getByte(columnIndex); -} -// ------------------------------------------------------------------------- -sal_Int16 SAL_CALL OptimisticSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::getShort" ); - OSL_ENSURE(m_xRow.is(),"m_xRow is null!"); - return m_xRow->getShort(columnIndex); -} -// ------------------------------------------------------------------------- -sal_Int32 SAL_CALL OptimisticSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::getInt" ); - OSL_ENSURE(m_xRow.is(),"m_xRow is null!"); - return m_xRow->getInt(columnIndex); -} -// ------------------------------------------------------------------------- -sal_Int64 SAL_CALL OptimisticSet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::getLong" ); - OSL_ENSURE(m_xRow.is(),"m_xRow is null!"); - return m_xRow->getLong(columnIndex); -} -// ------------------------------------------------------------------------- -float SAL_CALL OptimisticSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::getFloat" ); - OSL_ENSURE(m_xRow.is(),"m_xRow is null!"); - return m_xRow->getFloat(columnIndex); -} -// ------------------------------------------------------------------------- -double SAL_CALL OptimisticSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::getDouble" ); - OSL_ENSURE(m_xRow.is(),"m_xRow is null!"); - return m_xRow->getDouble(columnIndex); -} -// ------------------------------------------------------------------------- -Sequence< sal_Int8 > SAL_CALL OptimisticSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::getBytes" ); - OSL_ENSURE(m_xRow.is(),"m_xRow is null!"); - return m_xRow->getBytes(columnIndex); -} -// ------------------------------------------------------------------------- -::com::sun::star::util::Date SAL_CALL OptimisticSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::getDate" ); - OSL_ENSURE(m_xRow.is(),"m_xRow is null!"); - return m_xRow->getDate(columnIndex); -} -// ------------------------------------------------------------------------- -::com::sun::star::util::Time SAL_CALL OptimisticSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::getTime" ); - OSL_ENSURE(m_xRow.is(),"m_xRow is null!"); - return m_xRow->getTime(columnIndex); -} -// ------------------------------------------------------------------------- -::com::sun::star::util::DateTime SAL_CALL OptimisticSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::getTimestamp" ); - OSL_ENSURE(m_xRow.is(),"m_xRow is null!"); - return m_xRow->getTimestamp(columnIndex); -} -// ------------------------------------------------------------------------- -Reference< ::com::sun::star::io::XInputStream > SAL_CALL OptimisticSet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::getBinaryStream" ); - OSL_ENSURE(m_xRow.is(),"m_xRow is null!"); - return m_xRow->getBinaryStream(columnIndex); -} -// ------------------------------------------------------------------------- -Reference< ::com::sun::star::io::XInputStream > SAL_CALL OptimisticSet::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::getCharacterStream" ); - OSL_ENSURE(m_xRow.is(),"m_xRow is null!"); - return m_xRow->getCharacterStream(columnIndex); -} -// ------------------------------------------------------------------------- -Any SAL_CALL OptimisticSet::getObject( sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::getObject" ); - OSL_ENSURE(m_xRow.is(),"m_xRow is null!"); - return m_xRow->getObject(columnIndex,typeMap); -} -// ------------------------------------------------------------------------- -Reference< XRef > SAL_CALL OptimisticSet::getRef( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::getRef" ); - OSL_ENSURE(m_xRow.is(),"m_xRow is null!"); - return m_xRow->getRef(columnIndex); -} -// ------------------------------------------------------------------------- -Reference< XBlob > SAL_CALL OptimisticSet::getBlob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::getBlob" ); - OSL_ENSURE(m_xRow.is(),"m_xRow is null!"); - return m_xRow->getBlob(columnIndex); -} -// ------------------------------------------------------------------------- -Reference< XClob > SAL_CALL OptimisticSet::getClob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::getClob" ); - OSL_ENSURE(m_xRow.is(),"m_xRow is null!"); - return m_xRow->getClob(columnIndex); -} -// ------------------------------------------------------------------------- -Reference< XArray > SAL_CALL OptimisticSet::getArray( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::getArray" ); - OSL_ENSURE(m_xRow.is(),"m_xRow is null!"); - return m_xRow->getArray(columnIndex); -} -// ------------------------------------------------------------------------- -sal_Bool SAL_CALL OptimisticSet::rowUpdated( ) throw(SQLException, RuntimeException) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::rowUpdated" ); - return m_aKeyIter != m_aKeyMap.begin() && m_aKeyIter != m_aKeyMap.end() && m_aKeyIter->second.second.first == 2; -} -// ------------------------------------------------------------------------- -sal_Bool SAL_CALL OptimisticSet::rowInserted( ) throw(SQLException, RuntimeException) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::rowInserted" ); - return m_aKeyIter != m_aKeyMap.begin() && m_aKeyIter != m_aKeyMap.end() && m_aKeyIter->second.second.first == 1; -} -// ------------------------------------------------------------------------- -sal_Bool SAL_CALL OptimisticSet::rowDeleted( ) throw(SQLException, RuntimeException) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::rowDeleted" ); - sal_Bool bDeleted = m_bDeleted; - m_bDeleted = sal_False; - return bDeleted; -} // ----------------------------------------------------------------------------- ::rtl::OUString OptimisticSet::getComposedTableName(const ::rtl::OUString& /*_sCatalog*/, const ::rtl::OUString& /*_sSchema*/, @@ -1215,201 +484,6 @@ sal_Bool SAL_CALL OptimisticSet::rowDeleted( ) throw(SQLException, RuntimeExcep return aComposedName; } // ----------------------------------------------------------------------------- -/* -namespace dbaccess -{ - void getColumnPositions(const Reference& _rxQueryColumns, - const Sequence< ::rtl::OUString>& _aColumnNames, - const ::rtl::OUString& _rsUpdateTableName, - SelectColumnsMetaData& _rColumnNames) - { - // get the real name of the columns - Sequence< ::rtl::OUString> aSelNames(_rxQueryColumns->getElementNames()); - const ::rtl::OUString* pSelBegin = aSelNames.getConstArray(); - const ::rtl::OUString* pSelEnd = pSelBegin + aSelNames.getLength(); - - const ::rtl::OUString* pColumnIter = _aColumnNames.getConstArray(); - const ::rtl::OUString* pColumnEnd = pColumnIter + _aColumnNames.getLength(); - - ::comphelper::UStringMixLess aTmp(_rColumnNames.key_comp()); - ::comphelper::UStringMixEqual bCase(static_cast< ::comphelper::UStringMixLess*>(&aTmp)->isCaseSensitive()); - - for(sal_Int32 nPos = 1;pSelBegin != pSelEnd;++pSelBegin,++nPos) - { - Reference xColumnProp(_rxQueryColumns->getByName(*pSelBegin),UNO_QUERY); - ::rtl::OUString sRealName,sTableName; - OSL_ENSURE(xColumnProp->getPropertySetInfo()->hasPropertyByName(PROPERTY_REALNAME),"Property REALNAME not available!"); - OSL_ENSURE(xColumnProp->getPropertySetInfo()->hasPropertyByName(PROPERTY_TABLENAME),"Property TABLENAME not available!"); - xColumnProp->getPropertyValue(PROPERTY_REALNAME) >>= sRealName; - xColumnProp->getPropertyValue(PROPERTY_TABLENAME) >>= sTableName; - - for(;pColumnIter != pColumnEnd;++pColumnIter) - { - if(bCase(sRealName,*pColumnIter) && bCase(_rsUpdateTableName,sTableName) && _rColumnNames.find(*pColumnIter) == _rColumnNames.end()) - { - sal_Int32 nType = 0; - xColumnProp->getPropertyValue(PROPERTY_TYPE) >>= nType; - sal_Int32 nScale = 0; - xColumnProp->getPropertyValue(PROPERTY_SCALE) >>= nScale; - ::rtl::OUString sColumnDefault; - if ( xColumnProp->getPropertySetInfo()->hasPropertyByName(PROPERTY_DEFAULTVALUE) ) - xColumnProp->getPropertyValue(PROPERTY_DEFAULTVALUE) >>= sColumnDefault; - - sal_Int32 bNullable = sal_False; - xColumnProp->getPropertyValue(PROPERTY_ISNULLABLE) >>= bNullable; - - - _rColumnNames[sRealName] = SelectColumnDescription( nPos, nType,nScale,bNullable != sdbc::ColumnValue::NO_NULLS, sColumnDefault ); - break; - } - } - pColumnIter = _aColumnNames.getConstArray(); - } - } -} -*/ -// ----------------------------------------------------------------------------- -void OptimisticSet::impl_convertValue_throw(const ORowSetRow& _rInsertRow,const SelectColumnDescription& i_aMetaData) -{ - ORowSetValue& aValue((_rInsertRow->get())[i_aMetaData.nPosition]); - switch(i_aMetaData.nType) - { - case DataType::DECIMAL: - case DataType::NUMERIC: - { - ::rtl::OUString sValue = aValue.getString(); - sal_Int32 nIndex = sValue.indexOf('.'); - if ( nIndex != -1 ) - { - aValue = sValue.copy(0,nIndex + (i_aMetaData.nScale > 0 ? i_aMetaData.nScale + 1 : 0)); - } - } - break; - default: - break; - } -} -// ----------------------------------------------------------------------------- -void OptimisticSet::findTableColumnsMatching_throw(const Any& i_aTable - ,const Reference& i_xMeta - ,const Reference& i_xQueryColumns) -{ - ::rtl::OUString sCatalog,sSchema,sTable; - Reference xTableProp(i_aTable,UNO_QUERY); - Any aCatalog = xTableProp->getPropertyValue(PROPERTY_CATALOGNAME); - aCatalog >>= sCatalog; - xTableProp->getPropertyValue(PROPERTY_SCHEMANAME) >>= sSchema; - xTableProp->getPropertyValue(PROPERTY_NAME) >>= sTable; - - // first ask the database itself for the best columns which can be used - ::std::vector< ::rtl::OUString> aBestRowColumnNames; - /* - Reference xBestRes(i_xMeta->getBestRowIdentifier(aCatalog,sSchema,sTable,0,sal_False)); - Reference xBestRow(xBestRes,uno::UNO_QUERY); - while ( xBestRes->next() ) - { - aBestRowColumnNames.push_back(xBestRow->getString(2)); - } - */ - Sequence< ::rtl::OUString> aBestColumnNames; - if ( aBestRowColumnNames.empty() ) - { - Reference xKeyColumns = getPrimaryKeyColumns_throw(i_aTable); - if ( xKeyColumns.is() ) - aBestColumnNames = xKeyColumns->getElementNames(); - } - else - aBestColumnNames = Sequence< ::rtl::OUString>(&aBestRowColumnNames[0],aBestRowColumnNames.size()); - - const Reference xTblColSup(i_aTable,UNO_QUERY_THROW); - const Reference xTblColumns = xTblColSup->getColumns(); - const ::rtl::OUString sComposedUpdateTableName = dbtools::composeTableName( i_xMeta, sCatalog, sSchema, sTable, sal_False, ::dbtools::eInDataManipulation ); - ::dbaccess::getColumnPositions(i_xQueryColumns,aBestColumnNames,sComposedUpdateTableName,(*m_pKeyColumnNames),true); - ::dbaccess::getColumnPositions(i_xQueryColumns,xTblColumns->getElementNames(),sComposedUpdateTableName,(*m_pColumnNames),true); - - // locate parameter in select columns - Reference xParaSup(m_xComposer,UNO_QUERY); - Reference xQueryParameters = xParaSup->getParameters(); - const sal_Int32 nParaCount = xQueryParameters->getCount(); - Sequence< ::rtl::OUString> aParameterColumns(nParaCount); - for(sal_Int32 i = 0; i< nParaCount;++i) - { - Reference xPara(xQueryParameters->getByIndex(i),UNO_QUERY_THROW); - xPara->getPropertyValue(PROPERTY_REALNAME) >>= aParameterColumns[i]; - } - ::dbaccess::getColumnPositions(i_xQueryColumns,aParameterColumns,sComposedUpdateTableName,(*m_pParameterNames),true); - - SelectColumnsMetaData::const_iterator aPosIter = m_pKeyColumnNames->begin(); - SelectColumnsMetaData::const_iterator aPosEnd = m_pKeyColumnNames->end(); - for(;aPosIter != aPosEnd;++aPosIter) - { - if ( xTblColumns->hasByName(aPosIter->second.sRealName) ) - { - Reference xProp(xTblColumns->getByName(aPosIter->second.sRealName),UNO_QUERY); - sal_Bool bAuto = sal_False; - if( (xProp->getPropertyValue(PROPERTY_ISAUTOINCREMENT) >>= bAuto) && bAuto) - m_aAutoColumns.push_back(aPosIter->first); - } - } -} -// ----------------------------------------------------------------------------- -void OptimisticSet::executeUpdate(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOrginalRow,const ::rtl::OUString& i_sSQL,const ::rtl::OUString& i_sTableName) -{ - // now create end execute the prepared statement - Reference< XPreparedStatement > xPrep(m_xConnection->prepareStatement(i_sSQL)); - Reference< XParameters > xParameter(xPrep,UNO_QUERY); - - sal_Int32 i = 1; - // first the set values - SelectColumnsMetaData::const_iterator aIter = m_pColumnNames->begin(); - SelectColumnsMetaData::const_iterator aEnd = m_pColumnNames->end(); - sal_uInt16 j = 0; - for(;aIter != aEnd;++aIter,++j) - { - if ( aIter->second.sTableName == i_sTableName ) - { - sal_Int32 nPos = aIter->second.nPosition; - if((_rInsertRow->get())[nPos].isModified()) - { - impl_convertValue_throw(_rInsertRow,aIter->second); - (_rInsertRow->get())[nPos].setSigned((_rOrginalRow->get())[nPos].isSigned()); - setParameter(i++,xParameter,(_rInsertRow->get())[nPos],aIter->second.nType,aIter->second.nScale); - } - } - } - // and then the values of the where condition - aIter = m_pKeyColumnNames->begin(); - aEnd = m_pKeyColumnNames->end(); - j = 0; - for(;aIter != aEnd;++aIter,++j) - { - if ( aIter->second.sTableName == i_sTableName ) - { - setParameter(i++,xParameter,(_rOrginalRow->get())[aIter->second.nPosition],aIter->second.nType,aIter->second.nScale); - } - } -/* - // now we have to set the index values - ::std::vector::iterator aIdxColIter = aIndexColumnPositions.begin(); - ::std::vector::iterator aIdxColEnd = aIndexColumnPositions.end(); - j = 0; - aIter = m_pColumnNames->begin(); - for(;aIdxColIter != aIdxColEnd;++aIdxColIter,++i,++j,++aIter) - { - setParameter(i,xParameter,(_rOrginalRow->get())[*aIdxColIter],(_rOrginalRow->get())[*aIdxColIter].getTypeKind(),aIter->second.nScale); - } -*/ - const sal_Int32 nRowsUpdated = xPrep->executeUpdate(); - m_bUpdated = nRowsUpdated > 0; - if(m_bUpdated) - { - const sal_Int32 nBookmark = ::comphelper::getINT32((_rInsertRow->get())[0].getAny()); - m_aKeyIter = m_aKeyMap.find(nBookmark); - m_aKeyIter->second.second.first = 2; - copyRowValue(_rInsertRow,m_aKeyIter->second.first,nBookmark); - } -} -// ----------------------------------------------------------------------------- void OptimisticSet::fillJoinedColumns_throw(const ::std::vector< TNodePair >& i_aJoinColumns) { ::std::vector< TNodePair >::const_iterator aIter = i_aJoinColumns.begin(); diff --git a/dbaccess/source/core/api/OptimisticSet.hxx b/dbaccess/source/core/api/OptimisticSet.hxx index a3683aab0d12..ba0a04c8b773 100644 --- a/dbaccess/source/core/api/OptimisticSet.hxx +++ b/dbaccess/source/core/api/OptimisticSet.hxx @@ -31,11 +31,9 @@ #ifndef DBACCESS_CORE_API_OPTIMISTICSET_HXX #define DBACCESS_CORE_API_OPTIMISTICSET_HXX -#include "CacheSet.hxx" #include "KeySet.hxx" #include -#include -#include + #include #include @@ -47,29 +45,15 @@ namespace dbaccess { // is used when the source supports keys - class OptimisticSet : public OCacheSet + class OptimisticSet : public OKeySet { ::connectivity::OSQLParser m_aSqlParser; ::connectivity::OSQLParseTreeIterator m_aSqlIterator; - OKeySetMatrix m_aKeyMap; - OKeySetMatrix::iterator m_aKeyIter; - ::std::vector< ::rtl::OUString > m_aAutoColumns; // contains all columns which are autoincrement ones ::std::map m_aJoinedColumns; ::std::map m_aJoinedKeyColumns; - OUpdatedParameter m_aUpdatedParameter; // contains all parameter which have been updated and are needed for refetching - ORowSetValueVector m_aParameterValueForCache; - ::std::auto_ptr m_pKeyColumnNames; // contains all key column names - ::std::auto_ptr m_pColumnNames; // contains all column names - ::std::auto_ptr m_pParameterNames; // contains all parameter names - connectivity::OSQLTable m_xTable; // reference to our table - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement> m_xStatement; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> m_xSet; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow> m_xRow; - ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryAnalyzer > m_xComposer; - - sal_Bool m_bRowCountFinal; + mutable bool m_bResultSetChanged; /** @@ -84,23 +68,8 @@ namespace dbaccess const ::rtl::OUString& _sSchema, const ::rtl::OUString& _sTable); - /** copies the values from the insert row into the key row - * - * \param _rInsertRow the row which was inserted - * \param _rKeyRow The current key row of the row set. - + \param i_nBookmark The bookmark is used to update the parameter - */ - void copyRowValue(const ORowSetRow& _rInsertRow,ORowSetRow& _rKeyRow,sal_Int32 i_nBookmark); - - void fillAllRows(); - sal_Bool fetchRow(); - void impl_convertValue_throw(const ORowSetRow& _rInsertRow,const SelectColumnDescription& i_aMetaData); - void findTableColumnsMatching_throw( const ::com::sun::star::uno::Any& i_aTable - ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& i_xMeta - ,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& i_xQueryColumns); - void executeUpdate(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOrginalRow,const ::rtl::OUString& i_sSQL,const ::rtl::OUString& i_sTableName); - void executeInsert( const ORowSetRow& _rInsertRow,const ::rtl::OUString& i_sSQL,const ::rtl::OUString& i_sTableName); + void executeDelete(const ORowSetRow& _rDeleteRow,const ::rtl::OUString& i_sSQL,const ::rtl::OUString& i_sTableName); void fillJoinedColumns_throw(const ::std::vector< ::connectivity::TNodePair>& i_aJoinColumns); void fillJoinedColumns_throw(const ::rtl::OUString& i_sLeftColumn,const ::rtl::OUString& i_sRightColumn); @@ -115,59 +84,6 @@ namespace dbaccess // late ctor which can throw exceptions virtual void construct(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xDriverSet,const ::rtl::OUString& i_sRowSetFilter); - // ::com::sun::star::sdbc::XRow - virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - - - virtual sal_Bool SAL_CALL rowUpdated( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL rowInserted( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL rowDeleted( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - // ::com::sun::star::sdbc::XResultSet - virtual sal_Bool SAL_CALL next( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isBeforeFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isAfterLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL beforeFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL afterLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL first( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL last( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL previous( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL refreshRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - // ::com::sun::star::sdbcx::XRowLocate - virtual ::com::sun::star::uno::Any SAL_CALL getBookmark() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - // ------------------------------------------------------------------------- - virtual sal_Bool SAL_CALL moveToBookmark( const ::com::sun::star::uno::Any& bookmark ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - // ------------------------------------------------------------------------- - virtual sal_Bool SAL_CALL moveRelativeToBookmark( const ::com::sun::star::uno::Any& bookmark, sal_Int32 rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - // ------------------------------------------------------------------------- - virtual sal_Int32 SAL_CALL compareBookmarks( const ::com::sun::star::uno::Any& first, const ::com::sun::star::uno::Any& second ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - // ------------------------------------------------------------------------- - virtual sal_Bool SAL_CALL hasOrderedBookmarks( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - // ------------------------------------------------------------------------- - virtual sal_Int32 SAL_CALL hashBookmark( const ::com::sun::star::uno::Any& bookmark ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // ------------------------------------------------------------------------- // ::com::sun::star::sdbcx::XDeleteRows virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rows ,const connectivity::OSQLTable& _xTable) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -175,9 +91,6 @@ namespace dbaccess virtual void SAL_CALL updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOrginalRow,const connectivity::OSQLTable& _xTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL cancelRowUpdates( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL moveToInsertRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL moveToCurrentRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // CacheSet virtual bool isResultSetChanged() const; diff --git a/dbaccess/source/core/api/makefile.mk b/dbaccess/source/core/api/makefile.mk index 7af260080803..9a4dc9d8ec52 100644 --- a/dbaccess/source/core/api/makefile.mk +++ b/dbaccess/source/core/api/makefile.mk @@ -73,6 +73,7 @@ SLOFILES= \ $(SLO)$/View.obj \ $(SLO)$/WrappedResultSet.obj \ $(SLO)$/OptimisticSet.obj \ + $(SLO)$/PrivateRow.obj \ $(SLO)$/columnsettings.obj # --- Targets ---------------------------------- -- cgit v1.2.1 From 43245e76a3b8a5ebf67d0edf38934b2e3687fbc2 Mon Sep 17 00:00:00 2001 From: "Ocke Janssen [oj]" Date: Thu, 8 Jul 2010 12:22:36 +0200 Subject: dba33g: #i111205# handle filter for key and update and insert row --- dbaccess/source/core/api/PrivateRow.cxx | 141 ++++++++++++++++++++++++++++++++ dbaccess/source/core/api/PrivateRow.hxx | 69 ++++++++++++++++ 2 files changed, 210 insertions(+) create mode 100644 dbaccess/source/core/api/PrivateRow.cxx create mode 100644 dbaccess/source/core/api/PrivateRow.hxx diff --git a/dbaccess/source/core/api/PrivateRow.cxx b/dbaccess/source/core/api/PrivateRow.cxx new file mode 100644 index 000000000000..127194455440 --- /dev/null +++ b/dbaccess/source/core/api/PrivateRow.cxx @@ -0,0 +1,141 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle andor its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_dbaccess.hxx" +#include "PrivateRow.hxx" + +using namespace dbaccess; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::beans; +using namespace ::com::sun::star::sdbc; +using namespace ::com::sun::star::sdb; +using namespace ::com::sun::star::sdbcx; +using namespace ::com::sun::star::container; +using namespace ::com::sun::star::lang; +using namespace ::com::sun::star::util; +using namespace ::com::sun::star; + +::sal_Bool SAL_CALL OPrivateRow::wasNull( ) throw (SQLException, RuntimeException) + { + return m_aRow[m_nPos].isNull(); + } + ::rtl::OUString SAL_CALL OPrivateRow::getString( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException) + { + m_nPos = columnIndex; + return m_aRow[m_nPos]; + } + ::sal_Bool SAL_CALL OPrivateRow::getBoolean( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException) + { + m_nPos = columnIndex; + return m_aRow[m_nPos]; + } + ::sal_Int8 SAL_CALL OPrivateRow::getByte( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException) + { + m_nPos = columnIndex; + return m_aRow[m_nPos]; + } + ::sal_Int16 SAL_CALL OPrivateRow::getShort( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException) + { + m_nPos = columnIndex; + return m_aRow[m_nPos]; + } + ::sal_Int32 SAL_CALL OPrivateRow::getInt( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException) + { + m_nPos = columnIndex; + return m_aRow[m_nPos]; + } + ::sal_Int64 SAL_CALL OPrivateRow::getLong( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException) + { + m_nPos = columnIndex; + return m_aRow[m_nPos]; + } + float SAL_CALL OPrivateRow::getFloat( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException) + { + m_nPos = columnIndex; + return m_aRow[m_nPos]; + } + double SAL_CALL OPrivateRow::getDouble( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException) + { + m_nPos = columnIndex; + return m_aRow[m_nPos]; + } + Sequence< ::sal_Int8 > SAL_CALL OPrivateRow::getBytes( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException) + { + m_nPos = columnIndex; + return m_aRow[m_nPos]; + } + ::com::sun::star::util::Date SAL_CALL OPrivateRow::getDate( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException) + { + m_nPos = columnIndex; + return m_aRow[m_nPos]; + } + ::com::sun::star::util::Time SAL_CALL OPrivateRow::getTime( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException) + { + m_nPos = columnIndex; + return m_aRow[m_nPos]; + } + ::com::sun::star::util::DateTime SAL_CALL OPrivateRow::getTimestamp( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException) + { + m_nPos = columnIndex; + return m_aRow[m_nPos]; + } + Reference< ::com::sun::star::io::XInputStream > SAL_CALL OPrivateRow::getBinaryStream( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException) + { + m_nPos = columnIndex; + return Reference< ::com::sun::star::io::XInputStream >(m_aRow[m_nPos].makeAny(),UNO_QUERY); + } + Reference< ::com::sun::star::io::XInputStream > SAL_CALL OPrivateRow::getCharacterStream( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException) + { + m_nPos = columnIndex; + return Reference< ::com::sun::star::io::XInputStream >(m_aRow[m_nPos].makeAny(),UNO_QUERY); + } + Any SAL_CALL OPrivateRow::getObject( ::sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& ) throw (SQLException, RuntimeException) + { + m_nPos = columnIndex; + return m_aRow[m_nPos].makeAny(); + } + Reference< XRef > SAL_CALL OPrivateRow::getRef( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException) + { + m_nPos = columnIndex; + return Reference< XRef >(m_aRow[m_nPos].makeAny(),UNO_QUERY); + } + Reference< XBlob > SAL_CALL OPrivateRow::getBlob( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException) + { + m_nPos = columnIndex; + return Reference< XBlob >(m_aRow[m_nPos].makeAny(),UNO_QUERY); + } + Reference< XClob > SAL_CALL OPrivateRow::getClob( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException) + { + m_nPos = columnIndex; + return Reference< XClob >(m_aRow[m_nPos].makeAny(),UNO_QUERY); + } + Reference< XArray > SAL_CALL OPrivateRow::getArray( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException) + { + m_nPos = columnIndex; + return Reference< XArray >(m_aRow[m_nPos].makeAny(),UNO_QUERY); + } \ No newline at end of file diff --git a/dbaccess/source/core/api/PrivateRow.hxx b/dbaccess/source/core/api/PrivateRow.hxx new file mode 100644 index 000000000000..82dd97232c92 --- /dev/null +++ b/dbaccess/source/core/api/PrivateRow.hxx @@ -0,0 +1,69 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: OptimisticSet.cxx,v $ + * $Revision: 1.73 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef PRIVATE_ROW_HXX +#define PRIVATE_ROW_HXX + +#include +#include +#include "RowSetRow.hxx" + +namespace dbaccess +{ + class OPrivateRow : public ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XRow> + { + ORowSetValueVector::Vector m_aRow; + sal_Int32 m_nPos; + public: + OPrivateRow(const ORowSetValueVector::Vector& i_aRow) : m_aRow(i_aRow),m_nPos(0) + { + } + virtual ::sal_Bool SAL_CALL wasNull( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::rtl::OUString SAL_CALL getString( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL getBoolean( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::sal_Int8 SAL_CALL getByte( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::sal_Int16 SAL_CALL getShort( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getInt( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::sal_Int64 SAL_CALL getLong( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual float SAL_CALL getFloat( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual double SAL_CALL getDouble( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getBytes( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::util::Date SAL_CALL getDate( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::util::Time SAL_CALL getTime( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::util::DateTime SAL_CALL getTimestamp( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getBinaryStream( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getCharacterStream( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getObject( ::sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef > SAL_CALL getRef( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob > SAL_CALL getBlob( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob > SAL_CALL getClob( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray > SAL_CALL getArray( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + }; +} // dbaccess +#endif // PRIVATE_ROW_HXX -- cgit v1.2.1 From bf97aef60b98b7c72ebd494845d0bdfa0c54ef84 Mon Sep 17 00:00:00 2001 From: "Ocke Janssen [oj]" Date: Thu, 8 Jul 2010 12:45:25 +0200 Subject: dba33g: assertion when closing stream, only close either the input stream or output stream --- connectivity/source/commontools/FValue.cxx | 100 ++++++++++++++++----- .../source/drivers/hsqldb/HStorageAccess.cxx | 10 +-- connectivity/source/drivers/hsqldb/HStorageMap.cxx | 13 +-- 3 files changed, 89 insertions(+), 34 deletions(-) diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx index 2884e6179aaa..bb3ce9dbb13b 100644 --- a/connectivity/source/commontools/FValue.cxx +++ b/connectivity/source/commontools/FValue.cxx @@ -258,6 +258,7 @@ void ORowSetValue::setTypeKind(sal_Int32 _eType) (*this) = getAny(); break; default: + (*this) = getAny(); OSL_ENSURE(0,"ORowSetValue:operator==(): UNSPUPPORTED TYPE!"); } } @@ -344,6 +345,12 @@ void ORowSetValue::free() TRACE_FREE( Any ) m_aValue.m_pValue = NULL; break; + default: + OSL_ENSURE(m_aValue.m_pString,"String pointer is null!"); + delete (Any*)m_aValue.m_pValue; + TRACE_FREE( Any ) + m_aValue.m_pValue = NULL; + break; } m_bNull = sal_True; @@ -849,7 +856,9 @@ bool ORowSetValue::operator==(const ORowSetValue& _rRH) const bRet = false; break; default: + bRet = false; OSL_ENSURE(0,"ORowSetValue::operator==(): UNSPUPPORTED TYPE!"); + break; } return bRet; } @@ -942,6 +951,8 @@ Any ORowSetValue::makeAny() const break; default: OSL_ENSURE(0,"ORowSetValue::makeAny(): UNSPUPPORTED TYPE!"); + rValue = getAny(); + break; } } return rValue; @@ -1032,6 +1043,12 @@ Any ORowSetValue::makeAny() const } } break; + default: + { + Any aValue = getAny(); + aValue >>= aRet; + break; + } } } return aRet; @@ -1104,8 +1121,11 @@ sal_Bool ORowSetValue::getBool() const bRet = m_bSigned ? (m_aValue.m_nInt32 != 0) : (*static_cast(m_aValue.m_pValue) != sal_Int64(0)); break; default: - OSL_ENSURE(0,"Illegal conversion!"); - break; + { + Any aValue = getAny(); + aValue >>= bRet; + break; + } } } return bRet; @@ -1174,8 +1194,11 @@ sal_Int8 ORowSetValue::getInt8() const nRet = static_cast(*static_cast(m_aValue.m_pValue)); break; default: - OSL_ENSURE(0,"Illegal conversion!"); - break; + { + Any aValue = getAny(); + aValue >>= nRet; + break; + } } } return nRet; @@ -1244,8 +1267,11 @@ sal_Int16 ORowSetValue::getInt16() const nRet = static_cast(*static_cast(m_aValue.m_pValue)); break; default: - OSL_ENSURE(0,"Illegal conversion!"); - break; + { + Any aValue = getAny(); + aValue >>= nRet; + break; + } } } return nRet; @@ -1314,8 +1340,11 @@ sal_Int32 ORowSetValue::getInt32() const nRet = static_cast(*static_cast(m_aValue.m_pValue)); break; default: - OSL_ENSURE(0,"Illegal conversion!"); - break; + { + Any aValue = getAny(); + aValue >>= nRet; + break; + } } } return nRet; @@ -1384,8 +1413,11 @@ sal_Int64 ORowSetValue::getLong() const nRet = *(sal_Int64*)m_aValue.m_pValue; break; default: - OSL_ENSURE(0,"Illegal conversion!"); - break; + { + Any aValue = getAny(); + aValue >>= nRet; + break; + } } } return nRet; @@ -1458,8 +1490,11 @@ float ORowSetValue::getFloat() const nRet = float(*(sal_Int64*)m_aValue.m_pValue); break; default: - OSL_ENSURE(0,"Illegal conversion!"); - break; + { + Any aValue = getAny(); + aValue >>= nRet; + break; + } } } return nRet; @@ -1534,8 +1569,11 @@ double ORowSetValue::getDouble() const nRet = double(*(sal_Int64*)m_aValue.m_pValue); break; default: - OSL_ENSURE(0,"Illegal conversion!"); - break; + { + Any aValue = getAny(); + aValue >>= nRet; + break; + } } } return nRet; @@ -1626,6 +1664,11 @@ void ORowSetValue::setFromDouble(const double& _rVal,sal_Int32 _nDatatype) TRACE_ALLOC( sal_Int64 ) } break; + default: + { + m_aValue.m_pValue = new Any(_rVal); + break; + } } m_eTypeKind = _nDatatype; } @@ -1692,7 +1735,11 @@ Sequence ORowSetValue::getSequence() const aSeq = *static_cast< Sequence*>(m_aValue.m_pValue); break; default: - ; + { + Any aValue = getAny(); + aValue >>= aSeq; + break; + } } } return aSeq; @@ -1734,8 +1781,11 @@ Sequence ORowSetValue::getSequence() const } break; default: - OSL_ENSURE(0,"Illegal conversion!"); - break; + { + Any aAnyValue = getAny(); + aAnyValue >>= aValue; + break; + } } } return aValue; @@ -1776,8 +1826,11 @@ Sequence ORowSetValue::getSequence() const aValue = *static_cast< ::com::sun::star::util::Time*>(m_aValue.m_pValue); break; default: - OSL_ENSURE(0,"Illegal conversion!"); - break; + { + Any aAnyValue = getAny(); + aAnyValue >>= aValue; + break; + } } } return aValue; @@ -1826,8 +1879,11 @@ Sequence ORowSetValue::getSequence() const aValue = *static_cast< ::com::sun::star::util::DateTime*>(m_aValue.m_pValue); break; default: - OSL_ENSURE(0,"Illegal conversion!"); - break; + { + Any aAnyValue = getAny(); + aAnyValue >>= aValue; + break; + } } } return aValue; @@ -2094,7 +2150,7 @@ void ORowSetValue::impl_fill( const sal_Int32 _nType, sal_Bool _bNullable, const break; default: OSL_ENSURE( false, "ORowSetValue::fill: unsupported type!" ); - bReadData = false; + (*this) = _rValueSource.getObject(); break; } if ( bReadData && _bNullable && _rValueSource.wasNull() ) diff --git a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx index 1452df992a74..e7fab6acb6c0 100644 --- a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx +++ b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx @@ -234,7 +234,7 @@ jint read_from_storage_stream_into_buffer( JNIEnv * env, jobject /*obj_this*/,js if ( xIn.is() ) { jsize nLen = env->GetArrayLength(buffer); - if ( nLen < len ) + if ( nLen < len || len <= 0 ) { ThrowException( env, "java/io/IOException", @@ -439,21 +439,17 @@ void write_to_storage_stream_from_buffer( JNIEnv* env, jobject /*obj_this*/, jst if ( xOut.is() ) { jbyte *buf = env->GetByteArrayElements(buffer,NULL); -#ifdef HSQLDB_DBG - OSL_ENSURE(len <= env->GetArrayLength(buffer),"Length is greater than the buffer!"); -#endif - if (JNI_FALSE != env->ExceptionCheck()) { env->ExceptionClear(); OSL_ENSURE(0,"ExceptionClear"); } OSL_ENSURE(buf,"buf is NULL"); - if ( buf ) + if ( buf && len > 0 && len <= env->GetArrayLength(buffer)) { Sequence< ::sal_Int8 > aData(buf + off,len); - xOut->writeBytes(aData); env->ReleaseByteArrayElements(buffer, buf, JNI_ABORT); + xOut->writeBytes(aData); #ifdef HSQLDB_DBG if ( logger ) logger->write( aData.getConstArray(), len ); diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx index afb4d0da2640..fe4e5d9ca12e 100644 --- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx +++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx @@ -61,13 +61,14 @@ namespace connectivity { try { - m_xStream.clear(); - m_xSeek.clear(); + m_xStream.clear(); + m_xSeek.clear(); if ( m_xInputStream.is() ) { m_xInputStream->closeInput(); - m_xInputStream.clear(); + m_xInputStream.clear(); } + /* this is done implicity by the closing of the input stream if ( m_xOutputStream.is() ) { m_xOutputStream->closeOutput(); @@ -83,11 +84,13 @@ namespace connectivity OSL_UNUSED( e ); OSL_ENSURE(0,"Could not dispose OutputStream"); } - m_xOutputStream.clear(); + m_xOutputStream.clear(); } + */ } - catch(Exception& ) + catch(Exception& ex) { + OSL_UNUSED( ex ); OSL_ENSURE(0,"Exception catched!"); } } -- cgit v1.2.1 From 8300ef8db57da4dbf65a5b10323e1c909c41490b Mon Sep 17 00:00:00 2001 From: "Ocke Janssen [oj]" Date: Thu, 8 Jul 2010 12:46:25 +0200 Subject: dba33g: assertion when closing stream, only close either the input stream or output stream --- connectivity/source/drivers/hsqldb/HStorageMap.cxx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx index fe4e5d9ca12e..57ed88b1dda8 100644 --- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx +++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx @@ -68,8 +68,8 @@ namespace connectivity m_xInputStream->closeInput(); m_xInputStream.clear(); } - /* this is done implicity by the closing of the input stream - if ( m_xOutputStream.is() ) + // this is done implicity by the closing of the input stream + else if ( m_xOutputStream.is() ) { m_xOutputStream->closeOutput(); try @@ -86,7 +86,6 @@ namespace connectivity } m_xOutputStream.clear(); } - */ } catch(Exception& ex) { -- cgit v1.2.1 From 59d725548db0075ebd230df6cfa09abd76ee1a57 Mon Sep 17 00:00:00 2001 From: "Ocke Janssen [oj]" Date: Thu, 8 Jul 2010 13:22:49 +0200 Subject: dba33g: #i109528# remove clipboard listener --- reportdesign/source/ui/report/ReportController.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index a5280b7d93a3..6d13804fe7fa 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -333,7 +333,7 @@ IMPLEMENT_FORWARD_XINTERFACE2(OReportController,OReportController_BASE,OReportCo void OReportController::disposing() { - if ( getView() && m_pClipbordNotifier ) + if ( m_pClipbordNotifier ) { m_pClipbordNotifier->ClearCallbackLink(); m_pClipbordNotifier->AddRemoveListener( getView(), sal_False ); -- cgit v1.2.1 From 2141676620130121da7590eda02a235199f527d8 Mon Sep 17 00:00:00 2001 From: "Ocke Janssen [oj]" Date: Thu, 8 Jul 2010 14:32:56 +0200 Subject: dba33g: #i111142# handle insertrow corrected --- dbaccess/source/ui/inc/TableController.hxx | 2 +- dbaccess/source/ui/tabledesign/TEditControl.cxx | 3 --- dbaccess/source/ui/tabledesign/TableController.cxx | 15 +++++++++++++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx index f2e55a709671..3651c5632504 100644 --- a/dbaccess/source/ui/inc/TableController.hxx +++ b/dbaccess/source/ui/inc/TableController.hxx @@ -135,7 +135,7 @@ namespace dbaui inline ::std::vector< ::boost::shared_ptr >* getRows() { return &m_vRowList; } /// returns the postion of the the first empty row - sal_Int32 getFirstEmptyRowPosition() const; + sal_Int32 getFirstEmptyRowPosition(); inline const OTypeInfoMap* getTypeInfo() const { return &m_aTypeInfo; } diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index 2910380070c5..f64cabd58653 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -134,9 +134,6 @@ DBG_NAME(OTableEditorCtrl) #define HANDLE_ID 0 -// Anzahl Spalten beim Neuanlegen -#define NEWCOLS 128 - // default Spaltenbreiten #define FIELDNAME_WIDTH 100 #define FIELDTYPE_WIDTH 150 diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx index 542096508337..a848eb8de18c 100644 --- a/dbaccess/source/ui/tabledesign/TableController.cxx +++ b/dbaccess/source/ui/tabledesign/TableController.cxx @@ -108,6 +108,9 @@ using namespace ::dbtools; using namespace ::dbaui; using namespace ::comphelper; +// Anzahl Spalten beim Neuanlegen +#define NEWCOLS 128 + namespace { void dropTable(const Reference& _rxTable,const ::rtl::OUString& _sTableName) @@ -958,7 +961,7 @@ void OTableController::loadData() OSL_ENSURE(aTypeIter != m_aTypeInfo.end(),"We have no type infomation!"); bool bReadRow = !isAddAllowed(); - for(sal_Int32 i=m_vRowList.size(); i<128; i++ ) + for(sal_Int32 i=m_vRowList.size(); i < NEWCOLS; i++ ) { pTabEdRow.reset(new OTableRow()); pTabEdRow->SetReadOnly(bReadRow); @@ -1579,7 +1582,7 @@ void OTableController::reload() static_cast(getView())->Invalidate(); } // ----------------------------------------------------------------------------- -sal_Int32 OTableController::getFirstEmptyRowPosition() const +sal_Int32 OTableController::getFirstEmptyRowPosition() { sal_Int32 nRet = -1; ::std::vector< ::boost::shared_ptr >::const_iterator aIter = m_vRowList.begin(); @@ -1592,6 +1595,14 @@ sal_Int32 OTableController::getFirstEmptyRowPosition() const break; } } + if ( nRet == -1 ) + { + bool bReadRow = !isAddAllowed(); + ::boost::shared_ptr pTabEdRow(new OTableRow()); + pTabEdRow->SetReadOnly(bReadRow); + nRet = m_vRowList.size(); + m_vRowList.push_back( pTabEdRow); + } return nRet; } // ----------------------------------------------------------------------------- -- cgit v1.2.1 From 50fbc78991abce50a5dfa3e933f0adb6e0a75fc5 Mon Sep 17 00:00:00 2001 From: "Ocke Janssen [oj]" Date: Thu, 8 Jul 2010 15:27:58 +0200 Subject: dba33g: #i108954# handle value for string and date like value-type is defined --- .../pentaho/layoutprocessor/FormatValueUtility.java | 7 ++++++- .../layoutprocessor/FormattedTextLayoutController.java | 15 +++++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java index c8c98692a7a0..fc1baaa8c9a3 100755 --- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java @@ -125,7 +125,12 @@ public class FormatValueUtility } else if (value instanceof java.sql.Date) { - variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, "date-value", formatDate((Date) value)); + if ( "float".equals(valueType))//@see http://qa.openoffice.org/issues/show_bug.cgi?id=108954 + { + variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, VALUE, HSSFDateUtil.getExcelDate((Date) value, false, 2).toString()); + } + else + variableSection.setAttribute(OfficeNamespaces.OFFICE_NS, "date-value", formatDate((Date) value)); } else if (value instanceof Date) { diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java index 7a0a496ffb26..5a6b8f948372 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java @@ -136,9 +136,20 @@ public class FormattedTextLayoutController else { final DataFlags df = FormatValueUtility.computeDataFlag(element, getFlowController()); - if (df != null && df.getValue() instanceof String ) + if (df != null) { - target.processContent(df); + if (df.getValue() instanceof String) + { + target.processContent(df); + } + else //@see http://qa.openoffice.org/issues/show_bug.cgi?id=108954 + { + Element cell = getParentTableCell(); + if (cell != null && "string".equals(cell.getAttribute(OfficeNamespaces.OFFICE_NS, FormatValueUtility.VALUE_TYPE))) + { + target.processContent(df); + } + } } } -- cgit v1.2.1 From 103998e7c97acfb6cec90715eca62ee519d8d3fb Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Thu, 8 Jul 2010 15:42:47 +0200 Subject: #112855# call SdrEndTextEdit only if we are still in text edit --- sd/source/ui/func/futext.cxx | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) mode change 100644 => 100755 sd/source/ui/func/futext.cxx diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx old mode 100644 new mode 100755 index 2fd808dcda3e..2f3111665692 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -400,10 +400,17 @@ BOOL FuText::MouseButtonDown(const MouseEvent& rMEvt) // do the EndTextEdit first, it will delete the handles and force a // recreation. This will make aVEvt.pHdl to point to a deleted handle, // thus it is necessary to reset it and to get it again. - ::Outliner* pOutl = mpView->GetTextEditOutliner(); - if (mxTextObj.is() && (mxTextObj->GetOutlinerParaObject() || - (pOutl && pOutl->GetText(pOutl->GetParagraph( 0 )).Len() != 0))) + // #i112855# + // cl: I'm not sure why we checked here also for mxTextObj->GetOutlinerParaObjet + // this caused SdrEndTextEdit() to be called also when not in text editing and + // this does not make sense and caused troubles. (see issue 112855) + +// ::Outliner* pOutl = mpView->GetTextEditOutliner(); +// +// if (mxTextObj.is() && (mxTextObj->GetOutlinerParaObject() || +// (pOutl && pOutl->GetText(pOutl->GetParagraph( 0 )).Len() != 0))) + if( mpView->IsTextEdit() ) { mpView->SdrEndTextEdit(); -- cgit v1.2.1 From 9bd142499eb4254cbb413caaad31105da3b95eea Mon Sep 17 00:00:00 2001 From: "Ocke Janssen [oj]" Date: Thu, 8 Jul 2010 16:14:22 +0200 Subject: dba33g: #i110535# add order with realname and table name --- .../java/com/sun/star/report/SDBCReportDataFactory.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/reportbuilder/java/com/sun/star/report/SDBCReportDataFactory.java b/reportbuilder/java/com/sun/star/report/SDBCReportDataFactory.java index ba652f14c209..78ac17a7ba08 100644 --- a/reportbuilder/java/com/sun/star/report/SDBCReportDataFactory.java +++ b/reportbuilder/java/com/sun/star/report/SDBCReportDataFactory.java @@ -259,7 +259,17 @@ public class SDBCReportDataFactory implements DataSourceFactory if (!expression.startsWith(quote) && columns.hasByName(expression)) { - expression = quote + expression + quote; + XPropertySet column; + try + { + column = UnoRuntime.queryInterface(XPropertySet.class, columns.getByName(expression)); + expression = quote + column.getPropertyValue("TableName") + quote + "." + quote + expression + quote; + } + catch (Exception ex) + { + Logger.getLogger(SDBCReportDataFactory.class.getName()).log(Level.SEVERE, null, ex); + expression = quote + expression + quote; + } } expression = expression.trim(); // Trim away white spaces -- cgit v1.2.1 From d4b20337f69340abd5cc9bc3e72c617876cc15d6 Mon Sep 17 00:00:00 2001 From: sj Date: Thu, 8 Jul 2010 16:46:28 +0200 Subject: impress194: #i112166# always removing tempfile (now removing file via osl_removeFile instead of ucb::content - delete) --- vcl/inc/vcl/gfxlink.hxx | 7 ++--- vcl/source/gdi/gfxlink.cxx | 59 ++++++--------------------------------- vcl/source/gdi/pdfwriter_impl.cxx | 1 + 3 files changed, 11 insertions(+), 56 deletions(-) diff --git a/vcl/inc/vcl/gfxlink.hxx b/vcl/inc/vcl/gfxlink.hxx index 3b3938ec848b..dced5a19c461 100644 --- a/vcl/inc/vcl/gfxlink.hxx +++ b/vcl/inc/vcl/gfxlink.hxx @@ -33,9 +33,6 @@ #include #include -//#if 0 // _SOLAR__PRIVATE -#include - // ------------- // - ImpBuffer - // ------------- @@ -62,7 +59,7 @@ struct ImpBuffer struct ImpSwap { - INetURLObject maURL; + rtl::OUString maURL; ULONG mnDataSize; ULONG mnRefCount; @@ -71,7 +68,7 @@ struct ImpSwap BYTE* GetData() const; - BOOL IsSwapped() const { return maURL.GetMainURL( INetURLObject::NO_DECODE ).getLength() > 0; } + BOOL IsSwapped() const { return maURL.getLength() > 0; } void WriteTo( SvStream& rOStm ) const; }; diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx index 4d32990f9335..60ad94a63273 100644 --- a/vcl/source/gdi/gfxlink.cxx +++ b/vcl/source/gdi/gfxlink.cxx @@ -28,6 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" +#include #include #include #include @@ -398,12 +399,10 @@ ImpSwap::ImpSwap( BYTE* pData, ULONG nDataSize ) : { ::utl::TempFile aTempFile; - maURL = INetURLObject(aTempFile.GetURL()); - - if( maURL.GetMainURL( INetURLObject::NO_DECODE ).getLength() ) + maURL = aTempFile.GetURL(); + if( maURL.getLength() ) { - SvStream* pOStm = ::utl::UcbStreamHelper::CreateStream( maURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READWRITE | STREAM_SHARE_DENYWRITE ); - + SvStream* pOStm = ::utl::UcbStreamHelper::CreateStream( maURL, STREAM_READWRITE | STREAM_SHARE_DENYWRITE ); if( pOStm ) { pOStm->Write( pData, mnDataSize ); @@ -412,28 +411,8 @@ ImpSwap::ImpSwap( BYTE* pData, ULONG nDataSize ) : if( bError ) { - try - { - ::ucbhelper::Content aCnt( maURL.GetMainURL( INetURLObject::NO_DECODE ), - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >() ); - - aCnt.executeCommand( ::rtl::OUString::createFromAscii( "delete" ), - ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) ); - } - catch( const ::com::sun::star::ucb::ContentCreationException& ) - { - } - catch( const ::com::sun::star::uno::RuntimeException& ) - { - } - catch( const ::com::sun::star::ucb::CommandAbortedException& ) - { - } - catch( const ::com::sun::star::uno::Exception& ) - { - } - - maURL = INetURLObject(); + osl_removeFile( maURL.pData ); + maURL = String(); } } } @@ -445,28 +424,7 @@ ImpSwap::ImpSwap( BYTE* pData, ULONG nDataSize ) : ImpSwap::~ImpSwap() { if( IsSwapped() ) - { - try - { - ::ucbhelper::Content aCnt( maURL.GetMainURL( INetURLObject::NO_DECODE ), - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >() ); - - aCnt.executeCommand( ::rtl::OUString::createFromAscii( "delete" ), - ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) ); - } - catch( const ::com::sun::star::ucb::ContentCreationException& ) - { - } - catch( const ::com::sun::star::uno::RuntimeException& ) - { - } - catch( const ::com::sun::star::ucb::CommandAbortedException& ) - { - } - catch( const ::com::sun::star::uno::Exception& ) - { - } - } + osl_removeFile( maURL.pData ); } // ------------------------------------------------------------------------ @@ -477,8 +435,7 @@ BYTE* ImpSwap::GetData() const if( IsSwapped() ) { - SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( maURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READWRITE ); - + SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( maURL, STREAM_READWRITE ); if( pIStm ) { pData = new BYTE[ mnDataSize ]; diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 6cb0a7d07697..7b7f3bbcb4d3 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -32,6 +32,7 @@ #include #include +#include #include #include #include -- cgit v1.2.1 From cfc1d8bdffb17985e35d8ae5b987acc1de664354 Mon Sep 17 00:00:00 2001 From: "Ocke Janssen [oj]" Date: Fri, 9 Jul 2010 07:19:45 +0200 Subject: dba33g: #i110825# applay patch to removed unused code --- connectivity/source/commontools/FValue.cxx | 15 +++++++++++---- connectivity/source/drivers/jdbc/Boolean.cxx | 17 ----------------- connectivity/source/drivers/jdbc/Object.cxx | 8 -------- connectivity/source/drivers/jdbc/String.cxx | 20 -------------------- connectivity/source/inc/java/lang/Boolean.hxx | 1 - connectivity/source/inc/java/lang/Object.hxx | 2 -- connectivity/source/inc/java/lang/String.hxx | 1 - 7 files changed, 11 insertions(+), 53 deletions(-) diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx index bb3ce9dbb13b..aca181916b47 100644 --- a/connectivity/source/commontools/FValue.cxx +++ b/connectivity/source/commontools/FValue.cxx @@ -345,11 +345,18 @@ void ORowSetValue::free() TRACE_FREE( Any ) m_aValue.m_pValue = NULL; break; + case DataType::BIT: + case DataType::TINYINT: + case DataType::SMALLINT: + case DataType::BOOLEAN: + break; default: - OSL_ENSURE(m_aValue.m_pString,"String pointer is null!"); - delete (Any*)m_aValue.m_pValue; - TRACE_FREE( Any ) - m_aValue.m_pValue = NULL; + if ( m_aValue.m_pValue ) + { + delete (Any*)m_aValue.m_pValue; + TRACE_FREE( Any ) + m_aValue.m_pValue = NULL; + } break; } diff --git a/connectivity/source/drivers/jdbc/Boolean.cxx b/connectivity/source/drivers/jdbc/Boolean.cxx index 2df75283a14b..fd52f3092c0e 100644 --- a/connectivity/source/drivers/jdbc/Boolean.cxx +++ b/connectivity/source/drivers/jdbc/Boolean.cxx @@ -49,20 +49,3 @@ jclass java_lang_Boolean::getMyClass() const { return st_getMyClass(); } - -java_lang_Boolean::java_lang_Boolean( sal_Bool _par0 ): java_lang_Object( NULL, (jobject)NULL ) -{ - SDBThreadAttach t; - // Java-Call fuer den Konstruktor absetzen - // temporaere Variable initialisieren - static const char * cSignature = "(Z)V"; - jobject tempObj; - static jmethodID mID(NULL); - obtainMethodId(t.pEnv, "",cSignature, mID); - tempObj = t.pEnv->NewObject( getMyClass(), mID, _par0 ); - saveRef( t.pEnv, tempObj ); - t.pEnv->DeleteLocalRef( tempObj ); - // und aufraeumen -} - - diff --git a/connectivity/source/drivers/jdbc/Object.cxx b/connectivity/source/drivers/jdbc/Object.cxx index 4866781d23dd..4f5670ace8aa 100644 --- a/connectivity/source/drivers/jdbc/Object.cxx +++ b/connectivity/source/drivers/jdbc/Object.cxx @@ -166,14 +166,6 @@ void java_lang_Object::saveRef( JNIEnv * pXEnv, jobject myObj ) } -java_lang_Class * java_lang_Object::getClass() -{ - SDBThreadAttach t; - static jmethodID mID(NULL); - jobject out = callObjectMethod(t.pEnv,"getClass","()Ljava/lang/Class;", mID); - return out ? new java_lang_Class( t.pEnv, out ) : NULL; -} - ::rtl::OUString java_lang_Object::toString() const { static jmethodID mID(NULL); diff --git a/connectivity/source/drivers/jdbc/String.cxx b/connectivity/source/drivers/jdbc/String.cxx index e6102fc3a471..f32b0cce4325 100644 --- a/connectivity/source/drivers/jdbc/String.cxx +++ b/connectivity/source/drivers/jdbc/String.cxx @@ -51,26 +51,6 @@ jclass java_lang_String::st_getMyClass() return theClass; } -//-------------------------------------------------------------------------- -java_lang_String::java_lang_String( const ::rtl::OUString& _par0 ): java_lang_Object( NULL, (jobject)NULL ) -{ - SDBThreadAttach t; - if( !t.pEnv ) - return; - jvalue args[1]; - // Parameter konvertieren - args[0].l = convertwchar_tToJavaString(t.pEnv,_par0); - // Java-Call fuer den Konstruktor absetzen - // temporaere Variable initialisieren - static const char * cSignature = "(Ljava/lang/String;)V"; - jobject tempObj; - static jmethodID mID(NULL); - obtainMethodId(t.pEnv, "",cSignature, mID); - tempObj = t.pEnv->NewObjectA( getMyClass(), mID, args ); - saveRef( t.pEnv, tempObj ); - t.pEnv->DeleteLocalRef( tempObj ); - t.pEnv->DeleteLocalRef((jstring)args[0].l); -} //-------------------------------------------------------------------------- java_lang_String::operator ::rtl::OUString() { diff --git a/connectivity/source/inc/java/lang/Boolean.hxx b/connectivity/source/inc/java/lang/Boolean.hxx index f1f8081d9780..35655f8c1934 100644 --- a/connectivity/source/inc/java/lang/Boolean.hxx +++ b/connectivity/source/inc/java/lang/Boolean.hxx @@ -44,7 +44,6 @@ namespace connectivity // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: java_lang_Boolean( JNIEnv * pEnv, jobject myObj ) : java_lang_Object( pEnv, myObj ){} - java_lang_Boolean( sal_Bool _par0 ); static jclass st_getMyClass(); }; } diff --git a/connectivity/source/inc/java/lang/Object.hxx b/connectivity/source/inc/java/lang/Object.hxx index f0bacc2ee840..c00c5e67e06d 100644 --- a/connectivity/source/inc/java/lang/Object.hxx +++ b/connectivity/source/inc/java/lang/Object.hxx @@ -118,8 +118,6 @@ namespace connectivity void clearObject(JNIEnv& rEnv); void clearObject(); - java_lang_Class * getClass(); - virtual ::rtl::OUString toString() const; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() { return m_xFactory; } diff --git a/connectivity/source/inc/java/lang/String.hxx b/connectivity/source/inc/java/lang/String.hxx index 64584dab5e76..3e4bfd6c1399 100644 --- a/connectivity/source/inc/java/lang/String.hxx +++ b/connectivity/source/inc/java/lang/String.hxx @@ -42,7 +42,6 @@ namespace connectivity // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: java_lang_String( JNIEnv * pEnv, jobject myObj ) : java_lang_Object( pEnv, myObj ){} - java_lang_String( const ::rtl::OUString& _par0 ); operator ::rtl::OUString(); static jclass st_getMyClass(); -- cgit v1.2.1 From 8b75cd73ff47f3f2dd54e255c909bafab04804f5 Mon Sep 17 00:00:00 2001 From: "Ocke Janssen [oj]" Date: Fri, 9 Jul 2010 08:01:25 +0200 Subject: dba33g: #i112274# throw exception when trying to insert, update or delete rows, which is currently not supported at the driver --- mysqlc/source/mysqlc_resultset.cxx | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/mysqlc/source/mysqlc_resultset.cxx b/mysqlc/source/mysqlc_resultset.cxx index f6b6861b6a74..bb6eb3594e32 100644 --- a/mysqlc/source/mysqlc_resultset.cxx +++ b/mysqlc/source/mysqlc_resultset.cxx @@ -35,6 +35,9 @@ #include #include #include +#include +#include +#include #include #include @@ -967,6 +970,7 @@ void SAL_CALL OResultSet::insertRow() MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); // you only have to implement this if you want to insert new rows + mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::insertRow", *this); } /* }}} */ @@ -980,6 +984,7 @@ void SAL_CALL OResultSet::updateRow() checkDisposed(OResultSet_BASE::rBHelper.bDisposed); // only when you allow updates + mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::updateRow", *this); } /* }}} */ @@ -991,6 +996,7 @@ void SAL_CALL OResultSet::deleteRow() OSL_TRACE("OResultSet::deleteRow"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); + mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::deleteRow", *this); } /* }}} */ @@ -1002,6 +1008,7 @@ void SAL_CALL OResultSet::cancelRowUpdates() OSL_TRACE("OResultSet::cancelRowUpdates"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); + mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::cancelRowUpdates", *this); } /* }}} */ @@ -1015,6 +1022,7 @@ void SAL_CALL OResultSet::moveToInsertRow() checkDisposed(OResultSet_BASE::rBHelper.bDisposed); // only when you allow insert's + mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::moveToInsertRow", *this); } /* }}} */ @@ -1444,10 +1452,19 @@ void OResultSet::getFastPropertyValue(Any& _rValue, sal_Int32 nHandle) const _rValue <<= sal_False; break; case PROPERTY_ID_CURSORNAME: + break; case PROPERTY_ID_RESULTSETCONCURRENCY: + _rValue <<= ResultSetConcurrency::READ_ONLY; + break; case PROPERTY_ID_RESULTSETTYPE: + _rValue <<= ResultSetType::SCROLL_INSENSITIVE; + break; case PROPERTY_ID_FETCHDIRECTION: + _rValue <<= FetchDirection::FORWARD; + break; case PROPERTY_ID_FETCHSIZE: + _rValue <<= sal_Int32(50); + break; ; default: ; -- cgit v1.2.1 From 06611b0b7584e21c9b876c20d35850e8fefcf093 Mon Sep 17 00:00:00 2001 From: "Ocke Janssen [oj]" Date: Fri, 9 Jul 2010 14:49:18 +0200 Subject: dba33g: #i112213# handle chart import for columns --- dbaccess/source/core/api/RowSetCache.cxx | 23 ++++++++++----- dbaccess/source/core/inc/DatabaseDataProvider.hxx | 2 +- dbaccess/source/core/misc/DatabaseDataProvider.cxx | 34 ++++++++++++++++++---- .../source/filter/xml/xmlExportDocumentHandler.cxx | 2 ++ .../source/filter/xml/xmlImportDocumentHandler.cxx | 14 ++++++++- 5 files changed, 60 insertions(+), 15 deletions(-) diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx index 72cb67209e9f..92e29ac784ba 100644 --- a/dbaccess/source/core/api/RowSetCache.cxx +++ b/dbaccess/source/core/api/RowSetCache.cxx @@ -158,14 +158,21 @@ ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs, try { Reference< XResultSetUpdate> xUp(_xRs,UNO_QUERY_THROW); - xUp->moveToInsertRow(); - xUp->cancelRowUpdates(); - _xRs->beforeFirst(); - m_nPrivileges = Privilege::SELECT|Privilege::DELETE|Privilege::INSERT|Privilege::UPDATE; - m_pCacheSet = new WrappedResultSet(); - m_xCacheSet = m_pCacheSet; - m_pCacheSet->construct(_xRs,i_sRowSetFilter); - return; + Reference< XPropertySet> xProp(_xRs,UNO_QUERY); + Reference< XPropertySetInfo > xPropInfo = xProp->getPropertySetInfo(); + sal_Bool bBookmarkable = xPropInfo->hasPropertyByName(PROPERTY_ISBOOKMARKABLE) && + any2bool(xProp->getPropertyValue(PROPERTY_ISBOOKMARKABLE)) && Reference< XRowLocate >(_xRs, UNO_QUERY).is(); + if ( bBookmarkable ) + { + xUp->moveToInsertRow(); + xUp->cancelRowUpdates(); + _xRs->beforeFirst(); + m_nPrivileges = Privilege::SELECT|Privilege::DELETE|Privilege::INSERT|Privilege::UPDATE; + m_pCacheSet = new WrappedResultSet(); + m_xCacheSet = m_pCacheSet; + m_pCacheSet->construct(_xRs,i_sRowSetFilter); + return; + } } catch(const Exception& ex) { diff --git a/dbaccess/source/core/inc/DatabaseDataProvider.hxx b/dbaccess/source/core/inc/DatabaseDataProvider.hxx index 7ed69f467f7e..e1ceb4dde6f2 100644 --- a/dbaccess/source/core/inc/DatabaseDataProvider.hxx +++ b/dbaccess/source/core/inc/DatabaseDataProvider.hxx @@ -201,7 +201,7 @@ private: void impl_fillRowSet_throw(); void impl_executeRowSet_throw(::osl::ResettableMutexGuard& _rClearForNotifies); bool impl_fillParameters_nothrow( ::osl::ResettableMutexGuard& _rClearForNotifies); - void impl_fillInternalDataProvider_throw(sal_Bool _bHasCategories); + void impl_fillInternalDataProvider_throw(sal_Bool _bHasCategories,const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >& i_aColumnNames); void impl_invalidateParameter_nothrow(); ::com::sun::star::uno::Any impl_getNumberFormatKey_nothrow(const ::rtl::OUString & _sRangeRepresentation) const; diff --git a/dbaccess/source/core/misc/DatabaseDataProvider.cxx b/dbaccess/source/core/misc/DatabaseDataProvider.cxx index c45f9f98b8a0..da6289e472c0 100644 --- a/dbaccess/source/core/misc/DatabaseDataProvider.cxx +++ b/dbaccess/source/core/misc/DatabaseDataProvider.cxx @@ -204,6 +204,7 @@ uno::Reference< chart2::data::XDataSource > SAL_CALL DatabaseDataProvider::creat if ( createDataSourcePossible(_aArguments) ) { sal_Bool bHasCategories = sal_True; + uno::Sequence< uno::Sequence< ::rtl::OUString > > aColumnNames; const beans::PropertyValue* pArgIter = _aArguments.getConstArray(); const beans::PropertyValue* pArgEnd = pArgIter + _aArguments.getLength(); for(;pArgIter != pArgEnd;++pArgIter) @@ -211,7 +212,11 @@ uno::Reference< chart2::data::XDataSource > SAL_CALL DatabaseDataProvider::creat if ( pArgIter->Name.equalsAscii("HasCategories") ) { pArgIter->Value >>= bHasCategories; - break; + + } + else if ( pArgIter->Name.equalsAscii("ComplexColumnDescriptions") ) + { + pArgIter->Value >>= aColumnNames; } } bool bRet = false; @@ -221,7 +226,7 @@ uno::Reference< chart2::data::XDataSource > SAL_CALL DatabaseDataProvider::creat { impl_fillRowSet_throw(); impl_executeRowSet_throw(aClearForNotifies); - impl_fillInternalDataProvider_throw(bHasCategories); + impl_fillInternalDataProvider_throw(bHasCategories,aColumnNames); bRet = true; } catch(const uno::Exception& /*e*/) @@ -574,7 +579,7 @@ void DatabaseDataProvider::impl_executeRowSet_throw(::osl::ResettableMutexGuard& m_xRowSet->execute(); } // ----------------------------------------------------------------------------- -void DatabaseDataProvider::impl_fillInternalDataProvider_throw(sal_Bool _bHasCategories) +void DatabaseDataProvider::impl_fillInternalDataProvider_throw(sal_Bool _bHasCategories,const uno::Sequence< uno::Sequence< ::rtl::OUString > >& i_aColumnNames) { // clear the data before fill the new one uno::Reference< chart::XChartDataArray> xChartData(m_xInternal,uno::UNO_QUERY); @@ -586,11 +591,30 @@ void DatabaseDataProvider::impl_fillInternalDataProvider_throw(sal_Bool _bHasCat m_xInternal->deleteSequence(0); } - uno::Sequence< ::rtl::OUString > aColumns; uno::Reference< sdbcx::XColumnsSupplier> xColSup(m_xRowSet,uno::UNO_QUERY_THROW); uno::Reference< container::XNameAccess > xColumns = xColSup->getColumns(); - if ( xColumns.is() ) + uno::Sequence< ::rtl::OUString > aColumns; + if ( i_aColumnNames.getLength() ) + { + if ( _bHasCategories ) + { + aColumns.realloc(1); + aColumns[0] = xColumns->getElementNames()[0]; + } + for(sal_Int32 i = 0 ; i < i_aColumnNames.getLength();++i) + { + if ( i_aColumnNames[i].getLength() ) + { + sal_Int32 nCount = aColumns.getLength(); + aColumns.realloc(nCount+1); + aColumns[nCount] = i_aColumnNames[i][0]; + } + } + } + else + { aColumns = xColumns->getElementNames(); + } // fill the data uno::Reference< sdbc::XResultSet> xRes(m_xRowSet,uno::UNO_QUERY_THROW); uno::Reference< sdbc::XRow> xRow(m_xRowSet,uno::UNO_QUERY_THROW); diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx index e86e46221e50..3fa6b42e625b 100644 --- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx @@ -289,7 +289,9 @@ void SAL_CALL ExportDocumentHandler::endElement(const ::rtl::OUString & _sName) void SAL_CALL ExportDocumentHandler::characters(const ::rtl::OUString & aChars) throw (uno::RuntimeException, xml::sax::SAXException) { if ( !(m_bTableRowsStarted || m_bFirstRowExported) ) + { m_xDelegatee->characters(aChars); + } else if ( m_bExportChar ) { static const ::rtl::OUString s_sZero(RTL_CONSTASCII_USTRINGPARAM("0")); diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx index 4adbd142d4c8..c92eecc1084d 100644 --- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -122,7 +123,6 @@ void SAL_CALL ImportDocumentHandler::endDocument() throw (uno::RuntimeException, uno::Reference< chart2::data::XDataReceiver > xReceiver(m_xModel,uno::UNO_QUERY_THROW); if ( xReceiver.is() ) { - xReceiver->attachDataProvider(m_xDatabaseDataProvider.get()); // this fills the chart again uno::Sequence< beans::PropertyValue > aArgs( 4 ); aArgs[0] = beans::PropertyValue( @@ -137,6 +137,18 @@ void SAL_CALL ImportDocumentHandler::endDocument() throw (uno::RuntimeException, aArgs[3] = beans::PropertyValue( ::rtl::OUString::createFromAscii("DataRowSource"), -1, uno::makeAny( chart::ChartDataRowSource_COLUMNS ), beans::PropertyState_DIRECT_VALUE ); + + uno::Reference< chart::XComplexDescriptionAccess > xDataProvider(m_xModel->getDataProvider(),uno::UNO_QUERY); + if ( xDataProvider.is() ) + { + aArgs.realloc(5); + uno::Sequence< uno::Sequence< ::rtl::OUString > > aColumnNames = xDataProvider->getComplexColumnDescriptions(); + aArgs[4] = beans::PropertyValue( + ::rtl::OUString::createFromAscii("ComplexColumnDescriptions"), -1, + uno::makeAny( aColumnNames ), beans::PropertyState_DIRECT_VALUE ); + } + xReceiver->attachDataProvider(m_xDatabaseDataProvider.get()); + xReceiver->setArguments( aArgs ); } } -- cgit v1.2.1 From 084fbb9e5e3c5cba2f00b7eaf9dad5b61ff62b6f Mon Sep 17 00:00:00 2001 From: "Ocke Janssen [oj]" Date: Fri, 9 Jul 2010 14:49:18 +0200 Subject: dba33g: #i112213# handle chart import for columns --- connectivity/source/drivers/ado/AResultSet.cxx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx index c71d620d527c..0c5db12c3355 100644 --- a/connectivity/source/drivers/ado/AResultSet.cxx +++ b/connectivity/source/drivers/ado/AResultSet.cxx @@ -692,6 +692,10 @@ void SAL_CALL OResultSet::cancelRowUpdates( ) throw(SQLException, RuntimeExcept void SAL_CALL OResultSet::moveToInsertRow( ) throw(SQLException, RuntimeException) { + // ::osl::MutexGuard aGuard( m_aMutex ); + //checkDisposed(OResultSet_BASE::rBHelper.bDisposed); + // if ( getResultSetConcurrency() == ResultSetConcurrency::READ_ONLY ) + // throw SQLException(); } // ------------------------------------------------------------------------- @@ -977,7 +981,7 @@ Sequence< sal_Int32 > SAL_CALL OResultSet::deleteRows( const Sequence< Any >& ro sal_Int32 OResultSet::getResultSetConcurrency() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { - sal_Int32 nValue=0; + sal_Int32 nValue=ResultSetConcurrency::READ_ONLY; LockTypeEnum eRet; if(!SUCCEEDED(m_pRecordSet->get_LockType(&eRet))) { -- cgit v1.2.1 From d7c6bda8d274ed1a41457440fbca8cdf974d0345 Mon Sep 17 00:00:00 2001 From: "Ocke Janssen [oj]" Date: Mon, 12 Jul 2010 11:41:11 +0200 Subject: dba33g: add missing eol --- dbaccess/source/core/api/PrivateRow.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dbaccess/source/core/api/PrivateRow.cxx b/dbaccess/source/core/api/PrivateRow.cxx index 127194455440..939e335b4cb3 100644 --- a/dbaccess/source/core/api/PrivateRow.cxx +++ b/dbaccess/source/core/api/PrivateRow.cxx @@ -138,4 +138,5 @@ using namespace ::com::sun::star; { m_nPos = columnIndex; return Reference< XArray >(m_aRow[m_nPos].makeAny(),UNO_QUERY); - } \ No newline at end of file + } + -- cgit v1.2.1 From cb01c3c71cf92004a13d6f06bd18fbf1ff9239ba Mon Sep 17 00:00:00 2001 From: "Ocke Janssen [oj]" Date: Mon, 12 Jul 2010 14:15:15 +0200 Subject: dba33g: #i112213# handle chart import for columns --- dbaccess/source/core/misc/DatabaseDataProvider.cxx | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dbaccess/source/core/misc/DatabaseDataProvider.cxx b/dbaccess/source/core/misc/DatabaseDataProvider.cxx index da6289e472c0..a83b04d93471 100644 --- a/dbaccess/source/core/misc/DatabaseDataProvider.cxx +++ b/dbaccess/source/core/misc/DatabaseDataProvider.cxx @@ -596,11 +596,8 @@ void DatabaseDataProvider::impl_fillInternalDataProvider_throw(sal_Bool _bHasCat uno::Sequence< ::rtl::OUString > aColumns; if ( i_aColumnNames.getLength() ) { - if ( _bHasCategories ) - { - aColumns.realloc(1); - aColumns[0] = xColumns->getElementNames()[0]; - } + aColumns.realloc(1); + aColumns[0] = xColumns->getElementNames()[0]; for(sal_Int32 i = 0 ; i < i_aColumnNames.getLength();++i) { if ( i_aColumnNames[i].getLength() ) -- cgit v1.2.1 From 917dac0a4d7652c1e68ee94a262d4cb7d09a32b0 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Mon, 12 Jul 2010 15:56:54 +0200 Subject: solaris10u8: #i112480#: build libxml2 with versioned symbols on solaris: libxml2-gnome602728.patch: remove (disables version script). libxml2-global-symbols.patch: export various global variable symbols. --- libxml2/libxml2-global-symbols.patch | 59 ++++++++++++++++++++++++++++++++++++ libxml2/libxml2-gnome602728.patch | 12 -------- libxml2/makefile.mk | 5 ++- 3 files changed, 63 insertions(+), 13 deletions(-) create mode 100644 libxml2/libxml2-global-symbols.patch delete mode 100644 libxml2/libxml2-gnome602728.patch diff --git a/libxml2/libxml2-global-symbols.patch b/libxml2/libxml2-global-symbols.patch new file mode 100644 index 000000000000..20cd273d745c --- /dev/null +++ b/libxml2/libxml2-global-symbols.patch @@ -0,0 +1,59 @@ +--- misc/libxml2-2.7.6/libxml2.syms Tue Oct 6 18:31:35 2009 ++++ misc/build/libxml2-2.7.6/libxml2.syms Wed Jul 7 15:43:17 2010 +@@ -2184,10 +2184,10 @@ + } LIBXML2_2.6.27; + + LIBXML2_2.6.29 { +- global: ++# global: + + # threads +- xmlDllMain; ++#WIN32 only! xmlDllMain; + } LIBXML2_2.6.28; + + LIBXML2_2.6.32 { +@@ -2231,3 +2231,43 @@ + xmlXIncludeProcessTreeFlagsData; + } LIBXML2_2.7.3; + ++# HACK: export global variable accessor functions (globals.h) ++LIBXML2_GLOBAL_VARIABLES { ++ global: ++# __xmlMalloc; ++# __xmlMallocAtomic; ++# __xmlRealloc; ++# __xmlFree; ++# __xmlMemStrdup; ++ __docbDefaultSAXHandler; ++ __htmlDefaultSAXHandler; ++ __xmlLastError; ++ __oldXMLWDcompatibility; ++ __xmlBufferAllocScheme; ++ __xmlDefaultBufferSize; ++ __xmlDefaultSAXHandler; ++ __xmlDefaultSAXLocator; ++ __xmlDoValidityCheckingDefaultValue; ++ __xmlGenericError; ++ __xmlStructuredError; ++ __xmlGenericErrorContext; ++ __xmlStructuredErrorContext; ++ __xmlGetWarningsDefaultValue; ++ __xmlIndentTreeOutput; ++ __xmlTreeIndentString; ++ __xmlKeepBlanksDefaultValue; ++ __xmlLineNumbersDefaultValue; ++ __xmlLoadExtDtdDefaultValue; ++ __xmlParserDebugEntities; ++ __xmlParserVersion; ++ __xmlPedanticParserDefaultValue; ++ __xmlSaveNoEmptyTags; ++ __xmlSubstituteEntitiesDefaultValue; ++ __xmlRegisterNodeDefaultValue; ++ __xmlDeregisterNodeDefaultValue; ++ __xmlParserInputBufferCreateFilenameValue; ++ __xmlOutputBufferCreateFilenameValue; ++# Solaris ld needs explicit auto-reduction (or, alternatively, "-B local") ++ local: ++ *; ++} LIBXML2_2.7.4; diff --git a/libxml2/libxml2-gnome602728.patch b/libxml2/libxml2-gnome602728.patch deleted file mode 100644 index b284d457a751..000000000000 --- a/libxml2/libxml2-gnome602728.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- misc/libxml2-2.7.6/configure 2009-12-18 12:12:08.000000000 +0000 -+++ misc/build/libxml2-2.7.6/configure 2009-12-18 12:20:40.000000000 +0000 -@@ -12150,7 +12150,7 @@ - $(/usr/bin/ld --help 2>&1 | grep -- --version-script >/dev/null) && \ - VERSION_SCRIPT_FLAGS=-Wl,--version-script= - test "`uname`" == "SunOS" && \ -- VERSION_SCRIPT_FLAGS="-Wl,-M -Wl," -+ VERSION_SCRIPT_FLAGS="" - - if test -n "$VERSION_SCRIPT_FLAGS"; then - USE_VERSION_SCRIPT_TRUE= - diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index 93275b65b2d8..42589747a168 100644 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -46,10 +46,13 @@ LIBXML2VERSION=2.7.6 TARFILE_NAME=$(PRJNAME)-$(LIBXML2VERSION) TARFILE_MD5=7740a8ec23878a2f50120e1faa2730f2 + +# libxml2-global-symbols: #i112480#: Solaris ld won't export non-listed symbols PATCH_FILES=libxml2-configure.patch \ libxml2-mingw.patch \ libxml2-gnome599717.patch \ - libxml2-gnome602728.patch + libxml2-global-symbols.patch \ + # This is only for UNX environment now -- cgit v1.2.1 From 7e5ed4b24a3dcd1926946c434b3e12c167a4f950 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Mon, 12 Jul 2010 15:57:26 +0200 Subject: solaris10u8: #i112480#: build libxslt with versioned symbols on solaris: libxslt-gnome602728.patch: remove (disables version script). libxslt-internal-symbols.patch: do not export non-existing symbols. --- libxslt/libxslt-gnome602728.patch | 11 ------ libxslt/libxslt-internal-symbols.patch | 66 ++++++++++++++++++++++++++++++++++ libxslt/makefile.mk | 5 ++- 3 files changed, 70 insertions(+), 12 deletions(-) delete mode 100644 libxslt/libxslt-gnome602728.patch create mode 100644 libxslt/libxslt-internal-symbols.patch diff --git a/libxslt/libxslt-gnome602728.patch b/libxslt/libxslt-gnome602728.patch deleted file mode 100644 index 182855bf9486..000000000000 --- a/libxslt/libxslt-gnome602728.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- misc/libxslt-1.1.26.orig/configure 2009-12-21 10:07:14.000000000 +0000 -+++ misc/build/libxslt-1.1.26/configure 2009-12-21 10:07:42.000000000 +0000 -@@ -13402,7 +13402,7 @@ - $(/usr/bin/ld --help 2>&1 | grep -- --version-script >/dev/null) && \ - VERSION_SCRIPT_FLAGS=-Wl,--version-script= - test "`uname`" == "SunOS" && \ -- VERSION_SCRIPT_FLAGS="-Wl,-M -Wl," -+ VERSION_SCRIPT_FLAGS="" - - if test -n "$VERSION_SCRIPT_FLAGS"; then - USE_VERSION_SCRIPT_TRUE= diff --git a/libxslt/libxslt-internal-symbols.patch b/libxslt/libxslt-internal-symbols.patch new file mode 100644 index 000000000000..813c34f0386a --- /dev/null +++ b/libxslt/libxslt-internal-symbols.patch @@ -0,0 +1,66 @@ +--- misc/libxslt-1.1.26/libxslt/libxslt.syms Thu Sep 24 16:28:46 2009 ++++ misc/build/libxslt-1.1.26/libxslt/libxslt.syms Thu Jul 8 12:22:14 2010 +@@ -107,7 +107,7 @@ + xsltFreeCompMatchList; + xsltFreeTemplateHashes; + xsltGetTemplate; +- xsltMatchPattern; ++#NOT_IMPLEMENTED xsltMatchPattern; + xsltTestCompMatchList; + + # preproc +@@ -406,7 +406,7 @@ + global: + + # xsltInternals +- xsltConstNamespaceNameXSLT; # variable ++#XSLT_REFACTORED_XSLT_NSCOMP xsltConstNamespaceNameXSLT; # variable + xsltExtensionInstructionResultFinalize; + xsltExtensionInstructionResultRegister; + xsltInitCtxtKey; +@@ -415,24 +415,24 @@ + xsltInit; + + # xsltInternals +- xsltParseAnyXSLTElem; +- xsltParseSequenceConstructor; +- xsltPointerListAddSize; +- xsltPointerListClear; +- xsltPointerListCreate; +- xsltPointerListFree; ++#XSLT_REFACTORED xsltParseAnyXSLTElem; ++#XSLT_REFACTORED xsltParseSequenceConstructor; ++#XSLT_REFACTORED xsltPointerListAddSize; ++#XSLT_REFACTORED xsltPointerListClear; ++#XSLT_REFACTORED xsltPointerListCreate; ++#XSLT_REFACTORED xsltPointerListFree; + xsltRegisterLocalRVT; + xsltReleaseRVT; +- xsltRestoreDocumentNamespaces; ++#XSLT_REFACTORED_XSLT_NSCOMP xsltRestoreDocumentNamespaces; + + # extensions +- xsltStyleStylesheetLevelGetExtData; ++#XSLT_REFACTORED xsltStyleStylesheetLevelGetExtData; + + # xsltInternals +- xsltTransStorageAdd; +- xsltTransStorageRemove; ++#NOT_IMPLEMENTED xsltTransStorageAdd; ++#NOT_IMPLEMENTED xsltTransStorageRemove; + xsltUninit; +- xsltXSLTAttrMarker; # variable ++#XSLT_REFACTORED xsltXSLTAttrMarker; # variable + } LIBXML2_1.1.9; + + LIBXML2_1.1.20 { +@@ -475,5 +475,9 @@ + + # transform + xsltProcessOneNode; ++ ++# Solaris ld needs explicit auto-reduction (or, alternatively, "-B local") ++ local: ++ *; + } LIBXML2_1.1.25; + diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk index b3f9ed203653..11e8d1497e7e 100644 --- a/libxslt/makefile.mk +++ b/libxslt/makefile.mk @@ -50,9 +50,12 @@ LIBXSLTVERSION=$(LIBXSLT_MAJOR).$(LIBXSLT_MINOR).$(LIBXSLT_MICRO) TARFILE_NAME=$(PRJNAME)-$(LIBXSLTVERSION) TARFILE_MD5=e61d0364a30146aaa3001296f853b2b9 + +# libxslt-internal-symbols: #i112480#: Solaris ld requires symbols to be defined PATCH_FILES=libxslt-configure.patch \ libxslt-win_manifest.patch \ - libxslt-gnome602728.patch + libxslt-internal-symbols.patch \ + # This is only for UNX environment now .IF "$(OS)"=="WNT" -- cgit v1.2.1 From ae05c62681c56a11b1a6d8ca58a70fb767b0e8d1 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Mon, 12 Jul 2010 15:57:50 +0200 Subject: solaris10u8: #i112480#: fix libxmlsec configure: xmlsec1-configure-libxml-libxslt.patch: do not prepend /bin to $PATH. --- libxmlsec/makefile.mk | 2 ++ libxmlsec/xmlsec1-configure-libxml-libxslt.patch | 40 ++++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 libxmlsec/xmlsec1-configure-libxml-libxslt.patch diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk index 1f0e5976f5e5..c3a604cd1ff1 100644 --- a/libxmlsec/makefile.mk +++ b/libxmlsec/makefile.mk @@ -48,6 +48,7 @@ TARFILE_NAME=$(PRJNAME)-$(XMLSEC1VERSION) TARFILE_MD5=1f24ab1d39f4a51faf22244c94a6203f #xmlsec1-configure.patch: Set up the build. Straightforward configuration +#xmlsec1-configure-libxml-libxslt.patch: empty "$with_libxml" prepends /bin :-( #xmlsec1-olderlibxml2.patch: Allow build against older libxml2, for macosx #xmlsec1-nssdisablecallbacks.patch: Disable use of smime3 so don't need to package it #xmlsec1-customkeymanage.patch: Could we do this alternatively outside xmlsec @@ -57,6 +58,7 @@ TARFILE_MD5=1f24ab1d39f4a51faf22244c94a6203f #xmlsec1-mingw-customkeymanage-addmscrypto.patch builds the custom keymanager on mingw PATCH_FILES=\ xmlsec1-configure.patch \ + xmlsec1-configure-libxml-libxslt.patch \ xmlsec1-olderlibxml2.patch \ xmlsec1-nssdisablecallbacks.patch \ xmlsec1-customkeymanage.patch \ diff --git a/libxmlsec/xmlsec1-configure-libxml-libxslt.patch b/libxmlsec/xmlsec1-configure-libxml-libxslt.patch new file mode 100644 index 000000000000..fdf39ad19554 --- /dev/null +++ b/libxmlsec/xmlsec1-configure-libxml-libxslt.patch @@ -0,0 +1,40 @@ +--- misc/xmlsec1-1.2.14/configure Wed Jun 30 11:55:36 2010 ++++ misc/build/xmlsec1-1.2.14/configure Wed Jun 30 11:57:28 2010 +@@ -12077,7 +12077,7 @@ + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-as_dummy="$with_libxml/bin:$PATH" ++as_dummy="$with_libxml${with_libxml:+/bin:}$PATH" + for as_dir in $as_dummy + do + IFS=$as_save_IFS +@@ -12258,7 +12258,7 @@ + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-as_dummy="$with_libxslt/bin:$PATH" ++as_dummy="$with_libxslt${with_libxslt:+/bin:}$PATH" + for as_dir in $as_dummy + do + IFS=$as_save_IFS +--- misc/xmlsec1-1.2.14/configure.in Wed Jun 30 11:55:37 2010 ++++ misc/build/xmlsec1-1.2.14/configure.in Wed Jun 30 11:53:55 2010 +@@ -231,7 +231,7 @@ + if test "z$LIBXML_FOUND" = "zno" ; then + if test "z$with_libxml" != "zyes" ; then + AC_PATH_PROG([LIBXML_CONFIG], [$LIBXML_CONFIG], [], +- [$with_libxml/bin:$PATH]) ++ [$with_libxml${with_libxml:+/bin:}$PATH]) + fi + AC_MSG_CHECKING([libxml2 $LIBXML_CONFIG ]) + if ! LIBXML_VERSION=`$LIBXML_CONFIG --version 2>/dev/null`; then +@@ -296,7 +296,7 @@ + if test "z$LIBXSLT_FOUND" = "zno" ; then + if test "z$with_libxslt" != "zyes" ; then + AC_PATH_PROG([LIBXSLT_CONFIG], [$LIBXSLT_CONFIG], [], +- [$with_libxslt/bin:$PATH]) ++ [$with_libxslt${with_libxslt:+/bin:}:$PATH]) + fi + AC_MSG_CHECKING(for libxslt libraries >= $LIBXSLT_MIN_VERSION) + if ! LIBXSLT_VERSION=`$LIBXSLT_CONFIG --version 2>/dev/null`; then -- cgit v1.2.1 From 3287410fadd9d8490ae6b69398a7764ca4110d1c Mon Sep 17 00:00:00 2001 From: sj Date: Tue, 13 Jul 2010 17:26:23 +0200 Subject: impress194: #111699# applied patch (PPTTextObj::PPTTextObj with null field) --- filter/source/msfilter/svdfppt.cxx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 747306f81677..f334c86bbc5f 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -7122,6 +7122,10 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport PPTCharPropSet* pCurrent = (PPTCharPropSet*)aCharPropList.GetObject( nIdx ); sal_Int32 nNextStringLen = pCurrent->maString.Len(); + DBG_ASSERT( pFE->pField1, "missing field!" ); + if (!pFE->pField1) + break; + const SvxURLField* pField = (const SvxURLField*)pFE->pField1->GetField(); if ( pCurrent->mpFieldItem ) -- cgit v1.2.1 From 89b02b526eaaf76eb7c5cc1221a6eb7d762d42dc Mon Sep 17 00:00:00 2001 From: "Ocke Janssen [oj]" Date: Wed, 14 Jul 2010 09:39:49 +0200 Subject: dba33g: handle bookmark corrected after insertrow --- dbaccess/source/core/api/WrappedResultSet.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dbaccess/source/core/api/WrappedResultSet.cxx b/dbaccess/source/core/api/WrappedResultSet.cxx index 606715254e17..22e8f61383ac 100644 --- a/dbaccess/source/core/api/WrappedResultSet.cxx +++ b/dbaccess/source/core/api/WrappedResultSet.cxx @@ -126,7 +126,7 @@ void SAL_CALL WrappedResultSet::insertRow( const ORowSetRow& _rInsertRow,const c updateColumn(i,m_xUpdRow,*aIter); } m_xUpd->insertRow(); - (*_rInsertRow->get().begin()) = m_xDriverSet->getRow(); + (*_rInsertRow->get().begin()) = getBookmark(); } // ------------------------------------------------------------------------- void SAL_CALL WrappedResultSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOrginalRow,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException) @@ -164,6 +164,7 @@ void SAL_CALL WrappedResultSet::moveToInsertRow( ) throw(SQLException, RuntimeE void SAL_CALL WrappedResultSet::moveToCurrentRow( ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "WrappedResultSet::moveToCurrentRow" ); + m_xUpd->moveToCurrentRow(); } // ------------------------------------------------------------------------- void WrappedResultSet::fillValueRow(ORowSetRow& _rRow,sal_Int32 _nPosition) -- cgit v1.2.1 From 920500c40a8a4c47cb92bf5056aeb1713851e299 Mon Sep 17 00:00:00 2001 From: sj Date: Wed, 14 Jul 2010 13:37:19 +0200 Subject: fixed build problem (missing header file) --- cui/source/options/treeopt.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 880f8d263c6b..45925a4ca4fb 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include -- cgit v1.2.1 From 78d231a2b56c7a1d3bce10ae3bbd5b915fddff1b Mon Sep 17 00:00:00 2001 From: sj Date: Wed, 14 Jul 2010 13:40:29 +0200 Subject: impress194: #i111380# applied patch (fixed typo) --- svtools/source/filter.vcl/wmf/winmtf.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/svtools/source/filter.vcl/wmf/winmtf.cxx b/svtools/source/filter.vcl/wmf/winmtf.cxx index bf176015fd77..787e6522b890 100644 --- a/svtools/source/filter.vcl/wmf/winmtf.cxx +++ b/svtools/source/filter.vcl/wmf/winmtf.cxx @@ -2043,7 +2043,7 @@ void WinMtfOutput::ModifyWorldTransform( const XForm& rXForm, UINT32 nMode ) case MWT_IDENTITY : { maXForm.eM11 = maXForm.eM12 = maXForm.eM21 = maXForm.eM22 = 1.0f; - maXForm.eDx = maXForm.eDx = 0.0f; + maXForm.eDx = maXForm.eDy = 0.0f; } break; -- cgit v1.2.1 From 3ff5cbc45f24f6edead8957dd889817d1f4f23b0 Mon Sep 17 00:00:00 2001 From: sj Date: Wed, 14 Jul 2010 13:47:44 +0200 Subject: impress194: #i109282# applied patch (reading negative enhanced-path parameter) --- xmloff/source/draw/ximpcustomshape.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx index 9d7856348516..98255edf68d0 100644 --- a/xmloff/source/draw/ximpcustomshape.cxx +++ b/xmloff/source/draw/ximpcustomshape.cxx @@ -708,6 +708,7 @@ void GetEnhancedPath( std::vector< com::sun::star::beans::PropertyValue >& rDest case '8' : case '9' : case '.' : + case '-' : { com::sun::star::drawing::EnhancedCustomShapeParameterPair aPair; if ( GetNextParameter( aPair.First, nIndex, rValue ) && -- cgit v1.2.1 -- cgit v1.2.1 From 7ce9aab5e32f6586a67306d6e5619445247ac269 Mon Sep 17 00:00:00 2001 From: "Ocke Janssen [oj]" Date: Wed, 14 Jul 2010 14:32:48 +0200 Subject: dba33g: #i112668# add missing word not --- dbaccess/source/core/resource/strings.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dbaccess/source/core/resource/strings.src b/dbaccess/source/core/resource/strings.src index dc7023ca6fba..dd1ca4c8a184 100644 --- a/dbaccess/source/core/resource/strings.src +++ b/dbaccess/source/core/resource/strings.src @@ -273,7 +273,7 @@ String RID_STR_ROW_ALREADY_DELETED }; String RID_STR_UPDATE_FAILED { - Text [ en-US ] = "Current row could be updated."; + Text [ en-US ] = "Current row could not be updated."; }; //------------------------------------------------------------------------- String RID_STR_NO_INSERT_PRIVILEGE -- cgit v1.2.1 From 10bd37c4ce83606833f4addb1832600380e175a6 Mon Sep 17 00:00:00 2001 From: "Ocke Janssen [oj]" Date: Wed, 14 Jul 2010 14:35:59 +0200 Subject: dba33g: #i110067# correct word occurred --- connectivity/source/resource/conn_shared_res.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connectivity/source/resource/conn_shared_res.src b/connectivity/source/resource/conn_shared_res.src index 87f69a4aabd0..3c384cbaa232 100644 --- a/connectivity/source/resource/conn_shared_res.src +++ b/connectivity/source/resource/conn_shared_res.src @@ -131,7 +131,7 @@ String STR_STMT_TYPE_NOT_SUPPORTED String STR_UNSPECIFIED_ERROR { - Text [ en-US ] = "An unknown error occured."; + Text [ en-US ] = "An unknown error occurred."; }; String STR_COULD_NOT_CREATE_ADDRESSBOOK -- cgit v1.2.1 From aa183d45c83d5465ad77e8902e2314f2477ba2c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Wed, 14 Jul 2010 14:17:11 +0100 Subject: emailmerge33fix: #i113134# --- scripting/source/pyprov/mailmerge.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripting/source/pyprov/mailmerge.py b/scripting/source/pyprov/mailmerge.py index 55c204f87dbf..6592a59d1843 100644 --- a/scripting/source/pyprov/mailmerge.py +++ b/scripting/source/pyprov/mailmerge.py @@ -153,8 +153,8 @@ class PyMailSMTPService(unohelper.Base, XSmtpService): if len(textbody): mimeEncoding = re.sub("charset=.*", "charset=UTF-8", flavor.MimeType) - if mimeEncoding.find('charset=UTF-8') == -1: - mimeEncoding = mimeEncoding + "; charset=UTF-8" + if mimeEncoding.find('charset=UTF-8') == -1: + mimeEncoding = mimeEncoding + "; charset=UTF-8" textmsg['Content-Type'] = mimeEncoding textmsg['MIME-Version'] = '1.0' textmsg.set_payload(textbody) -- cgit v1.2.1 From a95d6a3fb831f13fefd316e5147fb183e8ed3b0d Mon Sep 17 00:00:00 2001 From: "Ocke Janssen [oj]" Date: Wed, 14 Jul 2010 15:25:10 +0200 Subject: dba33g: #i111345# handle string sep corrected --- connectivity/source/drivers/flat/ETable.cxx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx index eff2464ce533..70be592405eb 100644 --- a/connectivity/source/drivers/flat/ETable.cxx +++ b/connectivity/source/drivers/flat/ETable.cxx @@ -159,7 +159,10 @@ void OFlatTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale) (m_cStringDelimiter && m_cStringDelimiter == aField.GetChar(0))) { bNumeric = FALSE; - nStartPosFirstLine2 = nStartPosFirstLine; + if ( m_cStringDelimiter != '\0' ) + aFirstLine.GetTokenSpecial(aField,nStartPosFirstLine2,m_cFieldDelimiter,m_cStringDelimiter); + else + nStartPosFirstLine2 = nStartPosFirstLine; } else { -- cgit v1.2.1 From 0348b3a8bcec9ec8a6b06be61bdd997b835efd16 Mon Sep 17 00:00:00 2001 From: "Ocke Janssen [oj]" Date: Wed, 14 Jul 2010 15:34:49 +0200 Subject: dba33g: #i110067# reverting --- connectivity/source/resource/conn_shared_res.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connectivity/source/resource/conn_shared_res.src b/connectivity/source/resource/conn_shared_res.src index 3c384cbaa232..87f69a4aabd0 100644 --- a/connectivity/source/resource/conn_shared_res.src +++ b/connectivity/source/resource/conn_shared_res.src @@ -131,7 +131,7 @@ String STR_STMT_TYPE_NOT_SUPPORTED String STR_UNSPECIFIED_ERROR { - Text [ en-US ] = "An unknown error occurred."; + Text [ en-US ] = "An unknown error occured."; }; String STR_COULD_NOT_CREATE_ADDRESSBOOK -- cgit v1.2.1 From fb379786f3e71c42f2a7f1e0575635dc9d5f6306 Mon Sep 17 00:00:00 2001 From: "Ocke Janssen [oj]" Date: Wed, 14 Jul 2010 15:35:41 +0200 Subject: dba33g: #i112668# reverting --- dbaccess/source/core/resource/strings.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dbaccess/source/core/resource/strings.src b/dbaccess/source/core/resource/strings.src index dd1ca4c8a184..dc7023ca6fba 100644 --- a/dbaccess/source/core/resource/strings.src +++ b/dbaccess/source/core/resource/strings.src @@ -273,7 +273,7 @@ String RID_STR_ROW_ALREADY_DELETED }; String RID_STR_UPDATE_FAILED { - Text [ en-US ] = "Current row could not be updated."; + Text [ en-US ] = "Current row could be updated."; }; //------------------------------------------------------------------------- String RID_STR_NO_INSERT_PRIVILEGE -- cgit v1.2.1 From f50712190593f0fd7f25b56b3bd527fce2b4d886 Mon Sep 17 00:00:00 2001 From: sj Date: Wed, 14 Jul 2010 15:37:03 +0200 Subject: fixed build problem (missing header file) --- sd/source/filter/html/pubdlg.cxx | 1 + 1 file changed, 1 insertion(+) mode change 100644 => 100755 sd/source/filter/html/pubdlg.cxx diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx old mode 100644 new mode 100755 index 55e141f8d4cb..8079238bc1dc --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -51,6 +51,7 @@ #include #include #include +#include #include #include #include -- cgit v1.2.1 From f374182068ee99e6f013615bd8c767db6599699e Mon Sep 17 00:00:00 2001 From: "Ocke Janssen [oj]" Date: Wed, 14 Jul 2010 16:14:58 +0200 Subject: dba33g: #i112503# wae fix --- dbaccess/source/ui/misc/TokenWriter.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index 7c41a0fbfa04..833de52fcca7 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -100,7 +100,7 @@ ODatabaseImportExport::ODatabaseImportExport(const ::svx::ODataAccessDescriptor& const Reference< XMultiServiceFactory >& _rM, const Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, const String& rExchange) - :m_bBookmarkSelection( NULL ) + :m_bBookmarkSelection( sal_False ) ,m_xFormatter(_rxNumberF) ,m_xFactory(_rM) ,m_nCommandType(CommandType::TABLE) -- cgit v1.2.1 From 50afa0a34636b04bc88f3da0445b7c0c0576d8ca Mon Sep 17 00:00:00 2001 From: sj Date: Wed, 14 Jul 2010 16:42:33 +0200 Subject: fixed build problem (missing header file) --- sw/source/core/doc/acmplwrd.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/sw/source/core/doc/acmplwrd.cxx b/sw/source/core/doc/acmplwrd.cxx index dca350cab72a..5431de73cd6a 100644 --- a/sw/source/core/doc/acmplwrd.cxx +++ b/sw/source/core/doc/acmplwrd.cxx @@ -29,6 +29,7 @@ #include "precompiled_sw.hxx" +#include #include #include #include -- cgit v1.2.1 From 73d5f4f09c66ea29710a382dbd5bf971f603d335 Mon Sep 17 00:00:00 2001 From: Armin Le Grand Date: Wed, 14 Jul 2010 18:50:58 +0200 Subject: #i112959# enhanced bad handling of DrawTransparent in printer case --- vcl/source/gdi/outdev6.cxx | 41 +++++++++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/vcl/source/gdi/outdev6.cxx b/vcl/source/gdi/outdev6.cxx index 47b150ddc4c5..ebb91c82367d 100644 --- a/vcl/source/gdi/outdev6.cxx +++ b/vcl/source/gdi/outdev6.cxx @@ -345,6 +345,13 @@ void OutputDevice::DrawTransparent( const PolyPolygon& rPolyPoly, if( OUTDEV_PRINTER == meOutDevType ) { + if(100 >= nTransparencePercent) + { + // #i112959# 100% transparent, draw nothing + return; + } + + Rectangle aPolyRect( LogicToPixel( rPolyPoly ).GetBoundRect() ); const Size aDPISize( LogicToPixel( Size( 1, 1 ), MAP_INCH ) ); const long nBaseExtent = Max( FRound( aDPISize.Width() / 300. ), 1L ); @@ -359,30 +366,40 @@ void OutputDevice::DrawTransparent( const PolyPolygon& rPolyPoly, case( 25 ): nMove = nBaseExtent * 3; break; case( 50 ): nMove = nBaseExtent * 4; break; case( 75 ): nMove = nBaseExtent * 6; break; - // TODO What is the correct VALUE??? + + // #i112959# very transparent (88 < nTransparencePercent <= 99) + case( 100 ): nMove = nBaseExtent * 8; break; + + // #i112959# not transparent (nTransparencePercent < 13) default: nMove = 0; break; } Push( PUSH_CLIPREGION | PUSH_LINECOLOR ); IntersectClipRegion( rPolyPoly ); SetLineColor( GetFillColor() ); - - Rectangle aRect( aPolyRect.TopLeft(), Size( aPolyRect.GetWidth(), nBaseExtent ) ); - const BOOL bOldMap = mbMap; EnableMapMode( FALSE ); - while( aRect.Top() <= aPolyRect.Bottom() ) + if(nMove) { - DrawRect( aRect ); - aRect.Move( 0, nMove ); - } + Rectangle aRect( aPolyRect.TopLeft(), Size( aPolyRect.GetWidth(), nBaseExtent ) ); + while( aRect.Top() <= aPolyRect.Bottom() ) + { + DrawRect( aRect ); + aRect.Move( 0, nMove ); + } - aRect = Rectangle( aPolyRect.TopLeft(), Size( nBaseExtent, aPolyRect.GetHeight() ) ); - while( aRect.Left() <= aPolyRect.Right() ) + aRect = Rectangle( aPolyRect.TopLeft(), Size( nBaseExtent, aPolyRect.GetHeight() ) ); + while( aRect.Left() <= aPolyRect.Right() ) + { + DrawRect( aRect ); + aRect.Move( nMove, 0 ); + } + } + else { - DrawRect( aRect ); - aRect.Move( nMove, 0 ); + // #i112959# if not transparent, draw full rectangle in clip region + DrawRect( aPolyRect ); } EnableMapMode( bOldMap ); -- cgit v1.2.1 From 16a1d4bfcc2091502ec0a717f4617af4c361fac1 Mon Sep 17 00:00:00 2001 From: Ingo Schmidt Date: Wed, 14 Jul 2010 17:22:59 +0200 Subject: native321 #i111115# mac background images --- setup_native/source/mac/broffice/DS_Store | Bin 12292 -> 12292 bytes setup_native/source/mac/ooo/DS_Store | Bin 12292 -> 12292 bytes setup_native/source/mac/ooo/DS_Store_Langpack | Bin 12292 -> 12292 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/setup_native/source/mac/broffice/DS_Store b/setup_native/source/mac/broffice/DS_Store index 06aad72c93a0..b0407ef50452 100644 Binary files a/setup_native/source/mac/broffice/DS_Store and b/setup_native/source/mac/broffice/DS_Store differ diff --git a/setup_native/source/mac/ooo/DS_Store b/setup_native/source/mac/ooo/DS_Store index 632e6aff95be..e722b546e576 100644 Binary files a/setup_native/source/mac/ooo/DS_Store and b/setup_native/source/mac/ooo/DS_Store differ diff --git a/setup_native/source/mac/ooo/DS_Store_Langpack b/setup_native/source/mac/ooo/DS_Store_Langpack index 1b53eba75b74..3a8ad71a5660 100644 Binary files a/setup_native/source/mac/ooo/DS_Store_Langpack and b/setup_native/source/mac/ooo/DS_Store_Langpack differ -- cgit v1.2.1 From 41327dae9be54b6c04dc47095a76aa367a8ae4be Mon Sep 17 00:00:00 2001 From: Ingo Schmidt Date: Wed, 14 Jul 2010 17:24:53 +0200 Subject: native321 #162994# binfilter not in default installation --- scp2/source/binfilter/module_binfilter.scp | 3 ++- scp2/source/templates/module_langpack_binfilter.sct | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/scp2/source/binfilter/module_binfilter.scp b/scp2/source/binfilter/module_binfilter.scp index d7cba78f6101..ca3c94b759e0 100644 --- a/scp2/source/binfilter/module_binfilter.scp +++ b/scp2/source/binfilter/module_binfilter.scp @@ -33,7 +33,7 @@ Module gid_Module_Optional_Binfilter Sortkey = "700"; InstallOrder = "1100"; ParentID = gid_Module_Optional; - Default = YES; + Default = NO; Files = (gid_File_Share_Registry_Binfilter_Xcd, gid_Starregistry_Legacy_Binfilters_Rdb, gid_File_Lib_Bf_Go, @@ -60,6 +60,7 @@ Module gid_Module_Langpack_Binfilter_Template ParentID = gid_Module_Optional_Binfilter; Name = "gid_Module_Langpack_Binfilter_Template"; Description = "gid_Module_Langpack_Binfilter_Template"; + Default = NO; Styles = (TEMPLATEMODULE); Files = (gid_File_Res_Bf_Sch, gid_File_Res_Bf_Svx, diff --git a/scp2/source/templates/module_langpack_binfilter.sct b/scp2/source/templates/module_langpack_binfilter.sct index 76f389049580..72c209228849 100644 --- a/scp2/source/templates/module_langpack_binfilter.sct +++ b/scp2/source/templates/module_langpack_binfilter.sct @@ -28,6 +28,7 @@ Module gid_Module_Langpack_Binfilter_ ParentID = gid_Module_Langpack_Root_; Sortkey = "900"; + Default = NO; Language = ""; Assigns = gid_Module_Langpack_Binfilter_Template; Name = "gid_Module_Langpack_Binfilter_"; -- cgit v1.2.1 From 07daaab0760e97b8449ec7f123b005d7b4e4a94a Mon Sep 17 00:00:00 2001 From: "Ocke Janssen [oj]" Date: Thu, 15 Jul 2010 07:46:31 +0200 Subject: dba33g: #i111345# wrong error message used when opening invalid table format --- connectivity/source/drivers/dbase/DTable.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index 8544e4affda7..157d1f7b68fa 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -2607,7 +2607,7 @@ void ODbaseTable::throwInvalidDbaseFormat() // no dbase file const ::rtl::OUString sError( getConnection()->getResources().getResourceStringWithSubstitution( - STR_SQL_NAME_ERROR, + STR_INVALID_DBASE_FILE, "$filename$", getEntry(m_pConnection,m_Name) ) ); ::dbtools::throwGenericSQLException( sError, *this ); -- cgit v1.2.1 -- cgit v1.2.1 From 676216ee1ce7e38d3f3a4584444334dfa3db18c5 Mon Sep 17 00:00:00 2001 From: Armin Le Grand Date: Thu, 15 Jul 2010 13:43:18 +0200 Subject: #i112959# corrected comparison --- vcl/source/gdi/outdev6.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/vcl/source/gdi/outdev6.cxx b/vcl/source/gdi/outdev6.cxx index ebb91c82367d..819d205079e8 100644 --- a/vcl/source/gdi/outdev6.cxx +++ b/vcl/source/gdi/outdev6.cxx @@ -345,13 +345,12 @@ void OutputDevice::DrawTransparent( const PolyPolygon& rPolyPoly, if( OUTDEV_PRINTER == meOutDevType ) { - if(100 >= nTransparencePercent) + if(100 <= nTransparencePercent) { // #i112959# 100% transparent, draw nothing return; } - Rectangle aPolyRect( LogicToPixel( rPolyPoly ).GetBoundRect() ); const Size aDPISize( LogicToPixel( Size( 1, 1 ), MAP_INCH ) ); const long nBaseExtent = Max( FRound( aDPISize.Width() / 300. ), 1L ); -- cgit v1.2.1 From cfeed5b94e5ded03b3f29130e5061f86008f8a61 Mon Sep 17 00:00:00 2001 From: "Thomas Lange [tl]" Date: Fri, 16 Jul 2010 16:21:29 +0200 Subject: cws tl81: #i1122697# undoing spelling fix in unused string resource --- starmath/source/smres.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100755 => 100644 starmath/source/smres.src diff --git a/starmath/source/smres.src b/starmath/source/smres.src old mode 100755 new mode 100644 index 5af43400669d..7d3525bd2a29 --- a/starmath/source/smres.src +++ b/starmath/source/smres.src @@ -3574,7 +3574,7 @@ StringArray RID_PRINTUIOPTIONS < "Reduces or enlarges the size of the printed formula by a specified enlargement factor."; >; < "Miscellaneous options"; >; < "Ig~nore ~~ and ` at the end of the line"; >; - < "Specifies that these space wildcards will be removed if they are at the end of a line."; >; + < "Specfies that these space wildcards will be removed if they are at the end of a line."; >; }; }; -- cgit v1.2.1 From 787c36414e0537fbf7efab3d98545b0171ee335a Mon Sep 17 00:00:00 2001 From: os Date: Mon, 19 Jul 2010 17:40:41 +0200 Subject: #i113084# check auto correction pointer before access --- sw/source/ui/docvw/edtwin.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index e2e59e17831e..7b5741316cbb 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -2261,7 +2261,7 @@ KEYINPUT_CHECKTABLE_INSDEL: BOOL bIsAutoCorrectChar = SvxAutoCorrect::IsAutoCorrectChar( aCh ); - BOOL bRunNext = pACorr->HasRunNext(); + BOOL bRunNext = pACorr && pACorr->HasRunNext(); if( !aKeyEvent.GetRepeat() && pACorr && ( bIsAutoCorrectChar || bRunNext ) && pACfg->IsAutoFmtByInput() && (( pACorr->IsAutoCorrFlag( ChgWeightUnderl ) && -- cgit v1.2.1 From be11e260fcd9bbea19a3094aa04e0cccf98b02ca Mon Sep 17 00:00:00 2001 From: "Ocke Janssen [oj]" Date: Tue, 20 Jul 2010 09:24:45 +0200 Subject: dba33g: second version of bBookmarkSelection corrected --- dbaccess/source/ui/misc/TokenWriter.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index 833de52fcca7..b66778138d57 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -131,7 +131,7 @@ ODatabaseImportExport::ODatabaseImportExport(const ::svx::ODataAccessDescriptor& // import data ODatabaseImportExport::ODatabaseImportExport( const ::dbtools::SharedConnection& _rxConnection, const Reference< XNumberFormatter >& _rxNumberF, const Reference< XMultiServiceFactory >& _rM ) - :m_bBookmarkSelection( NULL ) + :m_bBookmarkSelection( sal_False ) ,m_xConnection(_rxConnection) ,m_xFormatter(_rxNumberF) ,m_xFactory(_rM) -- cgit v1.2.1 From 016832dafb3246b359326eba2ea6fb20ffb9f20e Mon Sep 17 00:00:00 2001 From: "Ocke Janssen [oj]" Date: Tue, 20 Jul 2010 10:45:17 +0200 Subject: dba33g: #i111205# quote tablename --- dbaccess/source/core/api/KeySet.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx index 2580733deba5..cee1887832d2 100644 --- a/dbaccess/source/core/api/KeySet.cxx +++ b/dbaccess/source/core/api/KeySet.cxx @@ -253,10 +253,11 @@ void OKeySet::findTableColumnsMatching_throw(const Any& i_aTable static ::rtl::OUString s_sDot(RTL_CONSTASCII_USTRINGPARAM(".")); static ::rtl::OUString s_sParam(RTL_CONSTASCII_USTRINGPARAM(" = ?")); // create the where clause + Reference xMeta = m_xConnection->getMetaData(); SelectColumnsMetaData::iterator aPosEnd = m_pKeyColumnNames->end(); for(SelectColumnsMetaData::iterator aPosIter = m_pKeyColumnNames->begin();aPosIter != aPosEnd;) { - aFilter.append(::dbtools::quoteName( aQuote,aPosIter->second.sTableName)); + aFilter.append(::dbtools::quoteTableName( xMeta,aPosIter->second.sTableName,::dbtools::eInDataManipulation)); aFilter.append(s_sDot); aFilter.append(::dbtools::quoteName( aQuote,aPosIter->second.sRealName)); aFilter.append(s_sParam); -- cgit v1.2.1 From ed48ce4046c9c2127eda9973e2021c9125081210 Mon Sep 17 00:00:00 2001 From: "Marc Neumann [msc]" Date: Tue, 20 Jul 2010 16:15:47 +0200 Subject: automationemailchange: #113281# change email header to oracle address --- .../chart2/optional/ch2_chart_data_dlg_impress.bas | 2 +- .../ch2_flexible_source_range_selection.bas | 2 +- .../chart2/optional/ch2_losa_ods_to_ods.bas | 2 +- .../chart2/optional/ch2_losa_ods_to_ots.bas | 2 +- .../chart2/optional/ch2_losa_ods_to_sdc.bas | 2 +- .../chart2/optional/ch2_losa_ods_to_sxc.bas | 2 +- .../chart2/optional/ch2_losa_ods_to_xls.bas | 2 +- .../chart2/optional/ch2_losa_sxc_to_ods.bas | 2 +- .../chart2/optional/ch2_losa_sxc_to_sdc.bas | 2 +- testautomation/chart2/optional/ch2_lvl1.bas | 2 +- testautomation/chart2/optional/ch2_lvl1_wizard.bas | 2 +- testautomation/chart2/optional/ch2_xml_format.bas | 2 +- .../chart2/optional/includes/ch2_datadialogue.inc | 2 +- .../ch2_flexible_source_range_selection.inc | 2 +- .../ch2_flexible_source_range_selection01.inc | 2 +- .../chart2/optional/includes/ch2_lvl1a.inc | 2 +- .../chart2/optional/includes/loadsave/ch2_losa.inc | 2 +- .../optional/includes/loadsave/ch2_xml_format.inc | 2 +- .../optional/includes/wizard/ch2_lvl1_wizard.inc | 2 +- .../optional/includes/wizard/ch2_lvl1_wizard2.inc | 2 +- testautomation/chart2/required/ch2_updt_calc.bas | 2 +- .../chart2/required/includes/ch2_file.inc | 2 +- .../chart2/required/includes/ch2_format.inc | 2 +- .../chart2/required/includes/ch2_format1.inc | 2 +- .../chart2/required/includes/ch2_insert.inc | 2 +- .../chart2/required/includes/ch2_insert_ctl.inc | 2 +- .../chart2/required/includes/ch2_menu.inc | 2 +- .../chart2/required/includes/ch2_ole.inc | 2 +- .../chart2/required/includes/ch2_toolbars.inc | 2 +- .../chart2/required/includes/ch2_view.inc | 2 +- .../chart2/required/includes/ch2_window.inc | 2 +- .../chart2/required/includes/ch2_wizard.inc | 2 +- testautomation/chart2/tools/ch_tools_axes.inc | 2 +- .../chart2/tools/ch_tools_chart_type.inc | 2 +- testautomation/chart2/tools/ch_tools_common.inc | 2 +- .../chart2/tools/ch_tools_data_labels.inc | 2 +- testautomation/chart2/tools/ch_tools_grids.inc | 2 +- testautomation/chart2/tools/ch_tools_legend.inc | 2 +- testautomation/chart2/tools/ch_tools_select.inc | 2 +- .../chart2/tools/ch_tools_statistics.inc | 2 +- .../chart2/tools/ch_tools_tab_borders_lines.inc | 2 +- testautomation/chart2/tools/ch_tools_tab_pages.inc | 2 +- testautomation/chart2/tools/ch_tools_titles.inc | 2 +- .../dbaccess/optional/dba_ctrl_Clipboard.bas | 2 +- .../dbaccess/optional/dba_ctrl_General.bas | 2 +- testautomation/dbaccess/optional/dba_ctrl_Grid.bas | 2 +- .../dbaccess/optional/dba_ctrl_PropertyBrowser.bas | 2 +- .../dbaccess/optional/dba_ctrl_Several.bas | 2 +- .../dbaccess/optional/dba_ctrl_Spreadsheet.bas | 2 +- .../dbaccess/optional/dba_ctrl_TextControl.bas | 2 +- .../dbaccess/optional/dba_ctrl_Wizards.bas | 2 +- .../dbaccess/optional/dba_db_ADOAccess.bas | 2 +- .../dbaccess/optional/dba_db_AdabasD.bas | 2 +- .../dbaccess/optional/dba_db_Addressbook.bas | 2 +- testautomation/dbaccess/optional/dba_db_Dbase.bas | 2 +- .../dbaccess/optional/dba_db_JDBCMySQL.bas | 2 +- .../dbaccess/optional/dba_db_Spreadsheet.bas | 2 +- testautomation/dbaccess/optional/dba_db_Text.bas | 2 +- .../dbaccess/optional/dba_db_dBase_functions.bas | 2 +- testautomation/dbaccess/optional/dba_db_hsqldb.bas | 2 +- .../dbaccess/optional/dba_frm_FormFilter.bas | 2 +- testautomation/dbaccess/optional/dba_frm_Forms.bas | 2 +- .../dbaccess/optional/dba_misc_Macros.bas | 2 +- .../optional/dba_misc_RegisterDatabase.bas | 2 +- .../dbaccess/optional/dba_rpt_DateTime.bas | 2 +- .../dbaccess/optional/dba_rpt_ExecuteReport.bas | 2 +- .../dbaccess/optional/dba_rpt_Formating.bas | 2 +- .../dbaccess/optional/dba_rpt_FunctionWizard.bas | 2 +- .../dbaccess/optional/dba_rpt_Grouping.bas | 2 +- .../dbaccess/optional/dba_rpt_PageNumber.bas | 2 +- .../dbaccess/optional/dba_rpt_PropertyBrowser.bas | 2 +- .../dbaccess/optional/dba_wiz_CopyTableWizard.bas | 2 +- .../dbaccess/optional/dba_wiz_DatabaseWizards.bas | 2 +- .../dbaccess/optional/dba_wiz_FormWizard.bas | 2 +- .../dbaccess/optional/dba_wiz_QueryWizard.bas | 2 +- .../dbaccess/optional/dba_wiz_ReportWizard.bas | 2 +- .../dbaccess/optional/dba_wiz_TableWizard.bas | 2 +- .../dbaccess/optional/dba_xf_Submission.bas | 2 +- .../dbaccess/optional/includes/ctrl_Clipboard.inc | 2 +- .../dbaccess/optional/includes/ctrl_General.inc | 2 +- .../dbaccess/optional/includes/ctrl_Grid.inc | 2 +- .../optional/includes/ctrl_PropertyBrowser.inc | 2 +- .../dbaccess/optional/includes/ctrl_Several1.inc | 2 +- .../dbaccess/optional/includes/ctrl_Several2.inc | 2 +- .../optional/includes/ctrl_Spreadsheet.inc | 2 +- .../optional/includes/ctrl_TextControl.inc | 2 +- .../dbaccess/optional/includes/ctrl_Wizards.inc | 2 +- .../dbaccess/optional/includes/db_ADOAccess.inc | 2 +- .../dbaccess/optional/includes/db_AdabasD.inc | 2 +- .../dbaccess/optional/includes/db_Dbase.inc | 2 +- .../optional/includes/db_DbaseFunction.inc | 2 +- .../dbaccess/optional/includes/db_IndexDesign.inc | 2 +- .../dbaccess/optional/includes/db_JDBCMySQL.inc | 2 +- .../dbaccess/optional/includes/db_Mozilla.inc | 2 +- .../dbaccess/optional/includes/db_ODBCMySQL.inc | 2 +- .../dbaccess/optional/includes/db_Query.inc | 2 +- .../dbaccess/optional/includes/db_Relations.inc | 2 +- .../dbaccess/optional/includes/db_Spreadsheet.inc | 2 +- .../dbaccess/optional/includes/db_Text.inc | 2 +- .../dbaccess/optional/includes/db_Windows.inc | 2 +- .../dbaccess/optional/includes/db_hsqldb.inc | 2 +- .../dbaccess/optional/includes/frm_FormFilter.inc | 2 +- .../dbaccess/optional/includes/frm_Forms.inc | 2 +- .../dbaccess/optional/includes/misc_Macros.inc | 2 +- .../optional/includes/misc_RegisterDatabase.inc | 2 +- .../dbaccess/optional/includes/rpt_DateTime.inc | 2 +- .../optional/includes/rpt_ExecuteReport.inc | 2 +- .../dbaccess/optional/includes/rpt_Formating.inc | 2 +- .../optional/includes/rpt_FunctionWizard.inc | 2 +- .../dbaccess/optional/includes/rpt_Grouping.inc | 2 +- .../dbaccess/optional/includes/rpt_PageNumber.inc | 2 +- .../optional/includes/rpt_PropertyBrowser.inc | 2 +- .../optional/includes/wiz_CopyTableWizard.inc | 2 +- .../optional/includes/wiz_DatabaseWizard.inc | 2 +- .../dbaccess/optional/includes/wiz_FormWizard.inc | 2 +- .../dbaccess/optional/includes/wiz_QueryWizard.inc | 2 +- .../optional/includes/wiz_ReportWizard.inc | 2 +- .../dbaccess/optional/includes/wiz_TableWizard.inc | 2 +- .../dbaccess/optional/includes/xf_Submission.inc | 2 +- testautomation/dbaccess/required/dba_Main.bas | 2 +- .../dbaccess/required/dba_ReportBuilder.bas | 2 +- .../dbaccess/required/dba_xforms_Main.bas | 2 +- .../dbaccess/required/includes/DatabaseTypes.inc | 2 +- .../dbaccess/required/includes/Forms.inc | 2 +- .../dbaccess/required/includes/MainApp.inc | 2 +- .../dbaccess/required/includes/Query.inc | 2 +- .../dbaccess/required/includes/ReportBuilder01.inc | 2 +- .../dbaccess/required/includes/Table.inc | 2 +- .../dbaccess/required/includes/TableDesign.inc | 2 +- .../dbaccess/required/includes/Wizards.inc | 2 +- .../dbaccess/required/includes/Xforms01.inc | 2 +- testautomation/dbaccess/tools/controltools.inc | 2 +- testautomation/dbaccess/tools/dbcreatetools.inc | 2 +- testautomation/dbaccess/tools/dbinit.inc | 2 +- testautomation/dbaccess/tools/dbtools.inc | 2 +- testautomation/dbaccess/tools/formtools.inc | 2 +- testautomation/dbaccess/tools/querytools.inc | 2 +- testautomation/dbaccess/tools/reporttools.inc | 2 +- testautomation/dbaccess/tools/tabletools.inc | 2 +- .../extensions/optional/e_display_name.bas | 2 +- .../extensions/optional/e_extensions.bas | 2 +- testautomation/extensions/optional/e_fileopen.bas | 2 +- testautomation/extensions/optional/e_help.bas | 2 +- .../extensions/optional/e_identifiers.bas | 2 +- testautomation/extensions/optional/e_issues.bas | 2 +- testautomation/extensions/optional/e_location.bas | 2 +- testautomation/extensions/optional/e_meta-inf.bas | 2 +- .../extensions/optional/e_online_update.bas | 2 +- testautomation/extensions/optional/e_options.bas | 2 +- testautomation/extensions/optional/e_platforms.bas | 2 +- testautomation/extensions/optional/e_publisher.bas | 2 +- .../extensions/optional/includes/display_name.inc | 2 +- .../extensions/optional/includes/extensions.inc | 2 +- .../extensions/optional/includes/fileopen.inc | 2 +- .../extensions/optional/includes/help.inc | 2 +- .../extensions/optional/includes/identifiers.inc | 2 +- .../extensions/optional/includes/issue110083.inc | 2 +- .../extensions/optional/includes/location.inc | 2 +- .../extensions/optional/includes/meta-inf.inc | 2 +- .../extensions/optional/includes/online_update.inc | 2 +- .../extensions/optional/includes/options.inc | 2 +- .../extensions/optional/includes/platforms.inc | 2 +- .../extensions/optional/includes/publisher.inc | 2 +- .../src/com/example/ToolPanel.java | 2 +- .../src/com/example/ToolPanelUIElement.java | 2 +- testautomation/extensions/required/e_update.bas | 2 +- .../extensions/required/includes/e_update.inc | 2 +- .../framework/optional/f_CJK_CollationDialogue.bas | 2 +- .../framework/optional/f_CJK_FeatureSwitch.bas | 2 +- .../framework/optional/f_CJK_GridLayout.bas | 2 +- .../optional/f_CJK_RubyDialogueProposal.bas | 2 +- .../optional/f_NewSortingAlgorithmForJapanese.bas | 2 +- .../framework/optional/f_basic_dialog_i18n.bas | 2 +- .../framework/optional/f_basic_documents.bas | 2 +- .../framework/optional/f_basic_eventbinding.bas | 2 +- .../framework/optional/f_basic_first.bas | 2 +- .../framework/optional/f_basic_formcontrols.bas | 2 +- .../framework/optional/f_basic_gridcontrol.bas | 2 +- .../optional/f_basic_library_export_import.bas | 2 +- .../framework/optional/f_basic_modules.bas | 2 +- .../optional/f_basic_package_export_import.bas | 2 +- .../optional/f_basic_protected_libraries.bas | 2 +- .../framework/optional/f_basic_shared_modules.bas | 2 +- .../optional/f_basic_templatedocuments.bas | 2 +- .../framework/optional/f_basic_vba-compat.bas | 2 +- .../framework/optional/f_configuration.bas | 2 +- .../framework/optional/f_extras_labels.bas | 2 +- .../framework/optional/f_extras_samplefileopen.bas | 2 +- .../framework/optional/f_extras_sampleopen.bas | 2 +- .../framework/optional/f_extras_samplepreview.bas | 2 +- .../optional/f_extras_tableautoformat.bas | 2 +- .../optional/f_extras_templatefileopen.bas | 2 +- .../framework/optional/f_extras_templateopen.bas | 2 +- .../optional/f_extras_templatepreview.bas | 2 +- .../framework/optional/f_filedlg_allowed_names.bas | 2 +- .../optional/f_filedlg_autocompletion.bas | 2 +- .../framework/optional/f_filedlg_cjk_files.bas | 2 +- .../framework/optional/f_filedlg_dialogtest.bas | 2 +- .../optional/f_filedlg_folder_navigation.bas | 2 +- .../optional/f_filedlg_forbidden_names_windows.bas | 2 +- .../optional/f_filedlg_multiselection.bas | 2 +- .../framework/optional/f_filedlg_passwords.bas | 2 +- .../optional/f_filedlg_reserved_names_unix.bas | 2 +- .../optional/f_filedlg_reserved_names_windows.bas | 2 +- .../framework/optional/f_fontworkgallery.bas | 2 +- .../framework/optional/f_help_bookmarks.bas | 2 +- .../optional/f_help_compare_applications.bas | 2 +- .../framework/optional/f_help_compare_content.bas | 2 +- .../framework/optional/f_help_compare_topics.bas | 2 +- .../framework/optional/f_help_search.bas | 2 +- .../framework/optional/f_help_view_topics.bas | 2 +- .../framework/optional/f_loadsave_general.bas | 2 +- .../framework/optional/f_menuentries.bas | 2 +- testautomation/framework/optional/f_ole.bas | 2 +- .../framework/optional/f_options_loadsave.bas | 2 +- .../framework/optional/f_options_ooo.bas | 2 +- .../framework/optional/f_scripting_organizers.bas | 2 +- .../optional/f_security_broken_signature.bas | 2 +- .../optional/f_security_certification_dialogs.bas | 2 +- .../optional/f_security_certified_docs.bas | 2 +- .../framework/optional/f_security_evilmacro.bas | 2 +- .../optional/f_security_incorrect_password.bas | 2 +- .../optional/f_security_macrosecurity.bas | 2 +- .../optional/f_security_recommend_password.bas | 2 +- .../framework/optional/f_security_trusted_path.bas | 2 +- .../framework/optional/f_toolbar_behavior.bas | 2 +- .../framework/optional/f_toolbar_items.bas | 2 +- .../framework/optional/f_usage_tracking.bas | 2 +- .../optional/includes/CJK_CollationDialogue_1.inc | 2 +- .../optional/includes/CJK_FeatureSwitchTest_1.inc | 2 +- .../includes/CJK_RubyDialogueProposal_1.inc | 2 +- .../includes/NewSortingAlgorithmForJapanese_1.inc | 2 +- .../optional/includes/basic_delete_modules.inc | 2 +- .../includes/basic_dialog_i18n_defaults.inc | 2 +- .../optional/includes/basic_documents.inc | 2 +- .../optional/includes/basic_eventbinding.inc | 2 +- .../optional/includes/basic_formcontrols.inc | 2 +- .../optional/includes/basic_gridcontrol.inc | 2 +- .../framework/optional/includes/basic_ide.inc | 2 +- .../optional/includes/basic_library_export.inc | 2 +- .../optional/includes/basic_library_import.inc | 2 +- .../framework/optional/includes/basic_macros.inc | 2 +- .../optional/includes/basic_modulehide.inc | 2 +- .../optional/includes/basic_modulenames.inc | 2 +- .../framework/optional/includes/basic_modules.inc | 2 +- .../optional/includes/basic_package_export.inc | 2 +- .../optional/includes/basic_package_import.inc | 2 +- .../includes/basic_protected_libraries.inc | 2 +- .../optional/includes/basic_shared_modules.inc | 2 +- .../optional/includes/basic_spectemplate.inc | 2 +- .../optional/includes/basic_usertemplate.inc | 2 +- .../basic_vba-compat_application-union.inc | 2 +- .../includes/basic_vba-compat_import_disabled.inc | 2 +- .../includes/basic_vba-compat_import_enabled.inc | 2 +- .../includes/basic_vba-compat_import_nothing.inc | 2 +- .../includes/basic_vba-compat_security_check.inc | 2 +- .../includes/basic_vba-compat_thisworkbook.inc | 2 +- .../includes/basic_vba-compat_xlsm-xlsb.inc | 2 +- .../optional/includes/basic_vba_compat_tools.inc | 2 +- .../framework/optional/includes/configuration.inc | 2 +- .../optional/includes/extras_file_open.inc | 2 +- .../optional/includes/extras_modify_objects.inc | 2 +- .../framework/optional/includes/extras_preview.inc | 2 +- .../optional/includes/extras_table_autoformat.inc | 2 +- .../optional/includes/f_usage_tracking.inc | 2 +- .../optional/includes/filedlg_allowed_names.inc | 2 +- .../optional/includes/filedlg_autocomplete.inc | 2 +- .../optional/includes/filedlg_cjk_files.inc | 2 +- .../optional/includes/filedlg_cjk_folders.inc | 2 +- .../includes/filedlg_document_properties.inc | 2 +- .../optional/includes/filedlg_filternames.inc | 2 +- .../optional/includes/filedlg_folders1.inc | 2 +- .../optional/includes/filedlg_folders2.inc | 2 +- .../optional/includes/filedlg_folders3.inc | 2 +- .../optional/includes/filedlg_folders4.inc | 2 +- .../optional/includes/filedlg_folders5.inc | 2 +- .../optional/includes/filedlg_folders6.inc | 2 +- .../optional/includes/filedlg_folders7.inc | 2 +- .../includes/filedlg_forbidden_names_windows.inc | 2 +- .../optional/includes/filedlg_multiselection.inc | 2 +- .../optional/includes/filedlg_passwords.inc | 2 +- .../includes/filedlg_reserved_names_unix.inc | 2 +- .../includes/filedlg_reserved_names_windows.inc | 2 +- .../framework/optional/includes/filedlg_tools.inc | 2 +- .../optional/includes/filedlg_triggers.inc | 2 +- .../optional/includes/fontworkgallery.inc | 2 +- .../framework/optional/includes/help_bookmarks.inc | 2 +- .../includes/help_compare_applications.inc | 2 +- .../optional/includes/help_compare_content.inc | 2 +- .../optional/includes/help_compare_topics.inc | 2 +- .../framework/optional/includes/help_search.inc | 2 +- .../optional/includes/help_view_topics.inc | 2 +- .../framework/optional/includes/loadsave_files.inc | 2 +- .../framework/optional/includes/loadsave_new.inc | 2 +- .../framework/optional/includes/menuentries.inc | 2 +- .../framework/optional/includes/ole_1.inc | 2 +- .../framework/optional/includes/ole_2.inc | 2 +- .../framework/optional/includes/ole_3.inc | 2 +- .../framework/optional/includes/ole_tools.inc | 2 +- .../framework/optional/includes/options_asia.inc | 2 +- .../framework/optional/includes/options_data.inc | 2 +- .../framework/optional/includes/options_int1.inc | 2 +- .../framework/optional/includes/options_lan1.inc | 2 +- .../optional/includes/options_loadsave_general.inc | 2 +- .../optional/includes/options_loadsave_html.inc | 2 +- .../includes/options_loadsave_msoffice.inc | 2 +- .../optional/includes/options_loadsave_vba.inc | 2 +- .../includes/options_ooo_accessibility.inc | 2 +- .../optional/includes/options_ooo_appearance.inc | 2 +- .../optional/includes/options_ooo_colors.inc | 2 +- .../includes/options_ooo_fontreplacement.inc | 2 +- .../optional/includes/options_ooo_general.inc | 2 +- .../optional/includes/options_ooo_java.inc | 2 +- .../optional/includes/options_ooo_memory.inc | 2 +- .../optional/includes/options_ooo_paths.inc | 2 +- .../optional/includes/options_ooo_print.inc | 2 +- .../optional/includes/options_ooo_security.inc | 2 +- .../optional/includes/options_ooo_userdata.inc | 2 +- .../optional/includes/options_ooo_view.inc | 2 +- .../optional/includes/scripting_organizers.inc | 2 +- .../includes/security_broken_signature.inc | 2 +- .../includes/security_certification_dialogs.inc | 2 +- .../optional/includes/security_evilmacro1.inc | 2 +- .../optional/includes/security_evilmacro2.inc | 2 +- .../optional/includes/security_evilmacro3.inc | 2 +- .../includes/security_incorrect_password.inc | 2 +- .../optional/includes/security_macrosecurity.inc | 2 +- .../includes/security_recommend_password.inc | 2 +- .../optional/includes/security_trusted_path.inc | 2 +- .../framework/optional/includes/standardbar2.inc | 2 +- .../optional/includes/toolbar_behavior.inc | 2 +- .../framework/optional/includes/w_grid_layout1.inc | 2 +- .../framework/required/f_help_browser.bas | 2 +- .../required/f_printer_administration.bas | 2 +- .../required/f_programmability_dialogs.bas | 2 +- .../framework/required/f_security_dialogs.bas | 2 +- .../framework/required/f_standard_toolbar.bas | 2 +- .../framework/required/f_tools_options.bas | 2 +- testautomation/framework/required/f_topten.bas | 2 +- .../framework/required/f_window_functions.bas | 2 +- testautomation/framework/required/f_wizards.bas | 2 +- .../required/includes/basic_dialog_export.inc | 2 +- .../required/includes/basic_dialog_i18n.inc | 2 +- .../required/includes/basic_dialog_i18n_import.inc | 2 +- .../required/includes/basic_macroassignment.inc | 2 +- .../required/includes/basic_organizer.inc | 2 +- .../framework/required/includes/first.inc | 2 +- .../framework/required/includes/help_browser.inc | 2 +- .../required/includes/printer_administration.inc | 2 +- .../required/includes/scripting_basics.inc | 2 +- .../required/includes/security_dialogs.inc | 2 +- .../framework/required/includes/smoketest.inc | 2 +- .../required/includes/standard_toolbar_1.inc | 2 +- .../required/includes/standard_toolbar_3.inc | 2 +- .../required/includes/standard_toolbar_4.inc | 2 +- .../required/includes/standard_toolbar_5.inc | 2 +- .../required/includes/standard_toolbar_6.inc | 2 +- .../required/includes/tools_customize.inc | 2 +- .../framework/required/includes/tools_options.inc | 2 +- .../framework/required/includes/topten.inc | 2 +- .../required/includes/window_functions.inc | 2 +- .../framework/required/includes/wizard_agenda.inc | 2 +- .../required/includes/wizard_documentconverter.inc | 2 +- .../required/includes/wizard_euroconverter.inc | 2 +- .../framework/required/includes/wizard_fax.inc | 2 +- .../required/includes/wizard_firsttime.inc | 2 +- .../framework/required/includes/wizard_letter.inc | 2 +- .../required/includes/wizard_mailmerge.inc | 2 +- .../required/includes/wizard_presentation.inc | 2 +- .../framework/required/includes/wizard_webpage.inc | 2 +- .../framework/tools/includes/CJK_tools.inc | 2 +- .../framework/tools/includes/customize_tools.inc | 2 +- .../framework/tools/includes/fileoperations.inc | 2 +- .../framework/tools/includes/formcontrols.inc | 2 +- .../framework/tools/includes/help_tools.inc | 2 +- .../framework/tools/includes/i18n_tools.inc | 2 +- .../framework/tools/includes/options_tools.inc | 2 +- .../framework/tools/includes/pbrowser_tools.inc | 2 +- .../tools/includes/private_environment.inc | 2 +- .../tools/includes/scriptorganizer_tools.inc | 2 +- .../framework/tools/includes/spadmin_tools.inc | 2 +- .../framework/tools/includes/template_tools.inc | 2 +- .../framework/tools/includes/toolbar_tools.inc | 2 +- .../framework/tools/includes/webtools.inc | 2 +- .../framework/tools/includes/window_tools.inc | 2 +- .../framework/tools/includes/wizards.inc | 2 +- .../input/empty/please_do_not_delete_this_file | 2 +- testautomation/global/required/includes/g_001.inc | 2 +- testautomation/global/required/includes/g_009.inc | 2 +- .../global/required/includes/g_customize.inc | 2 +- .../required/includes/g_numberformatter1.inc | 2 +- .../global/required/includes/g_option.inc | 2 +- .../required/includes/g_option_application.inc | 2 +- .../global/required/includes/g_printing.inc | 2 +- testautomation/global/system/includes/declare.inc | 2 +- testautomation/global/system/includes/gvariabl.inc | 2 +- testautomation/global/system/includes/iniinfo.inc | 2 +- testautomation/global/system/includes/inivalue.inc | 2 +- testautomation/global/system/includes/master.inc | 2 +- testautomation/global/system/includes/status.inc | 2 +- testautomation/global/system/includes/sysinfo.inc | 2 +- testautomation/global/tools/closeoffice.bas | 2 +- testautomation/global/tools/compressstatus.bas | 2 +- testautomation/global/tools/declare.bas | 2 +- .../global/tools/includes/optional/t_accels.inc | 2 +- .../tools/includes/optional/t_basic_ide_tools.inc | 2 +- .../includes/optional/t_basic_organizer_tools.inc | 2 +- .../tools/includes/optional/t_control_objects.inc | 2 +- .../global/tools/includes/optional/t_docfuncs.inc | 2 +- .../optional/t_extension_manager_tools.inc | 2 +- .../global/tools/includes/optional/t_filetools.inc | 2 +- .../global/tools/includes/optional/t_key_tools.inc | 2 +- .../global/tools/includes/optional/t_listfuncs.inc | 2 +- .../tools/includes/optional/t_locale_strings1.inc | 2 +- .../tools/includes/optional/t_locale_tools.inc | 2 +- .../tools/includes/optional/t_macro_tools.inc | 2 +- .../global/tools/includes/optional/t_ole.inc | 2 +- .../tools/includes/optional/t_security_tools.inc | 2 +- .../includes/optional/t_set_standard_controls.inc | 2 +- .../includes/optional/t_spreadsheet_tools1.inc | 2 +- .../tools/includes/optional/t_stringtools.inc | 2 +- .../tools/includes/optional/t_toolbar_tools1.inc | 4 +- .../tools/includes/optional/t_toolbar_writer.inc | 2 +- .../tools/includes/optional/t_treelist_tools.inc | 2 +- .../tools/includes/optional/t_ui_filters.inc | 2 +- .../global/tools/includes/optional/t_user_info.inc | 2 +- .../global/tools/includes/optional/t_xml1.inc | 2 +- .../global/tools/includes/optional/t_xml2.inc | 2 +- .../tools/includes/optional/t_xml_filter1.inc | 2 +- .../global/tools/includes/required/t_dir.inc | 2 +- .../global/tools/includes/required/t_doc1.inc | 2 +- .../global/tools/includes/required/t_doc2.inc | 2 +- .../global/tools/includes/required/t_files.inc | 2 +- .../global/tools/includes/required/t_filters.inc | 2 +- .../global/tools/includes/required/t_lists.inc | 2 +- .../global/tools/includes/required/t_menu.inc | 2 +- .../global/tools/includes/required/t_option.inc | 2 +- .../global/tools/includes/required/t_option2.inc | 2 +- .../global/tools/includes/required/t_tools1.inc | 2 +- .../global/tools/includes/required/t_tools2.inc | 2 +- .../global/tools/includes/required/t_tools3.inc | 6 +- testautomation/global/tools/resetoffice.bas | 2 +- testautomation/global/tools/wintree.bas | 2 +- testautomation/global/win/bars.win | 2 +- testautomation/global/win/sys_dial.win | 2 +- .../graphics/optional/d_export_graphic_a.bas | 2 +- .../graphics/optional/d_export_graphic_b.bas | 2 +- .../graphics/optional/export_graphic_a.bas | 2 +- .../graphics/optional/export_graphic_b.bas | 2 +- .../graphics/optional/g_accessability.bas | 2 +- testautomation/graphics/optional/g_area.bas | 2 +- .../graphics/optional/g_arrangealign.bas | 2 +- .../graphics/optional/g_autocorrection.bas | 2 +- testautomation/graphics/optional/g_character.bas | 2 +- testautomation/graphics/optional/g_clipboard.bas | 2 +- testautomation/graphics/optional/g_clipexport.bas | 2 +- testautomation/graphics/optional/g_convertto.bas | 146 ++++++++++----------- testautomation/graphics/optional/g_crossfading.bas | 2 +- .../graphics/optional/g_customshapes.bas | 2 +- testautomation/graphics/optional/g_demoguide.bas | 2 +- testautomation/graphics/optional/g_dimensions.bas | 2 +- testautomation/graphics/optional/g_edit.bas | 2 +- testautomation/graphics/optional/g_export_html.bas | 2 +- testautomation/graphics/optional/g_findreplace.bas | 2 +- testautomation/graphics/optional/g_format.bas | 2 +- testautomation/graphics/optional/g_group.bas | 2 +- testautomation/graphics/optional/g_imagemap.bas | 2 +- testautomation/graphics/optional/g_insert.bas | 2 +- testautomation/graphics/optional/g_line.bas | 2 +- testautomation/graphics/optional/g_load_save.bas | 2 +- testautomation/graphics/optional/g_mediaplayer.bas | 2 +- testautomation/graphics/optional/g_navigator.bas | 2 +- testautomation/graphics/optional/g_ole.bas | 2 +- testautomation/graphics/optional/g_paneview.bas | 2 +- testautomation/graphics/optional/g_paragraph.bas | 2 +- .../graphics/optional/g_savepictureas.bas | 2 +- testautomation/graphics/optional/g_shaddow.bas | 2 +- testautomation/graphics/optional/g_slidelayer.bas | 2 +- testautomation/graphics/optional/g_spellcheck.bas | 2 +- testautomation/graphics/optional/g_stylist.bas | 2 +- testautomation/graphics/optional/g_tables.bas | 2 +- testautomation/graphics/optional/g_toolbars.bas | 2 +- testautomation/graphics/optional/g_tools.bas | 2 +- testautomation/graphics/optional/g_zoom.bas | 2 +- testautomation/graphics/optional/gallery.bas | 2 +- testautomation/graphics/optional/gallery2.bas | 2 +- testautomation/graphics/optional/i_animation.bas | 2 +- .../graphics/optional/i_headerfooter.bas | 2 +- testautomation/graphics/optional/i_only_updt_1.bas | 2 +- testautomation/graphics/optional/i_only_updt_2.bas | 2 +- testautomation/graphics/optional/i_pengine.bas | 2 +- .../graphics/optional/i_saveloadlayout.bas | 2 +- testautomation/graphics/optional/i_shape.bas | 2 +- testautomation/graphics/optional/i_slidecopy.bas | 2 +- testautomation/graphics/optional/i_slideshow.bas | 2 +- .../graphics/optional/i_us_presentation.bas | 2 +- testautomation/graphics/optional/i_view.bas | 2 +- .../graphics/optional/includes/draw/d_002_.inc | 2 +- .../graphics/optional/includes/draw/d_003_.inc | 2 +- .../graphics/optional/includes/draw/d_005_.inc | 2 +- .../graphics/optional/includes/draw/d_007.inc | 2 +- .../optional/includes/global/export_graphic.inc | 2 +- .../optional/includes/global/export_graphic_2.inc | 2 +- .../optional/includes/global/g_accessability.inc | 2 +- .../graphics/optional/includes/global/g_area.inc | 2 +- .../optional/includes/global/g_arrangealign.inc | 2 +- .../optional/includes/global/g_autocorrection.inc | 2 +- .../optional/includes/global/g_character.inc | 2 +- .../optional/includes/global/g_clipboard.inc | 2 +- .../optional/includes/global/g_clipexport.inc | 2 +- .../optional/includes/global/g_clipexport2.inc | 2 +- .../optional/includes/global/g_clipexport3.inc | 2 +- .../optional/includes/global/g_convertto.inc | 2 +- .../optional/includes/global/g_crossfading.inc | 2 +- .../optional/includes/global/g_customshapes.inc | 2 +- .../optional/includes/global/g_demoguide.inc | 2 +- .../optional/includes/global/g_dimensions.inc | 2 +- .../graphics/optional/includes/global/g_edit.inc | 2 +- .../optional/includes/global/g_export_html.inc | 8 +- .../optional/includes/global/g_find_replace.inc | 2 +- .../graphics/optional/includes/global/g_format.inc | 2 +- .../graphics/optional/includes/global/g_group.inc | 2 +- .../optional/includes/global/g_imagemap.inc | 2 +- .../graphics/optional/includes/global/g_insert.inc | 4 +- .../graphics/optional/includes/global/g_line.inc | 2 +- .../optional/includes/global/g_load_save.inc | 2 +- .../optional/includes/global/g_mediaplayer.inc | 2 +- .../optional/includes/global/g_navigator.inc | 2 +- .../graphics/optional/includes/global/g_ole.inc | 2 +- .../optional/includes/global/g_paneview.inc | 2 +- .../optional/includes/global/g_paragraph.inc | 2 +- .../optional/includes/global/g_savepictureas.inc | 2 +- .../optional/includes/global/g_shaddow.inc | 2 +- .../optional/includes/global/g_slidelayer.inc | 2 +- .../optional/includes/global/g_spellcheck.inc | 2 +- .../optional/includes/global/g_stylist.inc | 2 +- .../graphics/optional/includes/global/g_tables.inc | 2 +- .../optional/includes/global/g_toolbars.inc | 2 +- .../graphics/optional/includes/global/g_tools.inc | 2 +- .../graphics/optional/includes/global/g_zoom.inc | 2 +- .../graphics/optional/includes/global/gallery.inc | 2 +- .../graphics/optional/includes/global/gallery2.inc | 2 +- .../graphics/optional/includes/global/id_001.inc | 2 +- .../graphics/optional/includes/global/id_002.inc | 2 +- .../graphics/optional/includes/global/id_003.inc | 2 +- .../graphics/optional/includes/global/id_004.inc | 2 +- .../graphics/optional/includes/global/id_005.inc | 2 +- .../graphics/optional/includes/global/id_006.inc | 2 +- .../graphics/optional/includes/global/id_007.inc | 2 +- .../graphics/optional/includes/global/id_008.inc | 2 +- .../graphics/optional/includes/global/id_009.inc | 2 +- .../graphics/optional/includes/global/id_011.inc | 2 +- .../optional/includes/impress/i_animation.inc | 2 +- .../optional/includes/impress/i_headerfooter.inc | 2 +- .../optional/includes/impress/i_pengine.inc | 2 +- .../optional/includes/impress/i_pengine1.inc | 2 +- .../optional/includes/impress/i_pengine2.inc | 2 +- .../optional/includes/impress/i_saveloadlayout.inc | 2 +- .../graphics/optional/includes/impress/i_shape.inc | 2 +- .../optional/includes/impress/i_slidecopy.inc | 2 +- .../optional/includes/impress/i_slidelayer.inc | 2 +- .../optional/includes/impress/i_slideshow.inc | 2 +- .../optional/includes/impress/i_slideshow2.inc | 2 +- .../optional/includes/impress/i_slideshow3.inc | 2 +- .../optional/includes/impress/i_stylist.inc | 2 +- .../optional/includes/impress/i_us2_present.inc | 2 +- .../optional/includes/impress/i_us_present.inc | 2 +- .../graphics/optional/includes/impress/i_view.inc | 2 +- .../graphics/optional/includes/impress/im_002_.inc | 2 +- .../graphics/optional/includes/impress/im_003_.inc | 2 +- .../graphics/optional/includes/impress/im_004_.inc | 2 +- .../graphics/optional/includes/impress/im_005_.inc | 2 +- .../graphics/optional/includes/impress/im_007_.inc | 2 +- .../graphics/optional/includes/impress/im_011_.inc | 2 +- .../graphics/optional/includes/impress/options.inc | 2 +- testautomation/graphics/required/d_opt.bas | 2 +- testautomation/graphics/required/d_updt.bas | 2 +- testautomation/graphics/required/i_opt.bas | 2 +- testautomation/graphics/required/i_updt_1.bas | 2 +- testautomation/graphics/required/i_updt_2.bas | 2 +- .../graphics/required/includes/draw/d_002_.inc | 2 +- .../graphics/required/includes/draw/d_003_.inc | 2 +- .../graphics/required/includes/draw/d_005_.inc | 2 +- .../graphics/required/includes/draw/d_007.inc | 2 +- .../graphics/required/includes/global/gallery.inc | 2 +- .../graphics/required/includes/global/gallery2.inc | 2 +- .../graphics/required/includes/global/id_001.inc | 2 +- .../graphics/required/includes/global/id_002.inc | 2 +- .../graphics/required/includes/global/id_003.inc | 2 +- .../graphics/required/includes/global/id_004.inc | 2 +- .../graphics/required/includes/global/id_005.inc | 2 +- .../graphics/required/includes/global/id_006.inc | 2 +- .../graphics/required/includes/global/id_007.inc | 2 +- .../graphics/required/includes/global/id_008.inc | 2 +- .../graphics/required/includes/global/id_009.inc | 2 +- .../graphics/required/includes/global/id_011.inc | 2 +- .../graphics/required/includes/global/id_opt_1.inc | 2 +- .../graphics/required/includes/global/id_opt_2.inc | 2 +- .../required/includes/impress/i_opt_1_.inc | 2 +- .../graphics/required/includes/impress/im_002_.inc | 2 +- .../graphics/required/includes/impress/im_003_.inc | 2 +- .../graphics/required/includes/impress/im_004_.inc | 2 +- .../graphics/required/includes/impress/im_005_.inc | 2 +- .../graphics/required/includes/impress/im_007_.inc | 2 +- .../graphics/required/includes/impress/im_011_.inc | 2 +- testautomation/graphics/tools/id_tools.inc | 2 +- testautomation/graphics/tools/id_tools_2.inc | 2 +- testautomation/graphics/tools/makeLokaleTxt.bas | 2 +- testautomation/math/optional/includes/m_101_.inc | 2 +- testautomation/math/optional/includes/m_105.inc | 2 +- testautomation/math/optional/includes/m_106_.inc | 2 +- testautomation/math/optional/m_lvl1.bas | 2 +- testautomation/math/required/includes/m_001_.inc | 2 +- testautomation/math/required/includes/m_002_.inc | 2 +- testautomation/math/required/includes/m_003_.inc | 2 +- testautomation/math/required/includes/m_004_.inc | 2 +- testautomation/math/required/includes/m_005_.inc | 2 +- testautomation/math/required/includes/m_006_.inc | 2 +- testautomation/math/required/includes/m_007_.inc | 2 +- testautomation/math/required/includes/m_010_.inc | 2 +- testautomation/math/required/includes/m_020_.inc | 2 +- testautomation/math/required/m_updt.bas | 2 +- .../spreadsheet/optional/c_arrayconstants.bas | 2 +- .../spreadsheet/optional/c_getpivotdata.bas | 2 +- .../spreadsheet/optional/c_import_general.bas | 2 +- testautomation/spreadsheet/optional/c_solver.bas | 2 +- .../includes/arrayconstants/c_arrayconstants.inc | 2 +- .../includes/getpivotdata/c_getpivotdata.inc | 2 +- .../includes/import_general/c_import_general.inc | 2 +- .../optional/includes/namedrange/c_namedrange.inc | 2 +- .../optional/includes/printrange/c_printrange.inc | 2 +- .../optional/includes/printscale/c_print_scale.inc | 2 +- .../optional/includes/solver/c_solver.inc | 2 +- testautomation/spreadsheet/required/c_updt1.bas | 2 +- testautomation/spreadsheet/required/c_updt2.bas | 2 +- .../required/includes/c_upd_datamenu.inc | 2 +- .../required/includes/c_upd_editmenu.inc | 2 +- .../required/includes/c_upd_editmenu2.inc | 2 +- .../required/includes/c_upd_filemenu.inc | 2 +- .../required/includes/c_upd_formatmenu.inc | 2 +- .../required/includes/c_upd_formatmenu2.inc | 2 +- .../required/includes/c_upd_formatmenu3.inc | 2 +- .../required/includes/c_upd_helpmenu.inc | 2 +- .../required/includes/c_upd_insertmenu.inc | 2 +- .../required/includes/c_upd_toolsmenu.inc | 2 +- .../required/includes/c_upd_toolsmenu2.inc | 2 +- .../required/includes/c_upd_viewmenu.inc | 2 +- .../required/includes/c_upd_windowmenu.inc | 2 +- .../spreadsheet/tools/includes/c_cell_tools.inc | 2 +- .../spreadsheet/tools/includes/c_l10n_tools.inc | 2 +- .../spreadsheet/tools/includes/c_select_tools.inc | 2 +- .../tools/includes/c_tool_l10n_mnomics.inc | 2 +- .../spreadsheet/tools/includes/c_tool_options.inc | 2 +- testautomation/tools/hid/hid.pl | 2 +- .../CJKCTLDependency/CJKCTLDependency1.inc | 2 +- .../alternative_text/w_alternative_text.inc | 2 +- .../includes/autocorrection/w_autocorrect1.inc | 2 +- .../includes/autocorrection/w_autocorrect2.inc | 2 +- .../optional/includes/autotext/w_autotext.inc | 2 +- .../optional/includes/calculate/w_calculate.inc | 2 +- .../chinesetranslate/w_chinesetranslate1.inc | 2 +- .../chinesetranslate/w_chinesetranslate2.inc | 2 +- .../optional/includes/clipboard/clipbrd_func.inc | 2 +- .../writer/optional/includes/clipboard/w_210_.inc | 2 +- .../writer/optional/includes/clipboard/w_211_.inc | 2 +- .../writer/optional/includes/clipboard/w_212_.inc | 2 +- .../writer/optional/includes/clipboard/w_213_.inc | 2 +- .../writer/optional/includes/clipboard/w_214_.inc | 2 +- .../writer/optional/includes/clipboard/w_215_.inc | 2 +- .../writer/optional/includes/clipboard/w_216_.inc | 2 +- .../writer/optional/includes/clipboard/w_217_.inc | 2 +- .../writer/optional/includes/clipboard/w_218_.inc | 2 +- .../writer/optional/includes/clipboard/w_219_.inc | 2 +- .../writer/optional/includes/clipboard/w_220_.inc | 2 +- .../writer/optional/includes/clipboard/w_221_.inc | 2 +- .../writer/optional/includes/clipboard/w_222_.inc | 2 +- .../includes/contextmenu/w_contextmenu1.inc | 2 +- .../optional/includes/drawing/w_drawing_tools1.inc | 2 +- .../optional/includes/drawing/w_drawing_tools2.inc | 2 +- .../optional/includes/dropdownLB/w_dropdownLB1.inc | 2 +- .../writer/optional/includes/fields/w_fields1.inc | 2 +- .../writer/optional/includes/fields/w_fields2.inc | 2 +- .../writer/optional/includes/fields/w_fields3.inc | 2 +- .../writer/optional/includes/fields/w_fields4.inc | 2 +- .../writer/optional/includes/fields/w_fields5.inc | 2 +- .../writer/optional/includes/fields/w_fields6.inc | 2 +- .../writer/optional/includes/fields/w_fields7.inc | 2 +- .../writer/optional/includes/filter/w_filter.inc | 2 +- .../optional/includes/fontwork/w_fontwork1.inc | 2 +- .../formatcharacter/w_format_character1.inc | 2 +- .../optional/includes/formatpage/w_formatpage1.inc | 2 +- .../optional/includes/formatpage/w_formatpage2.inc | 2 +- .../optional/includes/formatpage/w_formatpage3.inc | 2 +- .../optional/includes/formatpage/w_formatpage4.inc | 2 +- .../formatparagraph/w_formatparagraph1.inc | 2 +- .../formatparagraph/w_formatparagraph2.inc | 2 +- .../formatparagraph/w_formatparagraph3.inc | 2 +- .../hangulhanjaonversion/hhConversion1.inc | 2 +- .../hangulhanjaonversion/hhConversion2.inc | 2 +- .../hangulhanjaonversion/hhConversion3.inc | 2 +- .../includes/hyphenation/w_hyphenation.inc | 2 +- .../includes/insertgraphic/w_insertgraphic1.inc | 2 +- .../includes/insertgraphic/w_insertgraphic2.inc | 2 +- .../includes/insertgraphic/w_insertgraphic3.inc | 2 +- .../includes/insertgraphic/w_insertgraphic4.inc | 2 +- .../includes/insertgraphic/w_insertgraphic5.inc | 2 +- .../optional/includes/loadsave/w_loadsave.inc | 2 +- .../optional/includes/navigator/w_navigator.inc | 2 +- .../writer/optional/includes/number/w_205_.inc | 2 +- .../writer/optional/includes/number/w_205a_.inc | 2 +- .../writer/optional/includes/number/w_206_.inc | 2 +- .../writer/optional/includes/number/w_207_.inc | 2 +- .../writer/optional/includes/option/wh_o_1.inc | 2 +- .../writer/optional/includes/option/wh_o_2.inc | 2 +- .../writer/optional/includes/option/wh_o_3.inc | 2 +- .../writer/optional/includes/option/wr_o_1.inc | 2 +- .../writer/optional/includes/option/wr_o_2.inc | 2 +- .../writer/optional/includes/option/wr_o_3.inc | 2 +- .../writer/optional/includes/option/wr_o_4.inc | 6 +- .../writer/optional/includes/option/wr_o_5.inc | 2 +- .../writer/optional/includes/option/wr_o_a.inc | 2 +- .../optional/includes/redlining/w_redlining1.inc | 2 +- .../optional/includes/redlining/w_redlining2.inc | 2 +- .../writer/optional/includes/regexp/regular.inc | 2 +- .../writer/optional/includes/regexp/search.inc | 2 +- .../issuezilla/w_issuezilla_regression.inc | 2 +- .../optional/includes/section/w_section_1.inc | 2 +- .../optional/includes/section/w_section_2.inc | 2 +- .../optional/includes/section/w_section_3.inc | 2 +- .../optional/includes/section/w_section_4.inc | 2 +- .../optional/includes/section/w_section_tools.inc | 2 +- .../optional/includes/shortcut/w_shortcuts.inc | 2 +- .../optional/includes/sorting/w_sorting1.inc | 2 +- .../optional/includes/sorting/w_sorting2.inc | 2 +- .../optional/includes/spellcheck/w_spellcheck.inc | 2 +- .../optional/includes/spellcheck/w_spellcheck1.inc | 2 +- .../writer/optional/includes/stylist/w_stylist.inc | 2 +- .../writer/optional/includes/table/w_204_.inc | 2 +- .../writer/optional/includes/table/w_204a_.inc | 2 +- .../writer/optional/includes/table/w_204b_.inc | 2 +- .../optional/includes/textframes/w_textframes1.inc | 2 +- .../optional/includes/textframes/w_textframes2.inc | 2 +- .../optional/includes/textframes/w_textframes3.inc | 2 +- .../optional/includes/textframes/w_textframes4.inc | 2 +- .../optional/includes/textframes/w_textframes5.inc | 2 +- .../writer/optional/includes/tools/tools1.inc | 2 +- .../writer/optional/includes/tools/tools2.inc | 2 +- .../writer/optional/includes/undo/w_undo1.inc | 2 +- .../optional/includes/undo/w_undo_history_1.inc | 2 +- .../optional/includes/undo/w_undo_history_2.inc | 2 +- .../optional/includes/undo/w_undo_history_3.inc | 2 +- .../optional/includes/undo/w_undo_history_4.inc | 2 +- .../writer/optional/w_CJKCTLDependency.bas | 2 +- .../writer/optional/w_alternative_text.bas | 2 +- .../writer/optional/w_autocorrection.bas | 2 +- testautomation/writer/optional/w_autotext.bas | 2 +- testautomation/writer/optional/w_calculate.bas | 2 +- .../writer/optional/w_chinesetranslate.bas | 2 +- testautomation/writer/optional/w_clipbrd.bas | 2 +- testautomation/writer/optional/w_contextmenu.bas | 2 +- testautomation/writer/optional/w_drawing_tools.bas | 2 +- testautomation/writer/optional/w_dropdownLB.bas | 2 +- testautomation/writer/optional/w_fields.bas | 2 +- testautomation/writer/optional/w_filter.bas | 2 +- testautomation/writer/optional/w_fontwork.bas | 2 +- .../writer/optional/w_formatcharacter.bas | 2 +- testautomation/writer/optional/w_formatpage.bas | 2 +- .../writer/optional/w_formatparagraph.bas | 2 +- testautomation/writer/optional/w_hhConversion.bas | 2 +- testautomation/writer/optional/w_hyphenation.bas | 2 +- testautomation/writer/optional/w_insertgraphic.bas | 2 +- .../writer/optional/w_issuezilla_regression.bas | 2 +- testautomation/writer/optional/w_loadsave.bas | 2 +- testautomation/writer/optional/w_navigator.bas | 2 +- testautomation/writer/optional/w_numbering.bas | 2 +- testautomation/writer/optional/w_opt.bas | 2 +- testautomation/writer/optional/w_redlining.bas | 2 +- testautomation/writer/optional/w_search.bas | 2 +- testautomation/writer/optional/w_section.bas | 2 +- testautomation/writer/optional/w_shortcuts.bas | 2 +- testautomation/writer/optional/w_sorting.bas | 2 +- testautomation/writer/optional/w_spellcheck.bas | 2 +- testautomation/writer/optional/w_stylist.bas | 2 +- testautomation/writer/optional/w_table.bas | 2 +- testautomation/writer/optional/w_textframes.bas | 2 +- testautomation/writer/optional/w_undo.bas | 2 +- testautomation/writer/optional/ww_opt.bas | 2 +- testautomation/writer/required/includes/w_001_.inc | 2 +- .../writer/required/includes/w_001a_.inc | 2 +- .../writer/required/includes/w_001b_.inc | 2 +- testautomation/writer/required/includes/w_002_.inc | 2 +- testautomation/writer/required/includes/w_003_.inc | 2 +- testautomation/writer/required/includes/w_004_.inc | 2 +- testautomation/writer/required/includes/w_005_.inc | 2 +- .../writer/required/includes/w_005b_.inc | 2 +- testautomation/writer/required/includes/w_006_.inc | 2 +- testautomation/writer/required/includes/w_007_.inc | 2 +- testautomation/writer/required/includes/w_008_.inc | 2 +- testautomation/writer/required/includes/w_009_.inc | 2 +- testautomation/writer/required/includes/w_010_.inc | 2 +- .../writer/required/includes/w_010_1.inc | 2 +- testautomation/writer/required/includes/w_011_.inc | 2 +- testautomation/writer/required/includes/w_020_.inc | 2 +- testautomation/writer/required/w_updt.bas | 2 +- .../writer/tools/includes/w_get_locale_strings.inc | 2 +- .../writer/tools/includes/w_locale_strings2.inc | 2 +- testautomation/writer/tools/includes/w_tool1.inc | 2 +- testautomation/writer/tools/includes/w_tool2.inc | 2 +- testautomation/writer/tools/includes/w_tool3.inc | 2 +- testautomation/writer/tools/includes/w_tool4.inc | 2 +- testautomation/writer/tools/includes/w_tool5.inc | 2 +- testautomation/writer/tools/includes/w_tool6.inc | 2 +- testautomation/writer/tools/includes/w_tool7.inc | 2 +- testautomation/writer/tools/includes/w_tools.inc | 2 +- .../tools/includes/w_tools_autocorrection.inc | 2 +- .../writer/tools/includes/w_tools_drawing.inc | 2 +- .../writer/tools/includes/w_tools_hyphenation.inc | 2 +- .../writer/tools/includes/w_tools_undo.inc | 2 +- .../writer/tools/w_get_locale_strings.bas | 2 +- testautomation/xml/optional/calc_xml_7_export.bas | 2 +- testautomation/xml/optional/docbook_losa.bas | 2 +- testautomation/xml/optional/draw_xml_7_export.bas | 2 +- .../xml/optional/impress_xml_7_export.bas | 2 +- .../optional/includes/c_datapilot_pagefields.inc | 2 +- .../xml/optional/includes/c_xml_print_scale.inc | 2 +- .../xml/optional/includes/c_xml_scenario.inc | 2 +- .../includes/ch_xml_japanese_candlestick.inc | 2 +- .../xml/optional/includes/docbook_001.inc | 2 +- .../xml/optional/includes/f_xml_save_ms_ole.inc | 2 +- testautomation/xml/optional/includes/sxc7_01.inc | 2 +- testautomation/xml/optional/includes/sxc7_02.inc | 2 +- testautomation/xml/optional/includes/sxc7_03.inc | 2 +- testautomation/xml/optional/includes/sxd7_01.inc | 2 +- testautomation/xml/optional/includes/sxd7_02.inc | 2 +- testautomation/xml/optional/includes/sxd7_03.inc | 2 +- testautomation/xml/optional/includes/sxd7_04.inc | 2 +- testautomation/xml/optional/includes/sxd7_05.inc | 2 +- testautomation/xml/optional/includes/sxi7_01.inc | 2 +- testautomation/xml/optional/includes/sxm7_01.inc | 2 +- testautomation/xml/optional/includes/sxw7_01.inc | 2 +- testautomation/xml/optional/includes/sxw7_01a.inc | 2 +- testautomation/xml/optional/includes/sxw7_02.inc | 2 +- testautomation/xml/optional/includes/sxw7_03.inc | 2 +- .../optional/includes/w_xml_vertical_alignment.inc | 2 +- testautomation/xml/optional/math_xml_7_export.bas | 2 +- .../xml/optional/w_xml_vertical_alignment.bas | 2 +- .../xml/optional/writer_xml_7_export.bas | 2 +- .../xml/required/includes/oasis_graphics_01.inc | 2 +- .../xml/required/oasis_graphics_update.bas | 2 +- testautomation/xml/tools/includes/itools1.inc | 2 +- testautomation/xml/tools/includes/xmltool1.inc | 2 +- 851 files changed, 932 insertions(+), 932 deletions(-) mode change 100755 => 100644 testautomation/chart2/optional/ch2_chart_data_dlg_impress.bas mode change 100755 => 100644 testautomation/chart2/optional/ch2_flexible_source_range_selection.bas mode change 100755 => 100644 testautomation/chart2/optional/ch2_xml_format.bas mode change 100644 => 100755 testautomation/chart2/optional/includes/ch2_flexible_source_range_selection.inc mode change 100644 => 100755 testautomation/chart2/optional/includes/ch2_flexible_source_range_selection01.inc mode change 100644 => 100755 testautomation/chart2/optional/includes/loadsave/ch2_xml_format.inc mode change 100644 => 100755 testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard2.inc mode change 100644 => 100755 testautomation/chart2/required/ch2_updt_calc.bas mode change 100644 => 100755 testautomation/chart2/required/includes/ch2_file.inc mode change 100644 => 100755 testautomation/chart2/required/includes/ch2_format.inc mode change 100644 => 100755 testautomation/chart2/required/includes/ch2_format1.inc mode change 100644 => 100755 testautomation/chart2/required/includes/ch2_insert.inc mode change 100644 => 100755 testautomation/chart2/required/includes/ch2_insert_ctl.inc mode change 100644 => 100755 testautomation/chart2/required/includes/ch2_menu.inc mode change 100644 => 100755 testautomation/chart2/required/includes/ch2_ole.inc mode change 100644 => 100755 testautomation/chart2/required/includes/ch2_toolbars.inc mode change 100644 => 100755 testautomation/chart2/required/includes/ch2_view.inc mode change 100644 => 100755 testautomation/chart2/required/includes/ch2_window.inc mode change 100644 => 100755 testautomation/chart2/required/includes/ch2_wizard.inc mode change 100644 => 100755 testautomation/chart2/tools/ch_tools_axes.inc mode change 100644 => 100755 testautomation/chart2/tools/ch_tools_chart_type.inc mode change 100644 => 100755 testautomation/chart2/tools/ch_tools_common.inc mode change 100644 => 100755 testautomation/chart2/tools/ch_tools_data_labels.inc mode change 100644 => 100755 testautomation/chart2/tools/ch_tools_grids.inc mode change 100644 => 100755 testautomation/chart2/tools/ch_tools_legend.inc mode change 100644 => 100755 testautomation/chart2/tools/ch_tools_statistics.inc mode change 100644 => 100755 testautomation/chart2/tools/ch_tools_tab_borders_lines.inc mode change 100644 => 100755 testautomation/chart2/tools/ch_tools_tab_pages.inc mode change 100644 => 100755 testautomation/chart2/tools/ch_tools_titles.inc mode change 100755 => 100644 testautomation/dbaccess/optional/dba_misc_Macros.bas mode change 100644 => 100755 testautomation/dbaccess/optional/includes/ctrl_Clipboard.inc mode change 100644 => 100755 testautomation/dbaccess/optional/includes/ctrl_Grid.inc mode change 100644 => 100755 testautomation/dbaccess/optional/includes/ctrl_PropertyBrowser.inc mode change 100644 => 100755 testautomation/dbaccess/optional/includes/ctrl_Spreadsheet.inc mode change 100644 => 100755 testautomation/dbaccess/optional/includes/ctrl_TextControl.inc mode change 100644 => 100755 testautomation/dbaccess/optional/includes/db_ADOAccess.inc mode change 100644 => 100755 testautomation/dbaccess/optional/includes/db_AdabasD.inc mode change 100644 => 100755 testautomation/dbaccess/optional/includes/db_Dbase.inc mode change 100644 => 100755 testautomation/dbaccess/optional/includes/db_DbaseFunction.inc mode change 100644 => 100755 testautomation/dbaccess/optional/includes/db_IndexDesign.inc mode change 100644 => 100755 testautomation/dbaccess/optional/includes/db_Mozilla.inc mode change 100644 => 100755 testautomation/dbaccess/optional/includes/db_ODBCMySQL.inc mode change 100644 => 100755 testautomation/dbaccess/optional/includes/db_Query.inc mode change 100644 => 100755 testautomation/dbaccess/optional/includes/db_Spreadsheet.inc mode change 100644 => 100755 testautomation/dbaccess/optional/includes/db_Text.inc mode change 100644 => 100755 testautomation/dbaccess/optional/includes/db_Windows.inc mode change 100644 => 100755 testautomation/dbaccess/optional/includes/frm_Forms.inc mode change 100644 => 100755 testautomation/dbaccess/optional/includes/misc_RegisterDatabase.inc mode change 100644 => 100755 testautomation/dbaccess/optional/includes/rpt_DateTime.inc mode change 100644 => 100755 testautomation/dbaccess/optional/includes/rpt_ExecuteReport.inc mode change 100644 => 100755 testautomation/dbaccess/optional/includes/rpt_Formating.inc mode change 100644 => 100755 testautomation/dbaccess/optional/includes/rpt_FunctionWizard.inc mode change 100644 => 100755 testautomation/dbaccess/optional/includes/rpt_Grouping.inc mode change 100644 => 100755 testautomation/dbaccess/optional/includes/rpt_PageNumber.inc mode change 100644 => 100755 testautomation/dbaccess/optional/includes/rpt_PropertyBrowser.inc mode change 100644 => 100755 testautomation/dbaccess/optional/includes/wiz_CopyTableWizard.inc mode change 100644 => 100755 testautomation/dbaccess/optional/includes/wiz_FormWizard.inc mode change 100644 => 100755 testautomation/dbaccess/optional/includes/wiz_QueryWizard.inc mode change 100644 => 100755 testautomation/dbaccess/optional/includes/wiz_ReportWizard.inc mode change 100644 => 100755 testautomation/dbaccess/optional/includes/wiz_TableWizard.inc mode change 100644 => 100755 testautomation/dbaccess/optional/includes/xf_Submission.inc mode change 100644 => 100755 testautomation/dbaccess/required/includes/Forms.inc mode change 100644 => 100755 testautomation/dbaccess/required/includes/ReportBuilder01.inc mode change 100644 => 100755 testautomation/dbaccess/required/includes/Wizards.inc mode change 100644 => 100755 testautomation/dbaccess/required/includes/Xforms01.inc mode change 100644 => 100755 testautomation/dbaccess/tools/controltools.inc mode change 100644 => 100755 testautomation/dbaccess/tools/dbinit.inc mode change 100644 => 100755 testautomation/dbaccess/tools/querytools.inc mode change 100755 => 100644 testautomation/extensions/optional/e_issues.bas mode change 100644 => 100755 testautomation/extensions/optional/includes/display_name.inc mode change 100644 => 100755 testautomation/extensions/optional/includes/extensions.inc mode change 100644 => 100755 testautomation/extensions/optional/includes/fileopen.inc mode change 100644 => 100755 testautomation/extensions/optional/includes/help.inc mode change 100644 => 100755 testautomation/extensions/optional/includes/identifiers.inc mode change 100755 => 100644 testautomation/extensions/optional/includes/issue110083.inc mode change 100644 => 100755 testautomation/extensions/optional/includes/location.inc mode change 100644 => 100755 testautomation/extensions/optional/includes/meta-inf.inc mode change 100644 => 100755 testautomation/extensions/optional/includes/online_update.inc mode change 100644 => 100755 testautomation/extensions/optional/includes/options.inc mode change 100755 => 100644 testautomation/extensions/required/e_update.bas mode change 100644 => 100755 testautomation/extensions/required/includes/e_update.inc mode change 100644 => 100755 testautomation/framework/optional/includes/NewSortingAlgorithmForJapanese_1.inc mode change 100644 => 100755 testautomation/framework/optional/includes/basic_dialog_i18n_defaults.inc mode change 100644 => 100755 testautomation/framework/optional/includes/basic_eventbinding.inc mode change 100644 => 100755 testautomation/framework/optional/includes/basic_modules.inc mode change 100644 => 100755 testautomation/framework/optional/includes/basic_vba_compat_tools.inc mode change 100644 => 100755 testautomation/framework/optional/includes/extras_preview.inc mode change 100644 => 100755 testautomation/framework/optional/includes/f_usage_tracking.inc mode change 100644 => 100755 testautomation/framework/optional/includes/filedlg_allowed_names.inc mode change 100644 => 100755 testautomation/framework/optional/includes/filedlg_autocomplete.inc mode change 100644 => 100755 testautomation/framework/optional/includes/filedlg_cjk_folders.inc mode change 100644 => 100755 testautomation/framework/optional/includes/filedlg_folders1.inc mode change 100644 => 100755 testautomation/framework/optional/includes/filedlg_folders2.inc mode change 100644 => 100755 testautomation/framework/optional/includes/filedlg_folders3.inc mode change 100644 => 100755 testautomation/framework/optional/includes/filedlg_folders4.inc mode change 100644 => 100755 testautomation/framework/optional/includes/filedlg_folders5.inc mode change 100644 => 100755 testautomation/framework/optional/includes/filedlg_folders6.inc mode change 100644 => 100755 testautomation/framework/optional/includes/filedlg_folders7.inc mode change 100644 => 100755 testautomation/framework/optional/includes/filedlg_forbidden_names_windows.inc mode change 100644 => 100755 testautomation/framework/optional/includes/filedlg_multiselection.inc mode change 100644 => 100755 testautomation/framework/optional/includes/filedlg_reserved_names_unix.inc mode change 100644 => 100755 testautomation/framework/optional/includes/filedlg_reserved_names_windows.inc mode change 100644 => 100755 testautomation/framework/optional/includes/filedlg_tools.inc mode change 100644 => 100755 testautomation/framework/optional/includes/filedlg_triggers.inc mode change 100644 => 100755 testautomation/framework/optional/includes/fontworkgallery.inc mode change 100644 => 100755 testautomation/framework/optional/includes/help_bookmarks.inc mode change 100644 => 100755 testautomation/framework/optional/includes/help_view_topics.inc mode change 100644 => 100755 testautomation/framework/optional/includes/loadsave_files.inc mode change 100644 => 100755 testautomation/framework/optional/includes/loadsave_new.inc mode change 100644 => 100755 testautomation/framework/optional/includes/menuentries.inc mode change 100644 => 100755 testautomation/framework/optional/includes/ole_1.inc mode change 100644 => 100755 testautomation/framework/optional/includes/ole_2.inc mode change 100644 => 100755 testautomation/framework/optional/includes/options_asia.inc mode change 100644 => 100755 testautomation/framework/optional/includes/options_data.inc mode change 100644 => 100755 testautomation/framework/optional/includes/options_int1.inc mode change 100644 => 100755 testautomation/framework/optional/includes/options_lan1.inc mode change 100644 => 100755 testautomation/framework/optional/includes/options_loadsave_general.inc mode change 100644 => 100755 testautomation/framework/optional/includes/options_loadsave_html.inc mode change 100644 => 100755 testautomation/framework/optional/includes/options_loadsave_msoffice.inc mode change 100644 => 100755 testautomation/framework/optional/includes/options_loadsave_vba.inc mode change 100644 => 100755 testautomation/framework/optional/includes/options_ooo_accessibility.inc mode change 100644 => 100755 testautomation/framework/optional/includes/options_ooo_appearance.inc mode change 100644 => 100755 testautomation/framework/optional/includes/options_ooo_colors.inc mode change 100644 => 100755 testautomation/framework/optional/includes/options_ooo_fontreplacement.inc mode change 100644 => 100755 testautomation/framework/optional/includes/options_ooo_java.inc mode change 100644 => 100755 testautomation/framework/optional/includes/options_ooo_memory.inc mode change 100644 => 100755 testautomation/framework/optional/includes/options_ooo_paths.inc mode change 100644 => 100755 testautomation/framework/optional/includes/options_ooo_print.inc mode change 100644 => 100755 testautomation/framework/optional/includes/options_ooo_userdata.inc mode change 100644 => 100755 testautomation/framework/optional/includes/options_ooo_view.inc mode change 100644 => 100755 testautomation/framework/optional/includes/security_broken_signature.inc mode change 100644 => 100755 testautomation/framework/optional/includes/security_evilmacro1.inc mode change 100644 => 100755 testautomation/framework/optional/includes/security_evilmacro2.inc mode change 100644 => 100755 testautomation/framework/optional/includes/security_evilmacro3.inc mode change 100644 => 100755 testautomation/framework/optional/includes/security_trusted_path.inc mode change 100644 => 100755 testautomation/framework/optional/includes/toolbar_behavior.inc mode change 100644 => 100755 testautomation/framework/required/includes/basic_dialog_export.inc mode change 100644 => 100755 testautomation/framework/required/includes/basic_dialog_i18n_import.inc mode change 100644 => 100755 testautomation/framework/required/includes/security_dialogs.inc mode change 100644 => 100755 testautomation/framework/required/includes/smoketest.inc mode change 100644 => 100755 testautomation/framework/required/includes/standard_toolbar_1.inc mode change 100644 => 100755 testautomation/framework/required/includes/standard_toolbar_3.inc mode change 100644 => 100755 testautomation/framework/required/includes/standard_toolbar_5.inc mode change 100644 => 100755 testautomation/framework/required/includes/topten.inc mode change 100644 => 100755 testautomation/framework/required/includes/wizard_documentconverter.inc mode change 100644 => 100755 testautomation/framework/required/includes/wizard_euroconverter.inc mode change 100644 => 100755 testautomation/framework/required/includes/wizard_webpage.inc mode change 100644 => 100755 testautomation/framework/tools/includes/private_environment.inc mode change 100644 => 100755 testautomation/framework/tools/includes/webtools.inc mode change 100644 => 100755 testautomation/framework/tools/includes/window_tools.inc mode change 100644 => 100755 testautomation/global/required/includes/g_customize.inc mode change 100644 => 100755 testautomation/global/required/includes/g_option_application.inc mode change 100644 => 100755 testautomation/global/required/includes/g_printing.inc mode change 100644 => 100755 testautomation/global/system/includes/declare.inc mode change 100644 => 100755 testautomation/global/system/includes/sysinfo.inc mode change 100755 => 100644 testautomation/global/tools/closeoffice.bas mode change 100644 => 100755 testautomation/global/tools/includes/optional/t_accels.inc mode change 100644 => 100755 testautomation/global/tools/includes/optional/t_control_objects.inc mode change 100644 => 100755 testautomation/global/tools/includes/optional/t_key_tools.inc mode change 100644 => 100755 testautomation/global/tools/includes/optional/t_locale_tools.inc mode change 100644 => 100755 testautomation/global/tools/includes/optional/t_set_standard_controls.inc mode change 100644 => 100755 testautomation/global/tools/includes/optional/t_spreadsheet_tools1.inc mode change 100644 => 100755 testautomation/global/tools/includes/optional/t_toolbar_writer.inc mode change 100644 => 100755 testautomation/global/tools/includes/optional/t_ui_filters.inc mode change 100644 => 100755 testautomation/global/tools/includes/optional/t_user_info.inc mode change 100644 => 100755 testautomation/global/tools/includes/optional/t_xml1.inc mode change 100644 => 100755 testautomation/global/tools/includes/optional/t_xml2.inc mode change 100644 => 100755 testautomation/global/tools/includes/optional/t_xml_filter1.inc mode change 100644 => 100755 testautomation/global/tools/includes/required/t_option.inc mode change 100644 => 100755 testautomation/global/tools/includes/required/t_option2.inc mode change 100755 => 100644 testautomation/graphics/optional/d_export_graphic_a.bas mode change 100755 => 100644 testautomation/graphics/optional/d_export_graphic_b.bas mode change 100755 => 100644 testautomation/graphics/optional/export_graphic_a.bas mode change 100755 => 100644 testautomation/graphics/optional/export_graphic_b.bas mode change 100755 => 100644 testautomation/graphics/optional/g_area.bas mode change 100755 => 100644 testautomation/graphics/optional/g_arrangealign.bas mode change 100755 => 100644 testautomation/graphics/optional/g_autocorrection.bas mode change 100755 => 100644 testautomation/graphics/optional/g_character.bas mode change 100755 => 100644 testautomation/graphics/optional/g_clipboard.bas mode change 100755 => 100644 testautomation/graphics/optional/g_clipexport.bas mode change 100755 => 100644 testautomation/graphics/optional/g_demoguide.bas mode change 100755 => 100644 testautomation/graphics/optional/g_dimensions.bas mode change 100755 => 100644 testautomation/graphics/optional/g_edit.bas mode change 100755 => 100644 testautomation/graphics/optional/g_export_html.bas mode change 100755 => 100644 testautomation/graphics/optional/g_findreplace.bas mode change 100755 => 100644 testautomation/graphics/optional/g_format.bas mode change 100755 => 100644 testautomation/graphics/optional/g_imagemap.bas mode change 100755 => 100644 testautomation/graphics/optional/g_insert.bas mode change 100755 => 100644 testautomation/graphics/optional/g_load_save.bas mode change 100755 => 100644 testautomation/graphics/optional/g_mediaplayer.bas mode change 100755 => 100644 testautomation/graphics/optional/g_navigator.bas mode change 100755 => 100644 testautomation/graphics/optional/g_paneview.bas mode change 100755 => 100644 testautomation/graphics/optional/g_paragraph.bas mode change 100755 => 100644 testautomation/graphics/optional/g_shaddow.bas mode change 100755 => 100644 testautomation/graphics/optional/g_slidelayer.bas mode change 100755 => 100644 testautomation/graphics/optional/g_spellcheck.bas mode change 100755 => 100644 testautomation/graphics/optional/g_stylist.bas mode change 100755 => 100644 testautomation/graphics/optional/g_tables.bas mode change 100755 => 100644 testautomation/graphics/optional/g_toolbars.bas mode change 100755 => 100644 testautomation/graphics/optional/g_zoom.bas mode change 100755 => 100644 testautomation/graphics/optional/gallery.bas mode change 100755 => 100644 testautomation/graphics/optional/gallery2.bas mode change 100755 => 100644 testautomation/graphics/optional/i_headerfooter.bas mode change 100755 => 100644 testautomation/graphics/optional/i_only_updt_1.bas mode change 100755 => 100644 testautomation/graphics/optional/i_only_updt_2.bas mode change 100755 => 100644 testautomation/graphics/optional/i_pengine.bas mode change 100755 => 100644 testautomation/graphics/optional/i_shape.bas mode change 100755 => 100644 testautomation/graphics/optional/i_slideshow.bas mode change 100755 => 100644 testautomation/graphics/optional/i_us_presentation.bas mode change 100755 => 100644 testautomation/graphics/optional/i_view.bas mode change 100755 => 100644 testautomation/graphics/optional/includes/global/g_find_replace.inc mode change 100755 => 100644 testautomation/graphics/optional/includes/global/gallery.inc mode change 100755 => 100644 testautomation/graphics/optional/includes/global/id_005.inc mode change 100755 => 100644 testautomation/graphics/optional/includes/impress/i_slideshow.inc mode change 100755 => 100644 testautomation/graphics/required/d_opt.bas mode change 100755 => 100644 testautomation/graphics/required/i_opt.bas mode change 100755 => 100644 testautomation/graphics/required/i_updt_2.bas mode change 100755 => 100644 testautomation/graphics/tools/makeLokaleTxt.bas mode change 100644 => 100755 testautomation/math/optional/includes/m_106_.inc mode change 100644 => 100755 testautomation/math/required/includes/m_003_.inc mode change 100644 => 100755 testautomation/math/required/includes/m_004_.inc mode change 100644 => 100755 testautomation/math/required/includes/m_006_.inc mode change 100644 => 100755 testautomation/math/required/includes/m_010_.inc mode change 100644 => 100755 testautomation/spreadsheet/optional/includes/getpivotdata/c_getpivotdata.inc mode change 100644 => 100755 testautomation/spreadsheet/optional/includes/namedrange/c_namedrange.inc mode change 100644 => 100755 testautomation/spreadsheet/optional/includes/printrange/c_printrange.inc mode change 100644 => 100755 testautomation/spreadsheet/optional/includes/printscale/c_print_scale.inc mode change 100644 => 100755 testautomation/spreadsheet/required/includes/c_upd_datamenu.inc mode change 100644 => 100755 testautomation/spreadsheet/required/includes/c_upd_formatmenu.inc mode change 100644 => 100755 testautomation/spreadsheet/required/includes/c_upd_formatmenu3.inc mode change 100644 => 100755 testautomation/spreadsheet/required/includes/c_upd_helpmenu.inc mode change 100644 => 100755 testautomation/spreadsheet/required/includes/c_upd_windowmenu.inc mode change 100644 => 100755 testautomation/spreadsheet/tools/includes/c_cell_tools.inc mode change 100644 => 100755 testautomation/spreadsheet/tools/includes/c_l10n_tools.inc mode change 100644 => 100755 testautomation/spreadsheet/tools/includes/c_select_tools.inc mode change 100644 => 100755 testautomation/spreadsheet/tools/includes/c_tool_l10n_mnomics.inc mode change 100644 => 100755 testautomation/spreadsheet/tools/includes/c_tool_options.inc mode change 100644 => 100755 testautomation/writer/optional/includes/CJKCTLDependency/CJKCTLDependency1.inc mode change 100644 => 100755 testautomation/writer/optional/includes/alternative_text/w_alternative_text.inc mode change 100644 => 100755 testautomation/writer/optional/includes/autocorrection/w_autocorrect1.inc mode change 100644 => 100755 testautomation/writer/optional/includes/autocorrection/w_autocorrect2.inc mode change 100644 => 100755 testautomation/writer/optional/includes/calculate/w_calculate.inc mode change 100644 => 100755 testautomation/writer/optional/includes/chinesetranslate/w_chinesetranslate1.inc mode change 100644 => 100755 testautomation/writer/optional/includes/chinesetranslate/w_chinesetranslate2.inc mode change 100644 => 100755 testautomation/writer/optional/includes/clipboard/w_210_.inc mode change 100644 => 100755 testautomation/writer/optional/includes/clipboard/w_211_.inc mode change 100644 => 100755 testautomation/writer/optional/includes/clipboard/w_212_.inc mode change 100644 => 100755 testautomation/writer/optional/includes/clipboard/w_213_.inc mode change 100644 => 100755 testautomation/writer/optional/includes/clipboard/w_214_.inc mode change 100644 => 100755 testautomation/writer/optional/includes/clipboard/w_215_.inc mode change 100644 => 100755 testautomation/writer/optional/includes/clipboard/w_216_.inc mode change 100644 => 100755 testautomation/writer/optional/includes/clipboard/w_217_.inc mode change 100644 => 100755 testautomation/writer/optional/includes/clipboard/w_218_.inc mode change 100644 => 100755 testautomation/writer/optional/includes/clipboard/w_219_.inc mode change 100644 => 100755 testautomation/writer/optional/includes/clipboard/w_220_.inc mode change 100644 => 100755 testautomation/writer/optional/includes/clipboard/w_221_.inc mode change 100644 => 100755 testautomation/writer/optional/includes/clipboard/w_222_.inc mode change 100644 => 100755 testautomation/writer/optional/includes/contextmenu/w_contextmenu1.inc mode change 100644 => 100755 testautomation/writer/optional/includes/dropdownLB/w_dropdownLB1.inc mode change 100644 => 100755 testautomation/writer/optional/includes/fields/w_fields3.inc mode change 100644 => 100755 testautomation/writer/optional/includes/fields/w_fields6.inc mode change 100644 => 100755 testautomation/writer/optional/includes/filter/w_filter.inc mode change 100644 => 100755 testautomation/writer/optional/includes/fontwork/w_fontwork1.inc mode change 100644 => 100755 testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc mode change 100644 => 100755 testautomation/writer/optional/includes/formatpage/w_formatpage1.inc mode change 100644 => 100755 testautomation/writer/optional/includes/formatpage/w_formatpage2.inc mode change 100644 => 100755 testautomation/writer/optional/includes/formatpage/w_formatpage3.inc mode change 100644 => 100755 testautomation/writer/optional/includes/formatpage/w_formatpage4.inc mode change 100644 => 100755 testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc mode change 100644 => 100755 testautomation/writer/optional/includes/formatparagraph/w_formatparagraph2.inc mode change 100644 => 100755 testautomation/writer/optional/includes/formatparagraph/w_formatparagraph3.inc mode change 100644 => 100755 testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc mode change 100644 => 100755 testautomation/writer/optional/includes/insertgraphic/w_insertgraphic2.inc mode change 100644 => 100755 testautomation/writer/optional/includes/insertgraphic/w_insertgraphic3.inc mode change 100644 => 100755 testautomation/writer/optional/includes/insertgraphic/w_insertgraphic4.inc mode change 100644 => 100755 testautomation/writer/optional/includes/insertgraphic/w_insertgraphic5.inc mode change 100644 => 100755 testautomation/writer/optional/includes/loadsave/w_loadsave.inc mode change 100644 => 100755 testautomation/writer/optional/includes/number/w_205_.inc mode change 100644 => 100755 testautomation/writer/optional/includes/number/w_205a_.inc mode change 100644 => 100755 testautomation/writer/optional/includes/number/w_207_.inc mode change 100644 => 100755 testautomation/writer/optional/includes/option/wh_o_1.inc mode change 100644 => 100755 testautomation/writer/optional/includes/option/wh_o_2.inc mode change 100644 => 100755 testautomation/writer/optional/includes/option/wh_o_3.inc mode change 100644 => 100755 testautomation/writer/optional/includes/option/wr_o_1.inc mode change 100644 => 100755 testautomation/writer/optional/includes/option/wr_o_2.inc mode change 100644 => 100755 testautomation/writer/optional/includes/option/wr_o_3.inc mode change 100644 => 100755 testautomation/writer/optional/includes/option/wr_o_5.inc mode change 100644 => 100755 testautomation/writer/optional/includes/option/wr_o_a.inc mode change 100644 => 100755 testautomation/writer/optional/includes/redlining/w_redlining1.inc mode change 100644 => 100755 testautomation/writer/optional/includes/redlining/w_redlining2.inc mode change 100644 => 100755 testautomation/writer/optional/includes/regexp/regular.inc mode change 100644 => 100755 testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc mode change 100644 => 100755 testautomation/writer/optional/includes/section/w_section_1.inc mode change 100644 => 100755 testautomation/writer/optional/includes/section/w_section_2.inc mode change 100644 => 100755 testautomation/writer/optional/includes/section/w_section_3.inc mode change 100644 => 100755 testautomation/writer/optional/includes/section/w_section_tools.inc mode change 100644 => 100755 testautomation/writer/optional/includes/shortcut/w_shortcuts.inc mode change 100644 => 100755 testautomation/writer/optional/includes/sorting/w_sorting1.inc mode change 100644 => 100755 testautomation/writer/optional/includes/sorting/w_sorting2.inc mode change 100644 => 100755 testautomation/writer/optional/includes/spellcheck/w_spellcheck1.inc mode change 100644 => 100755 testautomation/writer/optional/includes/table/w_204_.inc mode change 100644 => 100755 testautomation/writer/optional/includes/table/w_204a_.inc mode change 100644 => 100755 testautomation/writer/optional/includes/table/w_204b_.inc mode change 100644 => 100755 testautomation/writer/optional/includes/textframes/w_textframes2.inc mode change 100644 => 100755 testautomation/writer/optional/includes/textframes/w_textframes3.inc mode change 100644 => 100755 testautomation/writer/optional/includes/textframes/w_textframes4.inc mode change 100644 => 100755 testautomation/writer/optional/includes/textframes/w_textframes5.inc mode change 100755 => 100644 testautomation/writer/optional/w_CJKCTLDependency.bas mode change 100755 => 100644 testautomation/writer/optional/w_alternative_text.bas mode change 100755 => 100644 testautomation/writer/optional/w_autotext.bas mode change 100755 => 100644 testautomation/writer/optional/w_calculate.bas mode change 100755 => 100644 testautomation/writer/optional/w_chinesetranslate.bas mode change 100755 => 100644 testautomation/writer/optional/w_clipbrd.bas mode change 100755 => 100644 testautomation/writer/optional/w_drawing_tools.bas mode change 100755 => 100644 testautomation/writer/optional/w_dropdownLB.bas mode change 100755 => 100644 testautomation/writer/optional/w_fields.bas mode change 100755 => 100644 testautomation/writer/optional/w_fontwork.bas mode change 100755 => 100644 testautomation/writer/optional/w_formatpage.bas mode change 100755 => 100644 testautomation/writer/optional/w_formatparagraph.bas mode change 100755 => 100644 testautomation/writer/optional/w_hhConversion.bas mode change 100755 => 100644 testautomation/writer/optional/w_hyphenation.bas mode change 100755 => 100644 testautomation/writer/optional/w_insertgraphic.bas mode change 100755 => 100644 testautomation/writer/optional/w_loadsave.bas mode change 100755 => 100644 testautomation/writer/optional/w_navigator.bas mode change 100755 => 100644 testautomation/writer/optional/w_redlining.bas mode change 100755 => 100644 testautomation/writer/optional/w_section.bas mode change 100755 => 100644 testautomation/writer/optional/w_sorting.bas mode change 100755 => 100644 testautomation/writer/optional/w_spellcheck.bas mode change 100755 => 100644 testautomation/writer/optional/w_stylist.bas mode change 100755 => 100644 testautomation/writer/optional/w_textframes.bas mode change 100755 => 100644 testautomation/writer/optional/w_undo.bas mode change 100644 => 100755 testautomation/writer/required/includes/w_001a_.inc mode change 100644 => 100755 testautomation/writer/required/includes/w_001b_.inc mode change 100644 => 100755 testautomation/writer/required/includes/w_003_.inc mode change 100644 => 100755 testautomation/writer/required/includes/w_006_.inc mode change 100644 => 100755 testautomation/writer/required/includes/w_008_.inc mode change 100644 => 100755 testautomation/writer/required/includes/w_010_1.inc mode change 100644 => 100755 testautomation/writer/tools/includes/w_get_locale_strings.inc mode change 100644 => 100755 testautomation/writer/tools/includes/w_tool5.inc mode change 100644 => 100755 testautomation/writer/tools/includes/w_tool7.inc mode change 100644 => 100755 testautomation/writer/tools/includes/w_tools_autocorrection.inc mode change 100644 => 100755 testautomation/writer/tools/includes/w_tools_drawing.inc mode change 100644 => 100755 testautomation/writer/tools/includes/w_tools_hyphenation.inc mode change 100644 => 100755 testautomation/writer/tools/includes/w_tools_undo.inc mode change 100755 => 100644 testautomation/xml/optional/docbook_losa.bas mode change 100644 => 100755 testautomation/xml/optional/includes/c_datapilot_pagefields.inc mode change 100644 => 100755 testautomation/xml/optional/includes/c_xml_print_scale.inc mode change 100644 => 100755 testautomation/xml/optional/includes/c_xml_scenario.inc mode change 100644 => 100755 testautomation/xml/optional/includes/ch_xml_japanese_candlestick.inc mode change 100644 => 100755 testautomation/xml/optional/includes/docbook_001.inc mode change 100644 => 100755 testautomation/xml/optional/includes/f_xml_save_ms_ole.inc mode change 100644 => 100755 testautomation/xml/optional/includes/sxc7_01.inc mode change 100644 => 100755 testautomation/xml/optional/includes/sxc7_02.inc mode change 100644 => 100755 testautomation/xml/optional/includes/sxc7_03.inc mode change 100644 => 100755 testautomation/xml/optional/includes/sxd7_01.inc mode change 100644 => 100755 testautomation/xml/optional/includes/sxd7_02.inc mode change 100644 => 100755 testautomation/xml/optional/includes/sxd7_03.inc mode change 100644 => 100755 testautomation/xml/optional/includes/sxd7_04.inc mode change 100644 => 100755 testautomation/xml/optional/includes/sxd7_05.inc mode change 100644 => 100755 testautomation/xml/optional/includes/sxi7_01.inc mode change 100644 => 100755 testautomation/xml/optional/includes/sxm7_01.inc mode change 100644 => 100755 testautomation/xml/optional/includes/sxw7_01.inc mode change 100644 => 100755 testautomation/xml/optional/includes/sxw7_01a.inc mode change 100644 => 100755 testautomation/xml/optional/includes/sxw7_02.inc mode change 100644 => 100755 testautomation/xml/optional/includes/sxw7_03.inc mode change 100644 => 100755 testautomation/xml/optional/includes/w_xml_vertical_alignment.inc mode change 100644 => 100755 testautomation/xml/required/includes/oasis_graphics_01.inc mode change 100644 => 100755 testautomation/xml/tools/includes/itools1.inc diff --git a/testautomation/chart2/optional/ch2_chart_data_dlg_impress.bas b/testautomation/chart2/optional/ch2_chart_data_dlg_impress.bas old mode 100755 new mode 100644 index 267c3c1e4303..83ac7f78c3c9 --- a/testautomation/chart2/optional/ch2_chart_data_dlg_impress.bas +++ b/testautomation/chart2/optional/ch2_chart_data_dlg_impress.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Resource Test for the Chart Data Dialogue in Impress. '* diff --git a/testautomation/chart2/optional/ch2_flexible_source_range_selection.bas b/testautomation/chart2/optional/ch2_flexible_source_range_selection.bas old mode 100755 new mode 100644 index 9fa1b3e5f051..6feedeb8004e --- a/testautomation/chart2/optional/ch2_flexible_source_range_selection.bas +++ b/testautomation/chart2/optional/ch2_flexible_source_range_selection.bas @@ -25,7 +25,7 @@ ' '/*********************************************************************** '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Updatetest for Flexible Source Range Selection '* diff --git a/testautomation/chart2/optional/ch2_losa_ods_to_ods.bas b/testautomation/chart2/optional/ch2_losa_ods_to_ods.bas index b6bf42f77b8d..ed1dce13adb5 100755 --- a/testautomation/chart2/optional/ch2_losa_ods_to_ods.bas +++ b/testautomation/chart2/optional/ch2_losa_ods_to_ods.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Load/Save test for chart files - Input: ODS, Output:ODS '* diff --git a/testautomation/chart2/optional/ch2_losa_ods_to_ots.bas b/testautomation/chart2/optional/ch2_losa_ods_to_ots.bas index 0e58413390c5..8cc8ffe9835c 100755 --- a/testautomation/chart2/optional/ch2_losa_ods_to_ots.bas +++ b/testautomation/chart2/optional/ch2_losa_ods_to_ots.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Load/Save test for chart files - Input: ODS, Output: OTS '* diff --git a/testautomation/chart2/optional/ch2_losa_ods_to_sdc.bas b/testautomation/chart2/optional/ch2_losa_ods_to_sdc.bas index 83884e36da66..d61c6183086a 100755 --- a/testautomation/chart2/optional/ch2_losa_ods_to_sdc.bas +++ b/testautomation/chart2/optional/ch2_losa_ods_to_sdc.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Load/Save test for chart files - Input: ODS, Output: SDC '* diff --git a/testautomation/chart2/optional/ch2_losa_ods_to_sxc.bas b/testautomation/chart2/optional/ch2_losa_ods_to_sxc.bas index f711beb925b7..00940a2ca37f 100755 --- a/testautomation/chart2/optional/ch2_losa_ods_to_sxc.bas +++ b/testautomation/chart2/optional/ch2_losa_ods_to_sxc.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Load/Save test for chart files - Input: ODS, Output: SXC '* diff --git a/testautomation/chart2/optional/ch2_losa_ods_to_xls.bas b/testautomation/chart2/optional/ch2_losa_ods_to_xls.bas index 4248e5e395f0..3a8ca2916eec 100755 --- a/testautomation/chart2/optional/ch2_losa_ods_to_xls.bas +++ b/testautomation/chart2/optional/ch2_losa_ods_to_xls.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Load/Save test for chart files - Input: ODS, Output: XLS '* diff --git a/testautomation/chart2/optional/ch2_losa_sxc_to_ods.bas b/testautomation/chart2/optional/ch2_losa_sxc_to_ods.bas index 405bb6a421a1..c662dfc52b3a 100755 --- a/testautomation/chart2/optional/ch2_losa_sxc_to_ods.bas +++ b/testautomation/chart2/optional/ch2_losa_sxc_to_ods.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Load/Save test for chart files - Input: SXC, Output:ODS '* diff --git a/testautomation/chart2/optional/ch2_losa_sxc_to_sdc.bas b/testautomation/chart2/optional/ch2_losa_sxc_to_sdc.bas index f2498ddf99bd..7c8e8726f580 100755 --- a/testautomation/chart2/optional/ch2_losa_sxc_to_sdc.bas +++ b/testautomation/chart2/optional/ch2_losa_sxc_to_sdc.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Load/Save test for chart files - Input: SXC, Output: SDC '* diff --git a/testautomation/chart2/optional/ch2_lvl1.bas b/testautomation/chart2/optional/ch2_lvl1.bas index 7d13d601ec18..9ae9f40ce301 100755 --- a/testautomation/chart2/optional/ch2_lvl1.bas +++ b/testautomation/chart2/optional/ch2_lvl1.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Chart2 functional tests '* diff --git a/testautomation/chart2/optional/ch2_lvl1_wizard.bas b/testautomation/chart2/optional/ch2_lvl1_wizard.bas index abe38f970a89..41811109e473 100755 --- a/testautomation/chart2/optional/ch2_lvl1_wizard.bas +++ b/testautomation/chart2/optional/ch2_lvl1_wizard.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Level 1 functional test for Chart2 Wizard '* diff --git a/testautomation/chart2/optional/ch2_xml_format.bas b/testautomation/chart2/optional/ch2_xml_format.bas old mode 100755 new mode 100644 index 75f3c10c9cb9..25f5d751b58f --- a/testautomation/chart2/optional/ch2_xml_format.bas +++ b/testautomation/chart2/optional/ch2_xml_format.bas @@ -25,7 +25,7 @@ ' '/*********************************************************************** '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : General XML file format check '* diff --git a/testautomation/chart2/optional/includes/ch2_datadialogue.inc b/testautomation/chart2/optional/includes/ch2_datadialogue.inc index f7e4078ad911..1b723c1479b7 100644 --- a/testautomation/chart2/optional/includes/ch2_datadialogue.inc +++ b/testautomation/chart2/optional/includes/ch2_datadialogue.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : oliver.craemer@sun.com +'* Owner : oliver.craemer@oracle.com '* '* short description : Resource-test for the Chart Data Dialogue. '* diff --git a/testautomation/chart2/optional/includes/ch2_flexible_source_range_selection.inc b/testautomation/chart2/optional/includes/ch2_flexible_source_range_selection.inc old mode 100644 new mode 100755 index 8cb7e0851809..0151f5021b3e --- a/testautomation/chart2/optional/includes/ch2_flexible_source_range_selection.inc +++ b/testautomation/chart2/optional/includes/ch2_flexible_source_range_selection.inc @@ -25,7 +25,7 @@ ' '/*********************************************************************** '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Updatetest for Flexible Source Range Selection in spreadsheets '* diff --git a/testautomation/chart2/optional/includes/ch2_flexible_source_range_selection01.inc b/testautomation/chart2/optional/includes/ch2_flexible_source_range_selection01.inc old mode 100644 new mode 100755 index 819b7da04c9a..ec2496ecb1f3 --- a/testautomation/chart2/optional/includes/ch2_flexible_source_range_selection01.inc +++ b/testautomation/chart2/optional/includes/ch2_flexible_source_range_selection01.inc @@ -25,7 +25,7 @@ ' '/*********************************************************************** '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Updatetest for Flexible Source Range Selection in Writer '* diff --git a/testautomation/chart2/optional/includes/ch2_lvl1a.inc b/testautomation/chart2/optional/includes/ch2_lvl1a.inc index 99ca5a985bc4..6da6e29ac72d 100644 --- a/testautomation/chart2/optional/includes/ch2_lvl1a.inc +++ b/testautomation/chart2/optional/includes/ch2_lvl1a.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Chart2 functional tests '* diff --git a/testautomation/chart2/optional/includes/loadsave/ch2_losa.inc b/testautomation/chart2/optional/includes/loadsave/ch2_losa.inc index 34b84e85250e..b530b0c2a364 100755 --- a/testautomation/chart2/optional/includes/loadsave/ch2_losa.inc +++ b/testautomation/chart2/optional/includes/loadsave/ch2_losa.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Load file of one Spreadsheet format and save to another '* diff --git a/testautomation/chart2/optional/includes/loadsave/ch2_xml_format.inc b/testautomation/chart2/optional/includes/loadsave/ch2_xml_format.inc old mode 100644 new mode 100755 index 0cf868bacaaf..fee95afb3f8e --- a/testautomation/chart2/optional/includes/loadsave/ch2_xml_format.inc +++ b/testautomation/chart2/optional/includes/loadsave/ch2_xml_format.inc @@ -25,7 +25,7 @@ ' '/*********************************************************************** '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Verify the Chart2 XML file format '* diff --git a/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc b/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc index 6bcf3399796d..357fa89c4393 100755 --- a/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc +++ b/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Chart wizard general functionality '* diff --git a/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard2.inc b/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard2.inc old mode 100644 new mode 100755 index e260d274e7ea..a89e8fad80d8 --- a/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard2.inc +++ b/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard2.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : New chart types '* diff --git a/testautomation/chart2/required/ch2_updt_calc.bas b/testautomation/chart2/required/ch2_updt_calc.bas old mode 100644 new mode 100755 index 7dba15ead84f..02cc2c883269 --- a/testautomation/chart2/required/ch2_updt_calc.bas +++ b/testautomation/chart2/required/ch2_updt_calc.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Resource Test for all chart specific menues '* diff --git a/testautomation/chart2/required/includes/ch2_file.inc b/testautomation/chart2/required/includes/ch2_file.inc old mode 100644 new mode 100755 index 049ed6b7c9fb..f7166df9c82e --- a/testautomation/chart2/required/includes/ch2_file.inc +++ b/testautomation/chart2/required/includes/ch2_file.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Chart resource test - Menu FILE '* diff --git a/testautomation/chart2/required/includes/ch2_format.inc b/testautomation/chart2/required/includes/ch2_format.inc old mode 100644 new mode 100755 index 1eb92e42a480..42048cbbb7de --- a/testautomation/chart2/required/includes/ch2_format.inc +++ b/testautomation/chart2/required/includes/ch2_format.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Chart resource test - Menu FORMAT '* diff --git a/testautomation/chart2/required/includes/ch2_format1.inc b/testautomation/chart2/required/includes/ch2_format1.inc old mode 100644 new mode 100755 index afae7e99e272..dbe1de149c9c --- a/testautomation/chart2/required/includes/ch2_format1.inc +++ b/testautomation/chart2/required/includes/ch2_format1.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Continue Chart resource test - Menu FORMAT '* diff --git a/testautomation/chart2/required/includes/ch2_insert.inc b/testautomation/chart2/required/includes/ch2_insert.inc old mode 100644 new mode 100755 index 7d65aa3460e2..79923a8198c6 --- a/testautomation/chart2/required/includes/ch2_insert.inc +++ b/testautomation/chart2/required/includes/ch2_insert.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Chart resource test - Menu INSERT '* diff --git a/testautomation/chart2/required/includes/ch2_insert_ctl.inc b/testautomation/chart2/required/includes/ch2_insert_ctl.inc old mode 100644 new mode 100755 index 03a91db6acb1..d01f9f8eee5f --- a/testautomation/chart2/required/includes/ch2_insert_ctl.inc +++ b/testautomation/chart2/required/includes/ch2_insert_ctl.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Chart resource test - CTL features '* diff --git a/testautomation/chart2/required/includes/ch2_menu.inc b/testautomation/chart2/required/includes/ch2_menu.inc old mode 100644 new mode 100755 index 7461fbc1461c..d7f5efbee3a5 --- a/testautomation/chart2/required/includes/ch2_menu.inc +++ b/testautomation/chart2/required/includes/ch2_menu.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Resource Test for chart2 main menus '* diff --git a/testautomation/chart2/required/includes/ch2_ole.inc b/testautomation/chart2/required/includes/ch2_ole.inc old mode 100644 new mode 100755 index 51b5db4a1d5f..6daf6545de41 --- a/testautomation/chart2/required/includes/ch2_ole.inc +++ b/testautomation/chart2/required/includes/ch2_ole.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Chart resource test - section FILE '* diff --git a/testautomation/chart2/required/includes/ch2_toolbars.inc b/testautomation/chart2/required/includes/ch2_toolbars.inc old mode 100644 new mode 100755 index c447078131fc..32eed54ee370 --- a/testautomation/chart2/required/includes/ch2_toolbars.inc +++ b/testautomation/chart2/required/includes/ch2_toolbars.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Chart resource test - section toolbars '* diff --git a/testautomation/chart2/required/includes/ch2_view.inc b/testautomation/chart2/required/includes/ch2_view.inc old mode 100644 new mode 100755 index 32664c0f0b16..39beac14839c --- a/testautomation/chart2/required/includes/ch2_view.inc +++ b/testautomation/chart2/required/includes/ch2_view.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Chart resource test - Menu VIEW '* diff --git a/testautomation/chart2/required/includes/ch2_window.inc b/testautomation/chart2/required/includes/ch2_window.inc old mode 100644 new mode 100755 index a9769c10a278..407898e228d1 --- a/testautomation/chart2/required/includes/ch2_window.inc +++ b/testautomation/chart2/required/includes/ch2_window.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Chart resource test - Menu WINDOW '* diff --git a/testautomation/chart2/required/includes/ch2_wizard.inc b/testautomation/chart2/required/includes/ch2_wizard.inc old mode 100644 new mode 100755 index 5939c9b7e682..df97ba6bda43 --- a/testautomation/chart2/required/includes/ch2_wizard.inc +++ b/testautomation/chart2/required/includes/ch2_wizard.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Create new Chart using the Wizard '* diff --git a/testautomation/chart2/tools/ch_tools_axes.inc b/testautomation/chart2/tools/ch_tools_axes.inc old mode 100644 new mode 100755 index 9ac6788e409d..ef897fbc345f --- a/testautomation/chart2/tools/ch_tools_axes.inc +++ b/testautomation/chart2/tools/ch_tools_axes.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Library for automation of the 'Insert::Axes...' dialog '* diff --git a/testautomation/chart2/tools/ch_tools_chart_type.inc b/testautomation/chart2/tools/ch_tools_chart_type.inc old mode 100644 new mode 100755 index 4cadbb748a11..7cf0a1e7d61b --- a/testautomation/chart2/tools/ch_tools_chart_type.inc +++ b/testautomation/chart2/tools/ch_tools_chart_type.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Tool library for chart type dialog '* diff --git a/testautomation/chart2/tools/ch_tools_common.inc b/testautomation/chart2/tools/ch_tools_common.inc old mode 100644 new mode 100755 index 2a8664109e19..f6d722fa2a25 --- a/testautomation/chart2/tools/ch_tools_common.inc +++ b/testautomation/chart2/tools/ch_tools_common.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Chart2 Tool library '* diff --git a/testautomation/chart2/tools/ch_tools_data_labels.inc b/testautomation/chart2/tools/ch_tools_data_labels.inc old mode 100644 new mode 100755 index d1cf05360e2c..879ddae59361 --- a/testautomation/chart2/tools/ch_tools_data_labels.inc +++ b/testautomation/chart2/tools/ch_tools_data_labels.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Tool library for Data Labels dialog '* diff --git a/testautomation/chart2/tools/ch_tools_grids.inc b/testautomation/chart2/tools/ch_tools_grids.inc old mode 100644 new mode 100755 index 0a0bc8226387..d909ef7426e1 --- a/testautomation/chart2/tools/ch_tools_grids.inc +++ b/testautomation/chart2/tools/ch_tools_grids.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Tool library for Grids dialog '* diff --git a/testautomation/chart2/tools/ch_tools_legend.inc b/testautomation/chart2/tools/ch_tools_legend.inc old mode 100644 new mode 100755 index 9c96ff79eb83..9c16c71d1af7 --- a/testautomation/chart2/tools/ch_tools_legend.inc +++ b/testautomation/chart2/tools/ch_tools_legend.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Tool library for Legend dialog '* diff --git a/testautomation/chart2/tools/ch_tools_select.inc b/testautomation/chart2/tools/ch_tools_select.inc index beeda0d3dcdd..8df51c8d9279 100755 --- a/testautomation/chart2/tools/ch_tools_select.inc +++ b/testautomation/chart2/tools/ch_tools_select.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : selecting charts '* diff --git a/testautomation/chart2/tools/ch_tools_statistics.inc b/testautomation/chart2/tools/ch_tools_statistics.inc old mode 100644 new mode 100755 index d1c3cf6d0bc9..59bd74496113 --- a/testautomation/chart2/tools/ch_tools_statistics.inc +++ b/testautomation/chart2/tools/ch_tools_statistics.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Tool library for Statistics dialog '* diff --git a/testautomation/chart2/tools/ch_tools_tab_borders_lines.inc b/testautomation/chart2/tools/ch_tools_tab_borders_lines.inc old mode 100644 new mode 100755 index 1d5f3e227f6b..4d9847615782 --- a/testautomation/chart2/tools/ch_tools_tab_borders_lines.inc +++ b/testautomation/chart2/tools/ch_tools_tab_borders_lines.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Tool library for Borders and Lines tab-page '* diff --git a/testautomation/chart2/tools/ch_tools_tab_pages.inc b/testautomation/chart2/tools/ch_tools_tab_pages.inc old mode 100644 new mode 100755 index 8d1954d4578c..63d88d35c3ff --- a/testautomation/chart2/tools/ch_tools_tab_pages.inc +++ b/testautomation/chart2/tools/ch_tools_tab_pages.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Tool library for Borders and Lines tab-page '* diff --git a/testautomation/chart2/tools/ch_tools_titles.inc b/testautomation/chart2/tools/ch_tools_titles.inc old mode 100644 new mode 100755 index 0f250a50be70..c3b64a6fa8f7 --- a/testautomation/chart2/tools/ch_tools_titles.inc +++ b/testautomation/chart2/tools/ch_tools_titles.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Tool library for Titles dialog '* diff --git a/testautomation/dbaccess/optional/dba_ctrl_Clipboard.bas b/testautomation/dbaccess/optional/dba_ctrl_Clipboard.bas index 3cbce6ec5da3..be3fe9ad0896 100755 --- a/testautomation/dbaccess/optional/dba_ctrl_Clipboard.bas +++ b/testautomation/dbaccess/optional/dba_ctrl_Clipboard.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Control Clipboard '* diff --git a/testautomation/dbaccess/optional/dba_ctrl_General.bas b/testautomation/dbaccess/optional/dba_ctrl_General.bas index a942539a3abc..4e66c5633d3b 100755 --- a/testautomation/dbaccess/optional/dba_ctrl_General.bas +++ b/testautomation/dbaccess/optional/dba_ctrl_General.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Controls General '* diff --git a/testautomation/dbaccess/optional/dba_ctrl_Grid.bas b/testautomation/dbaccess/optional/dba_ctrl_Grid.bas index 8ca71f992fd6..a143f43bf380 100755 --- a/testautomation/dbaccess/optional/dba_ctrl_Grid.bas +++ b/testautomation/dbaccess/optional/dba_ctrl_Grid.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Grid Control Test '* diff --git a/testautomation/dbaccess/optional/dba_ctrl_PropertyBrowser.bas b/testautomation/dbaccess/optional/dba_ctrl_PropertyBrowser.bas index bd2f6202bccc..e8822bc6f7be 100755 --- a/testautomation/dbaccess/optional/dba_ctrl_PropertyBrowser.bas +++ b/testautomation/dbaccess/optional/dba_ctrl_PropertyBrowser.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Property Browser '* diff --git a/testautomation/dbaccess/optional/dba_ctrl_Several.bas b/testautomation/dbaccess/optional/dba_ctrl_Several.bas index 77053a220d76..9b831063ff5c 100755 --- a/testautomation/dbaccess/optional/dba_ctrl_Several.bas +++ b/testautomation/dbaccess/optional/dba_ctrl_Several.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Controls Several '* diff --git a/testautomation/dbaccess/optional/dba_ctrl_Spreadsheet.bas b/testautomation/dbaccess/optional/dba_ctrl_Spreadsheet.bas index 3f32a23d75ca..fb1e601d26fb 100755 --- a/testautomation/dbaccess/optional/dba_ctrl_Spreadsheet.bas +++ b/testautomation/dbaccess/optional/dba_ctrl_Spreadsheet.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Spreadsheets Controls '* diff --git a/testautomation/dbaccess/optional/dba_ctrl_TextControl.bas b/testautomation/dbaccess/optional/dba_ctrl_TextControl.bas index 36f8c76da19f..6fc6ea2cb40f 100755 --- a/testautomation/dbaccess/optional/dba_ctrl_TextControl.bas +++ b/testautomation/dbaccess/optional/dba_ctrl_TextControl.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Controls Several '* diff --git a/testautomation/dbaccess/optional/dba_ctrl_Wizards.bas b/testautomation/dbaccess/optional/dba_ctrl_Wizards.bas index b037258828a8..05b728090d81 100755 --- a/testautomation/dbaccess/optional/dba_ctrl_Wizards.bas +++ b/testautomation/dbaccess/optional/dba_ctrl_Wizards.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Control Wizard Test '* diff --git a/testautomation/dbaccess/optional/dba_db_ADOAccess.bas b/testautomation/dbaccess/optional/dba_db_ADOAccess.bas index fa2ef9742f4b..78d33762e8dc 100755 --- a/testautomation/dbaccess/optional/dba_db_ADOAccess.bas +++ b/testautomation/dbaccess/optional/dba_db_ADOAccess.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Create ADO Access DS & Table & fill in Test '* diff --git a/testautomation/dbaccess/optional/dba_db_AdabasD.bas b/testautomation/dbaccess/optional/dba_db_AdabasD.bas index 9d767dfc09d3..d4adc067d343 100755 --- a/testautomation/dbaccess/optional/dba_db_AdabasD.bas +++ b/testautomation/dbaccess/optional/dba_db_AdabasD.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Create Adabas DS & Table & fill in Test '* diff --git a/testautomation/dbaccess/optional/dba_db_Addressbook.bas b/testautomation/dbaccess/optional/dba_db_Addressbook.bas index 868d2babfa6b..3a5a8fe218f9 100755 --- a/testautomation/dbaccess/optional/dba_db_Addressbook.bas +++ b/testautomation/dbaccess/optional/dba_db_Addressbook.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Address Book '* diff --git a/testautomation/dbaccess/optional/dba_db_Dbase.bas b/testautomation/dbaccess/optional/dba_db_Dbase.bas index ababbc0bf74d..a5f6712c6b6e 100755 --- a/testautomation/dbaccess/optional/dba_db_Dbase.bas +++ b/testautomation/dbaccess/optional/dba_db_Dbase.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Create dBase DS & Table & fill in Test '* diff --git a/testautomation/dbaccess/optional/dba_db_JDBCMySQL.bas b/testautomation/dbaccess/optional/dba_db_JDBCMySQL.bas index 5d80f4ec56b7..7f0843575e2e 100755 --- a/testautomation/dbaccess/optional/dba_db_JDBCMySQL.bas +++ b/testautomation/dbaccess/optional/dba_db_JDBCMySQL.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Create JDBC MySQL DS & Table & fill in Test '* diff --git a/testautomation/dbaccess/optional/dba_db_Spreadsheet.bas b/testautomation/dbaccess/optional/dba_db_Spreadsheet.bas index 91e93015ec8f..e61dff1a44f1 100755 --- a/testautomation/dbaccess/optional/dba_db_Spreadsheet.bas +++ b/testautomation/dbaccess/optional/dba_db_Spreadsheet.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Create Spreadsheet DS & standard ds tests '* diff --git a/testautomation/dbaccess/optional/dba_db_Text.bas b/testautomation/dbaccess/optional/dba_db_Text.bas index 5e01a89693d6..1193a3342569 100755 --- a/testautomation/dbaccess/optional/dba_db_Text.bas +++ b/testautomation/dbaccess/optional/dba_db_Text.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Create Text DS & further standard db tests '* diff --git a/testautomation/dbaccess/optional/dba_db_dBase_functions.bas b/testautomation/dbaccess/optional/dba_db_dBase_functions.bas index 1646c48df088..58f5ff23914f 100755 --- a/testautomation/dbaccess/optional/dba_db_dBase_functions.bas +++ b/testautomation/dbaccess/optional/dba_db_dBase_functions.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Optional test for dBase functions '* diff --git a/testautomation/dbaccess/optional/dba_db_hsqldb.bas b/testautomation/dbaccess/optional/dba_db_hsqldb.bas index 925d73f9385f..3aa06329a03a 100755 --- a/testautomation/dbaccess/optional/dba_db_hsqldb.bas +++ b/testautomation/dbaccess/optional/dba_db_hsqldb.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : hsqldb test '* diff --git a/testautomation/dbaccess/optional/dba_frm_FormFilter.bas b/testautomation/dbaccess/optional/dba_frm_FormFilter.bas index e91882002242..a820e1d36e58 100755 --- a/testautomation/dbaccess/optional/dba_frm_FormFilter.bas +++ b/testautomation/dbaccess/optional/dba_frm_FormFilter.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Form Filter Test '* diff --git a/testautomation/dbaccess/optional/dba_frm_Forms.bas b/testautomation/dbaccess/optional/dba_frm_Forms.bas index 18efcfbe164f..65d0a7280466 100755 --- a/testautomation/dbaccess/optional/dba_frm_Forms.bas +++ b/testautomation/dbaccess/optional/dba_frm_Forms.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Forms Test '* diff --git a/testautomation/dbaccess/optional/dba_misc_Macros.bas b/testautomation/dbaccess/optional/dba_misc_Macros.bas old mode 100755 new mode 100644 index e0d2e44a1dbe..659396bb98aa --- a/testautomation/dbaccess/optional/dba_misc_Macros.bas +++ b/testautomation/dbaccess/optional/dba_misc_Macros.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Macros in Databases '* diff --git a/testautomation/dbaccess/optional/dba_misc_RegisterDatabase.bas b/testautomation/dbaccess/optional/dba_misc_RegisterDatabase.bas index 411a50bc4543..125010d42120 100755 --- a/testautomation/dbaccess/optional/dba_misc_RegisterDatabase.bas +++ b/testautomation/dbaccess/optional/dba_misc_RegisterDatabase.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Register Databases '* diff --git a/testautomation/dbaccess/optional/dba_rpt_DateTime.bas b/testautomation/dbaccess/optional/dba_rpt_DateTime.bas index 5b9267c3e1b1..e53a92b97f1d 100755 --- a/testautomation/dbaccess/optional/dba_rpt_DateTime.bas +++ b/testautomation/dbaccess/optional/dba_rpt_DateTime.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Report Builder Date Time '* diff --git a/testautomation/dbaccess/optional/dba_rpt_ExecuteReport.bas b/testautomation/dbaccess/optional/dba_rpt_ExecuteReport.bas index c64207b76b0d..e2e290daed42 100755 --- a/testautomation/dbaccess/optional/dba_rpt_ExecuteReport.bas +++ b/testautomation/dbaccess/optional/dba_rpt_ExecuteReport.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Report Builder Execute Report '* diff --git a/testautomation/dbaccess/optional/dba_rpt_Formating.bas b/testautomation/dbaccess/optional/dba_rpt_Formating.bas index dcb9d99f4038..bcbb67a1e10e 100755 --- a/testautomation/dbaccess/optional/dba_rpt_Formating.bas +++ b/testautomation/dbaccess/optional/dba_rpt_Formating.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Base Optional Test for Conditional Formating '* diff --git a/testautomation/dbaccess/optional/dba_rpt_FunctionWizard.bas b/testautomation/dbaccess/optional/dba_rpt_FunctionWizard.bas index 4fa2fa64dca9..b0c868d7651a 100755 --- a/testautomation/dbaccess/optional/dba_rpt_FunctionWizard.bas +++ b/testautomation/dbaccess/optional/dba_rpt_FunctionWizard.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Report Builder Function Wizard '* diff --git a/testautomation/dbaccess/optional/dba_rpt_Grouping.bas b/testautomation/dbaccess/optional/dba_rpt_Grouping.bas index 3cc7a4c7c260..3702ba49a370 100755 --- a/testautomation/dbaccess/optional/dba_rpt_Grouping.bas +++ b/testautomation/dbaccess/optional/dba_rpt_Grouping.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Report Builder Grouping Report '* diff --git a/testautomation/dbaccess/optional/dba_rpt_PageNumber.bas b/testautomation/dbaccess/optional/dba_rpt_PageNumber.bas index 0c390a01dbc3..483b0522199e 100755 --- a/testautomation/dbaccess/optional/dba_rpt_PageNumber.bas +++ b/testautomation/dbaccess/optional/dba_rpt_PageNumber.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Report Builder Page Number '* diff --git a/testautomation/dbaccess/optional/dba_rpt_PropertyBrowser.bas b/testautomation/dbaccess/optional/dba_rpt_PropertyBrowser.bas index 21938422eb21..e605369bed24 100755 --- a/testautomation/dbaccess/optional/dba_rpt_PropertyBrowser.bas +++ b/testautomation/dbaccess/optional/dba_rpt_PropertyBrowser.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Test for the property browser '* diff --git a/testautomation/dbaccess/optional/dba_wiz_CopyTableWizard.bas b/testautomation/dbaccess/optional/dba_wiz_CopyTableWizard.bas index 5a223a7f600a..4a65067152e8 100755 --- a/testautomation/dbaccess/optional/dba_wiz_CopyTableWizard.bas +++ b/testautomation/dbaccess/optional/dba_wiz_CopyTableWizard.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Copy Table Wizard '* diff --git a/testautomation/dbaccess/optional/dba_wiz_DatabaseWizards.bas b/testautomation/dbaccess/optional/dba_wiz_DatabaseWizards.bas index dfad77310e46..5e97e0dd1f76 100755 --- a/testautomation/dbaccess/optional/dba_wiz_DatabaseWizards.bas +++ b/testautomation/dbaccess/optional/dba_wiz_DatabaseWizards.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Database Wizard Test '* diff --git a/testautomation/dbaccess/optional/dba_wiz_FormWizard.bas b/testautomation/dbaccess/optional/dba_wiz_FormWizard.bas index cf3b26c59293..75377cd71fcd 100755 --- a/testautomation/dbaccess/optional/dba_wiz_FormWizard.bas +++ b/testautomation/dbaccess/optional/dba_wiz_FormWizard.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Form Wizard Test '* diff --git a/testautomation/dbaccess/optional/dba_wiz_QueryWizard.bas b/testautomation/dbaccess/optional/dba_wiz_QueryWizard.bas index 306c684d03e8..79b05f86de9a 100755 --- a/testautomation/dbaccess/optional/dba_wiz_QueryWizard.bas +++ b/testautomation/dbaccess/optional/dba_wiz_QueryWizard.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Query Autopilot Test '* diff --git a/testautomation/dbaccess/optional/dba_wiz_ReportWizard.bas b/testautomation/dbaccess/optional/dba_wiz_ReportWizard.bas index e20fd7c6fc1f..984e1c2fd644 100755 --- a/testautomation/dbaccess/optional/dba_wiz_ReportWizard.bas +++ b/testautomation/dbaccess/optional/dba_wiz_ReportWizard.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Report Wizard '* diff --git a/testautomation/dbaccess/optional/dba_wiz_TableWizard.bas b/testautomation/dbaccess/optional/dba_wiz_TableWizard.bas index 4a5e28051b9e..458976b3a419 100755 --- a/testautomation/dbaccess/optional/dba_wiz_TableWizard.bas +++ b/testautomation/dbaccess/optional/dba_wiz_TableWizard.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Table Wizard Test '* diff --git a/testautomation/dbaccess/optional/dba_xf_Submission.bas b/testautomation/dbaccess/optional/dba_xf_Submission.bas index 590869a40a1e..460cd8a13554 100755 --- a/testautomation/dbaccess/optional/dba_xf_Submission.bas +++ b/testautomation/dbaccess/optional/dba_xf_Submission.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : XForm Submission Test '* diff --git a/testautomation/dbaccess/optional/includes/ctrl_Clipboard.inc b/testautomation/dbaccess/optional/includes/ctrl_Clipboard.inc old mode 100644 new mode 100755 index 005d5d3f0ec7..020f0bb8435b --- a/testautomation/dbaccess/optional/includes/ctrl_Clipboard.inc +++ b/testautomation/dbaccess/optional/includes/ctrl_Clipboard.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Clipboard test with controls between all application '* diff --git a/testautomation/dbaccess/optional/includes/ctrl_General.inc b/testautomation/dbaccess/optional/includes/ctrl_General.inc index 00c1b17e4c4b..9e137f4c7a70 100755 --- a/testautomation/dbaccess/optional/includes/ctrl_General.inc +++ b/testautomation/dbaccess/optional/includes/ctrl_General.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Data Source Administrator '* diff --git a/testautomation/dbaccess/optional/includes/ctrl_Grid.inc b/testautomation/dbaccess/optional/includes/ctrl_Grid.inc old mode 100644 new mode 100755 index cda004644496..4b41014a2257 --- a/testautomation/dbaccess/optional/includes/ctrl_Grid.inc +++ b/testautomation/dbaccess/optional/includes/ctrl_Grid.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Grid Control Test '* diff --git a/testautomation/dbaccess/optional/includes/ctrl_PropertyBrowser.inc b/testautomation/dbaccess/optional/includes/ctrl_PropertyBrowser.inc old mode 100644 new mode 100755 index feee460b9e5d..f51b14ea191b --- a/testautomation/dbaccess/optional/includes/ctrl_PropertyBrowser.inc +++ b/testautomation/dbaccess/optional/includes/ctrl_PropertyBrowser.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Property Browser '* diff --git a/testautomation/dbaccess/optional/includes/ctrl_Several1.inc b/testautomation/dbaccess/optional/includes/ctrl_Several1.inc index 0d7b24cbc0f2..4e0cd9334800 100755 --- a/testautomation/dbaccess/optional/includes/ctrl_Several1.inc +++ b/testautomation/dbaccess/optional/includes/ctrl_Several1.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Control Serveral Part 1 - check each control and each property '* diff --git a/testautomation/dbaccess/optional/includes/ctrl_Several2.inc b/testautomation/dbaccess/optional/includes/ctrl_Several2.inc index 4d49e459b231..82fa9229b1f8 100755 --- a/testautomation/dbaccess/optional/includes/ctrl_Several2.inc +++ b/testautomation/dbaccess/optional/includes/ctrl_Several2.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Control Serveral Part 2 (more controls) - check each control and each property '* diff --git a/testautomation/dbaccess/optional/includes/ctrl_Spreadsheet.inc b/testautomation/dbaccess/optional/includes/ctrl_Spreadsheet.inc old mode 100644 new mode 100755 index 600a0173a772..57a7973a8f89 --- a/testautomation/dbaccess/optional/includes/ctrl_Spreadsheet.inc +++ b/testautomation/dbaccess/optional/includes/ctrl_Spreadsheet.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Controls linked to spreadsheet cells '* diff --git a/testautomation/dbaccess/optional/includes/ctrl_TextControl.inc b/testautomation/dbaccess/optional/includes/ctrl_TextControl.inc old mode 100644 new mode 100755 index 00563d2a2bf8..4abf5a19b73d --- a/testautomation/dbaccess/optional/includes/ctrl_TextControl.inc +++ b/testautomation/dbaccess/optional/includes/ctrl_TextControl.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Text Control '* diff --git a/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc b/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc index 7c48e78e149d..49bcaceb6ac7 100755 --- a/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc +++ b/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Control Wizards Test '* diff --git a/testautomation/dbaccess/optional/includes/db_ADOAccess.inc b/testautomation/dbaccess/optional/includes/db_ADOAccess.inc old mode 100644 new mode 100755 index bd149f79d312..aeb14d7616ac --- a/testautomation/dbaccess/optional/includes/db_ADOAccess.inc +++ b/testautomation/dbaccess/optional/includes/db_ADOAccess.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Create ADO Access DS & Table & fill in Test '* diff --git a/testautomation/dbaccess/optional/includes/db_AdabasD.inc b/testautomation/dbaccess/optional/includes/db_AdabasD.inc old mode 100644 new mode 100755 index 0d72c0ab40b5..d5498582fa0a --- a/testautomation/dbaccess/optional/includes/db_AdabasD.inc +++ b/testautomation/dbaccess/optional/includes/db_AdabasD.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Create Adabas DS & Table & fill in Test '* diff --git a/testautomation/dbaccess/optional/includes/db_Dbase.inc b/testautomation/dbaccess/optional/includes/db_Dbase.inc old mode 100644 new mode 100755 index 0caf8935ee74..7b5a67e7496d --- a/testautomation/dbaccess/optional/includes/db_Dbase.inc +++ b/testautomation/dbaccess/optional/includes/db_Dbase.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Create dBase DS & Table & fill in Test '* diff --git a/testautomation/dbaccess/optional/includes/db_DbaseFunction.inc b/testautomation/dbaccess/optional/includes/db_DbaseFunction.inc old mode 100644 new mode 100755 index 74e26f16e33a..6d690a29225a --- a/testautomation/dbaccess/optional/includes/db_DbaseFunction.inc +++ b/testautomation/dbaccess/optional/includes/db_DbaseFunction.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Dbase function test '* diff --git a/testautomation/dbaccess/optional/includes/db_IndexDesign.inc b/testautomation/dbaccess/optional/includes/db_IndexDesign.inc old mode 100644 new mode 100755 index eb5a400c19c1..a41f2b396042 --- a/testautomation/dbaccess/optional/includes/db_IndexDesign.inc +++ b/testautomation/dbaccess/optional/includes/db_IndexDesign.inc @@ -26,7 +26,7 @@ '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : tests for indexes '* diff --git a/testautomation/dbaccess/optional/includes/db_JDBCMySQL.inc b/testautomation/dbaccess/optional/includes/db_JDBCMySQL.inc index bf2b9892d118..93f864d7e0d4 100755 --- a/testautomation/dbaccess/optional/includes/db_JDBCMySQL.inc +++ b/testautomation/dbaccess/optional/includes/db_JDBCMySQL.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Create JDBC MySQL DS & Table & fill in Test '* diff --git a/testautomation/dbaccess/optional/includes/db_Mozilla.inc b/testautomation/dbaccess/optional/includes/db_Mozilla.inc old mode 100644 new mode 100755 index aefc2a51679f..45cf9456d290 --- a/testautomation/dbaccess/optional/includes/db_Mozilla.inc +++ b/testautomation/dbaccess/optional/includes/db_Mozilla.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Address book mozilla '* diff --git a/testautomation/dbaccess/optional/includes/db_ODBCMySQL.inc b/testautomation/dbaccess/optional/includes/db_ODBCMySQL.inc old mode 100644 new mode 100755 index 0dab9fe9551e..0fd0a8bcfb5f --- a/testautomation/dbaccess/optional/includes/db_ODBCMySQL.inc +++ b/testautomation/dbaccess/optional/includes/db_ODBCMySQL.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : ODBC MySQL Test '* diff --git a/testautomation/dbaccess/optional/includes/db_Query.inc b/testautomation/dbaccess/optional/includes/db_Query.inc old mode 100644 new mode 100755 index bb93fd4d94cf..46dce6e903c6 --- a/testautomation/dbaccess/optional/includes/db_Query.inc +++ b/testautomation/dbaccess/optional/includes/db_Query.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Query Test Library '* diff --git a/testautomation/dbaccess/optional/includes/db_Relations.inc b/testautomation/dbaccess/optional/includes/db_Relations.inc index e04a1be4c6d6..98a94562c743 100755 --- a/testautomation/dbaccess/optional/includes/db_Relations.inc +++ b/testautomation/dbaccess/optional/includes/db_Relations.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Base Level 1 Create Relations between Test Tables '* diff --git a/testautomation/dbaccess/optional/includes/db_Spreadsheet.inc b/testautomation/dbaccess/optional/includes/db_Spreadsheet.inc old mode 100644 new mode 100755 index 37f1ddc8e1af..87eb5e1ce240 --- a/testautomation/dbaccess/optional/includes/db_Spreadsheet.inc +++ b/testautomation/dbaccess/optional/includes/db_Spreadsheet.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Create Spreadsheet DS & standard ds tests '* diff --git a/testautomation/dbaccess/optional/includes/db_Text.inc b/testautomation/dbaccess/optional/includes/db_Text.inc old mode 100644 new mode 100755 index b6dcd729d351..6130aee378b8 --- a/testautomation/dbaccess/optional/includes/db_Text.inc +++ b/testautomation/dbaccess/optional/includes/db_Text.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : test for a text database '* diff --git a/testautomation/dbaccess/optional/includes/db_Windows.inc b/testautomation/dbaccess/optional/includes/db_Windows.inc old mode 100644 new mode 100755 index 60382a91ed3c..6d675f2dd07f --- a/testautomation/dbaccess/optional/includes/db_Windows.inc +++ b/testautomation/dbaccess/optional/includes/db_Windows.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Addressbook Windows '* diff --git a/testautomation/dbaccess/optional/includes/db_hsqldb.inc b/testautomation/dbaccess/optional/includes/db_hsqldb.inc index 3ad3016a9eb3..061f786017ba 100755 --- a/testautomation/dbaccess/optional/includes/db_hsqldb.inc +++ b/testautomation/dbaccess/optional/includes/db_hsqldb.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : hsqldb test '* diff --git a/testautomation/dbaccess/optional/includes/frm_FormFilter.inc b/testautomation/dbaccess/optional/includes/frm_FormFilter.inc index 52579da2e15b..bdcf1c4bc63b 100755 --- a/testautomation/dbaccess/optional/includes/frm_FormFilter.inc +++ b/testautomation/dbaccess/optional/includes/frm_FormFilter.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Form Filter Test Library '* diff --git a/testautomation/dbaccess/optional/includes/frm_Forms.inc b/testautomation/dbaccess/optional/includes/frm_Forms.inc old mode 100644 new mode 100755 index 6b63754314e4..b31a064e60ee --- a/testautomation/dbaccess/optional/includes/frm_Forms.inc +++ b/testautomation/dbaccess/optional/includes/frm_Forms.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Form Test '* diff --git a/testautomation/dbaccess/optional/includes/misc_Macros.inc b/testautomation/dbaccess/optional/includes/misc_Macros.inc index dc14c715c305..e707682e3218 100755 --- a/testautomation/dbaccess/optional/includes/misc_Macros.inc +++ b/testautomation/dbaccess/optional/includes/misc_Macros.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : macros in databases '* diff --git a/testautomation/dbaccess/optional/includes/misc_RegisterDatabase.inc b/testautomation/dbaccess/optional/includes/misc_RegisterDatabase.inc old mode 100644 new mode 100755 index d072fbab0139..7e9eabf664d9 --- a/testautomation/dbaccess/optional/includes/misc_RegisterDatabase.inc +++ b/testautomation/dbaccess/optional/includes/misc_RegisterDatabase.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Register database '* diff --git a/testautomation/dbaccess/optional/includes/rpt_DateTime.inc b/testautomation/dbaccess/optional/includes/rpt_DateTime.inc old mode 100644 new mode 100755 index 648fc64c72bc..53c9570a5d75 --- a/testautomation/dbaccess/optional/includes/rpt_DateTime.inc +++ b/testautomation/dbaccess/optional/includes/rpt_DateTime.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Date Time Dialog '* diff --git a/testautomation/dbaccess/optional/includes/rpt_ExecuteReport.inc b/testautomation/dbaccess/optional/includes/rpt_ExecuteReport.inc old mode 100644 new mode 100755 index 084cdea51787..91270481ca7b --- a/testautomation/dbaccess/optional/includes/rpt_ExecuteReport.inc +++ b/testautomation/dbaccess/optional/includes/rpt_ExecuteReport.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Execute Report '* diff --git a/testautomation/dbaccess/optional/includes/rpt_Formating.inc b/testautomation/dbaccess/optional/includes/rpt_Formating.inc old mode 100644 new mode 100755 index b4d022afd126..e2671728b168 --- a/testautomation/dbaccess/optional/includes/rpt_Formating.inc +++ b/testautomation/dbaccess/optional/includes/rpt_Formating.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Formating '* diff --git a/testautomation/dbaccess/optional/includes/rpt_FunctionWizard.inc b/testautomation/dbaccess/optional/includes/rpt_FunctionWizard.inc old mode 100644 new mode 100755 index 4435136e1a85..810b2168c3ce --- a/testautomation/dbaccess/optional/includes/rpt_FunctionWizard.inc +++ b/testautomation/dbaccess/optional/includes/rpt_FunctionWizard.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Function Wizard '* diff --git a/testautomation/dbaccess/optional/includes/rpt_Grouping.inc b/testautomation/dbaccess/optional/includes/rpt_Grouping.inc old mode 100644 new mode 100755 index 3497dc446aef..229aebb7f599 --- a/testautomation/dbaccess/optional/includes/rpt_Grouping.inc +++ b/testautomation/dbaccess/optional/includes/rpt_Grouping.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Grouping Report '* diff --git a/testautomation/dbaccess/optional/includes/rpt_PageNumber.inc b/testautomation/dbaccess/optional/includes/rpt_PageNumber.inc old mode 100644 new mode 100755 index 7a3881a56dc7..a7fae4c7ffd4 --- a/testautomation/dbaccess/optional/includes/rpt_PageNumber.inc +++ b/testautomation/dbaccess/optional/includes/rpt_PageNumber.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Page Number '* diff --git a/testautomation/dbaccess/optional/includes/rpt_PropertyBrowser.inc b/testautomation/dbaccess/optional/includes/rpt_PropertyBrowser.inc old mode 100644 new mode 100755 index 9f14245b7b48..b3ee038a2f81 --- a/testautomation/dbaccess/optional/includes/rpt_PropertyBrowser.inc +++ b/testautomation/dbaccess/optional/includes/rpt_PropertyBrowser.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Property Browser '* diff --git a/testautomation/dbaccess/optional/includes/wiz_CopyTableWizard.inc b/testautomation/dbaccess/optional/includes/wiz_CopyTableWizard.inc old mode 100644 new mode 100755 index 0cc614af0d87..34f6cb3e3ecf --- a/testautomation/dbaccess/optional/includes/wiz_CopyTableWizard.inc +++ b/testautomation/dbaccess/optional/includes/wiz_CopyTableWizard.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Copy Table Autopilot '* diff --git a/testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc b/testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc index bd25224ba429..df9026ba2dd9 100755 --- a/testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc +++ b/testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Database Wizard '* diff --git a/testautomation/dbaccess/optional/includes/wiz_FormWizard.inc b/testautomation/dbaccess/optional/includes/wiz_FormWizard.inc old mode 100644 new mode 100755 index 55350854f0af..b3949b40ed49 --- a/testautomation/dbaccess/optional/includes/wiz_FormWizard.inc +++ b/testautomation/dbaccess/optional/includes/wiz_FormWizard.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Form Wizard Test '* diff --git a/testautomation/dbaccess/optional/includes/wiz_QueryWizard.inc b/testautomation/dbaccess/optional/includes/wiz_QueryWizard.inc old mode 100644 new mode 100755 index fad77d94f9de..19411fd4f105 --- a/testautomation/dbaccess/optional/includes/wiz_QueryWizard.inc +++ b/testautomation/dbaccess/optional/includes/wiz_QueryWizard.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Query Autopilot Test '* preconditions : Adabas has to be installed on the test machine diff --git a/testautomation/dbaccess/optional/includes/wiz_ReportWizard.inc b/testautomation/dbaccess/optional/includes/wiz_ReportWizard.inc old mode 100644 new mode 100755 index f089ecb191ff..67010e64fbfb --- a/testautomation/dbaccess/optional/includes/wiz_ReportWizard.inc +++ b/testautomation/dbaccess/optional/includes/wiz_ReportWizard.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Report Wizard Test '* diff --git a/testautomation/dbaccess/optional/includes/wiz_TableWizard.inc b/testautomation/dbaccess/optional/includes/wiz_TableWizard.inc old mode 100644 new mode 100755 index 791a31344ae7..cce02149942f --- a/testautomation/dbaccess/optional/includes/wiz_TableWizard.inc +++ b/testautomation/dbaccess/optional/includes/wiz_TableWizard.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Table Wizard '* diff --git a/testautomation/dbaccess/optional/includes/xf_Submission.inc b/testautomation/dbaccess/optional/includes/xf_Submission.inc old mode 100644 new mode 100755 index adfd53e5fe23..ad24c621b867 --- a/testautomation/dbaccess/optional/includes/xf_Submission.inc +++ b/testautomation/dbaccess/optional/includes/xf_Submission.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : XForms submission Test '* diff --git a/testautomation/dbaccess/required/dba_Main.bas b/testautomation/dbaccess/required/dba_Main.bas index 93a026489767..0d07dde2f3fb 100755 --- a/testautomation/dbaccess/required/dba_Main.bas +++ b/testautomation/dbaccess/required/dba_Main.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : DBAccess Main Test '* diff --git a/testautomation/dbaccess/required/dba_ReportBuilder.bas b/testautomation/dbaccess/required/dba_ReportBuilder.bas index 38be95f378fe..c57e31d2e45b 100755 --- a/testautomation/dbaccess/required/dba_ReportBuilder.bas +++ b/testautomation/dbaccess/required/dba_ReportBuilder.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Report Builder Main Test '* diff --git a/testautomation/dbaccess/required/dba_xforms_Main.bas b/testautomation/dbaccess/required/dba_xforms_Main.bas index 9e0dc16593b9..52efa7af582f 100755 --- a/testautomation/dbaccess/required/dba_xforms_Main.bas +++ b/testautomation/dbaccess/required/dba_xforms_Main.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : XForms Update Test '* diff --git a/testautomation/dbaccess/required/includes/DatabaseTypes.inc b/testautomation/dbaccess/required/includes/DatabaseTypes.inc index 02c8d29b63c7..ae5688374c75 100755 --- a/testautomation/dbaccess/required/includes/DatabaseTypes.inc +++ b/testautomation/dbaccess/required/includes/DatabaseTypes.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : test the database types '* diff --git a/testautomation/dbaccess/required/includes/Forms.inc b/testautomation/dbaccess/required/includes/Forms.inc old mode 100644 new mode 100755 index 288d4d250b0f..45c308f2b1f7 --- a/testautomation/dbaccess/required/includes/Forms.inc +++ b/testautomation/dbaccess/required/includes/Forms.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : test forms '* diff --git a/testautomation/dbaccess/required/includes/MainApp.inc b/testautomation/dbaccess/required/includes/MainApp.inc index eab441cbb228..fddb8d34667f 100755 --- a/testautomation/dbaccess/required/includes/MainApp.inc +++ b/testautomation/dbaccess/required/includes/MainApp.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : test the Main Application Window '* diff --git a/testautomation/dbaccess/required/includes/Query.inc b/testautomation/dbaccess/required/includes/Query.inc index f6fa45acbdd7..0fa9d6addb24 100755 --- a/testautomation/dbaccess/required/includes/Query.inc +++ b/testautomation/dbaccess/required/includes/Query.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : test the Main Query Application Window '* diff --git a/testautomation/dbaccess/required/includes/ReportBuilder01.inc b/testautomation/dbaccess/required/includes/ReportBuilder01.inc old mode 100644 new mode 100755 index c6ecfb9520e5..d1cce59d4d3f --- a/testautomation/dbaccess/required/includes/ReportBuilder01.inc +++ b/testautomation/dbaccess/required/includes/ReportBuilder01.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : report builder include file '* diff --git a/testautomation/dbaccess/required/includes/Table.inc b/testautomation/dbaccess/required/includes/Table.inc index f7a00c22fcd5..6d478bd35540 100755 --- a/testautomation/dbaccess/required/includes/Table.inc +++ b/testautomation/dbaccess/required/includes/Table.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : test the Main Table Application Window '* diff --git a/testautomation/dbaccess/required/includes/TableDesign.inc b/testautomation/dbaccess/required/includes/TableDesign.inc index 9204d34de1b9..9da4d602a6d9 100755 --- a/testautomation/dbaccess/required/includes/TableDesign.inc +++ b/testautomation/dbaccess/required/includes/TableDesign.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : test the Main Table Design Application Window '* diff --git a/testautomation/dbaccess/required/includes/Wizards.inc b/testautomation/dbaccess/required/includes/Wizards.inc old mode 100644 new mode 100755 index 84e6c45a0e18..4cde075d0e35 --- a/testautomation/dbaccess/required/includes/Wizards.inc +++ b/testautomation/dbaccess/required/includes/Wizards.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : test the Main Wizard Application Window '* diff --git a/testautomation/dbaccess/required/includes/Xforms01.inc b/testautomation/dbaccess/required/includes/Xforms01.inc old mode 100644 new mode 100755 index 458a3df26cfe..fcf3e03a98ea --- a/testautomation/dbaccess/required/includes/Xforms01.inc +++ b/testautomation/dbaccess/required/includes/Xforms01.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : XForms Main Test include file '* diff --git a/testautomation/dbaccess/tools/controltools.inc b/testautomation/dbaccess/tools/controltools.inc old mode 100644 new mode 100755 index 5d3e3bfbc03a..28b0583c0b42 --- a/testautomation/dbaccess/tools/controltools.inc +++ b/testautomation/dbaccess/tools/controltools.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Helper Routines for Form and Control Tests '* diff --git a/testautomation/dbaccess/tools/dbcreatetools.inc b/testautomation/dbaccess/tools/dbcreatetools.inc index 964c2be5e64d..2658281f65be 100755 --- a/testautomation/dbaccess/tools/dbcreatetools.inc +++ b/testautomation/dbaccess/tools/dbcreatetools.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Library with function for creating all possible databases '* diff --git a/testautomation/dbaccess/tools/dbinit.inc b/testautomation/dbaccess/tools/dbinit.inc old mode 100644 new mode 100755 index e6d3692499d1..53f192747926 --- a/testautomation/dbaccess/tools/dbinit.inc +++ b/testautomation/dbaccess/tools/dbinit.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Helper Routines for Base tests. '* diff --git a/testautomation/dbaccess/tools/dbtools.inc b/testautomation/dbaccess/tools/dbtools.inc index dd884d2cab1c..2e40a3f25726 100755 --- a/testautomation/dbaccess/tools/dbtools.inc +++ b/testautomation/dbaccess/tools/dbtools.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Helper Routines for Base tests. '* diff --git a/testautomation/dbaccess/tools/formtools.inc b/testautomation/dbaccess/tools/formtools.inc index 90d29b647384..ef7105ccef22 100755 --- a/testautomation/dbaccess/tools/formtools.inc +++ b/testautomation/dbaccess/tools/formtools.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Helper Routines for Base tests. '* diff --git a/testautomation/dbaccess/tools/querytools.inc b/testautomation/dbaccess/tools/querytools.inc old mode 100644 new mode 100755 index f4fc4aeb4847..29416dac7bf3 --- a/testautomation/dbaccess/tools/querytools.inc +++ b/testautomation/dbaccess/tools/querytools.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Helper Routines for Base tests. '* diff --git a/testautomation/dbaccess/tools/reporttools.inc b/testautomation/dbaccess/tools/reporttools.inc index 89dd00b504c6..4f7a6eb6d44c 100755 --- a/testautomation/dbaccess/tools/reporttools.inc +++ b/testautomation/dbaccess/tools/reporttools.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Report Helper Routines for Base tests. '* diff --git a/testautomation/dbaccess/tools/tabletools.inc b/testautomation/dbaccess/tools/tabletools.inc index fb354dcd4a75..99c4abf723b3 100755 --- a/testautomation/dbaccess/tools/tabletools.inc +++ b/testautomation/dbaccess/tools/tabletools.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : marc.neumann@sun.com +'* owner : marc.neumann@oracle.com '* '* short description : Tools for Tables '* diff --git a/testautomation/extensions/optional/e_display_name.bas b/testautomation/extensions/optional/e_display_name.bas index 61c57458b374..c05ce235cb25 100755 --- a/testautomation/extensions/optional/e_display_name.bas +++ b/testautomation/extensions/optional/e_display_name.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Extension display names '* diff --git a/testautomation/extensions/optional/e_extensions.bas b/testautomation/extensions/optional/e_extensions.bas index 2ea2a68a0ef5..fb7decd9eed6 100755 --- a/testautomation/extensions/optional/e_extensions.bas +++ b/testautomation/extensions/optional/e_extensions.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : Function test of extension manager '* diff --git a/testautomation/extensions/optional/e_fileopen.bas b/testautomation/extensions/optional/e_fileopen.bas index 3cc2ea374869..63afebe693ba 100755 --- a/testautomation/extensions/optional/e_fileopen.bas +++ b/testautomation/extensions/optional/e_fileopen.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : CWS oxtsysint01 enables installing extensions via file open dialog '* diff --git a/testautomation/extensions/optional/e_help.bas b/testautomation/extensions/optional/e_help.bas index 3f18db86689d..79420ad9d4de 100755 --- a/testautomation/extensions/optional/e_help.bas +++ b/testautomation/extensions/optional/e_help.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Extensible help '* diff --git a/testautomation/extensions/optional/e_identifiers.bas b/testautomation/extensions/optional/e_identifiers.bas index 526447987d2e..3eea26b9d46f 100755 --- a/testautomation/extensions/optional/e_identifiers.bas +++ b/testautomation/extensions/optional/e_identifiers.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Use unique identifiers instead of filenames for extensions '* diff --git a/testautomation/extensions/optional/e_issues.bas b/testautomation/extensions/optional/e_issues.bas old mode 100755 new mode 100644 index 549ad69b1a2e..cd3a4fe2f2ad --- a/testautomation/extensions/optional/e_issues.bas +++ b/testautomation/extensions/optional/e_issues.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Extension publisher string '* diff --git a/testautomation/extensions/optional/e_location.bas b/testautomation/extensions/optional/e_location.bas index bec66a615c99..cfe2f0c0fb19 100755 --- a/testautomation/extensions/optional/e_location.bas +++ b/testautomation/extensions/optional/e_location.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Test the extension locator service '* diff --git a/testautomation/extensions/optional/e_meta-inf.bas b/testautomation/extensions/optional/e_meta-inf.bas index 7eb96001aed0..1e4e80dc1f0b 100755 --- a/testautomation/extensions/optional/e_meta-inf.bas +++ b/testautomation/extensions/optional/e_meta-inf.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Case sensitive META-INF file '* diff --git a/testautomation/extensions/optional/e_online_update.bas b/testautomation/extensions/optional/e_online_update.bas index f0f63c3514ed..0a23d2ad4aa7 100755 --- a/testautomation/extensions/optional/e_online_update.bas +++ b/testautomation/extensions/optional/e_online_update.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Hit update button for an extension '* diff --git a/testautomation/extensions/optional/e_options.bas b/testautomation/extensions/optional/e_options.bas index 97126a333bb8..bfa0a14e16a5 100755 --- a/testautomation/extensions/optional/e_options.bas +++ b/testautomation/extensions/optional/e_options.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Options for extensions '* diff --git a/testautomation/extensions/optional/e_platforms.bas b/testautomation/extensions/optional/e_platforms.bas index fa8a348733b7..3884e374317f 100755 --- a/testautomation/extensions/optional/e_platforms.bas +++ b/testautomation/extensions/optional/e_platforms.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Supported extension platforms '* diff --git a/testautomation/extensions/optional/e_publisher.bas b/testautomation/extensions/optional/e_publisher.bas index c1dde48729dc..e87d84d05f49 100755 --- a/testautomation/extensions/optional/e_publisher.bas +++ b/testautomation/extensions/optional/e_publisher.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Extension publisher string '* diff --git a/testautomation/extensions/optional/includes/display_name.inc b/testautomation/extensions/optional/includes/display_name.inc old mode 100644 new mode 100755 index c77fb413e016..080c22fa3a98 --- a/testautomation/extensions/optional/includes/display_name.inc +++ b/testautomation/extensions/optional/includes/display_name.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Extension display names '* diff --git a/testautomation/extensions/optional/includes/extensions.inc b/testautomation/extensions/optional/includes/extensions.inc old mode 100644 new mode 100755 index 8d1c63ea7bab..90a7e17e16cc --- a/testautomation/extensions/optional/includes/extensions.inc +++ b/testautomation/extensions/optional/includes/extensions.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : Function test of extension manager '* diff --git a/testautomation/extensions/optional/includes/fileopen.inc b/testautomation/extensions/optional/includes/fileopen.inc old mode 100644 new mode 100755 index 481cce7d4e14..922e5ece9adc --- a/testautomation/extensions/optional/includes/fileopen.inc +++ b/testautomation/extensions/optional/includes/fileopen.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : CWS oxtsysint01 enables installing extensions via file open dialog '* diff --git a/testautomation/extensions/optional/includes/help.inc b/testautomation/extensions/optional/includes/help.inc old mode 100644 new mode 100755 index ee313b8d0cc7..004fd70ac429 --- a/testautomation/extensions/optional/includes/help.inc +++ b/testautomation/extensions/optional/includes/help.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Extensible help '* diff --git a/testautomation/extensions/optional/includes/identifiers.inc b/testautomation/extensions/optional/includes/identifiers.inc old mode 100644 new mode 100755 index 377db6e2d89e..1a183f6c8025 --- a/testautomation/extensions/optional/includes/identifiers.inc +++ b/testautomation/extensions/optional/includes/identifiers.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Use unique identifiers instead of filenames for extensions '* diff --git a/testautomation/extensions/optional/includes/issue110083.inc b/testautomation/extensions/optional/includes/issue110083.inc old mode 100755 new mode 100644 index 8940f7f8274c..73f7ad108322 --- a/testautomation/extensions/optional/includes/issue110083.inc +++ b/testautomation/extensions/optional/includes/issue110083.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : CWS sb112 fixes a problem with configuration schemas '* diff --git a/testautomation/extensions/optional/includes/location.inc b/testautomation/extensions/optional/includes/location.inc old mode 100644 new mode 100755 index 4730f8a7bfec..c23fdfdf922b --- a/testautomation/extensions/optional/includes/location.inc +++ b/testautomation/extensions/optional/includes/location.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Test the extension locator service '* diff --git a/testautomation/extensions/optional/includes/meta-inf.inc b/testautomation/extensions/optional/includes/meta-inf.inc old mode 100644 new mode 100755 index 0187e6302c2b..4d36586dd908 --- a/testautomation/extensions/optional/includes/meta-inf.inc +++ b/testautomation/extensions/optional/includes/meta-inf.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Case sensitive META-INF in packages '* diff --git a/testautomation/extensions/optional/includes/online_update.inc b/testautomation/extensions/optional/includes/online_update.inc old mode 100644 new mode 100755 index c107c1df0f3d..24739132beaa --- a/testautomation/extensions/optional/includes/online_update.inc +++ b/testautomation/extensions/optional/includes/online_update.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Hit update button for an extension '* diff --git a/testautomation/extensions/optional/includes/options.inc b/testautomation/extensions/optional/includes/options.inc old mode 100644 new mode 100755 index 43588b748ea0..ff30ba00847b --- a/testautomation/extensions/optional/includes/options.inc +++ b/testautomation/extensions/optional/includes/options.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Options for extensions '* diff --git a/testautomation/extensions/optional/includes/platforms.inc b/testautomation/extensions/optional/includes/platforms.inc index 4f96701afd20..db5d791498c6 100755 --- a/testautomation/extensions/optional/includes/platforms.inc +++ b/testautomation/extensions/optional/includes/platforms.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Supported extension platforms '* diff --git a/testautomation/extensions/optional/includes/publisher.inc b/testautomation/extensions/optional/includes/publisher.inc index ca8e31bb07b6..739b28edaef8 100755 --- a/testautomation/extensions/optional/includes/publisher.inc +++ b/testautomation/extensions/optional/includes/publisher.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Extension publisher and release notes '* diff --git a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/com/example/ToolPanel.java b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/com/example/ToolPanel.java index a28e07d5847b..fcebd804ec1f 100755 --- a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/com/example/ToolPanel.java +++ b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/com/example/ToolPanel.java @@ -33,7 +33,7 @@ import com.sun.star.uno.UnoRuntime; /** * - * @author frank.schoenheit@sun.com + * @author frank.schoenheit@oracle.com */ public class ToolPanel implements XToolPanel { diff --git a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/com/example/ToolPanelUIElement.java b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/com/example/ToolPanelUIElement.java index 6fb17d17f3d6..599850e00ef1 100755 --- a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/com/example/ToolPanelUIElement.java +++ b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/com/example/ToolPanelUIElement.java @@ -44,7 +44,7 @@ import java.util.logging.Logger; /** * - * @author frank.schoenheit@sun.com + * @author frank.schoenheit@oracle.com */ public class ToolPanelUIElement extends ComponentBase implements XUIElement { diff --git a/testautomation/extensions/required/e_update.bas b/testautomation/extensions/required/e_update.bas old mode 100755 new mode 100644 index b5bc2775a646..89c85cb139fc --- a/testautomation/extensions/required/e_update.bas +++ b/testautomation/extensions/required/e_update.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Extension Update Test '* diff --git a/testautomation/extensions/required/includes/e_update.inc b/testautomation/extensions/required/includes/e_update.inc old mode 100644 new mode 100755 index 769259aeaa7c..e563b5ae3a45 --- a/testautomation/extensions/required/includes/e_update.inc +++ b/testautomation/extensions/required/includes/e_update.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Extension Update Test '* diff --git a/testautomation/framework/optional/f_CJK_CollationDialogue.bas b/testautomation/framework/optional/f_CJK_CollationDialogue.bas index beb81e4db256..84ae67f474c7 100755 --- a/testautomation/framework/optional/f_CJK_CollationDialogue.bas +++ b/testautomation/framework/optional/f_CJK_CollationDialogue.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner: thorsten.bosbach@sun.com +'* owner: thorsten.bosbach@oracle.com '* '* short description: CJK Collation Dialogue test '* diff --git a/testautomation/framework/optional/f_CJK_FeatureSwitch.bas b/testautomation/framework/optional/f_CJK_FeatureSwitch.bas index cb4a8703136d..0543a64ad4c7 100755 --- a/testautomation/framework/optional/f_CJK_FeatureSwitch.bas +++ b/testautomation/framework/optional/f_CJK_FeatureSwitch.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner: thorsten.bosbach@sun.com +'* owner: thorsten.bosbach@oracle.com '* '* short description: CJK feature switch test '* diff --git a/testautomation/framework/optional/f_CJK_GridLayout.bas b/testautomation/framework/optional/f_CJK_GridLayout.bas index 1569816cd3a5..12954fae1170 100755 --- a/testautomation/framework/optional/f_CJK_GridLayout.bas +++ b/testautomation/framework/optional/f_CJK_GridLayout.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner: thorsten.bosbach@sun.com +'* owner: thorsten.bosbach@oracle.com '* '* short description: Grid Layout for CJK feature test '* diff --git a/testautomation/framework/optional/f_CJK_RubyDialogueProposal.bas b/testautomation/framework/optional/f_CJK_RubyDialogueProposal.bas index 2bf56608181b..cd1c7322b884 100755 --- a/testautomation/framework/optional/f_CJK_RubyDialogueProposal.bas +++ b/testautomation/framework/optional/f_CJK_RubyDialogueProposal.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner: thorsten.bosbach@sun.com +'* owner: thorsten.bosbach@oracle.com '* '* short description: CJK Ruby DialogueProposal test '* diff --git a/testautomation/framework/optional/f_NewSortingAlgorithmForJapanese.bas b/testautomation/framework/optional/f_NewSortingAlgorithmForJapanese.bas index 36f2016aafc5..44b157fe8d86 100755 --- a/testautomation/framework/optional/f_NewSortingAlgorithmForJapanese.bas +++ b/testautomation/framework/optional/f_NewSortingAlgorithmForJapanese.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner: thorsten.bosbach@sun.com +'* owner: thorsten.bosbach@oracle.com '* '* short description: New Sorting Algorithm For Japanese '* diff --git a/testautomation/framework/optional/f_basic_dialog_i18n.bas b/testautomation/framework/optional/f_basic_dialog_i18n.bas index 291894eb6296..0c65064803c1 100755 --- a/testautomation/framework/optional/f_basic_dialog_i18n.bas +++ b/testautomation/framework/optional/f_basic_dialog_i18n.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Testing the dialog i18n feature of the BASIC IDE '* diff --git a/testautomation/framework/optional/f_basic_documents.bas b/testautomation/framework/optional/f_basic_documents.bas index a9887adda4fc..48e78dc2c0c6 100755 --- a/testautomation/framework/optional/f_basic_documents.bas +++ b/testautomation/framework/optional/f_basic_documents.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : BASIC organizers and documents '* diff --git a/testautomation/framework/optional/f_basic_eventbinding.bas b/testautomation/framework/optional/f_basic_eventbinding.bas index d645648b64bc..658fbe2963a4 100755 --- a/testautomation/framework/optional/f_basic_eventbinding.bas +++ b/testautomation/framework/optional/f_basic_eventbinding.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : Function test of Basic IDE Assign Component '* diff --git a/testautomation/framework/optional/f_basic_first.bas b/testautomation/framework/optional/f_basic_first.bas index d948fb54c1db..d8f749380625 100755 --- a/testautomation/framework/optional/f_basic_first.bas +++ b/testautomation/framework/optional/f_basic_first.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : BASIC IDE / Macro dialogs '* diff --git a/testautomation/framework/optional/f_basic_formcontrols.bas b/testautomation/framework/optional/f_basic_formcontrols.bas index 33d01eef9e12..c0f6931d0a19 100755 --- a/testautomation/framework/optional/f_basic_formcontrols.bas +++ b/testautomation/framework/optional/f_basic_formcontrols.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Form controls in BASIC-IDE dialogs '* diff --git a/testautomation/framework/optional/f_basic_gridcontrol.bas b/testautomation/framework/optional/f_basic_gridcontrol.bas index 74ee57c52c5d..963482253438 100755 --- a/testautomation/framework/optional/f_basic_gridcontrol.bas +++ b/testautomation/framework/optional/f_basic_gridcontrol.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : test availablity of gridcontrol '* diff --git a/testautomation/framework/optional/f_basic_library_export_import.bas b/testautomation/framework/optional/f_basic_library_export_import.bas index a03e4bfe4804..f3fc06196a03 100755 --- a/testautomation/framework/optional/f_basic_library_export_import.bas +++ b/testautomation/framework/optional/f_basic_library_export_import.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Export BASIC libraries '* diff --git a/testautomation/framework/optional/f_basic_modules.bas b/testautomation/framework/optional/f_basic_modules.bas index fa7aa18f9ef5..ec92e75da4e9 100755 --- a/testautomation/framework/optional/f_basic_modules.bas +++ b/testautomation/framework/optional/f_basic_modules.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Modules in BASIC-IDE '* diff --git a/testautomation/framework/optional/f_basic_package_export_import.bas b/testautomation/framework/optional/f_basic_package_export_import.bas index db1b43c9f76d..dd299bda71bb 100755 --- a/testautomation/framework/optional/f_basic_package_export_import.bas +++ b/testautomation/framework/optional/f_basic_package_export_import.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Export BASIC libraries '* diff --git a/testautomation/framework/optional/f_basic_protected_libraries.bas b/testautomation/framework/optional/f_basic_protected_libraries.bas index 47167e237202..db372cc4a232 100755 --- a/testautomation/framework/optional/f_basic_protected_libraries.bas +++ b/testautomation/framework/optional/f_basic_protected_libraries.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Test protected libraries '* diff --git a/testautomation/framework/optional/f_basic_shared_modules.bas b/testautomation/framework/optional/f_basic_shared_modules.bas index aef11a739c8a..d62d56f4e24c 100755 --- a/testautomation/framework/optional/f_basic_shared_modules.bas +++ b/testautomation/framework/optional/f_basic_shared_modules.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Access modules below OpenOffice.org macros '* diff --git a/testautomation/framework/optional/f_basic_templatedocuments.bas b/testautomation/framework/optional/f_basic_templatedocuments.bas index 064502e96e33..f701417c8648 100755 --- a/testautomation/framework/optional/f_basic_templatedocuments.bas +++ b/testautomation/framework/optional/f_basic_templatedocuments.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : My Macros/standard execution with user defined template '* diff --git a/testautomation/framework/optional/f_basic_vba-compat.bas b/testautomation/framework/optional/f_basic_vba-compat.bas index 7b96728c1580..1d867b61edee 100755 --- a/testautomation/framework/optional/f_basic_vba-compat.bas +++ b/testautomation/framework/optional/f_basic_vba-compat.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Test VBA import options and compatibility switches '* diff --git a/testautomation/framework/optional/f_configuration.bas b/testautomation/framework/optional/f_configuration.bas index af945169e01e..889cd634cee5 100755 --- a/testautomation/framework/optional/f_configuration.bas +++ b/testautomation/framework/optional/f_configuration.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : thorsten.bosbach@sun.com +'* Owner : thorsten.bosbach@oracle.com '* '* short description : Function Test for known global Issues '* diff --git a/testautomation/framework/optional/f_extras_labels.bas b/testautomation/framework/optional/f_extras_labels.bas index c83307bd472d..51722ac38a32 100755 --- a/testautomation/framework/optional/f_extras_labels.bas +++ b/testautomation/framework/optional/f_extras_labels.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : check the names of all labels '* diff --git a/testautomation/framework/optional/f_extras_samplefileopen.bas b/testautomation/framework/optional/f_extras_samplefileopen.bas index a07609135c62..f8484c3f5310 100755 --- a/testautomation/framework/optional/f_extras_samplefileopen.bas +++ b/testautomation/framework/optional/f_extras_samplefileopen.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : open all samples via file-open dialog '* diff --git a/testautomation/framework/optional/f_extras_sampleopen.bas b/testautomation/framework/optional/f_extras_sampleopen.bas index ac11a9f330d1..aa96bb6ab4fa 100755 --- a/testautomation/framework/optional/f_extras_sampleopen.bas +++ b/testautomation/framework/optional/f_extras_sampleopen.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : open/save/load samples via template dialog '* diff --git a/testautomation/framework/optional/f_extras_samplepreview.bas b/testautomation/framework/optional/f_extras_samplepreview.bas index 7c5ecc8c1bea..070d7eaf0c39 100755 --- a/testautomation/framework/optional/f_extras_samplepreview.bas +++ b/testautomation/framework/optional/f_extras_samplepreview.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : display all samples as preview in template dialog '* diff --git a/testautomation/framework/optional/f_extras_tableautoformat.bas b/testautomation/framework/optional/f_extras_tableautoformat.bas index a7b21f88666a..2081369b40c0 100755 --- a/testautomation/framework/optional/f_extras_tableautoformat.bas +++ b/testautomation/framework/optional/f_extras_tableautoformat.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : check all names of table autoformats '* diff --git a/testautomation/framework/optional/f_extras_templatefileopen.bas b/testautomation/framework/optional/f_extras_templatefileopen.bas index 037dcaa6c166..5907f2cb00e5 100755 --- a/testautomation/framework/optional/f_extras_templatefileopen.bas +++ b/testautomation/framework/optional/f_extras_templatefileopen.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : open all templates via file-open dialog '* diff --git a/testautomation/framework/optional/f_extras_templateopen.bas b/testautomation/framework/optional/f_extras_templateopen.bas index e4fc9a1abe96..0b184af060eb 100755 --- a/testautomation/framework/optional/f_extras_templateopen.bas +++ b/testautomation/framework/optional/f_extras_templateopen.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : open all templates via template dialog '* diff --git a/testautomation/framework/optional/f_extras_templatepreview.bas b/testautomation/framework/optional/f_extras_templatepreview.bas index f0c4179282ef..1d50569b42b3 100755 --- a/testautomation/framework/optional/f_extras_templatepreview.bas +++ b/testautomation/framework/optional/f_extras_templatepreview.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : show all templates as preview in template dialog '* diff --git a/testautomation/framework/optional/f_filedlg_allowed_names.bas b/testautomation/framework/optional/f_filedlg_allowed_names.bas index 4f0c0533bc15..c3d44ee82754 100755 --- a/testautomation/framework/optional/f_filedlg_allowed_names.bas +++ b/testautomation/framework/optional/f_filedlg_allowed_names.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ ' ** -' ** owner : joerg.skottke@sun.com +' ** owner : joerg.skottke@oracle.com ' ** ' ** short description : check special filenames and destinations ' ** diff --git a/testautomation/framework/optional/f_filedlg_autocompletion.bas b/testautomation/framework/optional/f_filedlg_autocompletion.bas index 4208ed16b0c4..21f3addd2af4 100755 --- a/testautomation/framework/optional/f_filedlg_autocompletion.bas +++ b/testautomation/framework/optional/f_filedlg_autocompletion.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** ' ** -' ** owner : joerg.skottke@sun.com +' ** owner : joerg.skottke@oracle.com ' ** ' ** short description : Filedialog - check autocompletion and wildcards ' ** diff --git a/testautomation/framework/optional/f_filedlg_cjk_files.bas b/testautomation/framework/optional/f_filedlg_cjk_files.bas index 48d0af59851b..a3e807edad9a 100755 --- a/testautomation/framework/optional/f_filedlg_cjk_files.bas +++ b/testautomation/framework/optional/f_filedlg_cjk_files.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ ' ** -' ** owner : joerg.skottke@sun.com +' ** owner : joerg.skottke@oracle.com ' ** ' ** short description : check special filenames and destinations ' ** diff --git a/testautomation/framework/optional/f_filedlg_dialogtest.bas b/testautomation/framework/optional/f_filedlg_dialogtest.bas index 6ef9dd84dd84..8a14571ffe14 100755 --- a/testautomation/framework/optional/f_filedlg_dialogtest.bas +++ b/testautomation/framework/optional/f_filedlg_dialogtest.bas @@ -24,7 +24,7 @@ ' '/************************************************************************ ' ** -' ** owner : joerg.skottke@sun.com +' ** owner : joerg.skottke@oracle.com ' ** ' ** short description : check the internal file dialog (Dialog) ' ** diff --git a/testautomation/framework/optional/f_filedlg_folder_navigation.bas b/testautomation/framework/optional/f_filedlg_folder_navigation.bas index 8951e4ac942a..feacdd291253 100755 --- a/testautomation/framework/optional/f_filedlg_folder_navigation.bas +++ b/testautomation/framework/optional/f_filedlg_folder_navigation.bas @@ -24,7 +24,7 @@ ' '/************************************************************************ ' ** -' ** owner : joerg.skottke@sun.com +' ** owner : joerg.skottke@oracle.com ' ** ' ** short description : check the internal file dialog (Folders/Navigation) ' ** diff --git a/testautomation/framework/optional/f_filedlg_forbidden_names_windows.bas b/testautomation/framework/optional/f_filedlg_forbidden_names_windows.bas index 25f65df99180..f2a05d765b05 100755 --- a/testautomation/framework/optional/f_filedlg_forbidden_names_windows.bas +++ b/testautomation/framework/optional/f_filedlg_forbidden_names_windows.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ ' ** -' ** owner : joerg.skottke@sun.com +' ** owner : joerg.skottke@oracle.com ' ** ' ** short description : check special filenames and destinations ' ** diff --git a/testautomation/framework/optional/f_filedlg_multiselection.bas b/testautomation/framework/optional/f_filedlg_multiselection.bas index f94769185430..f25fe68fce74 100755 --- a/testautomation/framework/optional/f_filedlg_multiselection.bas +++ b/testautomation/framework/optional/f_filedlg_multiselection.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Select a huge number of documents and load '* diff --git a/testautomation/framework/optional/f_filedlg_passwords.bas b/testautomation/framework/optional/f_filedlg_passwords.bas index d3106c24f774..dac9a5258ac4 100755 --- a/testautomation/framework/optional/f_filedlg_passwords.bas +++ b/testautomation/framework/optional/f_filedlg_passwords.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : save and load passworded files '* diff --git a/testautomation/framework/optional/f_filedlg_reserved_names_unix.bas b/testautomation/framework/optional/f_filedlg_reserved_names_unix.bas index 76e4b70e3944..81359724a57c 100755 --- a/testautomation/framework/optional/f_filedlg_reserved_names_unix.bas +++ b/testautomation/framework/optional/f_filedlg_reserved_names_unix.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ ' ** -' ** owner : joerg.skottke@sun.com +' ** owner : joerg.skottke@oracle.com ' ** ' ** short description : check special filenames and destinations ' ** diff --git a/testautomation/framework/optional/f_filedlg_reserved_names_windows.bas b/testautomation/framework/optional/f_filedlg_reserved_names_windows.bas index 45c79d188837..1ca74f352f67 100755 --- a/testautomation/framework/optional/f_filedlg_reserved_names_windows.bas +++ b/testautomation/framework/optional/f_filedlg_reserved_names_windows.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ ' ** -' ** owner : joerg.skottke@sun.com +' ** owner : joerg.skottke@oracle.com ' ** ' ** short description : check special filenames and destinations ' ** diff --git a/testautomation/framework/optional/f_fontworkgallery.bas b/testautomation/framework/optional/f_fontworkgallery.bas index f1f47357f135..075d08536ef2 100755 --- a/testautomation/framework/optional/f_fontworkgallery.bas +++ b/testautomation/framework/optional/f_fontworkgallery.bas @@ -24,7 +24,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : Resource test of font work gallery '* diff --git a/testautomation/framework/optional/f_help_bookmarks.bas b/testautomation/framework/optional/f_help_bookmarks.bas index b394bf2cca74..c61241437303 100755 --- a/testautomation/framework/optional/f_help_bookmarks.bas +++ b/testautomation/framework/optional/f_help_bookmarks.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Bookmarks in the help browser '* diff --git a/testautomation/framework/optional/f_help_compare_applications.bas b/testautomation/framework/optional/f_help_compare_applications.bas index 3c96f1baed22..2f1d9418477c 100755 --- a/testautomation/framework/optional/f_help_compare_applications.bas +++ b/testautomation/framework/optional/f_help_compare_applications.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Compare lists from the Help Viewer against references '* diff --git a/testautomation/framework/optional/f_help_compare_content.bas b/testautomation/framework/optional/f_help_compare_content.bas index 5401d17fe5db..2df5ddc8eb00 100755 --- a/testautomation/framework/optional/f_help_compare_content.bas +++ b/testautomation/framework/optional/f_help_compare_content.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Compare lists from the Help Viewer against references '* diff --git a/testautomation/framework/optional/f_help_compare_topics.bas b/testautomation/framework/optional/f_help_compare_topics.bas index bb36f47fcf03..6ac22c441bbe 100755 --- a/testautomation/framework/optional/f_help_compare_topics.bas +++ b/testautomation/framework/optional/f_help_compare_topics.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Compare lists from the Help Viewer against references '* diff --git a/testautomation/framework/optional/f_help_search.bas b/testautomation/framework/optional/f_help_search.bas index b9694931da0a..7479644d0daf 100755 --- a/testautomation/framework/optional/f_help_search.bas +++ b/testautomation/framework/optional/f_help_search.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Search for a string, apply limitations '* diff --git a/testautomation/framework/optional/f_help_view_topics.bas b/testautomation/framework/optional/f_help_view_topics.bas index 1b84670bd0f5..1cfa9fd5ab30 100755 --- a/testautomation/framework/optional/f_help_view_topics.bas +++ b/testautomation/framework/optional/f_help_view_topics.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : load all index pages in help '* diff --git a/testautomation/framework/optional/f_loadsave_general.bas b/testautomation/framework/optional/f_loadsave_general.bas index 29fb17ec124c..c62c282ce10a 100755 --- a/testautomation/framework/optional/f_loadsave_general.bas +++ b/testautomation/framework/optional/f_loadsave_general.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : tborsten.bosbach@sun.com +'* owner : tborsten.bosbach@oracle.com '* '* short description : global functionality - load/save documents '* diff --git a/testautomation/framework/optional/f_menuentries.bas b/testautomation/framework/optional/f_menuentries.bas index 4334b7b8e1e1..99ff3ba18c97 100755 --- a/testautomation/framework/optional/f_menuentries.bas +++ b/testautomation/framework/optional/f_menuentries.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : thorsten.bosbach@sun.com +'* Owner : thorsten.bosbach@oracle.com '* '* short description : Read menubar and first level drop down lists and compare to reference '* diff --git a/testautomation/framework/optional/f_ole.bas b/testautomation/framework/optional/f_ole.bas index fffc3fe08e72..c1724e80d92e 100755 --- a/testautomation/framework/optional/f_ole.bas +++ b/testautomation/framework/optional/f_ole.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : OLE '* diff --git a/testautomation/framework/optional/f_options_loadsave.bas b/testautomation/framework/optional/f_options_loadsave.bas index abfc7d15f3a4..ff04293b3353 100755 --- a/testautomation/framework/optional/f_options_loadsave.bas +++ b/testautomation/framework/optional/f_options_loadsave.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : Function: Tools->Options: Load/Save '* diff --git a/testautomation/framework/optional/f_options_ooo.bas b/testautomation/framework/optional/f_options_ooo.bas index 6f18669466f1..d2432a19c261 100755 --- a/testautomation/framework/optional/f_options_ooo.bas +++ b/testautomation/framework/optional/f_options_ooo.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : General Tools/Options test '* diff --git a/testautomation/framework/optional/f_scripting_organizers.bas b/testautomation/framework/optional/f_scripting_organizers.bas index eb558a29686a..999b40e15a8c 100755 --- a/testautomation/framework/optional/f_scripting_organizers.bas +++ b/testautomation/framework/optional/f_scripting_organizers.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Test scripting-organizers / document-stored scripts '* diff --git a/testautomation/framework/optional/f_security_broken_signature.bas b/testautomation/framework/optional/f_security_broken_signature.bas index 0d142a10a70d..465465d5f39a 100755 --- a/testautomation/framework/optional/f_security_broken_signature.bas +++ b/testautomation/framework/optional/f_security_broken_signature.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Document with macro and broken signature '* diff --git a/testautomation/framework/optional/f_security_certification_dialogs.bas b/testautomation/framework/optional/f_security_certification_dialogs.bas index 8bf07f3d961f..da7c4a576249 100755 --- a/testautomation/framework/optional/f_security_certification_dialogs.bas +++ b/testautomation/framework/optional/f_security_certification_dialogs.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Walk through a number of dialogs related to digital signatures '* diff --git a/testautomation/framework/optional/f_security_certified_docs.bas b/testautomation/framework/optional/f_security_certified_docs.bas index 26d76b74ee7d..cbedea197802 100755 --- a/testautomation/framework/optional/f_security_certified_docs.bas +++ b/testautomation/framework/optional/f_security_certified_docs.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Load certified documents and verify the certificate '* diff --git a/testautomation/framework/optional/f_security_evilmacro.bas b/testautomation/framework/optional/f_security_evilmacro.bas index 89b7a4302eb3..b34174b70412 100755 --- a/testautomation/framework/optional/f_security_evilmacro.bas +++ b/testautomation/framework/optional/f_security_evilmacro.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Load documents containing hidden BASIC scripts '* diff --git a/testautomation/framework/optional/f_security_incorrect_password.bas b/testautomation/framework/optional/f_security_incorrect_password.bas index 1ce5abe7e3f4..f10835af3e72 100755 --- a/testautomation/framework/optional/f_security_incorrect_password.bas +++ b/testautomation/framework/optional/f_security_incorrect_password.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Verify that documents really get password protected '* diff --git a/testautomation/framework/optional/f_security_macrosecurity.bas b/testautomation/framework/optional/f_security_macrosecurity.bas index 857bbba208b9..27bf1de7da4e 100755 --- a/testautomation/framework/optional/f_security_macrosecurity.bas +++ b/testautomation/framework/optional/f_security_macrosecurity.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Macros with all security-levels '* diff --git a/testautomation/framework/optional/f_security_recommend_password.bas b/testautomation/framework/optional/f_security_recommend_password.bas index 49d6189d91b7..2807b6f7cd0d 100755 --- a/testautomation/framework/optional/f_security_recommend_password.bas +++ b/testautomation/framework/optional/f_security_recommend_password.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : checkbox to recommend password protection '* diff --git a/testautomation/framework/optional/f_security_trusted_path.bas b/testautomation/framework/optional/f_security_trusted_path.bas index 4c5cfa90fbdd..1d1b21a0eefb 100755 --- a/testautomation/framework/optional/f_security_trusted_path.bas +++ b/testautomation/framework/optional/f_security_trusted_path.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Execute macros from trusted path '* diff --git a/testautomation/framework/optional/f_toolbar_behavior.bas b/testautomation/framework/optional/f_toolbar_behavior.bas index 2dc186742318..559385d61030 100755 --- a/testautomation/framework/optional/f_toolbar_behavior.bas +++ b/testautomation/framework/optional/f_toolbar_behavior.bas @@ -24,7 +24,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : Resource test of toolbar behavior '* diff --git a/testautomation/framework/optional/f_toolbar_items.bas b/testautomation/framework/optional/f_toolbar_items.bas index 4277ce17d7aa..3bacf71ac7af 100755 --- a/testautomation/framework/optional/f_toolbar_items.bas +++ b/testautomation/framework/optional/f_toolbar_items.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Update/resource-test for toolbars '* diff --git a/testautomation/framework/optional/f_usage_tracking.bas b/testautomation/framework/optional/f_usage_tracking.bas index be7af57509af..c056aa239624 100755 --- a/testautomation/framework/optional/f_usage_tracking.bas +++ b/testautomation/framework/optional/f_usage_tracking.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Usage tracking '* diff --git a/testautomation/framework/optional/includes/CJK_CollationDialogue_1.inc b/testautomation/framework/optional/includes/CJK_CollationDialogue_1.inc index 0cab687d2f50..aaefdcd5bafb 100755 --- a/testautomation/framework/optional/includes/CJK_CollationDialogue_1.inc +++ b/testautomation/framework/optional/includes/CJK_CollationDialogue_1.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : CJK Collation Dialogue Design Draft '* diff --git a/testautomation/framework/optional/includes/CJK_FeatureSwitchTest_1.inc b/testautomation/framework/optional/includes/CJK_FeatureSwitchTest_1.inc index b8ddc55e012a..081b35f322ec 100644 --- a/testautomation/framework/optional/includes/CJK_FeatureSwitchTest_1.inc +++ b/testautomation/framework/optional/includes/CJK_FeatureSwitchTest_1.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : hercule.li@sun.com +'* owner : hercule.li@oracle.com '* '* short description : CJK Feature Switch test '* diff --git a/testautomation/framework/optional/includes/CJK_RubyDialogueProposal_1.inc b/testautomation/framework/optional/includes/CJK_RubyDialogueProposal_1.inc index 5b03be6151cb..ab6e04c33e3a 100755 --- a/testautomation/framework/optional/includes/CJK_RubyDialogueProposal_1.inc +++ b/testautomation/framework/optional/includes/CJK_RubyDialogueProposal_1.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : CJK Ruby Dialogue Proposal Test '* diff --git a/testautomation/framework/optional/includes/NewSortingAlgorithmForJapanese_1.inc b/testautomation/framework/optional/includes/NewSortingAlgorithmForJapanese_1.inc old mode 100644 new mode 100755 index e20124b78b93..13411aeb849f --- a/testautomation/framework/optional/includes/NewSortingAlgorithmForJapanese_1.inc +++ b/testautomation/framework/optional/includes/NewSortingAlgorithmForJapanese_1.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : hercule.li@sun.com +'* owner : hercule.li@oracle.com '* '* short description : New Sorting Algorithm For Japanese Test '* diff --git a/testautomation/framework/optional/includes/basic_delete_modules.inc b/testautomation/framework/optional/includes/basic_delete_modules.inc index 5418c322ce96..c35900b012e4 100755 --- a/testautomation/framework/optional/includes/basic_delete_modules.inc +++ b/testautomation/framework/optional/includes/basic_delete_modules.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Delete modules while BASIC is running '* diff --git a/testautomation/framework/optional/includes/basic_dialog_i18n_defaults.inc b/testautomation/framework/optional/includes/basic_dialog_i18n_defaults.inc old mode 100644 new mode 100755 index 79b4e039fa14..89d5614c5b11 --- a/testautomation/framework/optional/includes/basic_dialog_i18n_defaults.inc +++ b/testautomation/framework/optional/includes/basic_dialog_i18n_defaults.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Test correct handling of the default language '* diff --git a/testautomation/framework/optional/includes/basic_documents.inc b/testautomation/framework/optional/includes/basic_documents.inc index 13dd3567716a..7e6613cdfcbc 100755 --- a/testautomation/framework/optional/includes/basic_documents.inc +++ b/testautomation/framework/optional/includes/basic_documents.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : BASIC organizers and documents '* diff --git a/testautomation/framework/optional/includes/basic_eventbinding.inc b/testautomation/framework/optional/includes/basic_eventbinding.inc old mode 100644 new mode 100755 index 85601c312667..4d5ee502df66 --- a/testautomation/framework/optional/includes/basic_eventbinding.inc +++ b/testautomation/framework/optional/includes/basic_eventbinding.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : Function test of Basic IDE Assign Componenet '* diff --git a/testautomation/framework/optional/includes/basic_formcontrols.inc b/testautomation/framework/optional/includes/basic_formcontrols.inc index f755d645b888..cc8f999ff9ad 100755 --- a/testautomation/framework/optional/includes/basic_formcontrols.inc +++ b/testautomation/framework/optional/includes/basic_formcontrols.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Basic form-controls '* diff --git a/testautomation/framework/optional/includes/basic_gridcontrol.inc b/testautomation/framework/optional/includes/basic_gridcontrol.inc index 7f914ba9dafc..181bd2aa9b1f 100755 --- a/testautomation/framework/optional/includes/basic_gridcontrol.inc +++ b/testautomation/framework/optional/includes/basic_gridcontrol.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : gridcontrol '* diff --git a/testautomation/framework/optional/includes/basic_ide.inc b/testautomation/framework/optional/includes/basic_ide.inc index c8db670e8cc3..eabaadf3176a 100755 --- a/testautomation/framework/optional/includes/basic_ide.inc +++ b/testautomation/framework/optional/includes/basic_ide.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Macro Dialogs opened from Basic-IDE '* diff --git a/testautomation/framework/optional/includes/basic_library_export.inc b/testautomation/framework/optional/includes/basic_library_export.inc index 6f5acacbdb24..9d539e2a82a0 100755 --- a/testautomation/framework/optional/includes/basic_library_export.inc +++ b/testautomation/framework/optional/includes/basic_library_export.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Export BASIC library (flat) '* diff --git a/testautomation/framework/optional/includes/basic_library_import.inc b/testautomation/framework/optional/includes/basic_library_import.inc index 9d5dae88ff40..f6b62e99c7ea 100755 --- a/testautomation/framework/optional/includes/basic_library_import.inc +++ b/testautomation/framework/optional/includes/basic_library_import.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Import BASIC library (flat) '* diff --git a/testautomation/framework/optional/includes/basic_macros.inc b/testautomation/framework/optional/includes/basic_macros.inc index 17e1b83d5e18..dc58e21f1dea 100755 --- a/testautomation/framework/optional/includes/basic_macros.inc +++ b/testautomation/framework/optional/includes/basic_macros.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ ' ** -' ** owner : joerg.skottke@sun.com +' ** owner : joerg.skottke@oracle.com ' ** ' ** short description : check macro-dialogs / BASIC-IDE ( 1. part ) ' ** diff --git a/testautomation/framework/optional/includes/basic_modulehide.inc b/testautomation/framework/optional/includes/basic_modulehide.inc index 8423c67e6b67..fe492590c41b 100755 --- a/testautomation/framework/optional/includes/basic_modulehide.inc +++ b/testautomation/framework/optional/includes/basic_modulehide.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Verify that hiding modules works '* diff --git a/testautomation/framework/optional/includes/basic_modulenames.inc b/testautomation/framework/optional/includes/basic_modulenames.inc index f874fd93976a..6b166c54680a 100755 --- a/testautomation/framework/optional/includes/basic_modulenames.inc +++ b/testautomation/framework/optional/includes/basic_modulenames.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Test modulenames on the tabbar '* diff --git a/testautomation/framework/optional/includes/basic_modules.inc b/testautomation/framework/optional/includes/basic_modules.inc old mode 100644 new mode 100755 index 203ebf7bc219..14e3aedca6db --- a/testautomation/framework/optional/includes/basic_modules.inc +++ b/testautomation/framework/optional/includes/basic_modules.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Edit several modules and dialogs in basic ide '* diff --git a/testautomation/framework/optional/includes/basic_package_export.inc b/testautomation/framework/optional/includes/basic_package_export.inc index 28e214102dbb..b389c750e51d 100755 --- a/testautomation/framework/optional/includes/basic_package_export.inc +++ b/testautomation/framework/optional/includes/basic_package_export.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Export BASIC libraries as package '* diff --git a/testautomation/framework/optional/includes/basic_package_import.inc b/testautomation/framework/optional/includes/basic_package_import.inc index a16b9e4e50e2..31596ed21001 100755 --- a/testautomation/framework/optional/includes/basic_package_import.inc +++ b/testautomation/framework/optional/includes/basic_package_import.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Import BASIC library via Package Manager GUI as UNO Package '* diff --git a/testautomation/framework/optional/includes/basic_protected_libraries.inc b/testautomation/framework/optional/includes/basic_protected_libraries.inc index 03a9aea72834..6162352d710f 100755 --- a/testautomation/framework/optional/includes/basic_protected_libraries.inc +++ b/testautomation/framework/optional/includes/basic_protected_libraries.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Test protected libraries '* diff --git a/testautomation/framework/optional/includes/basic_shared_modules.inc b/testautomation/framework/optional/includes/basic_shared_modules.inc index 7e9beec7af98..63241fec9d7d 100755 --- a/testautomation/framework/optional/includes/basic_shared_modules.inc +++ b/testautomation/framework/optional/includes/basic_shared_modules.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Access modules below OpenOffice.org macros '* diff --git a/testautomation/framework/optional/includes/basic_spectemplate.inc b/testautomation/framework/optional/includes/basic_spectemplate.inc index 35e541a642a2..eeed6b047141 100755 --- a/testautomation/framework/optional/includes/basic_spectemplate.inc +++ b/testautomation/framework/optional/includes/basic_spectemplate.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Load the spec template via http and enable macros '* diff --git a/testautomation/framework/optional/includes/basic_usertemplate.inc b/testautomation/framework/optional/includes/basic_usertemplate.inc index 03f1602a94b5..97ec55c91505 100755 --- a/testautomation/framework/optional/includes/basic_usertemplate.inc +++ b/testautomation/framework/optional/includes/basic_usertemplate.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : My Macros/standard execution with user defined template '* diff --git a/testautomation/framework/optional/includes/basic_vba-compat_application-union.inc b/testautomation/framework/optional/includes/basic_vba-compat_application-union.inc index d9f421278514..9acd9d1b032e 100755 --- a/testautomation/framework/optional/includes/basic_vba-compat_application-union.inc +++ b/testautomation/framework/optional/includes/basic_vba-compat_application-union.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Test VBA compatibility switches '* diff --git a/testautomation/framework/optional/includes/basic_vba-compat_import_disabled.inc b/testautomation/framework/optional/includes/basic_vba-compat_import_disabled.inc index 1e361b6de0b2..81b2764a28f1 100755 --- a/testautomation/framework/optional/includes/basic_vba-compat_import_disabled.inc +++ b/testautomation/framework/optional/includes/basic_vba-compat_import_disabled.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Test VBA compatibility switches '* diff --git a/testautomation/framework/optional/includes/basic_vba-compat_import_enabled.inc b/testautomation/framework/optional/includes/basic_vba-compat_import_enabled.inc index 660561322db6..970b8249a412 100755 --- a/testautomation/framework/optional/includes/basic_vba-compat_import_enabled.inc +++ b/testautomation/framework/optional/includes/basic_vba-compat_import_enabled.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Test VBA compatibility switches '* diff --git a/testautomation/framework/optional/includes/basic_vba-compat_import_nothing.inc b/testautomation/framework/optional/includes/basic_vba-compat_import_nothing.inc index 66cc7a77eae5..dfade69eaafb 100755 --- a/testautomation/framework/optional/includes/basic_vba-compat_import_nothing.inc +++ b/testautomation/framework/optional/includes/basic_vba-compat_import_nothing.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Test VBA compatibility switches '* diff --git a/testautomation/framework/optional/includes/basic_vba-compat_security_check.inc b/testautomation/framework/optional/includes/basic_vba-compat_security_check.inc index ae26d996db6e..2dd9f6228455 100644 --- a/testautomation/framework/optional/includes/basic_vba-compat_security_check.inc +++ b/testautomation/framework/optional/includes/basic_vba-compat_security_check.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Test VBA compatibility switches '* diff --git a/testautomation/framework/optional/includes/basic_vba-compat_thisworkbook.inc b/testautomation/framework/optional/includes/basic_vba-compat_thisworkbook.inc index 03c52146a8fb..201dd8eb9862 100755 --- a/testautomation/framework/optional/includes/basic_vba-compat_thisworkbook.inc +++ b/testautomation/framework/optional/includes/basic_vba-compat_thisworkbook.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Test VBA compatibility switches '* diff --git a/testautomation/framework/optional/includes/basic_vba-compat_xlsm-xlsb.inc b/testautomation/framework/optional/includes/basic_vba-compat_xlsm-xlsb.inc index cfc8f06072e3..4c6f7c20a076 100755 --- a/testautomation/framework/optional/includes/basic_vba-compat_xlsm-xlsb.inc +++ b/testautomation/framework/optional/includes/basic_vba-compat_xlsm-xlsb.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Test VBA compatibility switches '* diff --git a/testautomation/framework/optional/includes/basic_vba_compat_tools.inc b/testautomation/framework/optional/includes/basic_vba_compat_tools.inc old mode 100644 new mode 100755 index 77437770891a..8fc37badb55f --- a/testautomation/framework/optional/includes/basic_vba_compat_tools.inc +++ b/testautomation/framework/optional/includes/basic_vba_compat_tools.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Small helpers for Excel BASIC import modes '* diff --git a/testautomation/framework/optional/includes/configuration.inc b/testautomation/framework/optional/includes/configuration.inc index fba0a6fe6bae..0fce11bddd1b 100755 --- a/testautomation/framework/optional/includes/configuration.inc +++ b/testautomation/framework/optional/includes/configuration.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : thorsten.bosbach@sun.com +'* Owner : thorsten.bosbach@oracle.com '* '* short description : Function Test for known global Issues '* diff --git a/testautomation/framework/optional/includes/extras_file_open.inc b/testautomation/framework/optional/includes/extras_file_open.inc index 874012f6bad1..b4de32acd917 100755 --- a/testautomation/framework/optional/includes/extras_file_open.inc +++ b/testautomation/framework/optional/includes/extras_file_open.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Perform standard operations on all samples/templates etc. '* diff --git a/testautomation/framework/optional/includes/extras_modify_objects.inc b/testautomation/framework/optional/includes/extras_modify_objects.inc index 1eb34f786e5f..f2e4717d2e96 100755 --- a/testautomation/framework/optional/includes/extras_modify_objects.inc +++ b/testautomation/framework/optional/includes/extras_modify_objects.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Perform standard operations on all samples/templates etc. '* diff --git a/testautomation/framework/optional/includes/extras_preview.inc b/testautomation/framework/optional/includes/extras_preview.inc old mode 100644 new mode 100755 index 8e1129bd5bf4..ca3a24ec9995 --- a/testautomation/framework/optional/includes/extras_preview.inc +++ b/testautomation/framework/optional/includes/extras_preview.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Perform standard operations on all samples/templates etc. '* diff --git a/testautomation/framework/optional/includes/extras_table_autoformat.inc b/testautomation/framework/optional/includes/extras_table_autoformat.inc index 892b33ca27fb..7ecb2ce9bf30 100755 --- a/testautomation/framework/optional/includes/extras_table_autoformat.inc +++ b/testautomation/framework/optional/includes/extras_table_autoformat.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Test the autoformat-feature for tables '* diff --git a/testautomation/framework/optional/includes/f_usage_tracking.inc b/testautomation/framework/optional/includes/f_usage_tracking.inc old mode 100644 new mode 100755 index 7ea54855eb5d..ef20c2a2f1e5 --- a/testautomation/framework/optional/includes/f_usage_tracking.inc +++ b/testautomation/framework/optional/includes/f_usage_tracking.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Usage tracking '* diff --git a/testautomation/framework/optional/includes/filedlg_allowed_names.inc b/testautomation/framework/optional/includes/filedlg_allowed_names.inc old mode 100644 new mode 100755 index ce386758c255..a6d54077f4b5 --- a/testautomation/framework/optional/includes/filedlg_allowed_names.inc +++ b/testautomation/framework/optional/includes/filedlg_allowed_names.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : check the internal file dialog ( extended tests ) '* diff --git a/testautomation/framework/optional/includes/filedlg_autocomplete.inc b/testautomation/framework/optional/includes/filedlg_autocomplete.inc old mode 100644 new mode 100755 index a289e0c6116e..bfa424378ef4 --- a/testautomation/framework/optional/includes/filedlg_autocomplete.inc +++ b/testautomation/framework/optional/includes/filedlg_autocomplete.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Autocompletion feature '* diff --git a/testautomation/framework/optional/includes/filedlg_cjk_files.inc b/testautomation/framework/optional/includes/filedlg_cjk_files.inc index a2bcc2230ec0..f9a049c6dbc9 100755 --- a/testautomation/framework/optional/includes/filedlg_cjk_files.inc +++ b/testautomation/framework/optional/includes/filedlg_cjk_files.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : check the internal file dialog ( extended tests ) '* diff --git a/testautomation/framework/optional/includes/filedlg_cjk_folders.inc b/testautomation/framework/optional/includes/filedlg_cjk_folders.inc old mode 100644 new mode 100755 index cc6555b715a1..cdeb2f922c98 --- a/testautomation/framework/optional/includes/filedlg_cjk_folders.inc +++ b/testautomation/framework/optional/includes/filedlg_cjk_folders.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : check the internal file dialog ( extended tests ) '* diff --git a/testautomation/framework/optional/includes/filedlg_document_properties.inc b/testautomation/framework/optional/includes/filedlg_document_properties.inc index 0fd8a0a79f55..53917531e275 100755 --- a/testautomation/framework/optional/includes/filedlg_document_properties.inc +++ b/testautomation/framework/optional/includes/filedlg_document_properties.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Access document properties '* diff --git a/testautomation/framework/optional/includes/filedlg_filternames.inc b/testautomation/framework/optional/includes/filedlg_filternames.inc index 083fdac2793e..1d0b91e2710d 100755 --- a/testautomation/framework/optional/includes/filedlg_filternames.inc +++ b/testautomation/framework/optional/includes/filedlg_filternames.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Verify that all filters are listed in the filter listbox '* diff --git a/testautomation/framework/optional/includes/filedlg_folders1.inc b/testautomation/framework/optional/includes/filedlg_folders1.inc old mode 100644 new mode 100755 index 52d905876df3..99cf0831f12c --- a/testautomation/framework/optional/includes/filedlg_folders1.inc +++ b/testautomation/framework/optional/includes/filedlg_folders1.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : check the internal file dialog ( 1. part ) '* diff --git a/testautomation/framework/optional/includes/filedlg_folders2.inc b/testautomation/framework/optional/includes/filedlg_folders2.inc old mode 100644 new mode 100755 index 4e1a8684ba03..e7b6f6e0dcbf --- a/testautomation/framework/optional/includes/filedlg_folders2.inc +++ b/testautomation/framework/optional/includes/filedlg_folders2.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : check the internal file dialog ( 1. part ) '* diff --git a/testautomation/framework/optional/includes/filedlg_folders3.inc b/testautomation/framework/optional/includes/filedlg_folders3.inc old mode 100644 new mode 100755 index 9219c3a76be6..354c95fbc23c --- a/testautomation/framework/optional/includes/filedlg_folders3.inc +++ b/testautomation/framework/optional/includes/filedlg_folders3.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : check the internal file dialog ( 1. part ) '* diff --git a/testautomation/framework/optional/includes/filedlg_folders4.inc b/testautomation/framework/optional/includes/filedlg_folders4.inc old mode 100644 new mode 100755 index 0e90c3b70d9d..6c0bbb881730 --- a/testautomation/framework/optional/includes/filedlg_folders4.inc +++ b/testautomation/framework/optional/includes/filedlg_folders4.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : check the internal file dialog ( 1. part ) '* diff --git a/testautomation/framework/optional/includes/filedlg_folders5.inc b/testautomation/framework/optional/includes/filedlg_folders5.inc old mode 100644 new mode 100755 index 03ea63a34a35..ed3959a6e7e4 --- a/testautomation/framework/optional/includes/filedlg_folders5.inc +++ b/testautomation/framework/optional/includes/filedlg_folders5.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : check the internal file dialog ( 1. part ) '* diff --git a/testautomation/framework/optional/includes/filedlg_folders6.inc b/testautomation/framework/optional/includes/filedlg_folders6.inc old mode 100644 new mode 100755 index dae5106793f9..e82589bbe1d0 --- a/testautomation/framework/optional/includes/filedlg_folders6.inc +++ b/testautomation/framework/optional/includes/filedlg_folders6.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : check the internal file dialog '* diff --git a/testautomation/framework/optional/includes/filedlg_folders7.inc b/testautomation/framework/optional/includes/filedlg_folders7.inc old mode 100644 new mode 100755 index 1a971d1bdada..df9c399c7253 --- a/testautomation/framework/optional/includes/filedlg_folders7.inc +++ b/testautomation/framework/optional/includes/filedlg_folders7.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : check the internal file dialog ( 1. part ) '* diff --git a/testautomation/framework/optional/includes/filedlg_forbidden_names_windows.inc b/testautomation/framework/optional/includes/filedlg_forbidden_names_windows.inc old mode 100644 new mode 100755 index 96cff87d3d04..b4b538b85cf6 --- a/testautomation/framework/optional/includes/filedlg_forbidden_names_windows.inc +++ b/testautomation/framework/optional/includes/filedlg_forbidden_names_windows.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : check the internal file dialog ( extended tests ) '* diff --git a/testautomation/framework/optional/includes/filedlg_multiselection.inc b/testautomation/framework/optional/includes/filedlg_multiselection.inc old mode 100644 new mode 100755 index ed6fc3670db8..32754ec00553 --- a/testautomation/framework/optional/includes/filedlg_multiselection.inc +++ b/testautomation/framework/optional/includes/filedlg_multiselection.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Select a huge number of documents and load '* diff --git a/testautomation/framework/optional/includes/filedlg_passwords.inc b/testautomation/framework/optional/includes/filedlg_passwords.inc index b921b1a831e0..b9442cd2bfbd 100755 --- a/testautomation/framework/optional/includes/filedlg_passwords.inc +++ b/testautomation/framework/optional/includes/filedlg_passwords.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : save and load passworded files '* diff --git a/testautomation/framework/optional/includes/filedlg_reserved_names_unix.inc b/testautomation/framework/optional/includes/filedlg_reserved_names_unix.inc old mode 100644 new mode 100755 index 885dc6a92f2d..7758fbe55783 --- a/testautomation/framework/optional/includes/filedlg_reserved_names_unix.inc +++ b/testautomation/framework/optional/includes/filedlg_reserved_names_unix.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : check the internal file dialog ( extended tests ) '* diff --git a/testautomation/framework/optional/includes/filedlg_reserved_names_windows.inc b/testautomation/framework/optional/includes/filedlg_reserved_names_windows.inc old mode 100644 new mode 100755 index 4fba22fb9c8f..48ed1a59e4a3 --- a/testautomation/framework/optional/includes/filedlg_reserved_names_windows.inc +++ b/testautomation/framework/optional/includes/filedlg_reserved_names_windows.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : check the internal file dialog ( extended tests ) '* diff --git a/testautomation/framework/optional/includes/filedlg_tools.inc b/testautomation/framework/optional/includes/filedlg_tools.inc old mode 100644 new mode 100755 index b4781813c89e..b04fdc3f92ec --- a/testautomation/framework/optional/includes/filedlg_tools.inc +++ b/testautomation/framework/optional/includes/filedlg_tools.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : check the internal file dialog ( 1. part ) '* diff --git a/testautomation/framework/optional/includes/filedlg_triggers.inc b/testautomation/framework/optional/includes/filedlg_triggers.inc old mode 100644 new mode 100755 index 47913a327091..1e39d2900895 --- a/testautomation/framework/optional/includes/filedlg_triggers.inc +++ b/testautomation/framework/optional/includes/filedlg_triggers.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Alternative ways to open file-dialogs / slot availablilty '* diff --git a/testautomation/framework/optional/includes/fontworkgallery.inc b/testautomation/framework/optional/includes/fontworkgallery.inc old mode 100644 new mode 100755 index 08fea775ba4e..c83ce1fb5740 --- a/testautomation/framework/optional/includes/fontworkgallery.inc +++ b/testautomation/framework/optional/includes/fontworkgallery.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : Resource test of font work gallery '* diff --git a/testautomation/framework/optional/includes/help_bookmarks.inc b/testautomation/framework/optional/includes/help_bookmarks.inc old mode 100644 new mode 100755 index c4aebad1af9d..04a16951c0a9 --- a/testautomation/framework/optional/includes/help_bookmarks.inc +++ b/testautomation/framework/optional/includes/help_bookmarks.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Bookmarks in the help browser '* diff --git a/testautomation/framework/optional/includes/help_compare_applications.inc b/testautomation/framework/optional/includes/help_compare_applications.inc index b7edb50dbc8b..3028c41ecedf 100755 --- a/testautomation/framework/optional/includes/help_compare_applications.inc +++ b/testautomation/framework/optional/includes/help_compare_applications.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : '* diff --git a/testautomation/framework/optional/includes/help_compare_content.inc b/testautomation/framework/optional/includes/help_compare_content.inc index fc9f9a7de4d9..73c11940e0dc 100755 --- a/testautomation/framework/optional/includes/help_compare_content.inc +++ b/testautomation/framework/optional/includes/help_compare_content.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : '* diff --git a/testautomation/framework/optional/includes/help_compare_topics.inc b/testautomation/framework/optional/includes/help_compare_topics.inc index feef650c64e9..ef060eb18275 100755 --- a/testautomation/framework/optional/includes/help_compare_topics.inc +++ b/testautomation/framework/optional/includes/help_compare_topics.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : '* diff --git a/testautomation/framework/optional/includes/help_search.inc b/testautomation/framework/optional/includes/help_search.inc index dddf9cbda60d..92243b538c4f 100755 --- a/testautomation/framework/optional/includes/help_search.inc +++ b/testautomation/framework/optional/includes/help_search.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Search for a string, apply restrictions, verify '* diff --git a/testautomation/framework/optional/includes/help_view_topics.inc b/testautomation/framework/optional/includes/help_view_topics.inc old mode 100644 new mode 100755 index 6a729fe27679..b14c5d5a8511 --- a/testautomation/framework/optional/includes/help_view_topics.inc +++ b/testautomation/framework/optional/includes/help_view_topics.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Display each help topic '* diff --git a/testautomation/framework/optional/includes/loadsave_files.inc b/testautomation/framework/optional/includes/loadsave_files.inc old mode 100644 new mode 100755 index c7fd948b5df3..a9eac8164c22 --- a/testautomation/framework/optional/includes/loadsave_files.inc +++ b/testautomation/framework/optional/includes/loadsave_files.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : File / New-Saving-Loading-Saving-Loading '* diff --git a/testautomation/framework/optional/includes/loadsave_new.inc b/testautomation/framework/optional/includes/loadsave_new.inc old mode 100644 new mode 100755 index 924646423031..02e734382fa2 --- a/testautomation/framework/optional/includes/loadsave_new.inc +++ b/testautomation/framework/optional/includes/loadsave_new.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : tborsten.bosbach@sun.com +'* owner : tborsten.bosbach@oracle.com '* '* short description : global functionality - load/save documents '* diff --git a/testautomation/framework/optional/includes/menuentries.inc b/testautomation/framework/optional/includes/menuentries.inc old mode 100644 new mode 100755 index 5c00a7cf34f1..f2006915c8b1 --- a/testautomation/framework/optional/includes/menuentries.inc +++ b/testautomation/framework/optional/includes/menuentries.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : thorsten.bosbach@sun.com +'* Owner : thorsten.bosbach@oracle.com '* '* short description : Read menubar and first level drop down lists and compare to reference '* diff --git a/testautomation/framework/optional/includes/ole_1.inc b/testautomation/framework/optional/includes/ole_1.inc old mode 100644 new mode 100755 index a90d517620a1..de7efa3bae8d --- a/testautomation/framework/optional/includes/ole_1.inc +++ b/testautomation/framework/optional/includes/ole_1.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : global-level-1-test -> insert all OLE-Objects out of OLE-dialog into all doc-types '* diff --git a/testautomation/framework/optional/includes/ole_2.inc b/testautomation/framework/optional/includes/ole_2.inc old mode 100644 new mode 100755 index f2c679e84b6d..a45c885428fb --- a/testautomation/framework/optional/includes/ole_2.inc +++ b/testautomation/framework/optional/includes/ole_2.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : global-level-1-test -> insert all OLE-Objects out of OLE-dialog into all doc-types '* diff --git a/testautomation/framework/optional/includes/ole_3.inc b/testautomation/framework/optional/includes/ole_3.inc index 9f1d0ac28d6b..0636bfacb576 100755 --- a/testautomation/framework/optional/includes/ole_3.inc +++ b/testautomation/framework/optional/includes/ole_3.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : '* diff --git a/testautomation/framework/optional/includes/ole_tools.inc b/testautomation/framework/optional/includes/ole_tools.inc index 03b921fc95d3..fdcfb6c62166 100755 --- a/testautomation/framework/optional/includes/ole_tools.inc +++ b/testautomation/framework/optional/includes/ole_tools.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : global-level-1-test -> insert all OLE-Objects out of OLE-dialog into all doc-types '* diff --git a/testautomation/framework/optional/includes/options_asia.inc b/testautomation/framework/optional/includes/options_asia.inc old mode 100644 new mode 100755 index 730d5a0e666f..76e990ca69fa --- a/testautomation/framework/optional/includes/options_asia.inc +++ b/testautomation/framework/optional/includes/options_asia.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : functionality test for language/settings '* diff --git a/testautomation/framework/optional/includes/options_data.inc b/testautomation/framework/optional/includes/options_data.inc old mode 100644 new mode 100755 index ac4c3240c3f4..4b60f9c99942 --- a/testautomation/framework/optional/includes/options_data.inc +++ b/testautomation/framework/optional/includes/options_data.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : general option test ( datasource - group ) '* diff --git a/testautomation/framework/optional/includes/options_int1.inc b/testautomation/framework/optional/includes/options_int1.inc old mode 100644 new mode 100755 index 76b989679c15..9c79a79a7d97 --- a/testautomation/framework/optional/includes/options_int1.inc +++ b/testautomation/framework/optional/includes/options_int1.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : general options test (test for internet-group) '* diff --git a/testautomation/framework/optional/includes/options_lan1.inc b/testautomation/framework/optional/includes/options_lan1.inc old mode 100644 new mode 100755 index c3659cb68f14..ac7f70d18de2 --- a/testautomation/framework/optional/includes/options_lan1.inc +++ b/testautomation/framework/optional/includes/options_lan1.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : general option test (test for language-group) '* diff --git a/testautomation/framework/optional/includes/options_loadsave_general.inc b/testautomation/framework/optional/includes/options_loadsave_general.inc old mode 100644 new mode 100755 index 39885ffc2e3c..84c41e906df6 --- a/testautomation/framework/optional/includes/options_loadsave_general.inc +++ b/testautomation/framework/optional/includes/options_loadsave_general.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : Tools->Options Load/Save: General '* diff --git a/testautomation/framework/optional/includes/options_loadsave_html.inc b/testautomation/framework/optional/includes/options_loadsave_html.inc old mode 100644 new mode 100755 index 072f4f4dea24..d1b7790f539b --- a/testautomation/framework/optional/includes/options_loadsave_html.inc +++ b/testautomation/framework/optional/includes/options_loadsave_html.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Test the Load/Save HTML compatibility page '* diff --git a/testautomation/framework/optional/includes/options_loadsave_msoffice.inc b/testautomation/framework/optional/includes/options_loadsave_msoffice.inc old mode 100644 new mode 100755 index b02f4778fd02..c04a110e7ce5 --- a/testautomation/framework/optional/includes/options_loadsave_msoffice.inc +++ b/testautomation/framework/optional/includes/options_loadsave_msoffice.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Test Load/Save MS-Office settings page '* diff --git a/testautomation/framework/optional/includes/options_loadsave_vba.inc b/testautomation/framework/optional/includes/options_loadsave_vba.inc old mode 100644 new mode 100755 index 3238f4de37d6..be367449553b --- a/testautomation/framework/optional/includes/options_loadsave_vba.inc +++ b/testautomation/framework/optional/includes/options_loadsave_vba.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Test VBA settings-page '* diff --git a/testautomation/framework/optional/includes/options_ooo_accessibility.inc b/testautomation/framework/optional/includes/options_ooo_accessibility.inc old mode 100644 new mode 100755 index 93e389a67d69..6e553bd336a3 --- a/testautomation/framework/optional/includes/options_ooo_accessibility.inc +++ b/testautomation/framework/optional/includes/options_ooo_accessibility.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : Tools->Options: OpenOffice.org Accessibility '* diff --git a/testautomation/framework/optional/includes/options_ooo_appearance.inc b/testautomation/framework/optional/includes/options_ooo_appearance.inc old mode 100644 new mode 100755 index afe8efa26be7..72b016b72582 --- a/testautomation/framework/optional/includes/options_ooo_appearance.inc +++ b/testautomation/framework/optional/includes/options_ooo_appearance.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : Tools->Options: OpenOffice.org Appearance '* diff --git a/testautomation/framework/optional/includes/options_ooo_colors.inc b/testautomation/framework/optional/includes/options_ooo_colors.inc old mode 100644 new mode 100755 index ccf4b4642173..6d1db18179c2 --- a/testautomation/framework/optional/includes/options_ooo_colors.inc +++ b/testautomation/framework/optional/includes/options_ooo_colors.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : Tools->Options: OpenOffice.org Colors '* diff --git a/testautomation/framework/optional/includes/options_ooo_fontreplacement.inc b/testautomation/framework/optional/includes/options_ooo_fontreplacement.inc old mode 100644 new mode 100755 index d83be235b765..ccf22af0680e --- a/testautomation/framework/optional/includes/options_ooo_fontreplacement.inc +++ b/testautomation/framework/optional/includes/options_ooo_fontreplacement.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : Tools->Options: OpenOffice.org Fonts '* diff --git a/testautomation/framework/optional/includes/options_ooo_general.inc b/testautomation/framework/optional/includes/options_ooo_general.inc index 0b218bff8493..c973feade8ae 100755 --- a/testautomation/framework/optional/includes/options_ooo_general.inc +++ b/testautomation/framework/optional/includes/options_ooo_general.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : 1. test for general group userdata '* diff --git a/testautomation/framework/optional/includes/options_ooo_java.inc b/testautomation/framework/optional/includes/options_ooo_java.inc old mode 100644 new mode 100755 index 4e8d39e124d9..4b3c1b9dd51d --- a/testautomation/framework/optional/includes/options_ooo_java.inc +++ b/testautomation/framework/optional/includes/options_ooo_java.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : Tools->Options: OpenOffice.org Java '* diff --git a/testautomation/framework/optional/includes/options_ooo_memory.inc b/testautomation/framework/optional/includes/options_ooo_memory.inc old mode 100644 new mode 100755 index 3f50fb90076d..6c2038556af4 --- a/testautomation/framework/optional/includes/options_ooo_memory.inc +++ b/testautomation/framework/optional/includes/options_ooo_memory.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : 1. test for general group userdata ... view) '* diff --git a/testautomation/framework/optional/includes/options_ooo_paths.inc b/testautomation/framework/optional/includes/options_ooo_paths.inc old mode 100644 new mode 100755 index 692f538d6507..85c797665a1e --- a/testautomation/framework/optional/includes/options_ooo_paths.inc +++ b/testautomation/framework/optional/includes/options_ooo_paths.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : Options - StarOffice - path settings '* diff --git a/testautomation/framework/optional/includes/options_ooo_print.inc b/testautomation/framework/optional/includes/options_ooo_print.inc old mode 100644 new mode 100755 index 23cced8c737d..35e83eb0d5f2 --- a/testautomation/framework/optional/includes/options_ooo_print.inc +++ b/testautomation/framework/optional/includes/options_ooo_print.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : Tools->Options: OpenOffice.org Print '* diff --git a/testautomation/framework/optional/includes/options_ooo_security.inc b/testautomation/framework/optional/includes/options_ooo_security.inc index be542fc71689..5c839a249af5 100755 --- a/testautomation/framework/optional/includes/options_ooo_security.inc +++ b/testautomation/framework/optional/includes/options_ooo_security.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : Tools->Options: OpenOffice.org Security '* diff --git a/testautomation/framework/optional/includes/options_ooo_userdata.inc b/testautomation/framework/optional/includes/options_ooo_userdata.inc old mode 100644 new mode 100755 index 9d5da5da6194..c1adc7709e70 --- a/testautomation/framework/optional/includes/options_ooo_userdata.inc +++ b/testautomation/framework/optional/includes/options_ooo_userdata.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : Tools->Options: OpenOffice.org User Data '* diff --git a/testautomation/framework/optional/includes/options_ooo_view.inc b/testautomation/framework/optional/includes/options_ooo_view.inc old mode 100644 new mode 100755 index ff3ee7936751..52130dcd09d4 --- a/testautomation/framework/optional/includes/options_ooo_view.inc +++ b/testautomation/framework/optional/includes/options_ooo_view.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : Tools->Options: OpenOffice.org View '* diff --git a/testautomation/framework/optional/includes/scripting_organizers.inc b/testautomation/framework/optional/includes/scripting_organizers.inc index d5159cd383ee..c3da1313da9c 100755 --- a/testautomation/framework/optional/includes/scripting_organizers.inc +++ b/testautomation/framework/optional/includes/scripting_organizers.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Test scripting-organizers / document-attached scripts '* diff --git a/testautomation/framework/optional/includes/security_broken_signature.inc b/testautomation/framework/optional/includes/security_broken_signature.inc old mode 100644 new mode 100755 index 3d7d822a9693..1cce0f33af3d --- a/testautomation/framework/optional/includes/security_broken_signature.inc +++ b/testautomation/framework/optional/includes/security_broken_signature.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Load documents containing hidden BASIC scripts '* diff --git a/testautomation/framework/optional/includes/security_certification_dialogs.inc b/testautomation/framework/optional/includes/security_certification_dialogs.inc index 18c47c36d5fa..ee7605ad1cce 100755 --- a/testautomation/framework/optional/includes/security_certification_dialogs.inc +++ b/testautomation/framework/optional/includes/security_certification_dialogs.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Walk through a number of dialogs related to digital signatures '* diff --git a/testautomation/framework/optional/includes/security_evilmacro1.inc b/testautomation/framework/optional/includes/security_evilmacro1.inc old mode 100644 new mode 100755 index 7fb6ad1de02a..9927f1652cb3 --- a/testautomation/framework/optional/includes/security_evilmacro1.inc +++ b/testautomation/framework/optional/includes/security_evilmacro1.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Load documents containing hidden BASIC scripts '* diff --git a/testautomation/framework/optional/includes/security_evilmacro2.inc b/testautomation/framework/optional/includes/security_evilmacro2.inc old mode 100644 new mode 100755 index 00ae5ee0a938..0c687976fba7 --- a/testautomation/framework/optional/includes/security_evilmacro2.inc +++ b/testautomation/framework/optional/includes/security_evilmacro2.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Load documents containing hidden BASIC scripts '* diff --git a/testautomation/framework/optional/includes/security_evilmacro3.inc b/testautomation/framework/optional/includes/security_evilmacro3.inc old mode 100644 new mode 100755 index 1fb86e329088..c891163ef3e2 --- a/testautomation/framework/optional/includes/security_evilmacro3.inc +++ b/testautomation/framework/optional/includes/security_evilmacro3.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Load documents containing hidden BASIC scripts '* diff --git a/testautomation/framework/optional/includes/security_incorrect_password.inc b/testautomation/framework/optional/includes/security_incorrect_password.inc index 2478a59d6294..8e6eb2deffee 100755 --- a/testautomation/framework/optional/includes/security_incorrect_password.inc +++ b/testautomation/framework/optional/includes/security_incorrect_password.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Password protect files '* diff --git a/testautomation/framework/optional/includes/security_macrosecurity.inc b/testautomation/framework/optional/includes/security_macrosecurity.inc index 1c9d360da9e6..93b4811de44f 100755 --- a/testautomation/framework/optional/includes/security_macrosecurity.inc +++ b/testautomation/framework/optional/includes/security_macrosecurity.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Macros with all security-levels '* diff --git a/testautomation/framework/optional/includes/security_recommend_password.inc b/testautomation/framework/optional/includes/security_recommend_password.inc index 628fdecd7ae5..ab914fe5125b 100755 --- a/testautomation/framework/optional/includes/security_recommend_password.inc +++ b/testautomation/framework/optional/includes/security_recommend_password.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Password settings in Tools/Options '* diff --git a/testautomation/framework/optional/includes/security_trusted_path.inc b/testautomation/framework/optional/includes/security_trusted_path.inc old mode 100644 new mode 100755 index 679abdcc9be4..9115ba2e9f5a --- a/testautomation/framework/optional/includes/security_trusted_path.inc +++ b/testautomation/framework/optional/includes/security_trusted_path.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Execute macros from trusted path '* diff --git a/testautomation/framework/optional/includes/standardbar2.inc b/testautomation/framework/optional/includes/standardbar2.inc index 3d2b87f33b7b..2b9f8a95d129 100755 --- a/testautomation/framework/optional/includes/standardbar2.inc +++ b/testautomation/framework/optional/includes/standardbar2.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : global update test (Standardbar) '* diff --git a/testautomation/framework/optional/includes/toolbar_behavior.inc b/testautomation/framework/optional/includes/toolbar_behavior.inc old mode 100644 new mode 100755 index 5f7357df7e31..e9e96f6bb72e --- a/testautomation/framework/optional/includes/toolbar_behavior.inc +++ b/testautomation/framework/optional/includes/toolbar_behavior.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : Resource test of toolbar behavior '* diff --git a/testautomation/framework/optional/includes/w_grid_layout1.inc b/testautomation/framework/optional/includes/w_grid_layout1.inc index 772ebc6d9d00..16ca31b09fa4 100644 --- a/testautomation/framework/optional/includes/w_grid_layout1.inc +++ b/testautomation/framework/optional/includes/w_grid_layout1.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : Grid Layout for CJK test in Writer '* diff --git a/testautomation/framework/required/f_help_browser.bas b/testautomation/framework/required/f_help_browser.bas index edc70c63f9ca..753b1d8cae99 100755 --- a/testautomation/framework/required/f_help_browser.bas +++ b/testautomation/framework/required/f_help_browser.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Update/resource-test for the help-browser '* diff --git a/testautomation/framework/required/f_printer_administration.bas b/testautomation/framework/required/f_printer_administration.bas index 60e32941c261..93ad542126ae 100755 --- a/testautomation/framework/required/f_printer_administration.bas +++ b/testautomation/framework/required/f_printer_administration.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : A brief look at the spadmin-tool '* diff --git a/testautomation/framework/required/f_programmability_dialogs.bas b/testautomation/framework/required/f_programmability_dialogs.bas index 537a4693770f..925334027592 100755 --- a/testautomation/framework/required/f_programmability_dialogs.bas +++ b/testautomation/framework/required/f_programmability_dialogs.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Update-Test for some dialogs in Basic-IDE '* diff --git a/testautomation/framework/required/f_security_dialogs.bas b/testautomation/framework/required/f_security_dialogs.bas index 1362dc6d43d6..76bd6cc57373 100755 --- a/testautomation/framework/required/f_security_dialogs.bas +++ b/testautomation/framework/required/f_security_dialogs.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Security dialogs in Tools/Options '* diff --git a/testautomation/framework/required/f_standard_toolbar.bas b/testautomation/framework/required/f_standard_toolbar.bas index 3fdcc8fde55f..83a860f6674a 100755 --- a/testautomation/framework/required/f_standard_toolbar.bas +++ b/testautomation/framework/required/f_standard_toolbar.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Update/resource-test for toolbars '* diff --git a/testautomation/framework/required/f_tools_options.bas b/testautomation/framework/required/f_tools_options.bas index 9b64e7e1cd26..b4cac6c8f4b3 100755 --- a/testautomation/framework/required/f_tools_options.bas +++ b/testautomation/framework/required/f_tools_options.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Verify that the applications appear in tools/options '* diff --git a/testautomation/framework/required/f_topten.bas b/testautomation/framework/required/f_topten.bas index 3b7068ece70b..4d9b741aa071 100755 --- a/testautomation/framework/required/f_topten.bas +++ b/testautomation/framework/required/f_topten.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : smoke test for each application '* diff --git a/testautomation/framework/required/f_window_functions.bas b/testautomation/framework/required/f_window_functions.bas index dabbd7647649..5f848835e7a6 100755 --- a/testautomation/framework/required/f_window_functions.bas +++ b/testautomation/framework/required/f_window_functions.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Basic Window/Titlebar functionality '* diff --git a/testautomation/framework/required/f_wizards.bas b/testautomation/framework/required/f_wizards.bas index d1f7c3e4797b..9ad1be7a05ed 100755 --- a/testautomation/framework/required/f_wizards.bas +++ b/testautomation/framework/required/f_wizards.bas @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Category 0 tests for all included wizards '* diff --git a/testautomation/framework/required/includes/basic_dialog_export.inc b/testautomation/framework/required/includes/basic_dialog_export.inc old mode 100644 new mode 100755 index 489a727545fe..ecdb26cc6ac0 --- a/testautomation/framework/required/includes/basic_dialog_export.inc +++ b/testautomation/framework/required/includes/basic_dialog_export.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Update test for the dialog export feature '* diff --git a/testautomation/framework/required/includes/basic_dialog_i18n.inc b/testautomation/framework/required/includes/basic_dialog_i18n.inc index 590c45a5f58a..3c95be08a9d6 100755 --- a/testautomation/framework/required/includes/basic_dialog_i18n.inc +++ b/testautomation/framework/required/includes/basic_dialog_i18n.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Update test for Basic IDE / Dialog i18n-feature '* diff --git a/testautomation/framework/required/includes/basic_dialog_i18n_import.inc b/testautomation/framework/required/includes/basic_dialog_i18n_import.inc old mode 100644 new mode 100755 index db72863173b8..e6e62995716c --- a/testautomation/framework/required/includes/basic_dialog_i18n_import.inc +++ b/testautomation/framework/required/includes/basic_dialog_i18n_import.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : '* diff --git a/testautomation/framework/required/includes/basic_macroassignment.inc b/testautomation/framework/required/includes/basic_macroassignment.inc index 05967fcfd008..6dda14b07698 100755 --- a/testautomation/framework/required/includes/basic_macroassignment.inc +++ b/testautomation/framework/required/includes/basic_macroassignment.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Update-Test for some dialogs in Basic-IDE '* diff --git a/testautomation/framework/required/includes/basic_organizer.inc b/testautomation/framework/required/includes/basic_organizer.inc index 789d870cb9a6..7df67c82cd62 100755 --- a/testautomation/framework/required/includes/basic_organizer.inc +++ b/testautomation/framework/required/includes/basic_organizer.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Update test for the Basic Organizer dialog '* diff --git a/testautomation/framework/required/includes/first.inc b/testautomation/framework/required/includes/first.inc index 700cee374104..478ba7cd6b90 100755 --- a/testautomation/framework/required/includes/first.inc +++ b/testautomation/framework/required/includes/first.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : First test of basic functionality '* diff --git a/testautomation/framework/required/includes/help_browser.inc b/testautomation/framework/required/includes/help_browser.inc index 62438373dc37..858dc46c2779 100755 --- a/testautomation/framework/required/includes/help_browser.inc +++ b/testautomation/framework/required/includes/help_browser.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : global update/resource test '* diff --git a/testautomation/framework/required/includes/printer_administration.inc b/testautomation/framework/required/includes/printer_administration.inc index a05ecc6b02a1..6349f381d194 100755 --- a/testautomation/framework/required/includes/printer_administration.inc +++ b/testautomation/framework/required/includes/printer_administration.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : updatetest for the printer configuration '* diff --git a/testautomation/framework/required/includes/scripting_basics.inc b/testautomation/framework/required/includes/scripting_basics.inc index d5377c4873bd..d1939546b89d 100755 --- a/testautomation/framework/required/includes/scripting_basics.inc +++ b/testautomation/framework/required/includes/scripting_basics.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Quick short test for the scripting framework '* diff --git a/testautomation/framework/required/includes/security_dialogs.inc b/testautomation/framework/required/includes/security_dialogs.inc old mode 100644 new mode 100755 index fec9900a28b8..d8f5a096595a --- a/testautomation/framework/required/includes/security_dialogs.inc +++ b/testautomation/framework/required/includes/security_dialogs.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Security dialogs in Tools/Options '* diff --git a/testautomation/framework/required/includes/smoketest.inc b/testautomation/framework/required/includes/smoketest.inc old mode 100644 new mode 100755 index dcff255d6c6c..24ef362a1bf1 --- a/testautomation/framework/required/includes/smoketest.inc +++ b/testautomation/framework/required/includes/smoketest.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : "10ner/Smoke Test" from release engineering '* diff --git a/testautomation/framework/required/includes/standard_toolbar_1.inc b/testautomation/framework/required/includes/standard_toolbar_1.inc old mode 100644 new mode 100755 index 4494d6a26cad..b7d54bb89180 --- a/testautomation/framework/required/includes/standard_toolbar_1.inc +++ b/testautomation/framework/required/includes/standard_toolbar_1.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : global update test (Standardbar) '* diff --git a/testautomation/framework/required/includes/standard_toolbar_3.inc b/testautomation/framework/required/includes/standard_toolbar_3.inc old mode 100644 new mode 100755 index cbc08096b8a6..46c71bd93409 --- a/testautomation/framework/required/includes/standard_toolbar_3.inc +++ b/testautomation/framework/required/includes/standard_toolbar_3.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Items on the standardbar '* diff --git a/testautomation/framework/required/includes/standard_toolbar_4.inc b/testautomation/framework/required/includes/standard_toolbar_4.inc index 3f393ff3291a..fbd21e46d032 100755 --- a/testautomation/framework/required/includes/standard_toolbar_4.inc +++ b/testautomation/framework/required/includes/standard_toolbar_4.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Invisible items on the standardbar '* diff --git a/testautomation/framework/required/includes/standard_toolbar_5.inc b/testautomation/framework/required/includes/standard_toolbar_5.inc old mode 100644 new mode 100755 index 76fa20d5dffa..8e03d1253f84 --- a/testautomation/framework/required/includes/standard_toolbar_5.inc +++ b/testautomation/framework/required/includes/standard_toolbar_5.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Customize toolbar '* diff --git a/testautomation/framework/required/includes/standard_toolbar_6.inc b/testautomation/framework/required/includes/standard_toolbar_6.inc index c3ff6be6e849..ab357cd81013 100755 --- a/testautomation/framework/required/includes/standard_toolbar_6.inc +++ b/testautomation/framework/required/includes/standard_toolbar_6.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Open applications from New button on standardbar '* diff --git a/testautomation/framework/required/includes/tools_customize.inc b/testautomation/framework/required/includes/tools_customize.inc index 2f7064055883..36089018a589 100755 --- a/testautomation/framework/required/includes/tools_customize.inc +++ b/testautomation/framework/required/includes/tools_customize.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Update Test for the Tools Customize Dialog '* diff --git a/testautomation/framework/required/includes/tools_options.inc b/testautomation/framework/required/includes/tools_options.inc index 82d5ef6ae861..928d533cbe3a 100755 --- a/testautomation/framework/required/includes/tools_options.inc +++ b/testautomation/framework/required/includes/tools_options.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Verify that the applications appear in tools/options '* diff --git a/testautomation/framework/required/includes/topten.inc b/testautomation/framework/required/includes/topten.inc old mode 100644 new mode 100755 index 9aea2b0ab8b6..a08d59c8064e --- a/testautomation/framework/required/includes/topten.inc +++ b/testautomation/framework/required/includes/topten.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Smoke test (load/save/clipboard) '* diff --git a/testautomation/framework/required/includes/window_functions.inc b/testautomation/framework/required/includes/window_functions.inc index 2adb42638d02..acc5e7a5219d 100644 --- a/testautomation/framework/required/includes/window_functions.inc +++ b/testautomation/framework/required/includes/window_functions.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Window/Titlebar functionality '* diff --git a/testautomation/framework/required/includes/wizard_agenda.inc b/testautomation/framework/required/includes/wizard_agenda.inc index d320234fd40b..a192be35015e 100755 --- a/testautomation/framework/required/includes/wizard_agenda.inc +++ b/testautomation/framework/required/includes/wizard_agenda.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Update test for agenda wizard '* diff --git a/testautomation/framework/required/includes/wizard_documentconverter.inc b/testautomation/framework/required/includes/wizard_documentconverter.inc old mode 100644 new mode 100755 index 7ba81116728b..cca037b16680 --- a/testautomation/framework/required/includes/wizard_documentconverter.inc +++ b/testautomation/framework/required/includes/wizard_documentconverter.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Update test for documentconverter '* diff --git a/testautomation/framework/required/includes/wizard_euroconverter.inc b/testautomation/framework/required/includes/wizard_euroconverter.inc old mode 100644 new mode 100755 index dd439ea4a3bd..87b32b5abf08 --- a/testautomation/framework/required/includes/wizard_euroconverter.inc +++ b/testautomation/framework/required/includes/wizard_euroconverter.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Update test for the Euroconverter '* diff --git a/testautomation/framework/required/includes/wizard_fax.inc b/testautomation/framework/required/includes/wizard_fax.inc index b970d8754c5d..bbd75f66a327 100755 --- a/testautomation/framework/required/includes/wizard_fax.inc +++ b/testautomation/framework/required/includes/wizard_fax.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Update Test for Fax Wizard '* diff --git a/testautomation/framework/required/includes/wizard_firsttime.inc b/testautomation/framework/required/includes/wizard_firsttime.inc index e057ba09d2e8..63c79966b41e 100755 --- a/testautomation/framework/required/includes/wizard_firsttime.inc +++ b/testautomation/framework/required/includes/wizard_firsttime.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Updatetest for the first time wizard '* diff --git a/testautomation/framework/required/includes/wizard_letter.inc b/testautomation/framework/required/includes/wizard_letter.inc index 267efcefd18a..1c0cb05031f0 100755 --- a/testautomation/framework/required/includes/wizard_letter.inc +++ b/testautomation/framework/required/includes/wizard_letter.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Update Test for Letter Wizard '* diff --git a/testautomation/framework/required/includes/wizard_mailmerge.inc b/testautomation/framework/required/includes/wizard_mailmerge.inc index 45b8947eec38..95f8d6d19a54 100755 --- a/testautomation/framework/required/includes/wizard_mailmerge.inc +++ b/testautomation/framework/required/includes/wizard_mailmerge.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Update test for the mailmerge wizard '* diff --git a/testautomation/framework/required/includes/wizard_presentation.inc b/testautomation/framework/required/includes/wizard_presentation.inc index 59544e0fb48e..68143b3cdc3c 100755 --- a/testautomation/framework/required/includes/wizard_presentation.inc +++ b/testautomation/framework/required/includes/wizard_presentation.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Update test for the presentation wizard '* diff --git a/testautomation/framework/required/includes/wizard_webpage.inc b/testautomation/framework/required/includes/wizard_webpage.inc old mode 100644 new mode 100755 index 6200079c8025..465fae368db1 --- a/testautomation/framework/required/includes/wizard_webpage.inc +++ b/testautomation/framework/required/includes/wizard_webpage.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : Resource test of Web Page Wizard '* diff --git a/testautomation/framework/tools/includes/CJK_tools.inc b/testautomation/framework/tools/includes/CJK_tools.inc index e905b55bbebc..38664ef78501 100755 --- a/testautomation/framework/tools/includes/CJK_tools.inc +++ b/testautomation/framework/tools/includes/CJK_tools.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : hercule.li@sun.com +'* owner : hercule.li@oracle.com '* '* short description : Tools for CJK feature test in Writer '* diff --git a/testautomation/framework/tools/includes/customize_tools.inc b/testautomation/framework/tools/includes/customize_tools.inc index 386c5423ee3a..9fbdb6928b08 100755 --- a/testautomation/framework/tools/includes/customize_tools.inc +++ b/testautomation/framework/tools/includes/customize_tools.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Tools to ease the use of the ToolsCustomize-Dialog '* diff --git a/testautomation/framework/tools/includes/fileoperations.inc b/testautomation/framework/tools/includes/fileoperations.inc index dd91cc08f498..061f9f606f48 100755 --- a/testautomation/framework/tools/includes/fileoperations.inc +++ b/testautomation/framework/tools/includes/fileoperations.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : check the internal file dialog ( extended tests ) '* diff --git a/testautomation/framework/tools/includes/formcontrols.inc b/testautomation/framework/tools/includes/formcontrols.inc index 03ebb004ee3a..6755ed2a2cdd 100755 --- a/testautomation/framework/tools/includes/formcontrols.inc +++ b/testautomation/framework/tools/includes/formcontrols.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ ' ** -' ** owner : joerg.skottke@sun.com +' ** owner : joerg.skottke@oracle.com ' ** ' ** short description : Tools to draw and select form controls in basic-ide ' ** diff --git a/testautomation/framework/tools/includes/help_tools.inc b/testautomation/framework/tools/includes/help_tools.inc index 8552954f4f34..9c81084952df 100755 --- a/testautomation/framework/tools/includes/help_tools.inc +++ b/testautomation/framework/tools/includes/help_tools.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Replacements for routines in t_lists.inc adds some '* diff --git a/testautomation/framework/tools/includes/i18n_tools.inc b/testautomation/framework/tools/includes/i18n_tools.inc index 131f162c8436..f918b1fe5076 100755 --- a/testautomation/framework/tools/includes/i18n_tools.inc +++ b/testautomation/framework/tools/includes/i18n_tools.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Tools to ease working with language dependent strings/values '* diff --git a/testautomation/framework/tools/includes/options_tools.inc b/testautomation/framework/tools/includes/options_tools.inc index 27969686dea6..4f7a05154795 100755 --- a/testautomation/framework/tools/includes/options_tools.inc +++ b/testautomation/framework/tools/includes/options_tools.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : tools for options tests '* diff --git a/testautomation/framework/tools/includes/pbrowser_tools.inc b/testautomation/framework/tools/includes/pbrowser_tools.inc index 912b3f85aec2..a6a089150a96 100755 --- a/testautomation/framework/tools/includes/pbrowser_tools.inc +++ b/testautomation/framework/tools/includes/pbrowser_tools.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Tools for working with the property browser for formcontrols '* diff --git a/testautomation/framework/tools/includes/private_environment.inc b/testautomation/framework/tools/includes/private_environment.inc old mode 100644 new mode 100755 index 87cfab146f15..af81110b3f18 --- a/testautomation/framework/tools/includes/private_environment.inc +++ b/testautomation/framework/tools/includes/private_environment.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Tools to ease working with private environment '* diff --git a/testautomation/framework/tools/includes/scriptorganizer_tools.inc b/testautomation/framework/tools/includes/scriptorganizer_tools.inc index 0b09ed6270ac..8cf067913d64 100755 --- a/testautomation/framework/tools/includes/scriptorganizer_tools.inc +++ b/testautomation/framework/tools/includes/scriptorganizer_tools.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Test scripting-organizers / document-attached scripts '* diff --git a/testautomation/framework/tools/includes/spadmin_tools.inc b/testautomation/framework/tools/includes/spadmin_tools.inc index b31e5dbe5a58..77cbdf61a44b 100755 --- a/testautomation/framework/tools/includes/spadmin_tools.inc +++ b/testautomation/framework/tools/includes/spadmin_tools.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : helper functions for SPAdmin '* diff --git a/testautomation/framework/tools/includes/template_tools.inc b/testautomation/framework/tools/includes/template_tools.inc index 5a1370b77262..c9d1e94fa16f 100755 --- a/testautomation/framework/tools/includes/template_tools.inc +++ b/testautomation/framework/tools/includes/template_tools.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Helper functions to ease usage of templates '* diff --git a/testautomation/framework/tools/includes/toolbar_tools.inc b/testautomation/framework/tools/includes/toolbar_tools.inc index 8d0b198b0441..63117227becc 100755 --- a/testautomation/framework/tools/includes/toolbar_tools.inc +++ b/testautomation/framework/tools/includes/toolbar_tools.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : global update test (Standardbar) '* diff --git a/testautomation/framework/tools/includes/webtools.inc b/testautomation/framework/tools/includes/webtools.inc old mode 100644 new mode 100755 index a56639a269e3..424ace8c959e --- a/testautomation/framework/tools/includes/webtools.inc +++ b/testautomation/framework/tools/includes/webtools.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Tools to ease working with web functionality '* diff --git a/testautomation/framework/tools/includes/window_tools.inc b/testautomation/framework/tools/includes/window_tools.inc old mode 100644 new mode 100755 index bb8579edfba7..93a09ccf533d --- a/testautomation/framework/tools/includes/window_tools.inc +++ b/testautomation/framework/tools/includes/window_tools.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Tools to handle windows/frames '* diff --git a/testautomation/framework/tools/includes/wizards.inc b/testautomation/framework/tools/includes/wizards.inc index a140401c1202..274d862a8520 100755 --- a/testautomation/framework/tools/includes/wizards.inc +++ b/testautomation/framework/tools/includes/wizards.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : helper functions for the wizards '* diff --git a/testautomation/global/input/empty/please_do_not_delete_this_file b/testautomation/global/input/empty/please_do_not_delete_this_file index c6103b698301..0b366e10364f 100644 --- a/testautomation/global/input/empty/please_do_not_delete_this_file +++ b/testautomation/global/input/empty/please_do_not_delete_this_file @@ -1,3 +1,3 @@ Please do not delete this file. -thorsten.ziehm@sun.com \ No newline at end of file +thorsten.ziehm@oracle.com \ No newline at end of file diff --git a/testautomation/global/required/includes/g_001.inc b/testautomation/global/required/includes/g_001.inc index 07c294f44e2f..8cbc1bb24526 100755 --- a/testautomation/global/required/includes/g_001.inc +++ b/testautomation/global/required/includes/g_001.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : thorsten.bosbach@sun.com +'* Owner : thorsten.bosbach@oracle.com '* '* short description : Global resource tests for the menu: File '* diff --git a/testautomation/global/required/includes/g_009.inc b/testautomation/global/required/includes/g_009.inc index 17b31cf3fd08..61ef7dd95c37 100755 --- a/testautomation/global/required/includes/g_009.inc +++ b/testautomation/global/required/includes/g_009.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : thorsten.bosbach@sun.com +'* Owner : thorsten.bosbach@oracle.com '* '* short description : Global resource tests for the menu: Help '* diff --git a/testautomation/global/required/includes/g_customize.inc b/testautomation/global/required/includes/g_customize.inc old mode 100644 new mode 100755 index f2df48f3c552..07c2dde3927d --- a/testautomation/global/required/includes/g_customize.inc +++ b/testautomation/global/required/includes/g_customize.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : thorsten.bosbach@sun.com +'* Owner : thorsten.bosbach@oracle.com '* '* short description : update and resouce test for tools/customize '* diff --git a/testautomation/global/required/includes/g_numberformatter1.inc b/testautomation/global/required/includes/g_numberformatter1.inc index 2271bc333142..2539e12455e5 100755 --- a/testautomation/global/required/includes/g_numberformatter1.inc +++ b/testautomation/global/required/includes/g_numberformatter1.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : wolfram.garten@sun.com +'* owner : wolfram.garten@oracle.com '* '* short description : update and resouce test for numberformatter '* diff --git a/testautomation/global/required/includes/g_option.inc b/testautomation/global/required/includes/g_option.inc index fe462038899f..2f7b6aa33ac2 100755 --- a/testautomation/global/required/includes/g_option.inc +++ b/testautomation/global/required/includes/g_option.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : update and resouce test for all option pages (at tools/options) '* diff --git a/testautomation/global/required/includes/g_option_application.inc b/testautomation/global/required/includes/g_option_application.inc old mode 100644 new mode 100755 index 4fe4a6cb2cad..233b6cb9d9cc --- a/testautomation/global/required/includes/g_option_application.inc +++ b/testautomation/global/required/includes/g_option_application.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : update and resouce test for all option pages (at tools/options) '* diff --git a/testautomation/global/required/includes/g_printing.inc b/testautomation/global/required/includes/g_printing.inc old mode 100644 new mode 100755 index e05c1ba1d7e6..15ee12c4308d --- a/testautomation/global/required/includes/g_printing.inc +++ b/testautomation/global/required/includes/g_printing.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Resource test for the printing dialog '* diff --git a/testautomation/global/system/includes/declare.inc b/testautomation/global/system/includes/declare.inc old mode 100644 new mode 100755 index 97ef228a8118..5fed58be6cfd --- a/testautomation/global/system/includes/declare.inc +++ b/testautomation/global/system/includes/declare.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : starting routines for declare.bas '* diff --git a/testautomation/global/system/includes/gvariabl.inc b/testautomation/global/system/includes/gvariabl.inc index eff969fbee2c..ca3764a1a51b 100755 --- a/testautomation/global/system/includes/gvariabl.inc +++ b/testautomation/global/system/includes/gvariabl.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : helge.delfs@sun.com +'* owner : helge.delfs@oracle.com '* '* short description : all global variables '* diff --git a/testautomation/global/system/includes/iniinfo.inc b/testautomation/global/system/includes/iniinfo.inc index aa305b9a1a21..0b83af421eeb 100755 --- a/testautomation/global/system/includes/iniinfo.inc +++ b/testautomation/global/system/includes/iniinfo.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : helge.delfs@sun.com +'* owner : helge.delfs@oracle.com '* '* short description : get information for startup a test out of important ini-files '* diff --git a/testautomation/global/system/includes/inivalue.inc b/testautomation/global/system/includes/inivalue.inc index cf70fa365f7e..2cc13be957cb 100755 --- a/testautomation/global/system/includes/inivalue.inc +++ b/testautomation/global/system/includes/inivalue.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : routines to handle ini-files ( read/write items ) '* diff --git a/testautomation/global/system/includes/master.inc b/testautomation/global/system/includes/master.inc index fafb5f758a85..880496e3dc42 100755 --- a/testautomation/global/system/includes/master.inc +++ b/testautomation/global/system/includes/master.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : helge.delfs@sun.com +'* owner : helge.delfs@oracle.com '* '* short description : very important routines to start a testscript '* diff --git a/testautomation/global/system/includes/status.inc b/testautomation/global/system/includes/status.inc index bf1ba6a74416..83430bfaa332 100755 --- a/testautomation/global/system/includes/status.inc +++ b/testautomation/global/system/includes/status.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : Routines for the status page feature '* diff --git a/testautomation/global/system/includes/sysinfo.inc b/testautomation/global/system/includes/sysinfo.inc old mode 100644 new mode 100755 index f6b7ba369b1f..30e00585d517 --- a/testautomation/global/system/includes/sysinfo.inc +++ b/testautomation/global/system/includes/sysinfo.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : helge.delfs@sun.com +'* owner : helge.delfs@oracle.com '* '* short description : Establish facts of the operating system '* diff --git a/testautomation/global/tools/closeoffice.bas b/testautomation/global/tools/closeoffice.bas old mode 100755 new mode 100644 index a2a9200d10c3..da402ecd40f7 --- a/testautomation/global/tools/closeoffice.bas +++ b/testautomation/global/tools/closeoffice.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : Exit the [Star|Open][Office|Suite][.org] nicely '* diff --git a/testautomation/global/tools/compressstatus.bas b/testautomation/global/tools/compressstatus.bas index b8ed46d3b3f5..679b322096b0 100755 --- a/testautomation/global/tools/compressstatus.bas +++ b/testautomation/global/tools/compressstatus.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : Compress local written status files for submission '* diff --git a/testautomation/global/tools/declare.bas b/testautomation/global/tools/declare.bas index a874bb674a8c..7d00ef69f824 100755 --- a/testautomation/global/tools/declare.bas +++ b/testautomation/global/tools/declare.bas @@ -24,7 +24,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : To get Help ID's from the office '* diff --git a/testautomation/global/tools/includes/optional/t_accels.inc b/testautomation/global/tools/includes/optional/t_accels.inc old mode 100644 new mode 100755 index 4d04afaf3554..04718449b13b --- a/testautomation/global/tools/includes/optional/t_accels.inc +++ b/testautomation/global/tools/includes/optional/t_accels.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : handle accelerators '* diff --git a/testautomation/global/tools/includes/optional/t_basic_ide_tools.inc b/testautomation/global/tools/includes/optional/t_basic_ide_tools.inc index fcf8d301db58..f7537d52700c 100755 --- a/testautomation/global/tools/includes/optional/t_basic_ide_tools.inc +++ b/testautomation/global/tools/includes/optional/t_basic_ide_tools.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ ' ** -' ** owner : joerg.skottke@sun.com +' ** owner : joerg.skottke@oracle.com ' ** ' ** short description : tools for the property-browser test ' ** diff --git a/testautomation/global/tools/includes/optional/t_basic_organizer_tools.inc b/testautomation/global/tools/includes/optional/t_basic_organizer_tools.inc index b813ee2bf706..f63d610dbdb8 100755 --- a/testautomation/global/tools/includes/optional/t_basic_organizer_tools.inc +++ b/testautomation/global/tools/includes/optional/t_basic_organizer_tools.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ ' ** -' ** owner : joerg.skottke@sun.com +' ** owner : joerg.skottke@oracle.com ' ** ' ** short description : tools for tools/macro test ' ** diff --git a/testautomation/global/tools/includes/optional/t_control_objects.inc b/testautomation/global/tools/includes/optional/t_control_objects.inc old mode 100644 new mode 100755 index 00bafbf04ed5..b1da7d7e8d95 --- a/testautomation/global/tools/includes/optional/t_control_objects.inc +++ b/testautomation/global/tools/includes/optional/t_control_objects.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Functions to manipulate controls by accessing them as objects '* diff --git a/testautomation/global/tools/includes/optional/t_docfuncs.inc b/testautomation/global/tools/includes/optional/t_docfuncs.inc index c544db3111fa..7f43b7211630 100755 --- a/testautomation/global/tools/includes/optional/t_docfuncs.inc +++ b/testautomation/global/tools/includes/optional/t_docfuncs.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : misc functions to handle documents '* diff --git a/testautomation/global/tools/includes/optional/t_extension_manager_tools.inc b/testautomation/global/tools/includes/optional/t_extension_manager_tools.inc index 0b530af4a274..654b1b76c515 100755 --- a/testautomation/global/tools/includes/optional/t_extension_manager_tools.inc +++ b/testautomation/global/tools/includes/optional/t_extension_manager_tools.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Tools to ease working with the extension manager '* diff --git a/testautomation/global/tools/includes/optional/t_filetools.inc b/testautomation/global/tools/includes/optional/t_filetools.inc index 420b14ae9676..070427ef3c5b 100755 --- a/testautomation/global/tools/includes/optional/t_filetools.inc +++ b/testautomation/global/tools/includes/optional/t_filetools.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Functions that work with files like deleting, loading... '* diff --git a/testautomation/global/tools/includes/optional/t_key_tools.inc b/testautomation/global/tools/includes/optional/t_key_tools.inc old mode 100644 new mode 100755 index 9bf994824cc9..14906c127c68 --- a/testautomation/global/tools/includes/optional/t_key_tools.inc +++ b/testautomation/global/tools/includes/optional/t_key_tools.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : tools for evaluation of key=value datalists '* diff --git a/testautomation/global/tools/includes/optional/t_listfuncs.inc b/testautomation/global/tools/includes/optional/t_listfuncs.inc index ea8a5d5bec68..8aefe8720939 100755 --- a/testautomation/global/tools/includes/optional/t_listfuncs.inc +++ b/testautomation/global/tools/includes/optional/t_listfuncs.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Replacements for routines in t_lists.inc adds some '* diff --git a/testautomation/global/tools/includes/optional/t_locale_strings1.inc b/testautomation/global/tools/includes/optional/t_locale_strings1.inc index d3e7708dbd30..29c4bcf3cb6b 100755 --- a/testautomation/global/tools/includes/optional/t_locale_strings1.inc +++ b/testautomation/global/tools/includes/optional/t_locale_strings1.inc @@ -25,7 +25,7 @@ ' '/*********************************************************************** '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : defining locale dependant strings '* diff --git a/testautomation/global/tools/includes/optional/t_locale_tools.inc b/testautomation/global/tools/includes/optional/t_locale_tools.inc old mode 100644 new mode 100755 index 83a80ad0d107..75d18e2c5856 --- a/testautomation/global/tools/includes/optional/t_locale_tools.inc +++ b/testautomation/global/tools/includes/optional/t_locale_tools.inc @@ -25,7 +25,7 @@ ' '/*********************************************************************** '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : place it here '* diff --git a/testautomation/global/tools/includes/optional/t_macro_tools.inc b/testautomation/global/tools/includes/optional/t_macro_tools.inc index 18d5245e13f7..6c1fcc478e5a 100755 --- a/testautomation/global/tools/includes/optional/t_macro_tools.inc +++ b/testautomation/global/tools/includes/optional/t_macro_tools.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ ' ** -' ** owner : joerg.skottke@sun.com +' ** owner : joerg.skottke@oracle.com ' ** ' ** short description : Helper functions for Macro tests ' ** diff --git a/testautomation/global/tools/includes/optional/t_ole.inc b/testautomation/global/tools/includes/optional/t_ole.inc index 63c55705add9..13138dfc52ab 100755 --- a/testautomation/global/tools/includes/optional/t_ole.inc +++ b/testautomation/global/tools/includes/optional/t_ole.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Tools for OLE objects '* diff --git a/testautomation/global/tools/includes/optional/t_security_tools.inc b/testautomation/global/tools/includes/optional/t_security_tools.inc index 24a718fd7a48..28625be35880 100755 --- a/testautomation/global/tools/includes/optional/t_security_tools.inc +++ b/testautomation/global/tools/includes/optional/t_security_tools.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Tools to ease testing of security related funtionality '* diff --git a/testautomation/global/tools/includes/optional/t_set_standard_controls.inc b/testautomation/global/tools/includes/optional/t_set_standard_controls.inc old mode 100644 new mode 100755 index bcc8cda10e5b..8384edcc27d1 --- a/testautomation/global/tools/includes/optional/t_set_standard_controls.inc +++ b/testautomation/global/tools/includes/optional/t_set_standard_controls.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : helge.delfs@sun.com +'* owner : helge.delfs@oracle.com '* '* short description : Tool library for setting controls and verifying the functionality '* diff --git a/testautomation/global/tools/includes/optional/t_spreadsheet_tools1.inc b/testautomation/global/tools/includes/optional/t_spreadsheet_tools1.inc old mode 100644 new mode 100755 index cdc0eae38540..55da2fc1c9aa --- a/testautomation/global/tools/includes/optional/t_spreadsheet_tools1.inc +++ b/testautomation/global/tools/includes/optional/t_spreadsheet_tools1.inc @@ -25,7 +25,7 @@ ' '/*********************************************************************** '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Global tools for spreadsheet '* diff --git a/testautomation/global/tools/includes/optional/t_stringtools.inc b/testautomation/global/tools/includes/optional/t_stringtools.inc index 914d8b7c6ab4..7f946fd3b046 100755 --- a/testautomation/global/tools/includes/optional/t_stringtools.inc +++ b/testautomation/global/tools/includes/optional/t_stringtools.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Functions for manipulation of strings '* diff --git a/testautomation/global/tools/includes/optional/t_toolbar_tools1.inc b/testautomation/global/tools/includes/optional/t_toolbar_tools1.inc index 0bd7ae50525f..77c72a9ec2dc 100755 --- a/testautomation/global/tools/includes/optional/t_toolbar_tools1.inc +++ b/testautomation/global/tools/includes/optional/t_toolbar_tools1.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : helge.delfs@sun.com +'* owner : helge.delfs@oracle.com '* '* short description : Toolbar tools 1 '* @@ -36,7 +36,7 @@ '\************************************************************************************* '****************************************************************** -'* Created by hercule.li@sun.com +'* Created by hercule.li@oracle.com '* This function will active or inactive image button in toolbar '* sToolbar : Toolbar name '* sObject : image button name diff --git a/testautomation/global/tools/includes/optional/t_toolbar_writer.inc b/testautomation/global/tools/includes/optional/t_toolbar_writer.inc old mode 100644 new mode 100755 index dea5fe027a63..892dbd09bb36 --- a/testautomation/global/tools/includes/optional/t_toolbar_writer.inc +++ b/testautomation/global/tools/includes/optional/t_toolbar_writer.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : helge.delfs@sun.com +'* owner : helge.delfs@oracle.com '* '* short description : Toolbar tools - Writer '* diff --git a/testautomation/global/tools/includes/optional/t_treelist_tools.inc b/testautomation/global/tools/includes/optional/t_treelist_tools.inc index 0c1d17e62c91..5477022dc160 100755 --- a/testautomation/global/tools/includes/optional/t_treelist_tools.inc +++ b/testautomation/global/tools/includes/optional/t_treelist_tools.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Helpers for accessing treelists '* diff --git a/testautomation/global/tools/includes/optional/t_ui_filters.inc b/testautomation/global/tools/includes/optional/t_ui_filters.inc old mode 100644 new mode 100755 index b76765e05069..7b9dd66e1a40 --- a/testautomation/global/tools/includes/optional/t_ui_filters.inc +++ b/testautomation/global/tools/includes/optional/t_ui_filters.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Get the UI names for default filters '* diff --git a/testautomation/global/tools/includes/optional/t_user_info.inc b/testautomation/global/tools/includes/optional/t_user_info.inc old mode 100644 new mode 100755 index 7ad00b9e539e..d4771be2e3c9 --- a/testautomation/global/tools/includes/optional/t_user_info.inc +++ b/testautomation/global/tools/includes/optional/t_user_info.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Extension Update Test '* diff --git a/testautomation/global/tools/includes/optional/t_xml1.inc b/testautomation/global/tools/includes/optional/t_xml1.inc old mode 100644 new mode 100755 index e84dad7ddf47..5afd05cbb22f --- a/testautomation/global/tools/includes/optional/t_xml1.inc +++ b/testautomation/global/tools/includes/optional/t_xml1.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : helge.delfs@sun.com +'* Owner : helge.delfs@oracle.com '* '* short description : simple XML-Parser for XML-Files from Registration-Database and Routines to work with SAX-Parser in Testtool '* diff --git a/testautomation/global/tools/includes/optional/t_xml2.inc b/testautomation/global/tools/includes/optional/t_xml2.inc old mode 100644 new mode 100755 index 93bd725dbc38..46dc9b350393 --- a/testautomation/global/tools/includes/optional/t_xml2.inc +++ b/testautomation/global/tools/includes/optional/t_xml2.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : helge.delfs@sun.com +'* owner : helge.delfs@oracle.com '* '* short description : XML search routines II '* diff --git a/testautomation/global/tools/includes/optional/t_xml_filter1.inc b/testautomation/global/tools/includes/optional/t_xml_filter1.inc old mode 100644 new mode 100755 index e82b7f17553f..7ccab1c0db88 --- a/testautomation/global/tools/includes/optional/t_xml_filter1.inc +++ b/testautomation/global/tools/includes/optional/t_xml_filter1.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : helge.delfs@sun.com +'* owner : helge.delfs@oracle.com '* '* short description : Tools / XML Filter Settings Resource Test '* diff --git a/testautomation/global/tools/includes/required/t_dir.inc b/testautomation/global/tools/includes/required/t_dir.inc index 04c4bd8956f9..ee673e6b1c47 100755 --- a/testautomation/global/tools/includes/required/t_dir.inc +++ b/testautomation/global/tools/includes/required/t_dir.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : functions for directories and files; execution happens in the office '* diff --git a/testautomation/global/tools/includes/required/t_doc1.inc b/testautomation/global/tools/includes/required/t_doc1.inc index 61c6afadab03..ff07554bca35 100644 --- a/testautomation/global/tools/includes/required/t_doc1.inc +++ b/testautomation/global/tools/includes/required/t_doc1.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : Global Routines for Document Handling '* diff --git a/testautomation/global/tools/includes/required/t_doc2.inc b/testautomation/global/tools/includes/required/t_doc2.inc index 4941d0fcf7ad..4192563b0eba 100755 --- a/testautomation/global/tools/includes/required/t_doc2.inc +++ b/testautomation/global/tools/includes/required/t_doc2.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : Global Routines for Document Handling; Part two '* diff --git a/testautomation/global/tools/includes/required/t_files.inc b/testautomation/global/tools/includes/required/t_files.inc index d9da7ce5191a..4b0ddd09318b 100755 --- a/testautomation/global/tools/includes/required/t_files.inc +++ b/testautomation/global/tools/includes/required/t_files.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* Owner : thorsten.bosbach@sun.com +'* Owner : thorsten.bosbach@oracle.com '* '* short description : Global routines for loading, saving, printing, export '* diff --git a/testautomation/global/tools/includes/required/t_filters.inc b/testautomation/global/tools/includes/required/t_filters.inc index f6a2beca6eb0..afb1bf999c52 100755 --- a/testautomation/global/tools/includes/required/t_filters.inc +++ b/testautomation/global/tools/includes/required/t_filters.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Retrieve and set filternames and suffixes '* diff --git a/testautomation/global/tools/includes/required/t_lists.inc b/testautomation/global/tools/includes/required/t_lists.inc index f32db2f29277..9fa2172fbccf 100755 --- a/testautomation/global/tools/includes/required/t_lists.inc +++ b/testautomation/global/tools/includes/required/t_lists.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : helge.delfs@sun.com +'* owner : helge.delfs@oracle.com '* '* short description : general routines to work with lists (arrays) '* diff --git a/testautomation/global/tools/includes/required/t_menu.inc b/testautomation/global/tools/includes/required/t_menu.inc index a7c64b37865d..830012cc7dae 100755 --- a/testautomation/global/tools/includes/required/t_menu.inc +++ b/testautomation/global/tools/includes/required/t_menu.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* Owner : thorsten.bosbach@sun.com +'* Owner : thorsten.bosbach@oracle.com '* '* short description : wrappers for accessing menues (context-, bar-, button- menues) '* diff --git a/testautomation/global/tools/includes/required/t_option.inc b/testautomation/global/tools/includes/required/t_option.inc old mode 100644 new mode 100755 index b94d4a028833..4f4467263072 --- a/testautomation/global/tools/includes/required/t_option.inc +++ b/testautomation/global/tools/includes/required/t_option.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : General option test (sub-routines for options tests) '* diff --git a/testautomation/global/tools/includes/required/t_option2.inc b/testautomation/global/tools/includes/required/t_option2.inc old mode 100644 new mode 100755 index 2b10f50ce00a..7e97c58d2848 --- a/testautomation/global/tools/includes/required/t_option2.inc +++ b/testautomation/global/tools/includes/required/t_option2.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : Tools library for options testcases '* diff --git a/testautomation/global/tools/includes/required/t_tools1.inc b/testautomation/global/tools/includes/required/t_tools1.inc index 7242d1c3653d..051afec0ad24 100755 --- a/testautomation/global/tools/includes/required/t_tools1.inc +++ b/testautomation/global/tools/includes/required/t_tools1.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@sun.com +'* owner : joerg.skottke@oracle.com '* '* short description : Tools (1) '* diff --git a/testautomation/global/tools/includes/required/t_tools2.inc b/testautomation/global/tools/includes/required/t_tools2.inc index 449977d9329d..76422a5e8108 100755 --- a/testautomation/global/tools/includes/required/t_tools2.inc +++ b/testautomation/global/tools/includes/required/t_tools2.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : helge.delfs@sun.com +'* owner : helge.delfs@oracle.com '* '* short description : Global Tools II '* diff --git a/testautomation/global/tools/includes/required/t_tools3.inc b/testautomation/global/tools/includes/required/t_tools3.inc index 987a6ded6bb6..4b29928a1b93 100755 --- a/testautomation/global/tools/includes/required/t_tools3.inc +++ b/testautomation/global/tools/includes/required/t_tools3.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : helge.delfs@sun.com +'* owner : helge.delfs@oracle.com '* '* short description : Global Tools III '* @@ -34,7 +34,7 @@ sub hToolbarSelect( sType as string, sOpen as boolean, optional SetToDefault as boolean ) Dim sDefault as integer, sKontext as string, sPosition as integer Dim SteppedThrough as boolean - '/// Created by helge.delfs@sun.com + '/// Created by helge.delfs@oracle.com '/// This function opens/closes a toolbar through View/Toolbar menu '/// Required parameters: '/// sType as string -> Name of the toolbar to be opened / closed @@ -840,7 +840,7 @@ sub hToolbarSelect( sType as string, sOpen as boolean, optional SetToDefault as end sub sub hCloseAllToolbars - '/// Created by thorsten.bosbach@sun.com + '/// Created by thorsten.bosbach@oracle.com '/// This function closes all known toolbars which are not docked '/// only if Build ID is below 8892 if (gBuild < 8892) AND (gBuild > 8888) then diff --git a/testautomation/global/tools/resetoffice.bas b/testautomation/global/tools/resetoffice.bas index e6566c15de0c..ca7590ad753f 100755 --- a/testautomation/global/tools/resetoffice.bas +++ b/testautomation/global/tools/resetoffice.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : Exit the [Star|Open][Office|Suite][.org] and delete user directory '* diff --git a/testautomation/global/tools/wintree.bas b/testautomation/global/tools/wintree.bas index 944091e37f48..0d4c376316a0 100755 --- a/testautomation/global/tools/wintree.bas +++ b/testautomation/global/tools/wintree.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : thorsten.bosbach@sun.com +'* owner : thorsten.bosbach@oracle.com '* '* short description : Show the complete window hierarchy '* diff --git a/testautomation/global/win/bars.win b/testautomation/global/win/bars.win index f2c40134d964..964027cbc7b2 100755 --- a/testautomation/global/win/bars.win +++ b/testautomation/global/win/bars.win @@ -26,7 +26,7 @@ '* '/************************************************************************ '* -'* owner : helge.delfs@sun.com +'* owner : helge.delfs@oracle.com '* '* Description : Declaration of bars and buttons '* Note: To be in kmost cases compatible with old regresson diff --git a/testautomation/global/win/sys_dial.win b/testautomation/global/win/sys_dial.win index 4cacc4dda5cc..d25c83ba8997 100755 --- a/testautomation/global/win/sys_dial.win +++ b/testautomation/global/win/sys_dial.win @@ -127,7 +127,7 @@ OrdnerName fpicker:Edit:DLG_SVT_QUERYFOLDERNAME:ED_SVT_QUERYFOLDERNAME_DLG_NAME *TranslationWindow svtools:WorkWindow:TT_INLINE_TRANSLATION svtools:FloatingWindow:TT_INLINE_TRANSLATION ' **** specal longnames for bas test -' **** author marc.schwanz@sun.com +' **** author marc.neumann@oracle.com *MSC_Special_Dialog MSC_Super_ID *MSC_Special_Dialog2 MSC_Super_ID2 *MSC_Special_Dialog3 MSC_Super_ID3 diff --git a/testautomation/graphics/optional/d_export_graphic_a.bas b/testautomation/graphics/optional/d_export_graphic_a.bas old mode 100755 new mode 100644 index 406571f06a96..b5968240e024 --- a/testautomation/graphics/optional/d_export_graphic_a.bas +++ b/testautomation/graphics/optional/d_export_graphic_a.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Export Test - A-tests. (More durable ones) '* diff --git a/testautomation/graphics/optional/d_export_graphic_b.bas b/testautomation/graphics/optional/d_export_graphic_b.bas old mode 100755 new mode 100644 index a239feedf95c..97560705afc4 --- a/testautomation/graphics/optional/d_export_graphic_b.bas +++ b/testautomation/graphics/optional/d_export_graphic_b.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Export Test - B-tests. (the usual suspects) '* diff --git a/testautomation/graphics/optional/export_graphic_a.bas b/testautomation/graphics/optional/export_graphic_a.bas old mode 100755 new mode 100644 index 2460058af521..9dee4114b37f --- a/testautomation/graphics/optional/export_graphic_a.bas +++ b/testautomation/graphics/optional/export_graphic_a.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Export Test - A-tests. (More durable ones) '* diff --git a/testautomation/graphics/optional/export_graphic_b.bas b/testautomation/graphics/optional/export_graphic_b.bas old mode 100755 new mode 100644 index 65dd8ae13621..9502b5005625 --- a/testautomation/graphics/optional/export_graphic_b.bas +++ b/testautomation/graphics/optional/export_graphic_b.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Export Test - B-tests. (the usual suspects) '* diff --git a/testautomation/graphics/optional/g_accessability.bas b/testautomation/graphics/optional/g_accessability.bas index fc03755763b5..1113dcb4324f 100644 --- a/testautomation/graphics/optional/g_accessability.bas +++ b/testautomation/graphics/optional/g_accessability.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Accessability '* diff --git a/testautomation/graphics/optional/g_area.bas b/testautomation/graphics/optional/g_area.bas old mode 100755 new mode 100644 index 069066050810..3ad024ced1f6 --- a/testautomation/graphics/optional/g_area.bas +++ b/testautomation/graphics/optional/g_area.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Format Area '* diff --git a/testautomation/graphics/optional/g_arrangealign.bas b/testautomation/graphics/optional/g_arrangealign.bas old mode 100755 new mode 100644 index cfe68eb49a67..3d9f2e2ab4ab --- a/testautomation/graphics/optional/g_arrangealign.bas +++ b/testautomation/graphics/optional/g_arrangealign.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Arrange and Align '* diff --git a/testautomation/graphics/optional/g_autocorrection.bas b/testautomation/graphics/optional/g_autocorrection.bas old mode 100755 new mode 100644 index f00e0eb136f3..b4fb2af0b472 --- a/testautomation/graphics/optional/g_autocorrection.bas +++ b/testautomation/graphics/optional/g_autocorrection.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphic Function: Tools - Autocorrect '* diff --git a/testautomation/graphics/optional/g_character.bas b/testautomation/graphics/optional/g_character.bas old mode 100755 new mode 100644 index fcd4dff6907e..e13eccb813c3 --- a/testautomation/graphics/optional/g_character.bas +++ b/testautomation/graphics/optional/g_character.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Format - Character '* diff --git a/testautomation/graphics/optional/g_clipboard.bas b/testautomation/graphics/optional/g_clipboard.bas old mode 100755 new mode 100644 index 3f542e9964ea..47b48949a162 --- a/testautomation/graphics/optional/g_clipboard.bas +++ b/testautomation/graphics/optional/g_clipboard.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Clipboard '* diff --git a/testautomation/graphics/optional/g_clipexport.bas b/testautomation/graphics/optional/g_clipexport.bas old mode 100755 new mode 100644 index b1d25469e758..d75eef694394 --- a/testautomation/graphics/optional/g_clipexport.bas +++ b/testautomation/graphics/optional/g_clipexport.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Clipboard export Test '* diff --git a/testautomation/graphics/optional/g_convertto.bas b/testautomation/graphics/optional/g_convertto.bas index 4a1e76cfe04d..8283981462ee 100644 --- a/testautomation/graphics/optional/g_convertto.bas +++ b/testautomation/graphics/optional/g_convertto.bas @@ -1,73 +1,73 @@ -'encoding UTF-8 Do not remove or change this line! -'************************************************************************** -' 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 -' -' This file is part of OpenOffice.org. -' -' OpenOffice.org is free software: you can redistribute it and/or modify -' it under the terms of the GNU Lesser General Public License version 3 -' only, as published by the Free Software Foundation. -' -' OpenOffice.org is distributed in the hope that it will be useful, -' but WITHOUT ANY WARRANTY; without even the implied warranty of -' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -' GNU Lesser General Public License version 3 for more details -' (a copy is included in the LICENSE file that accompanied this code). -' -' You should have received a copy of the GNU Lesser General Public License -' version 3 along with OpenOffice.org. If not, see -' -' for a copy of the LGPLv3 License. -' -'/************************************************************************ -'* -'* Owner : wolfram.garten@sun.com -'* -'* short description : Graphics Function: Convert to ... -'* -'\****************************************************************** - -global Ueber_Text_1 as string -global Ueber_Text_2 as string -global Ueber_Text_3 as string - -sub main - PrintLog "------------------------- g_convertto test -------------------------" - Call hStatusIn ( "Graphics","g_convertto.bas") - - use "graphics\tools\id_tools.inc" - use "graphics\tools\id_tools_2.inc" - use "graphics\optional\includes\global\g_convertto.inc" - - PrintLog "-------------------------" + gApplication + "-------------------" - Call tiModifyConvertToPolygon - ' Call tdContextConvertIntoBitmap - Call tiAendernUmwandelnInKurve - Call tiAendernUmwandelnInPolygonGrafik - 'Call tiAendernUmwandelnIn3D - 'Call tiAendernUmwandelnIn3DRotationsKoerper - 'Call tiAendernUmwandelnInMetaFile - - gApplication = "DRAW" - PrintLog "-------------------------" + gApplication + "-------------------" - 'Call tiModifyConvertToPolygon - 'Call tdContextConvertIntoBitmap - 'Call tiAendernUmwandelnInKurve - 'Call tiAendernUmwandelnInPolygonGrafik - 'Call tiAendernUmwandelnIn3D - 'Call tiAendernUmwandelnIn3DRotationsKoerper - 'Call tiAendernUmwandelnInMetaFile - - Call hStatusOut -end sub - -sub LoadIncludeFiles - use "global\system\includes\master.inc" - use "global\system\includes\gvariabl.inc" - gApplication = "IMPRESS" - Call GetUseFiles -end sub +'encoding UTF-8 Do not remove or change this line! +'************************************************************************** +' 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 +' +' This file is part of OpenOffice.org. +' +' OpenOffice.org is free software: you can redistribute it and/or modify +' it under the terms of the GNU Lesser General Public License version 3 +' only, as published by the Free Software Foundation. +' +' OpenOffice.org is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU Lesser General Public License version 3 for more details +' (a copy is included in the LICENSE file that accompanied this code). +' +' You should have received a copy of the GNU Lesser General Public License +' version 3 along with OpenOffice.org. If not, see +' +' for a copy of the LGPLv3 License. +' +'/************************************************************************ +'* +'* Owner : wolfram.garten@oracle.com +'* +'* short description : Graphics Function: Convert to ... +'* +'\****************************************************************** + +global Ueber_Text_1 as string +global Ueber_Text_2 as string +global Ueber_Text_3 as string + +sub main + PrintLog "------------------------- g_convertto test -------------------------" + Call hStatusIn ( "Graphics","g_convertto.bas") + + use "graphics\tools\id_tools.inc" + use "graphics\tools\id_tools_2.inc" + use "graphics\optional\includes\global\g_convertto.inc" + + PrintLog "-------------------------" + gApplication + "-------------------" + Call tiModifyConvertToPolygon + Call tdContextConvertIntoBitmap + Call tiAendernUmwandelnInKurve + Call tiAendernUmwandelnInPolygonGrafik + Call tiAendernUmwandelnIn3D + Call tiAendernUmwandelnIn3DRotationsKoerper + Call tiAendernUmwandelnInMetaFile + + gApplication = "DRAW" + PrintLog "-------------------------" + gApplication + "-------------------" + Call tiModifyConvertToPolygon + Call tdContextConvertIntoBitmap + Call tiAendernUmwandelnInKurve + Call tiAendernUmwandelnInPolygonGrafik + Call tiAendernUmwandelnIn3D + Call tiAendernUmwandelnIn3DRotationsKoerper + Call tiAendernUmwandelnInMetaFile + + Call hStatusOut +end sub + +sub LoadIncludeFiles + use "global\system\includes\master.inc" + use "global\system\includes\gvariabl.inc" + gApplication = "IMPRESS" + Call GetUseFiles +end sub diff --git a/testautomation/graphics/optional/g_crossfading.bas b/testautomation/graphics/optional/g_crossfading.bas index 1520f995e8ab..0c8102e70bde 100644 --- a/testautomation/graphics/optional/g_crossfading.bas +++ b/testautomation/graphics/optional/g_crossfading.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphic Optional Test for Edit/Crossfading '* diff --git a/testautomation/graphics/optional/g_customshapes.bas b/testautomation/graphics/optional/g_customshapes.bas index f759be72f680..960fb7a2e19b 100644 --- a/testautomation/graphics/optional/g_customshapes.bas +++ b/testautomation/graphics/optional/g_customshapes.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Customshapes '* diff --git a/testautomation/graphics/optional/g_demoguide.bas b/testautomation/graphics/optional/g_demoguide.bas old mode 100755 new mode 100644 index 62e0e487ca89..c3a8fe861724 --- a/testautomation/graphics/optional/g_demoguide.bas +++ b/testautomation/graphics/optional/g_demoguide.bas @@ -25,7 +25,7 @@ ' '/*********************************************************************** '* -'* owner : wolfram.garten@sun.com +'* owner : wolfram.garten@oracle.com '* '* short description : testcase to check the demo guide '* diff --git a/testautomation/graphics/optional/g_dimensions.bas b/testautomation/graphics/optional/g_dimensions.bas old mode 100755 new mode 100644 index 1ebbb15e3c31..3644dfd3b0d8 --- a/testautomation/graphics/optional/g_dimensions.bas +++ b/testautomation/graphics/optional/g_dimensions.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Dimensioning Line '* diff --git a/testautomation/graphics/optional/g_edit.bas b/testautomation/graphics/optional/g_edit.bas old mode 100755 new mode 100644 index f99f9e34e0fc..305967f73112 --- a/testautomation/graphics/optional/g_edit.bas +++ b/testautomation/graphics/optional/g_edit.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Edit '* diff --git a/testautomation/graphics/optional/g_export_html.bas b/testautomation/graphics/optional/g_export_html.bas old mode 100755 new mode 100644 index c561f244c214..faa2783b6d2f --- a/testautomation/graphics/optional/g_export_html.bas +++ b/testautomation/graphics/optional/g_export_html.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Export to HTML '* diff --git a/testautomation/graphics/optional/g_findreplace.bas b/testautomation/graphics/optional/g_findreplace.bas old mode 100755 new mode 100644 index 55cd9ee405d1..9de7acfa2bc5 --- a/testautomation/graphics/optional/g_findreplace.bas +++ b/testautomation/graphics/optional/g_findreplace.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Optional Find and Replace Test '* diff --git a/testautomation/graphics/optional/g_format.bas b/testautomation/graphics/optional/g_format.bas old mode 100755 new mode 100644 index 1ee537573a5f..1c03f7bf8801 --- a/testautomation/graphics/optional/g_format.bas +++ b/testautomation/graphics/optional/g_format.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Format '* diff --git a/testautomation/graphics/optional/g_group.bas b/testautomation/graphics/optional/g_group.bas index f8d16e653c9c..93f542bcc027 100644 --- a/testautomation/graphics/optional/g_group.bas +++ b/testautomation/graphics/optional/g_group.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Group '* diff --git a/testautomation/graphics/optional/g_imagemap.bas b/testautomation/graphics/optional/g_imagemap.bas old mode 100755 new mode 100644 index 20a785548c7c..b2dd4a62c182 --- a/testautomation/graphics/optional/g_imagemap.bas +++ b/testautomation/graphics/optional/g_imagemap.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: ImageMap '* diff --git a/testautomation/graphics/optional/g_insert.bas b/testautomation/graphics/optional/g_insert.bas old mode 100755 new mode 100644 index bae6d277c98f..a006e2f04c3e --- a/testautomation/graphics/optional/g_insert.bas +++ b/testautomation/graphics/optional/g_insert.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Insert '* diff --git a/testautomation/graphics/optional/g_line.bas b/testautomation/graphics/optional/g_line.bas index 867621aa88b0..c1327e21bc96 100644 --- a/testautomation/graphics/optional/g_line.bas +++ b/testautomation/graphics/optional/g_line.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Format - Line '* diff --git a/testautomation/graphics/optional/g_load_save.bas b/testautomation/graphics/optional/g_load_save.bas old mode 100755 new mode 100644 index 5ee50f636ea7..b68da93657fc --- a/testautomation/graphics/optional/g_load_save.bas +++ b/testautomation/graphics/optional/g_load_save.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Load and Save '* diff --git a/testautomation/graphics/optional/g_mediaplayer.bas b/testautomation/graphics/optional/g_mediaplayer.bas old mode 100755 new mode 100644 index 3e25c88b3e1f..e237ce752a2d --- a/testautomation/graphics/optional/g_mediaplayer.bas +++ b/testautomation/graphics/optional/g_mediaplayer.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Mediaplayer-functionallity '* diff --git a/testautomation/graphics/optional/g_navigator.bas b/testautomation/graphics/optional/g_navigator.bas old mode 100755 new mode 100644 index 41b1babec1ed..cc165c76b37e --- a/testautomation/graphics/optional/g_navigator.bas +++ b/testautomation/graphics/optional/g_navigator.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Navigator '* diff --git a/testautomation/graphics/optional/g_ole.bas b/testautomation/graphics/optional/g_ole.bas index 6409388ef2f6..98f99e4ab931 100644 --- a/testautomation/graphics/optional/g_ole.bas +++ b/testautomation/graphics/optional/g_ole.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Ole-behaviour '* diff --git a/testautomation/graphics/optional/g_paneview.bas b/testautomation/graphics/optional/g_paneview.bas old mode 100755 new mode 100644 index da1043ba6e63..021a95cfbfad --- a/testautomation/graphics/optional/g_paneview.bas +++ b/testautomation/graphics/optional/g_paneview.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Paneview-behaviour '* diff --git a/testautomation/graphics/optional/g_paragraph.bas b/testautomation/graphics/optional/g_paragraph.bas old mode 100755 new mode 100644 index e45fa68c7ce4..502728773a6e --- a/testautomation/graphics/optional/g_paragraph.bas +++ b/testautomation/graphics/optional/g_paragraph.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Format - Paragraph '* diff --git a/testautomation/graphics/optional/g_savepictureas.bas b/testautomation/graphics/optional/g_savepictureas.bas index e3c5f3fc5b8d..332632dcdac6 100644 --- a/testautomation/graphics/optional/g_savepictureas.bas +++ b/testautomation/graphics/optional/g_savepictureas.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Contextmenu-SaveAs Picture -Test '* diff --git a/testautomation/graphics/optional/g_shaddow.bas b/testautomation/graphics/optional/g_shaddow.bas old mode 100755 new mode 100644 index cdfc24c2ea90..c6e963ae1658 --- a/testautomation/graphics/optional/g_shaddow.bas +++ b/testautomation/graphics/optional/g_shaddow.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ ' * -' * Owner : wolfram.garten@sun.com +' * Owner : wolfram.garten@oracle.com ' * ' * short description : Shaddow Optional Test ' * diff --git a/testautomation/graphics/optional/g_slidelayer.bas b/testautomation/graphics/optional/g_slidelayer.bas old mode 100755 new mode 100644 index ba444adbd71c..3ffd9a4ab37a --- a/testautomation/graphics/optional/g_slidelayer.bas +++ b/testautomation/graphics/optional/g_slidelayer.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Slide and Layer '* diff --git a/testautomation/graphics/optional/g_spellcheck.bas b/testautomation/graphics/optional/g_spellcheck.bas old mode 100755 new mode 100644 index bc975337b1d9..7dad1b0d9e40 --- a/testautomation/graphics/optional/g_spellcheck.bas +++ b/testautomation/graphics/optional/g_spellcheck.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Tools - Spellcheck '* diff --git a/testautomation/graphics/optional/g_stylist.bas b/testautomation/graphics/optional/g_stylist.bas old mode 100755 new mode 100644 index 0e3b66922af2..50da6610c41a --- a/testautomation/graphics/optional/g_stylist.bas +++ b/testautomation/graphics/optional/g_stylist.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Stylist '* diff --git a/testautomation/graphics/optional/g_tables.bas b/testautomation/graphics/optional/g_tables.bas old mode 100755 new mode 100644 index 4d4979631839..dee2e14c67a5 --- a/testautomation/graphics/optional/g_tables.bas +++ b/testautomation/graphics/optional/g_tables.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : wolfram.garten@sun.com +'* owner : wolfram.garten@oracle.com '* '* short description : Testing of impress tables '* diff --git a/testautomation/graphics/optional/g_toolbars.bas b/testautomation/graphics/optional/g_toolbars.bas old mode 100755 new mode 100644 index 12ff49f97cc9..b643e02c9e9b --- a/testautomation/graphics/optional/g_toolbars.bas +++ b/testautomation/graphics/optional/g_toolbars.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Toolbars '* diff --git a/testautomation/graphics/optional/g_tools.bas b/testautomation/graphics/optional/g_tools.bas index 272840602ac4..4e79a89ca469 100644 --- a/testautomation/graphics/optional/g_tools.bas +++ b/testautomation/graphics/optional/g_tools.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Tools '* diff --git a/testautomation/graphics/optional/g_zoom.bas b/testautomation/graphics/optional/g_zoom.bas old mode 100755 new mode 100644 index 204338131c63..1b494950ce44 --- a/testautomation/graphics/optional/g_zoom.bas +++ b/testautomation/graphics/optional/g_zoom.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Zoom '* diff --git a/testautomation/graphics/optional/gallery.bas b/testautomation/graphics/optional/gallery.bas old mode 100755 new mode 100644 index c26526ee7791..9b81954f8902 --- a/testautomation/graphics/optional/gallery.bas +++ b/testautomation/graphics/optional/gallery.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : wolfram.garten@sun.com +'* owner : wolfram.garten@oracle.com '* '* short description : (quick test) Checking functionality and all Gallery themes '* diff --git a/testautomation/graphics/optional/gallery2.bas b/testautomation/graphics/optional/gallery2.bas old mode 100755 new mode 100644 index ca0ef0ad3bcb..d467b0a74876 --- a/testautomation/graphics/optional/gallery2.bas +++ b/testautomation/graphics/optional/gallery2.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : wolfram.garten@sun.com +'* owner : wolfram.garten@oracle.com '* '* short description : (long duration! > 6h) Testing all Gallery items '* diff --git a/testautomation/graphics/optional/i_animation.bas b/testautomation/graphics/optional/i_animation.bas index 6b2c4851a28a..85503fc790c1 100644 --- a/testautomation/graphics/optional/i_animation.bas +++ b/testautomation/graphics/optional/i_animation.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Impress Function: Animation '* diff --git a/testautomation/graphics/optional/i_headerfooter.bas b/testautomation/graphics/optional/i_headerfooter.bas old mode 100755 new mode 100644 index 2ed85c89553c..e050b914ca9e --- a/testautomation/graphics/optional/i_headerfooter.bas +++ b/testautomation/graphics/optional/i_headerfooter.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Header and Footer '* diff --git a/testautomation/graphics/optional/i_only_updt_1.bas b/testautomation/graphics/optional/i_only_updt_1.bas old mode 100755 new mode 100644 index cd14cca268dc..fd1e4ae68215 --- a/testautomation/graphics/optional/i_only_updt_1.bas +++ b/testautomation/graphics/optional/i_only_updt_1.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Impress Only Required Test (Part 1) '* diff --git a/testautomation/graphics/optional/i_only_updt_2.bas b/testautomation/graphics/optional/i_only_updt_2.bas old mode 100755 new mode 100644 index 13faba0d6f2f..7b35dbab5740 --- a/testautomation/graphics/optional/i_only_updt_2.bas +++ b/testautomation/graphics/optional/i_only_updt_2.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Impress Only Required (Test Part 2) '* diff --git a/testautomation/graphics/optional/i_pengine.bas b/testautomation/graphics/optional/i_pengine.bas old mode 100755 new mode 100644 index 994d3486736e..5ddefe26ca94 --- a/testautomation/graphics/optional/i_pengine.bas +++ b/testautomation/graphics/optional/i_pengine.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ ' * -' * Owner : wolfram.garten@sun.com +' * Owner : wolfram.garten@oracle.com ' * ' * short description : Presentation-Engine Optional Test ' * diff --git a/testautomation/graphics/optional/i_saveloadlayout.bas b/testautomation/graphics/optional/i_saveloadlayout.bas index 08fc52a44270..137007da7c8f 100644 --- a/testautomation/graphics/optional/i_saveloadlayout.bas +++ b/testautomation/graphics/optional/i_saveloadlayout.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Save & Load testing of Layout -templates. '* diff --git a/testautomation/graphics/optional/i_shape.bas b/testautomation/graphics/optional/i_shape.bas old mode 100755 new mode 100644 index e92e97898448..0ebb3c1e4864 --- a/testautomation/graphics/optional/i_shape.bas +++ b/testautomation/graphics/optional/i_shape.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : wolfram.garten@sun.com +'* owner : wolfram.garten@oracle.com '* '* short description : Import presentations with shapes in .ppt format '* diff --git a/testautomation/graphics/optional/i_slidecopy.bas b/testautomation/graphics/optional/i_slidecopy.bas index cc1ac3f9d7bd..c780904e542d 100644 --- a/testautomation/graphics/optional/i_slidecopy.bas +++ b/testautomation/graphics/optional/i_slidecopy.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Slidecopy-behaviour '* diff --git a/testautomation/graphics/optional/i_slideshow.bas b/testautomation/graphics/optional/i_slideshow.bas old mode 100755 new mode 100644 index 30d309dc41f9..8a9062c87c05 --- a/testautomation/graphics/optional/i_slideshow.bas +++ b/testautomation/graphics/optional/i_slideshow.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Function: Slideshow '* diff --git a/testautomation/graphics/optional/i_us_presentation.bas b/testautomation/graphics/optional/i_us_presentation.bas old mode 100755 new mode 100644 index a9f95f97d23c..fc1196fdb182 --- a/testautomation/graphics/optional/i_us_presentation.bas +++ b/testautomation/graphics/optional/i_us_presentation.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics User-scenario-test: 2 Users creates Presentations. '* diff --git a/testautomation/graphics/optional/i_view.bas b/testautomation/graphics/optional/i_view.bas old mode 100755 new mode 100644 index eab1e9fdfc06..7dacea82d1b2 --- a/testautomation/graphics/optional/i_view.bas +++ b/testautomation/graphics/optional/i_view.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Impress Function: View '* diff --git a/testautomation/graphics/optional/includes/draw/d_002_.inc b/testautomation/graphics/optional/includes/draw/d_002_.inc index d3d0ee81a9c3..9b2f267a0729 100644 --- a/testautomation/graphics/optional/includes/draw/d_002_.inc +++ b/testautomation/graphics/optional/includes/draw/d_002_.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/draw/d_003_.inc b/testautomation/graphics/optional/includes/draw/d_003_.inc index 3a7c7da12c38..744461061559 100644 --- a/testautomation/graphics/optional/includes/draw/d_003_.inc +++ b/testautomation/graphics/optional/includes/draw/d_003_.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/draw/d_005_.inc b/testautomation/graphics/optional/includes/draw/d_005_.inc index 046e0bd76a30..6c3e7b2484df 100644 --- a/testautomation/graphics/optional/includes/draw/d_005_.inc +++ b/testautomation/graphics/optional/includes/draw/d_005_.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/draw/d_007.inc b/testautomation/graphics/optional/includes/draw/d_007.inc index 6582ff2c34c1..89fef373f161 100644 --- a/testautomation/graphics/optional/includes/draw/d_007.inc +++ b/testautomation/graphics/optional/includes/draw/d_007.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/export_graphic.inc b/testautomation/graphics/optional/includes/global/export_graphic.inc index e1d1479f5ee1..fd2cf45f9800 100644 --- a/testautomation/graphics/optional/includes/global/export_graphic.inc +++ b/testautomation/graphics/optional/includes/global/export_graphic.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Export A-tests '* diff --git a/testautomation/graphics/optional/includes/global/export_graphic_2.inc b/testautomation/graphics/optional/includes/global/export_graphic_2.inc index 2a2cbac2020a..5e0a2f3ec811 100644 --- a/testautomation/graphics/optional/includes/global/export_graphic_2.inc +++ b/testautomation/graphics/optional/includes/global/export_graphic_2.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics Export B-tests. (the usual suspects) '* diff --git a/testautomation/graphics/optional/includes/global/g_accessability.inc b/testautomation/graphics/optional/includes/global/g_accessability.inc index 8d59b0c6b387..6fa992308c44 100644 --- a/testautomation/graphics/optional/includes/global/g_accessability.inc +++ b/testautomation/graphics/optional/includes/global/g_accessability.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Accessability '* diff --git a/testautomation/graphics/optional/includes/global/g_area.inc b/testautomation/graphics/optional/includes/global/g_area.inc index caab5801a075..758044290d45 100644 --- a/testautomation/graphics/optional/includes/global/g_area.inc +++ b/testautomation/graphics/optional/includes/global/g_area.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/g_arrangealign.inc b/testautomation/graphics/optional/includes/global/g_arrangealign.inc index 16f0ca213d26..48c6599efa72 100644 --- a/testautomation/graphics/optional/includes/global/g_arrangealign.inc +++ b/testautomation/graphics/optional/includes/global/g_arrangealign.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/g_autocorrection.inc b/testautomation/graphics/optional/includes/global/g_autocorrection.inc index 447808b4bc8e..731c9e0ed21f 100644 --- a/testautomation/graphics/optional/includes/global/g_autocorrection.inc +++ b/testautomation/graphics/optional/includes/global/g_autocorrection.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/g_character.inc b/testautomation/graphics/optional/includes/global/g_character.inc index 31b4f364c50c..a9d578665c5a 100644 --- a/testautomation/graphics/optional/includes/global/g_character.inc +++ b/testautomation/graphics/optional/includes/global/g_character.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/g_clipboard.inc b/testautomation/graphics/optional/includes/global/g_clipboard.inc index 9bc85a4bbad1..4c1900876565 100644 --- a/testautomation/graphics/optional/includes/global/g_clipboard.inc +++ b/testautomation/graphics/optional/includes/global/g_clipboard.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/g_clipexport.inc b/testautomation/graphics/optional/includes/global/g_clipexport.inc index 91357e867937..64385ffd78c3 100644 --- a/testautomation/graphics/optional/includes/global/g_clipexport.inc +++ b/testautomation/graphics/optional/includes/global/g_clipexport.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Tests the clipboard-function with a rectangle '* diff --git a/testautomation/graphics/optional/includes/global/g_clipexport2.inc b/testautomation/graphics/optional/includes/global/g_clipexport2.inc index c8dfe7f52d91..fae2cdcc7820 100644 --- a/testautomation/graphics/optional/includes/global/g_clipexport2.inc +++ b/testautomation/graphics/optional/includes/global/g_clipexport2.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/g_clipexport3.inc b/testautomation/graphics/optional/includes/global/g_clipexport3.inc index c51d92eb3fed..5a6e86ac2a9c 100644 --- a/testautomation/graphics/optional/includes/global/g_clipexport3.inc +++ b/testautomation/graphics/optional/includes/global/g_clipexport3.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Procedures for the Clipboard-Export-Test '* diff --git a/testautomation/graphics/optional/includes/global/g_convertto.inc b/testautomation/graphics/optional/includes/global/g_convertto.inc index 8acac43a45fc..33eb157bc465 100644 --- a/testautomation/graphics/optional/includes/global/g_convertto.inc +++ b/testautomation/graphics/optional/includes/global/g_convertto.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/g_crossfading.inc b/testautomation/graphics/optional/includes/global/g_crossfading.inc index 275f1ee49839..0d7142b9ae46 100644 --- a/testautomation/graphics/optional/includes/global/g_crossfading.inc +++ b/testautomation/graphics/optional/includes/global/g_crossfading.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/g_customshapes.inc b/testautomation/graphics/optional/includes/global/g_customshapes.inc index 850356821d2f..28c2e22ed301 100644 --- a/testautomation/graphics/optional/includes/global/g_customshapes.inc +++ b/testautomation/graphics/optional/includes/global/g_customshapes.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Customshapes-test '* diff --git a/testautomation/graphics/optional/includes/global/g_demoguide.inc b/testautomation/graphics/optional/includes/global/g_demoguide.inc index 8da45a872259..54a3a67c58d0 100644 --- a/testautomation/graphics/optional/includes/global/g_demoguide.inc +++ b/testautomation/graphics/optional/includes/global/g_demoguide.inc @@ -25,7 +25,7 @@ ' '/*********************************************************************** '* -'* owner : wolfram.garten@sun.com +'* owner : wolfram.garten@oracle.com '* '* short description : testcase to check the demo guide '* diff --git a/testautomation/graphics/optional/includes/global/g_dimensions.inc b/testautomation/graphics/optional/includes/global/g_dimensions.inc index 3d48ad7327ab..5980903828e0 100644 --- a/testautomation/graphics/optional/includes/global/g_dimensions.inc +++ b/testautomation/graphics/optional/includes/global/g_dimensions.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/g_edit.inc b/testautomation/graphics/optional/includes/global/g_edit.inc index 6313865b8912..869e6730cf0d 100644 --- a/testautomation/graphics/optional/includes/global/g_edit.inc +++ b/testautomation/graphics/optional/includes/global/g_edit.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/g_export_html.inc b/testautomation/graphics/optional/includes/global/g_export_html.inc index 5f6e9fa6040a..6b91cdef26fd 100644 --- a/testautomation/graphics/optional/includes/global/g_export_html.inc +++ b/testautomation/graphics/optional/includes/global/g_export_html.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* @@ -49,7 +49,7 @@ testcase tHtmlExport hToolsOptions ("STAROFFICE","USERDATA") VorName.SetText "Garfield" ZuName.SetText "Peanuts" - EMail.SetText "recumbent@sun.com" + EMail.SetText "recumbent@oracle.com" Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK @@ -197,8 +197,8 @@ testcase tHtmlExport end if sTemp = EMail.GetText Adresse1=EMail.GetText - if (sTemp <> "recumbent@sun.com") then - warnlog "Value for 'Email' is other than expected, should be 'recumbent@sun.com', is: '"+sTemp+"'" + if (sTemp <> "recumbent@oracle.com") then + warnlog "Value for 'Email' is other than expected, should be 'recumbent@oracle.com', is: '"+sTemp+"'" end if printlog "set text in field 'your homepage' " Homepage.SetText "mahler" diff --git a/testautomation/graphics/optional/includes/global/g_find_replace.inc b/testautomation/graphics/optional/includes/global/g_find_replace.inc old mode 100755 new mode 100644 index f49de3b03d35..4f6a045578e0 --- a/testautomation/graphics/optional/includes/global/g_find_replace.inc +++ b/testautomation/graphics/optional/includes/global/g_find_replace.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Edit -> Find & Replace '* diff --git a/testautomation/graphics/optional/includes/global/g_format.inc b/testautomation/graphics/optional/includes/global/g_format.inc index 2e2f1b0368ff..8cf37d5432a3 100644 --- a/testautomation/graphics/optional/includes/global/g_format.inc +++ b/testautomation/graphics/optional/includes/global/g_format.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/g_group.inc b/testautomation/graphics/optional/includes/global/g_group.inc index 3023e673a526..a11b809355ce 100644 --- a/testautomation/graphics/optional/includes/global/g_group.inc +++ b/testautomation/graphics/optional/includes/global/g_group.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/g_imagemap.inc b/testautomation/graphics/optional/includes/global/g_imagemap.inc index c8bee2af8537..de53fdb6f647 100644 --- a/testautomation/graphics/optional/includes/global/g_imagemap.inc +++ b/testautomation/graphics/optional/includes/global/g_imagemap.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/g_insert.inc b/testautomation/graphics/optional/includes/global/g_insert.inc index fbc787eac29a..44d9030413ea 100644 --- a/testautomation/graphics/optional/includes/global/g_insert.inc +++ b/testautomation/graphics/optional/includes/global/g_insert.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* @@ -167,7 +167,7 @@ testcase tInsertFields hToolsOptions ("STAROFFICE","USERDATA") VorName.SetText "Garfield" ZuName.SetText "Peanuts" - EMail.SetText "recumbent@sun.com" + EMail.SetText "recumbent@oracle.com" Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK diff --git a/testautomation/graphics/optional/includes/global/g_line.inc b/testautomation/graphics/optional/includes/global/g_line.inc index 55869c258f43..adc573a16e48 100644 --- a/testautomation/graphics/optional/includes/global/g_line.inc +++ b/testautomation/graphics/optional/includes/global/g_line.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/g_load_save.inc b/testautomation/graphics/optional/includes/global/g_load_save.inc index 6622c9c7a452..8d64e158eb2a 100644 --- a/testautomation/graphics/optional/includes/global/g_load_save.inc +++ b/testautomation/graphics/optional/includes/global/g_load_save.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/g_mediaplayer.inc b/testautomation/graphics/optional/includes/global/g_mediaplayer.inc index 01fe8137ef64..5961a2132467 100644 --- a/testautomation/graphics/optional/includes/global/g_mediaplayer.inc +++ b/testautomation/graphics/optional/includes/global/g_mediaplayer.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : g_mediaplayer.inc '* diff --git a/testautomation/graphics/optional/includes/global/g_navigator.inc b/testautomation/graphics/optional/includes/global/g_navigator.inc index 7f4c06d6d979..4b9ef8948ab8 100644 --- a/testautomation/graphics/optional/includes/global/g_navigator.inc +++ b/testautomation/graphics/optional/includes/global/g_navigator.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/g_ole.inc b/testautomation/graphics/optional/includes/global/g_ole.inc index 84ff10294e6d..56a23c5fb021 100644 --- a/testautomation/graphics/optional/includes/global/g_ole.inc +++ b/testautomation/graphics/optional/includes/global/g_ole.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description: includefile for Ole-testing '* diff --git a/testautomation/graphics/optional/includes/global/g_paneview.inc b/testautomation/graphics/optional/includes/global/g_paneview.inc index 28e679367f08..a2e7bdb87266 100644 --- a/testautomation/graphics/optional/includes/global/g_paneview.inc +++ b/testautomation/graphics/optional/includes/global/g_paneview.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description: includefile for Paneview-testing '* diff --git a/testautomation/graphics/optional/includes/global/g_paragraph.inc b/testautomation/graphics/optional/includes/global/g_paragraph.inc index 5ba028ca5244..69f145230d2a 100644 --- a/testautomation/graphics/optional/includes/global/g_paragraph.inc +++ b/testautomation/graphics/optional/includes/global/g_paragraph.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/g_savepictureas.inc b/testautomation/graphics/optional/includes/global/g_savepictureas.inc index 3888cf31d39e..bbf9776b7ece 100644 --- a/testautomation/graphics/optional/includes/global/g_savepictureas.inc +++ b/testautomation/graphics/optional/includes/global/g_savepictureas.inc @@ -25,7 +25,7 @@ ' '/******************************************************************** '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Graphics ContextMenu -SavePictureAs -Test '* diff --git a/testautomation/graphics/optional/includes/global/g_shaddow.inc b/testautomation/graphics/optional/includes/global/g_shaddow.inc index 0a7708086371..1dfd01f305aa 100644 --- a/testautomation/graphics/optional/includes/global/g_shaddow.inc +++ b/testautomation/graphics/optional/includes/global/g_shaddow.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : Tests the shaddow-function on a picture '* diff --git a/testautomation/graphics/optional/includes/global/g_slidelayer.inc b/testautomation/graphics/optional/includes/global/g_slidelayer.inc index 4064ca5e9f45..a28526305d75 100644 --- a/testautomation/graphics/optional/includes/global/g_slidelayer.inc +++ b/testautomation/graphics/optional/includes/global/g_slidelayer.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/g_spellcheck.inc b/testautomation/graphics/optional/includes/global/g_spellcheck.inc index 9780cb9933dc..74f6177287ef 100644 --- a/testautomation/graphics/optional/includes/global/g_spellcheck.inc +++ b/testautomation/graphics/optional/includes/global/g_spellcheck.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/g_stylist.inc b/testautomation/graphics/optional/includes/global/g_stylist.inc index fe9a1e28dabb..fab547eb5d3b 100644 --- a/testautomation/graphics/optional/includes/global/g_stylist.inc +++ b/testautomation/graphics/optional/includes/global/g_stylist.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/g_tables.inc b/testautomation/graphics/optional/includes/global/g_tables.inc index ca5fc625c4ab..94a76349e948 100644 --- a/testautomation/graphics/optional/includes/global/g_tables.inc +++ b/testautomation/graphics/optional/includes/global/g_tables.inc @@ -25,7 +25,7 @@ ' '/****************************************************************** '* -'* owner : wolfram.garten@sun.com +'* owner : wolfram.garten@oracle.com '* '* short description : Testing of impress tables '* diff --git a/testautomation/graphics/optional/includes/global/g_toolbars.inc b/testautomation/graphics/optional/includes/global/g_toolbars.inc index 10ea5cdba195..9f8d8a6b2fb4 100644 --- a/testautomation/graphics/optional/includes/global/g_toolbars.inc +++ b/testautomation/graphics/optional/includes/global/g_toolbars.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/g_tools.inc b/testautomation/graphics/optional/includes/global/g_tools.inc index 2d802af5b40c..b760ad7b1b0f 100644 --- a/testautomation/graphics/optional/includes/global/g_tools.inc +++ b/testautomation/graphics/optional/includes/global/g_tools.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : will be moved to autocorrection.bas/inc '* diff --git a/testautomation/graphics/optional/includes/global/g_zoom.inc b/testautomation/graphics/optional/includes/global/g_zoom.inc index 30a6798d9082..c82b6743966a 100644 --- a/testautomation/graphics/optional/includes/global/g_zoom.inc +++ b/testautomation/graphics/optional/includes/global/g_zoom.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* Owner : wolfram.garten@sun.com +'* Owner : wolfram.garten@oracle.com '* '* short description : '* diff --git a/testautomation/graphics/optional/includes/global/gallery.inc b/testautomation/graphics/optional/includes/global/gallery.inc old mode 100755 new mode 100644 index 8398395c3653..6eca0a5276e3 --- a/testautomation/graphics/optional/includes/global/gallery.inc +++ b/testautomation/graphics/optional/includes/global/gallery.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : wolfram.garten@sun.com +'* owner : wolfram.garten@oracle.com '* '* short description : Global Required/resource test: Checking the gallery '* diff --git a/testautomation/graphics/optional/includes/global/gallery2.inc b/testautomation/graphics/optional/includes/global/gallery2.inc index b86cedcf8154..d46d0ae4a99c 100644 --- a/testautomation/graphics/optional/includes/global/gallery2.inc +++ b/testautomation/graphics/optional/includes/global/gallery2.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : wolfram.garten@sun.com +'* owner : wolfram.garten@oracle.com '* '* short description : Checking all gallery themes '* diff --git a/testautomation/graphics/optional/includes/global/id_001.inc b/testautomation/graphics/optional/includes/global/id_001.inc index 2bbca902b249..15a99c0d3f23 100644 --- a/testautomation/graphics/optional/includes/global/id_001.inc +++ b/testautomation/graphics/optional/includes/global/id_001.inc @@ -25,7 +25,7 @@ ' '/********************************