diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-08-03 09:00:15 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-08-03 09:00:15 +0000 |
| commit | 2634b5627ca5741ab3e66759547cdddd34091482 (patch) | |
| tree | c10791c3bffaa0004abc6f20e38c00d2f1f7473a /basctl | |
| parent | 945f0fe81a4906c8540b15073cc310764825fae1 (diff) | |
INTEGRATION: CWS ab34 (1.6.20); FILE MERGED
2007/07/24 14:02:47 ab 1.6.20.3: RESYNC: (1.6-1.7); FILE MERGED
Solved conflict
2007/07/24 13:04:58 ab 1.6.20.2: #i77072# Removed conflicts with m222
2007/07/24 10:17:26 ab 1.6.20.1: #i77072# Drag & Drop support in Dialog Organizer
Diffstat (limited to 'basctl')
| -rw-r--r-- | basctl/source/inc/localizationmgr.hxx | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/basctl/source/inc/localizationmgr.hxx b/basctl/source/inc/localizationmgr.hxx index 5c993ea8f349..caff9c2745e5 100644 --- a/basctl/source/inc/localizationmgr.hxx +++ b/basctl/source/inc/localizationmgr.hxx @@ -4,9 +4,9 @@ * * $RCSfile: localizationmgr.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: hr $ $Date: 2007-06-26 16:53:22 $ + * last change: $Author: hr $ $Date: 2007-08-03 10:00:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -136,16 +136,26 @@ public: getStringResourceFromDialogLibrary( ::com::sun::star::uno::Reference < ::com::sun::star::container::XNameContainer > xDialogLib ); - // Clipboard + // Clipboard / Drag & Drop static void resetResourceForDialog( ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > xDialogModel, ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceManager > xStringResourceManager ); - static void moveResourcesForPastedEditorObject( DlgEditor* pEditor, + static void setResourceIDsForDialog( + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > xDialogModel, + ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceManager > xStringResourceManager ); + + static void copyResourcesForPastedEditorObject( DlgEditor* pEditor, ::com::sun::star::uno::Any aControlAny, const ::rtl::OUString& aCtrlName, ::com::sun::star::uno::Reference< ::com::sun::star::resource:: XStringResourceResolver > xSourceStringResolver ); + static void copyResourceForDroppedDialog( + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > xDialogModel, + const ::rtl::OUString& aDialogName, + ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceManager > xStringResourceManager, + ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceResolver > xSourceStringResolver ); + static void copyResourceForDialog( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xDialogModel, const ::com::sun::star::uno::Reference< ::com::sun::star::resource:: |