diff options
author | Andreas Schlüns <as@openoffice.org> | 2001-10-26 08:05:41 +0000 |
---|---|---|
committer | Andreas Schlüns <as@openoffice.org> | 2001-10-26 08:05:41 +0000 |
commit | ee9f8606761b86bb392237f9632d609959c3fbbd (patch) | |
tree | e1b5da5660225732771be354671d80ffa8be2dcb /sfx2/source/appl/childwin.cxx | |
parent | c3477cae4c7db32eafbcf69bc8d337cd2351d8d0 (diff) |
#93810# don't make beamer status data persistent
Diffstat (limited to 'sfx2/source/appl/childwin.cxx')
-rw-r--r-- | sfx2/source/appl/childwin.cxx | 45 |
1 files changed, 25 insertions, 20 deletions
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index 3635a40cdd..7a2f948487 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -2,9 +2,9 @@ * * $RCSfile: childwin.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: mba $ $Date: 2001-10-12 16:42:52 $ + * last change: $Author: as $ $Date: 2001-10-26 09:05:41 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -241,28 +241,33 @@ SfxChildWindow* SfxChildWindow::CreateChildWindow( sal_uInt16 nId, //------------------------------------------------------------------------- void SfxChildWindow::SaveStatus(const SfxChildWinInfo& rInfo) { - String aWinData( 'V' ); - aWinData += String::CreateFromInt32( nVersion ); - aWinData += ','; - aWinData += rInfo.bVisible ? 'V' : 'H'; - aWinData += ','; - aWinData += String::CreateFromInt32( rInfo.nFlags ); - if ( rInfo.aExtraString.Len() ) + sal_uInt16 nID = GetType(); + // Don't make beamer data persitent in cfg ... + if( nID != SID_BROWSER ) { + String aWinData( 'V' ); + aWinData += String::CreateFromInt32( nVersion ); aWinData += ','; - aWinData += rInfo.aExtraString; - } - - SvtViewOptions aWinOpt( E_WINDOW, String::CreateFromInt32( GetType() ) ); -// aWinOpt.SetPosition( rInfo.aPos.X(), rInfo.aPos.Y() ); -// aWinOpt.SetSize( rInfo.aSize.Width(), rInfo.aSize.Height() ); - aWinOpt.SetWindowState( String( rInfo.aWinState, RTL_TEXTENCODING_UTF8 ) ); + aWinData += rInfo.bVisible ? 'V' : 'H'; + aWinData += ','; + aWinData += String::CreateFromInt32( rInfo.nFlags ); + if ( rInfo.aExtraString.Len() ) + { + aWinData += ','; + aWinData += rInfo.aExtraString; + } - ::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq(1); - aSeq[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Data") ); - aSeq[0].Value <<= ::rtl::OUString( aWinData ); - aWinOpt.SetUserData( aSeq ); + SvtViewOptions aWinOpt( E_WINDOW, String::CreateFromInt32( nID ) ); + // aWinOpt.SetPosition( rInfo.aPos.X(), rInfo.aPos.Y() ); + // aWinOpt.SetSize( rInfo.aSize.Width(), rInfo.aSize.Height() ); + aWinOpt.SetWindowState( String( rInfo.aWinState, RTL_TEXTENCODING_UTF8 ) ); + ::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq(1); + aSeq[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Data") ); + aSeq[0].Value <<= ::rtl::OUString( aWinData ); + aWinOpt.SetUserData( aSeq ); + } + // ... but save status at runtime! pImp->pFact->aInfo = rInfo; } |