Kaydet (Commit) 19289db6 authored tarafından Vladimir Glazounov's avatar Vladimir Glazounov

INTEGRATION: CWS inplaceobjects (1.10.46); FILE MERGED

2006/07/03 15:10:16 mba 1.10.46.2: #i66239#: some fixes for correct hatch window border size and smoother toolbar switching
2006/06/09 10:36:28 mba 1.10.46.1: #i66239#: support individual MiscStatus
üst d7e9570b
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: docholder.hxx,v $ * $RCSfile: docholder.hxx,v $
* *
* $Revision: 1.10 $ * $Revision: 1.11 $
* *
* last change: $Author: rt $ $Date: 2005-09-08 18:39:17 $ * last change: $Author: vg $ $Date: 2006-11-01 18:20:43 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
...@@ -165,7 +165,7 @@ public: ...@@ -165,7 +165,7 @@ public:
OCommonEmbeddedObject* GetEmbedObject() { return m_pEmbedObj; } OCommonEmbeddedObject* GetEmbedObject() { return m_pEmbedObj; }
void SetComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseable >& xDoc, sal_Bool bReadOnly ); void SetComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseable >& xDoc, sal_Bool bReadOnly );
void ResizeHatchWindow();
void LockOffice(); void LockOffice();
void FreeOffice(); void FreeOffice();
...@@ -241,7 +241,8 @@ public: ...@@ -241,7 +241,8 @@ public:
// XHatchWindowController // XHatchWindowController
virtual void SAL_CALL requestPositioning( const ::com::sun::star::awt::Rectangle& aRect ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL requestPositioning( const ::com::sun::star::awt::Rectangle& aRect ) throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::awt::Rectangle SAL_CALL calcAdjustedRectangle( const ::com::sun::star::awt::Rectangle& aRect ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::awt::Rectangle SAL_CALL calcAdjustedRectangle( const ::com::sun::star::awt::Rectangle& aRect ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL activated( ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL deactivated( ) throw (::com::sun::star::uno::RuntimeException);
}; };
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment