diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:11:16 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:11:16 +0200 |
| commit | 0553d10867217e30a86c88c17ccb15a06030ce07 (patch) | |
| tree | 4d85a5a78ea132f8fd53b26ce93e94ae30dad1f9 /sd/source/ui/inc/PresentationViewShell.hxx | |
| parent | d0ac8f1e7866c637be15f081b59ef456aacb954a (diff) | |
recreated tag OOO_BUILD_3_2_98_1 which had these commits:
commit c0de36f21ef8f0afd7667f53a5d97dbc264a1cfb (tag: refs/tags/OOO_BUILD_3_2_98_1)
Author: Petr Mladek <pmladek@walk.suse.cz>
Date: Wed Sep 15 19:03:26 2010 +0200
Release ooo-build-3.2.98.1, tag OOO_BUILD_3_2_98_1 (3.3-alpha1)
commit e31a45314a5a2f1e7e2bbea4a2bb6eca7beb7962
Merge: 7234327 29a7259
Author: Jan Holesovsky <kendy@suse.cz>
Date: Wed Sep 8 11:34:03 2010 +0200
Merge commit 'ooo/OOO330_m7'
commit 29a72592b0046498a30e87a7beedae4d29161f9b (tag: refs/tags/ooo/OOO330_m7)
Merge: 10146e0 6b04480
Author: Kurt Zenker <kz@openoffice.org>
Date: Tue Aug 31 15:10:03 2010 +0200
CWS-TOOLING: integrate CWS impress197
commit 6b04480dd88a5bd048d12874dc8c07630670c239
Author: sj <sj@openoffice.org>
Date: Mon Aug 9 14:11:58 2010 +0200
impress197: #163250# fixed string handling, improved polygon splitting
sd/source/filter/ppt/propread.cxx | 128 ++++++++++++++++++++++++-------------
1 files changed, 83 insertions(+), 45 deletions(-)
commit a37d85f979d1616b158c918762821ed82b1e0691
Merge: 1380a03 d766efe
Author: Christian Lippka <christian.lippka@sun.com>
Date: Fri Aug 6 14:53:07 2010 +0200
merge
commit 1380a03aaf7464643eb99de1488ab5b372663ccd
Author: Christian Lippka <christian.lippka@sun.com>
Date: Wed Aug 4 10:48:35 2010 +0200
#i113603# only change layout shape size on init or of user call is set
sd/source/core/sdpage.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit d766efe9f601a65cd22b46e0f4131d9acd74b1a8
Author: Andre Fischer<andre.f.fischer <Andre Fischer<andre.f.fischer@oracle.com>
Date: Thu Jan 1 00:00:00 1970 +0000
impress197: #i112420# Create accessibility object of ToolPanelViewShell in constructor.
sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 17 +++++++++++++++--
sd/source/ui/view/sdwindow.cxx | 4 ++--
2 files changed, 17 insertions(+), 4 deletions(-)
Notes
split repo tag: impress_OOO_BUILD_3_2_98_1
Diffstat (limited to 'sd/source/ui/inc/PresentationViewShell.hxx')
| -rw-r--r-- | sd/source/ui/inc/PresentationViewShell.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sd/source/ui/inc/PresentationViewShell.hxx b/sd/source/ui/inc/PresentationViewShell.hxx index 366026fe2e06..a76134aa6709 100644 --- a/sd/source/ui/inc/PresentationViewShell.hxx +++ b/sd/source/ui/inc/PresentationViewShell.hxx @@ -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 @@ -41,10 +41,10 @@ class PresentationViewShell : public DrawViewShell { public: TYPEINFO(); - + SFX_DECL_VIEWFACTORY(PresViewShell); SFX_DECL_INTERFACE( SD_IF_SDPRESVIEWSHELL ) - + PresentationViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, ::Window* pParentWindow, FrameView* pFrameView = NULL); virtual ~PresentationViewShell (void); @@ -65,7 +65,7 @@ protected: private: Rectangle maOldVisArea; - + virtual void Activate (BOOL bIsMDIActivate); virtual void Paint (const Rectangle& rRect, ::sd::Window* pWin); }; |