diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2013-02-21 12:32:16 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2013-02-22 11:55:29 +0000 |
| commit | 5c89214a80f0284eafaf4eba23243dfe3c9f7193 (patch) | |
| tree | f7ec4dfd817ff589e8cebf5e92dcdee902a10996 /embeddedobj | |
| parent | def619581f3a833c4c476548c6d17a76d204dd28 (diff) | |
fdo#39674: Rename menues to menu
Change-Id: Idc22167d1a0dc518b3f9e96884213140d07b565b
Reviewed-on: https://gerrit.libreoffice.org/2316
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'embeddedobj')
| -rw-r--r-- | embeddedobj/source/general/docholder.cxx | 8 | ||||
| -rw-r--r-- | embeddedobj/source/inc/docholder.hxx | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx index 6a812908f917..79e48973c277 100644 --- a/embeddedobj/source/general/docholder.cxx +++ b/embeddedobj/source/general/docholder.cxx @@ -601,7 +601,7 @@ void DocumentHolder::FindConnectPoints( } //--------------------------------------------------------------------------- -uno::Reference< container::XIndexAccess > DocumentHolder::MergeMenuesForInplace( +uno::Reference< container::XIndexAccess > DocumentHolder::MergeMenusForInplace( const uno::Reference< container::XIndexAccess >& xContMenu, const uno::Reference< frame::XDispatchProvider >& xContDisp, const ::rtl::OUString& aContModuleName, @@ -648,7 +648,7 @@ uno::Reference< container::XIndexAccess > DocumentHolder::MergeMenuesForInplace( } //--------------------------------------------------------------------------- -sal_Bool DocumentHolder::MergeMenues_Impl( const uno::Reference< ::com::sun::star::frame::XLayoutManager >& xOwnLM, +sal_Bool DocumentHolder::MergeMenus_Impl( const uno::Reference< ::com::sun::star::frame::XLayoutManager >& xOwnLM, const uno::Reference< ::com::sun::star::frame::XLayoutManager >& xContLM, const uno::Reference< frame::XDispatchProvider >& xContDisp, const ::rtl::OUString& aContModuleName ) @@ -667,7 +667,7 @@ sal_Bool DocumentHolder::MergeMenues_Impl( const uno::Reference< ::com::sun::sta uno::Reference< container::XIndexAccess > xOwnMenu = RetrieveOwnMenu_Impl(); uno::Reference< frame::XDispatchProvider > xOwnDisp( m_xFrame, uno::UNO_QUERY_THROW ); - uno::Reference< container::XIndexAccess > xMergedMenu = MergeMenuesForInplace( xContMenu, xContDisp, aContModuleName, xOwnMenu, xOwnDisp ); + uno::Reference< container::XIndexAccess > xMergedMenu = MergeMenusForInplace( xContMenu, xContDisp, aContModuleName, xOwnMenu, xOwnDisp ); uno::Reference< ::com::sun::star::frame::XMenuBarMergingAcceptor > xMerge( xOwnLM, uno::UNO_QUERY_THROW ); bMenuMerged = xMerge->setMergedMenuBar( xMergedMenu ); @@ -709,7 +709,7 @@ sal_Bool DocumentHolder::ShowUI( const uno::Reference< ::com::sun::star::frame:: xOwnLM->setDockingAreaAcceptor( xDocAreaAcc ); // try to merge menus; don't do anything else if it fails - if ( MergeMenues_Impl( xOwnLM, xContainerLM, xContainerDP, aContModuleName ) ) + if ( MergeMenus_Impl( xOwnLM, xContainerLM, xContainerDP, aContModuleName ) ) { // make sure that the container LM does not control the size of the containers window anymore // this must be done after merging menus as we won't get the container menu otherwise diff --git a/embeddedobj/source/inc/docholder.hxx b/embeddedobj/source/inc/docholder.hxx index a76faae55597..a04dbb64fd6c 100644 --- a/embeddedobj/source/inc/docholder.hxx +++ b/embeddedobj/source/inc/docholder.hxx @@ -93,7 +93,7 @@ private: void ResizeWindows_Impl( const ::com::sun::star::awt::Rectangle& aHatchRect ); ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > RetrieveOwnMenu_Impl(); - sal_Bool MergeMenues_Impl( + sal_Bool MergeMenus_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& xOwnLM, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& xContLM, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xContDisp, @@ -106,7 +106,7 @@ public: sal_Int32 nConnectPoints[2] ) throw ( ::com::sun::star::uno::Exception ); - static ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > MergeMenuesForInplace( + static ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > MergeMenusForInplace( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& xContMenu, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xContDisp, const ::rtl::OUString& aContModuleName, |