summaryrefslogtreecommitdiff
path: root/sd/source/ui/view
diff options
context:
space:
mode:
authorPeter Foley <pefoley2@verizon.net>2013-04-13 09:22:11 -0400
committerPeter Foley <pefoley2@verizon.net>2013-04-13 20:17:42 -0400
commit54ad562ff57e5a7293ad017e6664bcfedaef09af (patch)
tree7545507a0a5aedd34fa7ad6d5b74f0a89efc041e /sd/source/ui/view
parente3e040f671097e1675be80e2db294ad208e0b13c (diff)
fix mergelibs=all
Change-Id: I267ebf8842ceefdaae3729364dcb75ab66c62e1c
Diffstat (limited to 'sd/source/ui/view')
-rw-r--r--sd/source/ui/view/viewshe2.cxx6
1 files changed, 2 insertions, 4 deletions
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
*/