diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-03-10 15:23:34 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-03-10 15:23:34 +0000 |
| commit | 6be9a7f501772ca705344eb3c7e46d742b2073bb (patch) | |
| tree | 60f350fabf5381a2a54847498d30ca7b0d1dc2f9 /svx/source/form/fmshell.cxx | |
| parent | 02f3aa935e452fc833dbf077d308cda36fa1450d (diff) | |
INTEGRATION: CWS dba24 (1.57.18); FILE MERGED
2005/03/08 09:12:52 fs 1.57.18.4: RESYNC: (1.59-1.60); FILE MERGED
2005/02/21 12:40:01 oj 1.57.18.3: RESYNC: (1.57-1.59); FILE MERGED
2005/02/10 11:45:42 fs 1.57.18.2: #i41973#
2005/02/09 17:07:42 fs 1.57.18.1: copying the fix for #i40565# from branch cws_src680_dba23, since they are a prerequisite for fixing other issues
Diffstat (limited to 'svx/source/form/fmshell.cxx')
| -rw-r--r-- | svx/source/form/fmshell.cxx | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index e98e9cc592f1..cd481ce4416c 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fmshell.cxx,v $ * - * $Revision: 1.60 $ + * $Revision: 1.61 $ * - * last change: $Author: kz $ $Date: 2005-03-01 19:08:48 $ + * last change: $Author: vg $ $Date: 2005-03-10 16:23:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -257,9 +257,9 @@ #include <comphelper/processfactory.hxx> #endif #ifndef SVX_SOURCE_INC_FMDOCUMENTCLASSIFICATION_HXX -#include <fmdocumentclassification.hxx> +#include "fmdocumentclassification.hxx" #endif -#ifndef IMPROVEFORMS_SVX_SOURCE_FORM_FORMTOOLBARS_HXX +#ifndef SVX_SOURCE_INC_FORMTOOLBARS_HXX #include "formtoolbars.hxx" #endif @@ -530,10 +530,7 @@ FmFormShell::FmFormShell( SfxViewShell* _pParent, FmFormView* pView ) { m_pImpl->acquire(); SetPool( &SFX_APP()->GetPool() ); - String sName; - sName.AssignAscii("Form"); - SetName( sName ); - // SetHelpId( SVX_INTERFACE_FORM_SH ); + SetName( String::CreateFromAscii( "Form" ) ); SetView(m_pFormView); } |