diff options
author | Sander Vesik <svesik@openoffice.org> | 2004-04-21 13:20:29 +0000 |
---|---|---|
committer | Sander Vesik <svesik@openoffice.org> | 2004-04-21 13:20:29 +0000 |
commit | 86091fa9ca7d9a7477b4bc908001a1bcf3cf29da (patch) | |
tree | 99799b3f6af3f742db5478f352e2a7a9d4b19897 /extensions | |
parent | 721dbee10cdab8acbe1f7149a1316f9ea6e84cf5 (diff) |
INTEGRATION: CWS ooo20040329 (1.21.64); FILE MERGED
2004/04/08 03:10:17 svesik 1.21.64.2: RESYNC: (1.21-1.22); FILE MERGED
2004/03/17 12:57:48 waratah 1.21.64.1: #i1858# alter order of definitions to remove some warnings from -Wall
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/source/propctrlr/propcontroller.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index 06121930a49a..1538bba1f7a6 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -2,9 +2,9 @@ * * $RCSfile: propcontroller.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: obo $ $Date: 2004-03-19 12:05:33 $ + * last change: $Author: svesik $ $Date: 2004-04-21 14:20:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -58,7 +58,6 @@ * * ************************************************************************/ - #ifndef _EXTENSIONS_PROPCTRLR_PROPCONTROLLER_HXX_ #include "propcontroller.hxx" #endif @@ -178,12 +177,12 @@ namespace pcr ,m_pPropertyInfo(NULL) ,m_pChangeMultiplexer(NULL) ,m_pView(NULL) - ,m_bHasListSource( sal_False ) - ,m_bHasCursorSource( sal_False ) + ,m_sStandard(ModuleRes(RID_STR_STANDARD)) ,m_nGenericPageId(0) ,m_nDataPageId(0) ,m_nEventPageId(0) - ,m_sStandard(ModuleRes(RID_STR_STANDARD)) + ,m_bHasListSource( sal_False ) + ,m_bHasCursorSource( sal_False ) ,m_bContainerFocusListening(sal_False) ,m_bSuspendingDependentComp( sal_False ) ,m_bInspectingSubForm( sal_False ) |