summaryrefslogtreecommitdiff
path: root/sfx2/source/appl/appinit.cxx
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2013-04-09 02:32:35 +0200
committerMatúš Kukan <matus.kukan@gmail.com>2013-04-09 15:32:31 +0200
commitb284dcc733d0bef1c113fa20e9ade849088f24cc (patch)
tree303292a272bfdffdb54583f36f4b45e4c071012d /sfx2/source/appl/appinit.cxx
parent47832f6b488917d803d1c4e4c53594ae35094e43 (diff)
Revert "fix sfx2 with Library_merged"
This reverts commit 0b78f2b9dc17dfa88d72d6ee27e3e0e0ca6a152f. Change-Id: I3608c15226f233add01ebe4a64667012854cf08b
Diffstat (limited to 'sfx2/source/appl/appinit.cxx')
-rw-r--r--sfx2/source/appl/appinit.cxx4
1 files changed, 0 insertions, 4 deletions
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 6dc25eed1908..2a85ac9c6189 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 );