diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-03-31 11:16:32 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-03-31 11:34:28 -0400 |
| commit | 0b78f2b9dc17dfa88d72d6ee27e3e0e0ca6a152f (patch) | |
| tree | 5eb56cde5d12e8e1402d4fe2b8deda667ff491df /sfx2 | |
| parent | Make sure merged libs are 0 bytes long. (diff) | |
| download | core-0b78f2b9dc17dfa88d72d6ee27e3e0e0ca6a152f.tar.gz core-0b78f2b9dc17dfa88d72d6ee27e3e0e0ca6a152f.zip | |
fix sfx2 with Library_merged
Change-Id: I53d64b9023be816d0179eed21920beed3660909c
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/appinit.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index 935d00ab4ff8..cef12aaafbce 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -186,7 +186,11 @@ String GetSpecialCharsForEdit(Window* pParent, const Font& rFont) bDetermineFunction = true; #ifndef DISABLE_DYNLOADING - static ::rtl::OUString aLibName( SVLIBRARY( "cui" ) ); + #ifdef LIBO_MERGEDLIBS + static OUString aLibName( SVLIBRARY( "merged" ) ); + #else + static OUString aLibName( SVLIBRARY( "cui" ) ); + #endif oslModule handleMod = osl_loadModuleRelative( &thisModule, aLibName.pData, 0 ); |