diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-03-11 11:26:05 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-03-11 11:26:05 +0100 |
| commit | aabc69e75dcde2bebc84df9242e86328de7fefd5 (patch) | |
| tree | 3400a6d8c98f295be3c3bf29f70fda5b8b876d0f /framework/source/layoutmanager/layoutmanager.cxx | |
| parent | b7dc581d7ce45f9c692d942686ad0dd9ab701d90 (diff) | |
| parent | 344e390b9d114b3cbdd9d1b39ea44e5cdf875788 (diff) | |
autorecovery: merged changes from m74. Still need to find out how to re-do two patches (to module_hidden_ooo.scp and file_ooo.scp in scp2/source/ooo) which do not apply anymore.
Diffstat (limited to 'framework/source/layoutmanager/layoutmanager.cxx')
| -rw-r--r-- | framework/source/layoutmanager/layoutmanager.cxx | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 121436998efa..458368bd6581 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: layoutmanager.cxx,v $ - * $Revision: 1.72 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -6185,16 +6182,6 @@ sal_Bool LayoutManager::implts_resetMenuBar() return sal_False; } -void LayoutManager::implts_setMenuBarCloser(sal_Bool bCloserState) -{ - /* SAFE AREA ----------------------------------------------------------------------------------------------- */ - WriteGuard aWriteLock( m_aLock ); - m_bMenuBarCloser = bCloserState; - aWriteLock.unlock(); - - implts_updateMenuBarClose(); -} - sal_Int16 LayoutManager::implts_getCurrentSymbolsSize() { sal_Int16 eOptSymbolsSize( 0 ); |