diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-04-13 09:22:11 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-04-13 20:17:42 -0400 |
| commit | 54ad562ff57e5a7293ad017e6664bcfedaef09af (patch) | |
| tree | 7545507a0a5aedd34fa7ad6d5b74f0a89efc041e | |
| parent | e3e040f671097e1675be80e2db294ad208e0b13c (diff) | |
fix mergelibs=all
Change-Id: I267ebf8842ceefdaae3729364dcb75ab66c62e1c
| -rw-r--r-- | Library_merged.mk | 2 | ||||
| -rw-r--r-- | sd/source/ui/inc/ViewShell.hxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/view/viewshe2.cxx | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index 59edec136213..2c4257afc121 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_libraries,merged,\ $(eval $(call gb_Library_use_externals,merged,\ boostdatetime \ $(call gb_Helper_optional,DESKTOP,clucene) \ + cppunit \ cups \ curl \ expat \ @@ -62,6 +63,7 @@ $(eval $(call gb_Library_use_externals,merged,\ $(if $(filter-out IOS,$(OS)),lpsolve) \ mythes \ nss3 \ + $(call gb_Helper_optional,PYUNO,python) \ zlib \ )) diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index 60ccfca78b68..62395018fdde 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -44,8 +44,6 @@ class ScrollBarBox; class SdDrawDocument; class ScrollBar; -extern const String aEmptyStr; - namespace com { namespace sun { namespace star { namespace embed { class XEmbeddedObject; @@ -53,6 +51,8 @@ namespace embed { namespace sd { +extern const String aEmptyStr; + class DrawDocShell; class FrameView; class LayerTabBar; diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index 16410c0e6af6..31dcf3752feb 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -72,12 +72,10 @@ using namespace com::sun::star; -#if !defined(DISABLE_DYNLOADING) // otherwise use the one in sw... -const String aEmptyStr; -#endif - namespace sd { +const String aEmptyStr; + /** * adjust Thumbpos and VisibleSize */ |