[Libreoffice-commits] core.git: 8 commits - i18npool/source Library_merged.mk sc/source sd/source sfx2/source solenv/gbuild sw/source
Matúš Kukan
matus.kukan at gmail.com
Tue Apr 9 04:38:54 PDT 2013
Library_merged.mk | 26 ++------------------------
i18npool/source/localedata/localedata.cxx | 11 ++---------
sc/source/ui/attrdlg/scuiexp.cxx | 2 +-
sc/source/ui/docshell/impex.cxx | 4 ----
sd/source/ui/dlg/sduiexp.cxx | 2 +-
sd/source/ui/view/viewshe2.cxx | 2 +-
sfx2/source/appl/appinit.cxx | 4 ----
solenv/gbuild/Library.mk | 3 ---
sw/source/ui/dialog/swdialmgr.cxx | 2 +-
sw/source/ui/dialog/swuiexp.cxx | 2 +-
10 files changed, 9 insertions(+), 49 deletions(-)
New commits:
commit 2705fc72df2058332773b5cb04a6b4d207f5e39c
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Tue Apr 9 14:15:55 2013 +0200
libmerged: remove some of unused externals and static libraries
Because cppunit was causing troubles. It's not in installation, to be
used at run-time, so we can't link against it.
Change-Id: I133feb0c3dab50bacbe96775a28dd1a61f09882e
diff --git a/Library_merged.mk b/Library_merged.mk
index 663a806..7385553 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -44,23 +44,13 @@ $(eval $(call gb_Library_use_libraries,merged,\
$(gb_UWINAPI) \
))
-ifneq ($(OS),IOS)
-$(eval $(call gb_Library_use_static_libraries,merged,\
- writerperfect \
-))
-endif
-
$(eval $(call gb_Library_use_externals,merged,\
boostdatetime \
- $(if $(filter-out IOS,$(OS)),cdr) \
$(call gb_Helper_optional,DESKTOP,clucene) \
- cmis \
- cppunit \
cups \
curl \
expat \
hunspell \
- hyphen \
icui18n \
icule \
icuuc \
@@ -69,25 +59,11 @@ $(eval $(call gb_Library_use_externals,merged,\
libxml2 \
$(call gb_Helper_optional,DESKTOP,libxslt) \
$(if $(filter-out IOS,$(OS)),lpsolve) \
- $(if $(filter-out IOS,$(OS)),mspub) \
- $(if $(filter-out IOS,$(OS)),mwaw) \
mythes \
nss3 \
- openssl \
- orcus \
- $(call gb_Helper_optional,PYUNO,python) \
- $(if $(filter-out IOS,$(OS)),wpd) \
- $(if $(filter-out IOS,$(OS)),wpg) \
- $(if $(filter-out IOS,$(OS)),wps) \
- $(if $(filter-out IOS,$(OS)),visio) \
zlib \
))
-$(eval $(call gb_Library_use_static_libraries,merged,\
- sax_shared \
- ulingu \
-))
-
ifeq ($(ENABLE_GRAPHITE),TRUE)
$(eval $(call gb_Library_use_externals,merged,\
graphite \
commit caceb6fa3cf288e0a66bb547647b5d496e10f4ee
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Tue Apr 9 13:07:46 2013 +0200
sd: fix linking of aEmptyStr; not in libmerged
Change-Id: Ie8d832755a124544e08c09d2e5200511783513e7
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx
index 6f88cf1..16410c0 100644
--- a/sd/source/ui/view/viewshe2.cxx
+++ b/sd/source/ui/view/viewshe2.cxx
@@ -72,7 +72,7 @@
using namespace com::sun::star;
-#if !defined(DISABLE_DYNLOADING) && !defined(LIBO_MERGELIBS) // otherwise use the one in sw...
+#if !defined(DISABLE_DYNLOADING) // otherwise use the one in sw...
const String aEmptyStr;
#endif
commit 57cbe8d485a0245abbfb868070261af405f9d9dd
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Tue Apr 9 11:07:50 2013 +0200
fix linking of libmerged: add jvmaccess
Change-Id: I374041bba8ea4f20d22aeea8b486f68b0d7acd7b
diff --git a/Library_merged.mk b/Library_merged.mk
index e633b0d..663a806 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -34,7 +34,8 @@ $(eval $(call gb_Library_use_libraries,merged,\
cppu \
cppuhelper \
i18nlangtag \
- jvmfwk \
+ jvmaccess \
+ jvmfwk \
sal \
salhelper \
tl \
commit b284dcc733d0bef1c113fa20e9ade849088f24cc
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Tue Apr 9 02:32:35 2013 +0200
Revert "fix sfx2 with Library_merged"
This reverts commit 0b78f2b9dc17dfa88d72d6ee27e3e0e0ca6a152f.
Change-Id: I3608c15226f233add01ebe4a64667012854cf08b
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 6dc25ee..2a85ac9 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -186,11 +186,7 @@ String GetSpecialCharsForEdit(Window* pParent, const Font& rFont)
bDetermineFunction = true;
#ifndef DISABLE_DYNLOADING
- #ifdef LIBO_MERGEDLIBS
- static OUString aLibName( SVLIBRARY( "merged" ) );
- #else
static OUString aLibName( SVLIBRARY( "cui" ) );
- #endif
oslModule handleMod = osl_loadModuleRelative(
&thisModule, aLibName.pData, 0 );
commit 47832f6b488917d803d1c4e4c53594ae35094e43
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Tue Apr 9 02:30:30 2013 +0200
Revert "add javavm and jvmfwk to Library_merged"
This reverts commit 77169b9ceccfedeadef272f701425430cf1c719d.
Conflicts:
Library_merged.mk
Change-Id: Id7c42457127a622cf71910bafc97f69db545243f
diff --git a/Library_merged.mk b/Library_merged.mk
index 5b501d5..e633b0d 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Library_use_libraries,merged,\
cppu \
cppuhelper \
i18nlangtag \
+ jvmfwk \
sal \
salhelper \
tl \
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 7f62315..a6d15a6 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -123,11 +123,8 @@ $(call gb_ComponentTarget_ComponentTarget,$(2),\
$(call gb_Library_get_runtime_filename,$(gb_Library__get_name)))
$(call gb_Library__get_final_target,$(gb_Library__get_name)) : \
$(call gb_ComponentTarget_get_outdir_target,$(2))
-# prevent circular deps: Library_merged -> localedata -> saxparser -> services.rdb -> javavm.component
-ifneq ($(gb_Library__get_name),merged)
$(call gb_ComponentTarget_get_target,$(2)) :| \
$(call gb_Library_get_target,$(gb_Library__get_name))
-endif
$(call gb_Library_get_clean_target,$(gb_Library__get_name)) : \
$(call gb_ComponentTarget_get_clean_target,$(2))
endef
commit b91f836091c2d1b5c9f6ff8a9fe2bd4da5176191
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Tue Apr 9 02:28:31 2013 +0200
Revert "add fwl, scui, sdui, swui to Library_merged"
This reverts commit 6c8c54ee90a2a8d3a8d35b7e89fb39770500936f.
Conflicts:
solenv/gbuild/extensions/pre_MergedLibsList.mk
Change-Id: I6393507344297990dfcc6e234c7b0e503a8bd10b
diff --git a/sc/source/ui/attrdlg/scuiexp.cxx b/sc/source/ui/attrdlg/scuiexp.cxx
index 9337434..77e5b2e 100644
--- a/sc/source/ui/attrdlg/scuiexp.cxx
+++ b/sc/source/ui/attrdlg/scuiexp.cxx
@@ -36,7 +36,7 @@ namespace scui
}
}
-#if defined(DISABLE_DYNLOADING) || defined (LIBO_MERGELIBS)
+#ifdef DISABLE_DYNLOADING
#define CreateDialogFactory ScCreateDialogFactory
#endif
diff --git a/sd/source/ui/dlg/sduiexp.cxx b/sd/source/ui/dlg/sduiexp.cxx
index f3d935e..d1a64e5 100644
--- a/sd/source/ui/dlg/sduiexp.cxx
+++ b/sd/source/ui/dlg/sduiexp.cxx
@@ -20,7 +20,7 @@
#include "sddlgfact.hxx"
#include "sal/types.h"
-#if defined(DISABLE_DYNLOADING) || defined (LIBO_MERGELIBS)
+#ifdef DISABLE_DYNLOADING
#define CreateDialogFactory SdCreateDialogFactory
#endif
diff --git a/sw/source/ui/dialog/swdialmgr.cxx b/sw/source/ui/dialog/swdialmgr.cxx
index 5775ed7..fe14678 100644
--- a/sw/source/ui/dialog/swdialmgr.cxx
+++ b/sw/source/ui/dialog/swdialmgr.cxx
@@ -21,7 +21,7 @@
#include "tools/string.hxx"
#include <sfx2/app.hxx>
-#if !defined(DISABLE_DYNLOADING) && !defined (LIBO_MERGELIBS)
+#ifndef DISABLE_DYNLOADING
//copy from core\bastyp\swtypes.cxx
String aEmptyStr; // constant strings
diff --git a/sw/source/ui/dialog/swuiexp.cxx b/sw/source/ui/dialog/swuiexp.cxx
index ee6231b..7b92e892 100644
--- a/sw/source/ui/dialog/swuiexp.cxx
+++ b/sw/source/ui/dialog/swuiexp.cxx
@@ -33,7 +33,7 @@ namespace swui
}
}
-#if defined(DISABLE_DYNLOADING) || defined (LIBO_MERGELIBS)
+#ifdef DISABLE_DYNLOADING
#define CreateDialogFactory SwCreateDialogFactory
#endif
commit 40800be3816760fe606e7fa8dcf7d3d9ad550257
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Tue Apr 9 02:22:49 2013 +0200
Revert "fix scfilt with Library_merged"
This reverts commit 1a04271d2e5de7dccfeb3ac0609e49155b5fe250.
Conflicts:
sc/source/ui/docshell/impex.cxx
Change-Id: I723727e045ca7e81ef9396a8b50e83ea95b162ab
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 7e734d3..b6c4869 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -2260,11 +2260,7 @@ ScFormatFilterPlugin &ScFormatFilter::Get()
return *plugin;
#ifndef DISABLE_DYNLOADING
-#ifdef LIBO_MERGELIBS
- OUString sFilterLib(SVLIBRARY("merged"));
-#else
OUString sFilterLib(SVLIBRARY("scfilt"));
-#endif
static ::osl::Module aModule;
bool bLoaded = aModule.loadRelative(&thisModule, sFilterLib);
if (!bLoaded)
commit 3609fc4b6f8a0de00d81fedfd58aab84dfb97a22
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Tue Apr 9 02:20:15 2013 +0200
Revert "fix breakiterator with Library_merged"
This reverts commit db754e891e35a2832645fce676a5f6f0bf162976.
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index 7960f50..2e50fe8 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -41,15 +41,6 @@ typedef sal_Unicode const * const * (SAL_CALL * MyFunc_FormatCode)( sal_Int16&,
#ifndef DISABLE_DYNLOADING
-#ifdef LIBO_MERGELIBS
-
-static const char *lcl_DATA_EN = "mergedlo";
-static const char *lcl_DATA_ES = "mergedlo";
-static const char *lcl_DATA_EURO = "mergedlo";
-static const char *lcl_DATA_OTHERS = "mergedlo";
-
-#else
-
static const char *lcl_DATA_EN = "localedata_en";
static const char *lcl_DATA_ES = "localedata_es";
static const char *lcl_DATA_EURO = "localedata_euro";
@@ -57,6 +48,8 @@ static const char *lcl_DATA_OTHERS = "localedata_others";
#endif
+#ifndef DISABLE_DYNLOADING
+
static const struct {
const char* pLocale;
const char* pLib;
More information about the Libreoffice-commits
mailing list