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/DrawDocShell.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
Notes:
split repo tag: impress_OOO_BUILD_3_2_98_1
Diffstat (limited to 'sd/source/ui/inc/DrawDocShell.hxx')
-rwxr-xr-x | sd/source/ui/inc/DrawDocShell.hxx | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index 4ad4b0d09392..2709340ffa4b 100755 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.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 @@ -85,11 +85,11 @@ public: virtual ~DrawDocShell(); void UpdateRefDevice(); - virtual void Activate( BOOL bMDI ); - virtual void Deactivate( BOOL bMDI ); + virtual void Activate( BOOL bMDI ); + virtual void Deactivate( BOOL bMDI ); virtual BOOL InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); - virtual BOOL ConvertFrom( SfxMedium &rMedium ); - virtual BOOL Save(); + virtual BOOL ConvertFrom( SfxMedium &rMedium ); + virtual BOOL Save(); virtual BOOL SaveAsOwnFormat( SfxMedium& rMedium ); virtual BOOL ConvertTo( SfxMedium &rMedium ); virtual BOOL SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ); @@ -99,13 +99,13 @@ public: virtual sal_Bool SaveAs( SfxMedium &rMedium ); virtual Rectangle GetVisArea(USHORT nAspect) const; - virtual void Draw(OutputDevice*, const JobSetup& rSetup, USHORT nAspect = ASPECT_CONTENT); + virtual void Draw(OutputDevice*, const JobSetup& rSetup, USHORT nAspect = ASPECT_CONTENT); virtual SfxUndoManager* GetUndoManager(); virtual Printer* GetDocumentPrinter(); virtual void OnDocumentPrinterChanged(Printer* pNewPrinter); virtual SfxStyleSheetBasePool* GetStyleSheetPool(); - virtual void SetOrganizerSearchMask(SfxStyleSheetBasePool* pBasePool) const; - virtual Size GetFirstPageSize(); + virtual void SetOrganizerSearchMask(SfxStyleSheetBasePool* pBasePool) const; + virtual Size GetFirstPageSize(); virtual void FillClass(SvGlobalName* pClassName, sal_uInt32* pFormat, String* pAppName, String* pFullTypeName, String* pShortTypeName, sal_Int32 nFileFormat, sal_Bool bTemplate = sal_False ) const; virtual void SetModified( BOOL = TRUE ); @@ -115,28 +115,28 @@ public: sd::ViewShell* GetViewShell() { return mpViewShell; } ::sd::FrameView* GetFrameView(); - ::sd::FunctionReference GetDocShellFunction() const { return mxDocShellFunction; } + ::sd::FunctionReference GetDocShellFunction() const { return mxDocShellFunction; } void SetDocShellFunction( const ::sd::FunctionReference& xFunction ); SdDrawDocument* GetDoc(); DocumentType GetDocumentType() const { return meDocType; } SfxPrinter* GetPrinter(BOOL bCreate); - void SetPrinter(SfxPrinter *pNewPrinter); - void UpdateFontList(); + void SetPrinter(SfxPrinter *pNewPrinter); + void UpdateFontList(); BOOL IsInDestruction() const { return mbInDestruction; } - void CancelSearching(); + void CancelSearching(); - void Execute( SfxRequest& rReq ); - void GetState(SfxItemSet&); + void Execute( SfxRequest& rReq ); + void GetState(SfxItemSet&); - void Connect(sd::ViewShell* pViewSh); - void Disconnect(sd::ViewShell* pViewSh); - void UpdateTablePointers(); + void Connect(sd::ViewShell* pViewSh); + void Disconnect(sd::ViewShell* pViewSh); + void UpdateTablePointers(); - BOOL GotoBookmark(const String& rBookmark); + BOOL GotoBookmark(const String& rBookmark); Bitmap GetPagePreviewBitmap(SdPage* pPage, USHORT nMaxEdgePixel); @@ -155,17 +155,17 @@ public: a default name of a not-yet-existing slide (e.g. 'Slide 17'), TRUE is returned, but rName is set to an empty string. */ - BOOL CheckPageName(::Window* pWin, String& rName ); + BOOL CheckPageName(::Window* pWin, String& rName ); void SetSlotFilter(BOOL bEnable = FALSE, USHORT nCount = 0, const USHORT* pSIDs = NULL) { mbFilterEnable = bEnable; mnFilterCount = nCount; mpFilterSIDs = pSIDs; } void ApplySlotFilter() const; - UINT16 GetStyleFamily() const { return mnStyleFamily; } - void SetStyleFamily( UINT16 nSF ) { mnStyleFamily = nSF; } + UINT16 GetStyleFamily() const { return mnStyleFamily; } + void SetStyleFamily( UINT16 nSF ) { mnStyleFamily = nSF; } /** executes the SID_OPENDOC slot to let the framework open a document with the given URL and this document as a referer */ - void OpenBookmark( const String& rBookmarkURL ); + void OpenBookmark( const String& rBookmarkURL ); /** checks, if the given name is a valid new name for a slide @@ -204,28 +204,28 @@ public: // #91457# ExecuteSpellPopup now handled by DrawDocShell DECL_LINK( OnlineSpellCallback, SpellCallbackInfo* ); - void ClearUndoBuffer(); + void ClearUndoBuffer(); protected: - SdDrawDocument* mpDoc; - SfxUndoManager* mpUndoManager; - SfxPrinter* mpPrinter; - ::sd::ViewShell* mpViewShell; - FontList* mpFontList; - ::sd::FunctionReference mxDocShellFunction; + SdDrawDocument* mpDoc; + SfxUndoManager* mpUndoManager; + SfxPrinter* mpPrinter; + ::sd::ViewShell* mpViewShell; + FontList* mpFontList; + ::sd::FunctionReference mxDocShellFunction; DocumentType meDocType; - UINT16 mnStyleFamily; + UINT16 mnStyleFamily; const USHORT* mpFilterSIDs; USHORT mnFilterCount; BOOL mbFilterEnable; - BOOL mbSdDataObj; + BOOL mbSdDataObj; BOOL mbInDestruction; - BOOL mbOwnPrinter; + BOOL mbOwnPrinter; BOOL mbNewDocument; - bool mbOwnDocument; // if true, we own mpDoc and will delete it in our d'tor - void Construct(bool bClipboard); + bool mbOwnDocument; // if true, we own mpDoc and will delete it in our d'tor + void Construct(bool bClipboard); virtual void InPlaceActivate( BOOL bActive ); }; |