INTEGRATION: CWS mav09 (1.2.82); FILE MERGED

2004/09/16 18:34:19 mav 1.2.82.9: RESYNC: (1.5-1.7); FILE MERGED
2004/08/09 19:47:43 mav 1.2.82.8: RESYNC: (1.4-1.5); FILE MERGED
2004/07/14 14:58:19 mav 1.2.82.7: #i27773# resolve resync problems
2004/07/09 18:19:02 mav 1.2.82.6: RESYNC: (1.3-1.4); FILE MERGED
2004/07/08 22:44:54 mav 1.2.82.5: RESYNC: (1.2-1.3); FILE MERGED
2004/07/02 08:45:39 mba 1.2.82.4: #i27773#: some ToDos
2004/05/10 08:07:42 mba 1.2.82.3: #i27773#: notification of UIActivation fixed; some wrong size manipulations
2004/04/27 17:02:04 mba 1.2.82.2: #i27773#: new embedding API
2004/04/14 14:12:16 mba 1.2.82.1: #i27773#: remove so3; new storage API
This commit is contained in:
Kurt Zenker 2004-10-04 17:36:38 +00:00
parent 8f406a5c6b
commit a7435fec21

View file

@ -2,9 +2,9 @@
*
* $RCSfile: ViewShell.hxx,v $
*
* $Revision: 1.7 $
* $Revision: 1.8 $
*
* last change: $Author: rt $ $Date: 2004-08-23 08:20:50 $
* last change: $Author: kz $ $Date: 2004-10-04 18:36:38 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -529,6 +529,9 @@ public:
PageKind ePageKind,
BOOL bPrintMarkedOnly);
virtual void UIActivating( SfxInPlaceClient* );
virtual void UIDeactivated( SfxInPlaceClient* );
/** Show controls of the UI or hide them, depending on the given flag.
As a result the border is adapted.
*/
@ -634,9 +637,6 @@ protected:
virtual void Activate(BOOL IsMDIActivate);
virtual void Deactivate(BOOL IsMDIActivate);
virtual void UIActivate( SvInPlaceObject* );
virtual void UIDeactivate( SvInPlaceObject* );
virtual void SetZoomFactor( const Fraction &rZoomX,
const Fraction &rZoomY );