Library_merged.mk | 3 ---
framework/source/services/frame.cxx | 10 ++++------
solenv/gbuild/LinkTarget.mk | 3 +++
solenv/gbuild/extensions/pre_MergedLibsList.mk | 3 +++
4 files changed, 10 insertions(+), 9 deletions(-)
New commits:
commit c1c13e6e38b8c58b0def4f462fd0ea3a5b2697cd
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Mon Nov 23 22:23:12 2015 +0100
Add i18nlangtag and ucbhelper to libmerged
Change-Id: I717d3289d63787cd8148d480783092868a60873b
diff --git a/Library_merged.mk b/Library_merged.mk
index 49dcbb5..8247e5a 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -18,13 +18,11 @@ $(eval $(call gb_Library_use_library_objects,merged,\
$(eval $(call gb_Library_use_libraries,merged,\
cppu \
cppuhelper \
- i18nlangtag \
$(if $(ENABLE_JAVA), \
jvmaccess \
jvmfwk) \
sal \
salhelper \
- ucbhelper \
xmlreader \
$(gb_UWINAPI) \
))
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index d9a97a1..7f24a57 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -821,12 +821,14 @@ gb_BUILD_HELPER_LIBS := basegfx \
comphelper \
cppu \
cppuhelper \
+ i18nlangtag \
reg \
sal \
salhelper \
sax \
store \
tl \
+ ucbhelper \
unoidl \
xmlreader \
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index c9275f4..4ad27fb 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -30,6 +30,7 @@ MERGE_LIBRARY_LIST := \
fwi \
fwk \
$(call gb_Helper_optional,DESKTOP,helplinker) \
+ i18nlangtag \
i18npool \
i18nutil \
lng \
@@ -51,6 +52,7 @@ MERGE_LIBRARY_LIST := \
tl \
$(if $(filter TRUE,$(ENABLE_TELEPATHY)),tubes) \
ucb1 \
+ ucbhelper \
ucpexpand1 \
ucpfile1 \
unoxml \
commit 8668e044b27ca70de2e5b47741d5ccb2d4418ac4
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Mon Nov 23 22:16:31 2015 +0100
Add comphelper to libmerged
Change-Id: I59af9f5a9d0d3e189280f98bb18e522dc9ebf2fb
diff --git a/Library_merged.mk b/Library_merged.mk
index 2e482e8..49dcbb5 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -16,7 +16,6 @@ $(eval $(call gb_Library_use_library_objects,merged,\
))
$(eval $(call gb_Library_use_libraries,merged,\
- comphelper \
cppu \
cppuhelper \
i18nlangtag \
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 6af790c..d9a97a1 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -818,6 +818,7 @@ endef
# libraries which are merged but need to be built for gb_BUILD_HELPER_TOOLS
gb_BUILD_HELPER_LIBS := basegfx \
+ comphelper \
cppu \
cppuhelper \
reg \
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 97953ee..c9275f4 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -14,6 +14,7 @@ MERGE_LIBRARY_LIST := \
$(if $(filter $(OS),ANDROID),,basebmp) \
basegfx \
canvastools \
+ comphelper \
configmgr \
cppcanvas \
$(call gb_Helper_optional,DBCONNECTIVITY,dbtools) \
commit c6122fe6143ff1efa9f449d46a848cf3071ac67e
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Mon Nov 23 22:07:12 2015 +0100
Make this static WeakReference local to Frame::impl_checkMenuCloser()
..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
diff --git a/framework/source/services/frame.cxx
b/framework/source/services/frame.cxx
index 754768e..bcd12d4 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -402,7 +402,6 @@ private:
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_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::XDispatchInformationProvider >
m_xDispatchInfoHelper;
css::uno::Reference< css::frame::XTitle >
m_xTitleHelper;
@@ -414,8 +413,6 @@ protected:
FrameContainer
m_aChildFrameContainer; /// array of child frames
};
-css::uno::WeakReference< css::frame::XFrame2 > Frame::m_xCloserFrame;
-
// XInterface, XTypeProvider, XServiceInfo
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
// or must be enabled/disabled at all.
SolarMutexGuard aGuard;
-
- css::uno::Reference< css::frame::XFrame2 > xCloserFrame
(m_xCloserFrame.get(), css::uno::UNO_QUERY);
+ // Holds the only frame, which must show the special closer menu item (can
be NULL!)
+ 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.is())
impl_setCloser(xCloserFrame, false);
if (xNewCloserFrame.is())
impl_setCloser(xNewCloserFrame, true);
- m_xCloserFrame = xNewCloserFrame;
+ s_xCloserFrame = xNewCloserFrame;
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
