summaryrefslogtreecommitdiff
path: root/sd/source/ui/inc/futext.hxx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:12:08 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:12:08 +0200
commit49ac1b530b440d4fa3ec0bff9cd3d4e70bef838a (patch)
treed432fa8e42251e69e95f7d56cca7fc1b03f18f2c /sd/source/ui/inc/futext.hxx
parent315eec9e4dbdd27063f4b970c25e9c719e86bcd8 (diff)
recreated tag libreoffice-3.3.3.1 which had these commits:
commit a74d3413eb0220f6c35f38a8ce955098b9fb6eb6 (tag: refs/tags/libreoffice-3.3.3.1) Author: Petr Mladek <pmladek@suse.cz> Date: Tue May 31 17:39:06 2011 +0200 Version 3.3.3.1, tag libreoffice-3.3.3.1 (3.3.3-rc1) commit 64665cb6c5b6ace06e81d3c98c424b6cf2beb49c Author: Petr Mladek <pmladek@suse.cz> Date: Tue May 31 16:35:37 2011 +0200 Remove extra bracket to fix build build breakage added by the previous commit sd/source/filter/eppt/pptx-epptbase.cxx | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 9dd7ef585a463bafa8750e5b30acb38949bbf1ce Author: Tor Lillqvist <tlillqvist@novell.com> Date: Fri May 20 11:00:26 2011 +0300 Add sanity check before dereference, bnc#694119 Signed-off-by: Petr Mladek <pmladek@suse.cz> sd/source/filter/eppt/pptx-epptbase.cxx | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit d53f1f6ee9f02d3d77c76910023986f7f346fc30 Author: Caolán McNamara <caolanm@redhat.com> Date: Fri Mar 18 13:19:59 2011 +0100 Fix fdo#33947 crash in Impress after printing Fixes lifetime issue with DrawViewShell - solved by not handing one in to the print preview DocumentRenderer Signed-off-by: Thorsten Behrens <tbehrens@novell.com> sd/source/ui/view/DocumentRenderer.cxx | 2 +- sd/source/ui/view/drawview.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Notes
split repo tag: impress_libreoffice-3.3.3.1 split repo tag: impress_libreoffice-3.3.4.1
Diffstat (limited to 'sd/source/ui/inc/futext.hxx')
-rw-r--r--sd/source/ui/inc/futext.hxx20
1 files changed, 10 insertions, 10 deletions
diff --git a/sd/source/ui/inc/futext.hxx b/sd/source/ui/inc/futext.hxx
index bd732ab3a534..d169ac700f67 100644
--- a/sd/source/ui/inc/futext.hxx
+++ b/sd/source/ui/inc/futext.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -47,7 +47,7 @@ namespace sd {
|*
\************************************************************************/
-class FuText
+class FuText
: public FuConstruct
{
public:
@@ -65,11 +65,11 @@ public:
virtual void ReceiveRequest(SfxRequest& rReq);
virtual void DoubleClick(const MouseEvent& rMEvt);
- virtual void Activate(); // Function aktivieren
- virtual void Deactivate(); // Function deaktivieren
+ virtual void Activate(); // Function aktivieren
+ virtual void Deactivate(); // Function deaktivieren
void SetInEditMode(const MouseEvent& rMEvt, BOOL bQuickDrag);
- BOOL DeleteDefaultText();
+ BOOL DeleteDefaultText();
SdrTextObj* GetTextObj() { return static_cast< SdrTextObj* >( mxTextObj.get() ); }
DECL_LINK(SpellError, void* );
@@ -88,19 +88,19 @@ public:
static void ChangeFontSize( bool, OutlinerView*, const FontList*, ::sd::View* );
protected:
- FuText (ViewShell* pViewSh,
- ::sd::Window* pWin,
+ FuText (ViewShell* pViewSh,
+ ::sd::Window* pWin,
::sd::View* pView,
- SdDrawDocument* pDoc,
+ SdDrawDocument* pDoc,
SfxRequest& rReq);
virtual void disposing();
- SdrObjectWeakRef mxTextObj;
+ SdrObjectWeakRef mxTextObj;
Link aOldLink;
BOOL bFirstObjCreated;
- SfxRequest& rRequest;
+ SfxRequest& rRequest;
private:
// #97016#