diff options
| author | Peter Foley <pefoley2@verizon.net> | 2011-12-24 09:44:24 -0500 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2011-12-24 09:44:24 -0500 |
| commit | fd6649175956c9d322fe02fd413fe6970aa6819e (patch) | |
| tree | ce2691616f82ef55d3b8f3e45812777477e8668f /extensions/source/nsplugin | |
| parent | 79b252a56db8f1c2159d3269de415ffe2f2d9bb1 (diff) | |
| parent | a8feb5b1df99c12a5cb644097f935e9ccf512ed5 (diff) | |
Merge remote-tracking branch 'origin/master' into feature/gbuild_extensions
Conflicts:
Module_tail_build.mk
Repository.mk
extensions/util/makefile.pmk
postprocess/prj/build.lst
svx/AllLangResTarget_svx.mk
Diffstat (limited to 'extensions/source/nsplugin')
| -rw-r--r-- | extensions/source/nsplugin/source/so_env.cxx | 2 | ||||
| -rw-r--r-- | extensions/source/nsplugin/source/so_instance.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/extensions/source/nsplugin/source/so_env.cxx b/extensions/source/nsplugin/source/so_env.cxx index 454bdc830f9c..322a2fffb45d 100644 --- a/extensions/source/nsplugin/source/so_env.cxx +++ b/extensions/source/nsplugin/source/so_env.cxx @@ -322,7 +322,7 @@ const char* findInstallDir() debug_fprintf(NSP_LOG_APPEND, "start of findInstallDir()\n"); if (!pInstall) { - findReadSversion((void**)&pInstall, 0, "["SECTION_NAME"]", SOFFICE_VERSION"="); + findReadSversion((void**)&pInstall, 0, "[" SECTION_NAME "]", SOFFICE_VERSION "="); if (!pInstall) pInstall = const_cast< char* >( "" ); } diff --git a/extensions/source/nsplugin/source/so_instance.cxx b/extensions/source/nsplugin/source/so_instance.cxx index 273c3db220cc..b7957f99a448 100644 --- a/extensions/source/nsplugin/source/so_instance.cxx +++ b/extensions/source/nsplugin/source/so_instance.cxx @@ -381,7 +381,7 @@ sal_Bool SoPluginInstance::SetWindow(NSP_HWND hParent, int x, int y, int w, int m_nX = x; m_nY = y; - if (0 == m_sURL.getLength()) + if ( m_sURL.isEmpty() ) return sal_True; if(!mxRemoteMSF.is()) |