From 19050440c53e8c455d74e708889da2548b0d3082 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien
Date: Tue, 2 Jan 2007 14:34:27 +0000
Subject: [PATCH] INTEGRATION: CWS ab31 (1.14.160); FILE MERGED 2006/11/23
13:10:19 cd 1.14.160.1: #i71514# ResourceResolver support for dialogs and
dependent controls
---
toolkit/inc/toolkit/controls/unocontrol.hxx | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/toolkit/inc/toolkit/controls/unocontrol.hxx b/toolkit/inc/toolkit/controls/unocontrol.hxx
index 61114198ce4f..4d65d6220308 100644
--- a/toolkit/inc/toolkit/controls/unocontrol.hxx
+++ b/toolkit/inc/toolkit/controls/unocontrol.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: unocontrol.hxx,v $
*
- * $Revision: 1.15 $
+ * $Revision: 1.16 $
*
- * last change: $Author: ihi $ $Date: 2006-11-14 12:28:00 $
+ * last change: $Author: hr $ $Date: 2007-01-02 15:34:27 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -170,6 +170,7 @@ protected:
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > getParentPeer() const;
void updateFromModel();
void peerCreated();
+ bool ImplMapPlaceHolder( ::rtl::OUString& rPlaceHolder );
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > ImplGetCompatiblePeer( sal_Bool bAcceptExistingPeer );
virtual void ImplSetPeerProperty( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Any& rVal );
virtual void PrepareWindowDescriptor( ::com::sun::star::awt::WindowDescriptor& rDesc );