diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:05:12 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:05:12 +0200 |
commit | 912d939b74d4ac436d4eb7a473f8c314c34148d8 (patch) | |
tree | 9786710241c767f0f6917200c9318978b0d787dd /sc/source/ui/inc/drwtrans.hxx | |
parent | bc9a24765b3a6f97bda09afc07bf47151fed14e8 (diff) |
recreated tag libreoffice-3.3.3.1 which had these commits:
commit 631630de93e96b82e3b94ee4b5c388e40305ff77 (tag: refs/tags/libreoffice-3.3.3.1)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue May 31 17:39:03 2011 +0200
Version 3.3.3.1, tag libreoffice-3.3.3.1 (3.3.3-rc1)
commit 3152922a95e18814e32bcf8bc29c872077d05a65
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Wed May 4 09:06:08 2011 -0400
lp#775608: Libreoffice Calc's PRODUCT function doesn't calculate correctly.
Signed-off-by: Kohei Yoshida <kyoshida@novell.com>
sc/source/core/tool/interpr1.cxx | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
commit 8f34ffa5677bfc86ef5aa33811955c577f8799c3
Author: Kohei Yoshida <kyoshida@novell.com>
Date: Mon Mar 21 16:01:47 2011 -0400
Fix seg faults on sheet deletion.
Sometimes a simple sheet removal causes segfault in certain types of
documents. Not always reproducible, but this fix is certainly safer.
(n#680272)
Signed-off-by: Noel Power <nopower@novell.com>
sc/source/ui/docshell/docfunc.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit e54c3699db11dc1bcc7bd7fa069c9c4124715839
Author: Tibby Lickle <tibbylickle@googlemail.com>
Date: Thu Mar 10 19:08:18 2011 +0000
Disabled auto-complete in Calc filter dialog - fix for bug 34898.
A hyphen character caused auto-complete to kick in, changing the user's choice of conditional operator to "=". This was not changed back if auto-complete option is overridden.
Signed-off-by: Kohei Yoshida <kyoshida@novell.com>
sc/source/ui/dbgui/filtdlg.cxx | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
Notes
Notes:
split repo tag: calc_libreoffice-3.3.3.1
Diffstat (limited to 'sc/source/ui/inc/drwtrans.hxx')
-rw-r--r-- | sc/source/ui/inc/drwtrans.hxx | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/sc/source/ui/inc/drwtrans.hxx b/sc/source/ui/inc/drwtrans.hxx index de256909fcf7..4e9088c4e4be 100644 --- a/sc/source/ui/inc/drwtrans.hxx +++ b/sc/source/ui/inc/drwtrans.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,31 +48,31 @@ class SdrOle2Obj; class ScDrawTransferObj : public TransferableHelper { private: - SdrModel* pModel; - TransferableDataHelper aOleData; - TransferableObjectDescriptor aObjDesc; -//REMOVE SvEmbeddedObjectRef aDocShellRef; -//REMOVE SvEmbeddedObjectRef aDrawPersistRef; - SfxObjectShellRef aDocShellRef; - SfxObjectShellRef aDrawPersistRef; + SdrModel* pModel; + TransferableDataHelper aOleData; + TransferableObjectDescriptor aObjDesc; +//REMOVE SvEmbeddedObjectRef aDocShellRef; +//REMOVE SvEmbeddedObjectRef aDrawPersistRef; + SfxObjectShellRef aDocShellRef; + SfxObjectShellRef aDrawPersistRef; // extracted from model in ctor: - Size aSrcSize; - INetBookmark* pBookmark; - BOOL bGraphic; - BOOL bGrIsBit; - BOOL bOleObj; + Size aSrcSize; + INetBookmark* pBookmark; + BOOL bGraphic; + BOOL bGrIsBit; + BOOL bOleObj; // source information for drag&drop: // (view is needed to handle drawing obejcts) - SdrView* pDragSourceView; - USHORT nDragSourceFlags; - BOOL bDragWasInternal; + SdrView* pDragSourceView; + USHORT nDragSourceFlags; + BOOL bDragWasInternal; sal_uInt32 nSourceDocID; - void InitDocShell(); -//REMOVE SvInPlaceObjectRef GetSingleObject(); + void InitDocShell(); +//REMOVE SvInPlaceObjectRef GetSingleObject(); SdrOle2Obj* GetSingleObject(); public: @@ -80,23 +80,23 @@ public: const TransferableObjectDescriptor& rDesc ); virtual ~ScDrawTransferObj(); - virtual void AddSupportedFormats(); - virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual sal_Bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, + virtual void AddSupportedFormats(); + virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual sal_Bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual void ObjectReleased(); - virtual void DragFinished( sal_Int8 nDropAction ); + virtual void ObjectReleased(); + virtual void DragFinished( sal_Int8 nDropAction ); - SdrModel* GetModel() { return pModel; } + SdrModel* GetModel() { return pModel; } - void SetDrawPersist( const SfxObjectShellRef& rRef ); - void SetDragSource( ScDrawView* pView ); - void SetDragSourceObj( SdrObject* pObj, SCTAB nTab ); - void SetDragSourceFlags( USHORT nFlags ); - void SetDragWasInternal(); + void SetDrawPersist( const SfxObjectShellRef& rRef ); + void SetDragSource( ScDrawView* pView ); + void SetDragSourceObj( SdrObject* pObj, SCTAB nTab ); + void SetDragSourceFlags( USHORT nFlags ); + void SetDragWasInternal(); - SdrView* GetDragSourceView() { return pDragSourceView; } - USHORT GetDragSourceFlags() const { return nDragSourceFlags; } + SdrView* GetDragSourceView() { return pDragSourceView; } + USHORT GetDragSourceFlags() const { return nDragSourceFlags; } void SetSourceDocID( sal_uInt32 nVal ) { nSourceDocID = nVal; } |