diff options
| author | Sander Vesik <svesik@openoffice.org> | 2004-04-21 13:19:13 +0000 |
|---|---|---|
| committer | Sander Vesik <svesik@openoffice.org> | 2004-04-21 13:19:13 +0000 |
| commit | f6d2e7dd81350b1d2356064a3ee68e2fe78fe3d4 (patch) | |
| tree | 1e3efe0c8687537090a7366d459e224866791669 /extensions | |
| parent | 606eef62417cee906b26ca2cdf3a4e86d391a086 (diff) | |
INTEGRATION: CWS ooo20040329 (1.19.6); FILE MERGED
2004/04/08 03:21:40 svesik 1.19.6.2: RESYNC: (1.19-1.20); FILE MERGED
2004/03/17 12:57:48 waratah 1.19.6.1: #i1858# alter order of definitions to remove some warnings from -Wall
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/bibliography/framectr.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx index ec4258abf191..71d250e3e116 100644 --- a/extensions/source/bibliography/framectr.cxx +++ b/extensions/source/bibliography/framectr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: framectr.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: obo $ $Date: 2004-03-19 11:57:14 $ + * last change: $Author: svesik $ $Date: 2004-04-21 14:19:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -58,7 +58,6 @@ * * ************************************************************************/ - #ifndef _SV_WAITOBJ_HXX //autogen wg. WaitObject #include <vcl/waitobj.hxx> #endif @@ -217,8 +216,8 @@ BibFrameController_Impl::BibFrameController_Impl( const uno::Reference< awt::XWi BibFrameController_Impl::BibFrameController_Impl( const uno::Reference< awt::XWindow > & xComponent, BibDataManager* pDataManager) :xWindow( xComponent ) - ,pDatMan( pDataManager ) ,m_xDatMan( pDataManager ) + ,pDatMan( pDataManager ) ,pBibMod(NULL) { Window* pParent = VCLUnoHelper::GetWindow( xWindow ); |