mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make this static WeakReference local to Frame::impl_checkMenuCloser()

Browse Source 
..to avoid problem shown with comphelper added to libmerged. More info in
http://lists.freedesktop.org/archives/libreoffice/2015-November/071189.html

Change-Id: I2017d87f64f1ae3a1a1cf2e50bce24c05cff6321
This commit is contained in:
Matúš Kukan
2015-11-23 22:07:12 +01:00
parent a7c3a2a9be
commit c6122fe614
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
framework/source/services/frame.cxx
View File

@@ -402,7 +402,6 @@ private:
SvtCommandOptions m_aCommandOptions; /// ref counted class to support disabling commands defined by configuration file SvtCommandOptions m_aCommandOptions; /// ref counted class to support disabling commands defined by configuration file
bool m_bSelfClose; /// in case of CloseVetoException on method close() was thrown by ourself - we must close ourself later if no internal processes are running bool m_bSelfClose; /// in case of CloseVetoException on method close() was thrown by ourself - we must close ourself later if no internal processes are running
bool m_bIsHidden; /// indicates, if this frame is used in hidden mode or not bool m_bIsHidden; /// indicates, if this frame is used in hidden mode or not
static css::uno::WeakReference< css::frame::XFrame2 > m_xCloserFrame; /// holds the only frame, which must show the special closer menu item (can be NULL!)
css::uno::Reference< css::frame::XLayoutManager2 > m_xLayoutManager; /// is used to layout the child windows of the frame. css::uno::Reference< css::frame::XLayoutManager2 > m_xLayoutManager; /// is used to layout the child windows of the frame.
css::uno::Reference< css::frame::XDispatchInformationProvider > m_xDispatchInfoHelper; css::uno::Reference< css::frame::XDispatchInformationProvider > m_xDispatchInfoHelper;
css::uno::Reference< css::frame::XTitle > m_xTitleHelper; css::uno::Reference< css::frame::XTitle > m_xTitleHelper;
@@ -414,8 +413,6 @@ protected:
FrameContainer m_aChildFrameContainer; /// array of child frames FrameContainer m_aChildFrameContainer; /// array of child frames
}; };
css::uno::WeakReference< css::frame::XFrame2 > Frame::m_xCloserFrame;
// XInterface, XTypeProvider, XServiceInfo // XInterface, XTypeProvider, XServiceInfo
DEFINE_XINTERFACE_22 ( Frame , DEFINE_XINTERFACE_22 ( Frame ,
@@ -3206,15 +3203,16 @@ void Frame::impl_checkMenuCloser()
// Only if the closer state must be moved from one frame to another one // Only if the closer state must be moved from one frame to another one
// or must be enabled/disabled at all. // or must be enabled/disabled at all.
SolarMutexGuard aGuard; SolarMutexGuard aGuard;
// Holds the only frame, which must show the special closer menu item (can be NULL!)
css::uno::Reference< css::frame::XFrame2 > xCloserFrame (m_xCloserFrame.get(), css::uno::UNO_QUERY); static css::uno::WeakReference< css::frame::XFrame2 > s_xCloserFrame;
css::uno::Reference< css::frame::XFrame2 > xCloserFrame (s_xCloserFrame.get(), css::uno::UNO_QUERY);
if (xCloserFrame!=xNewCloserFrame) if (xCloserFrame!=xNewCloserFrame)
{ {
if (xCloserFrame.is()) if (xCloserFrame.is())
impl_setCloser(xCloserFrame, false); impl_setCloser(xCloserFrame, false);
if (xNewCloserFrame.is()) if (xNewCloserFrame.is())
impl_setCloser(xNewCloserFrame, true); impl_setCloser(xNewCloserFrame, true);
m_xCloserFrame = xNewCloserFrame; s_xCloserFrame = xNewCloserFrame;
} }
} }