vcl: It's a close button, there is no such a thing as a 'closer'.

Clean up at least vcl + what depends on that, but unfortunately there are
still some "Closer"'s left elsewhere...

Change-Id: I019c863d07ee62d701ff01c8d871334012c105f1

2 files changed, 6 insertions, 8 deletions

diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx
index 88e3364b19b5..0dcfc4574404 100644
--- a/framework/inc/services/layoutmanager.hxx
+++ b/framework/inc/services/layoutmanager.hxx
@@ -295,7 +295,7 @@ namespace framework
             bool                                                                        m_bHideCurrentUI;
             bool                                                                        m_bGlobalSettings;
             bool                                                                        m_bPreserveContentSize;
-            bool                                                                        m_bMenuBarCloser;
+            bool                                                                        m_bMenuBarCloseButton;
             css::awt::Rectangle                                                         m_aDockingArea;
             css::uno::Reference< ::com::sun::star::ui::XDockingAreaAcceptor >           m_xDockingAreaAcceptor;
             css::uno::Reference< ::com::sun::star::lang::XComponent >                   m_xInplaceMenuBar;
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 3efe6504ad73..b3487c995f71 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -118,7 +118,7 @@ LayoutManager::LayoutManager( const Reference< XComponentContext >& xContext ) :
         , m_bHideCurrentUI( false )
         , m_bGlobalSettings( false )
         , m_bPreserveContentSize( false )
-        , m_bMenuBarCloser( false )
+        , m_bMenuBarCloseButton( false )
         , m_pInplaceMenuBar( NULL )
         , m_xModuleManager( ModuleManager::create( xContext ))
         , m_xUIElementFactoryManager( ui::theUIElementFactoryManager::get(xContext) )
@@ -144,7 +144,7 @@ LayoutManager::LayoutManager( const Reference< XComponentContext >& xContext ) :
     registerProperty( LAYOUTMANAGER_PROPNAME_AUTOMATICTOOLBARS, LAYOUTMANAGER_PROPHANDLE_AUTOMATICTOOLBARS, css::beans::PropertyAttribute::TRANSIENT, &m_bAutomaticToolbars, ::getCppuType( &m_bAutomaticToolbars ) );
     registerProperty( LAYOUTMANAGER_PROPNAME_HIDECURRENTUI, LAYOUTMANAGER_PROPHANDLE_HIDECURRENTUI, beans::PropertyAttribute::TRANSIENT, &m_bHideCurrentUI, ::getCppuType( &m_bHideCurrentUI ) );
     registerProperty( LAYOUTMANAGER_PROPNAME_LOCKCOUNT, LAYOUTMANAGER_PROPHANDLE_LOCKCOUNT, beans::PropertyAttribute::TRANSIENT | beans::PropertyAttribute::READONLY, &m_nLockCount, getCppuType( &m_nLockCount )  );
-    registerProperty( LAYOUTMANAGER_PROPNAME_MENUBARCLOSER, LAYOUTMANAGER_PROPHANDLE_MENUBARCLOSER, beans::PropertyAttribute::TRANSIENT, &m_bMenuBarCloser, ::getCppuType( &m_bMenuBarCloser ) );
+    registerProperty( LAYOUTMANAGER_PROPNAME_MENUBARCLOSER, LAYOUTMANAGER_PROPHANDLE_MENUBARCLOSER, beans::PropertyAttribute::TRANSIENT, &m_bMenuBarCloseButton, ::getCppuType( &m_bMenuBarCloseButton ) );
     registerPropertyNoMember( LAYOUTMANAGER_PROPNAME_REFRESHVISIBILITY, LAYOUTMANAGER_PROPHANDLE_REFRESHVISIBILITY, beans::PropertyAttribute::TRANSIENT, ::getCppuType( &bRefreshVisibility ), &bRefreshVisibility );
     registerProperty( LAYOUTMANAGER_PROPNAME_PRESERVE_CONTENT_SIZE, LAYOUTMANAGER_PROPHANDLE_PRESERVE_CONTENT_SIZE, beans::PropertyAttribute::TRANSIENT, &m_bPreserveContentSize, ::getCppuType( &m_bPreserveContentSize ) );
 }
@@ -2526,12 +2526,10 @@ void LayoutManager::implts_setDockingAreaWindowSizes( const awt::Rectangle& /*rB
     }
 }
 
-//      XMenuCloser
-
 void LayoutManager::implts_updateMenuBarClose()
 {
     SolarMutexClearableGuard aWriteLock;
-    bool                      bShowCloser( m_bMenuBarCloser );
+    bool                      bShowCloseButton( m_bMenuBarCloseButton );
     Reference< awt::XWindow > xContainerWindow( m_xContainerWindow );
     aWriteLock.clear();
 
@@ -2546,8 +2544,8 @@ void LayoutManager::implts_updateMenuBarClose()
             if ( pMenuBar )
             {
                 // TODO remove link on sal_False ?!
-                pMenuBar->ShowCloser( bShowCloser );
-                pMenuBar->SetCloserHdl( LINK( this, LayoutManager, MenuBarClose ));
+                pMenuBar->ShowCloseButton(bShowCloseButton);
+                pMenuBar->SetCloseButtonClickHdl(LINK(this, LayoutManager, MenuBarClose));
             }
         }
     }