extensions/source/scanner/sanedlg.cxx | 2 +- solenv/gbuild/AllLangResTarget.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit 0b638638ef6e8c93318cb898ef8312e0e197b45e Author: David Tardon <[email protected]> Date: Mon Jun 4 11:38:30 2012 +0200 fdo#50628 fix resource file name Change-Id: I17df8114983a06f7a58df30821873ecd4387cec0 diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx index e12e640..4fbd382 100644 --- a/extensions/source/scanner/sanedlg.cxx +++ b/extensions/source/scanner/sanedlg.cxx @@ -41,7 +41,7 @@ ResId SaneResId( sal_uInt32 nID ) { - static ResMgr* pResMgr = ResMgr::CreateResMgr( "san" ); + static ResMgr* pResMgr = ResMgr::CreateResMgr( "scn" ); return ResId( nID, *pResMgr ); } commit 52cd118b4e460787059aeab90bdbe5bc9ef33cbd Author: David Tardon <[email protected]> Date: Mon Jun 4 10:23:33 2012 +0200 fdo#50630 set correct path to images' module dir Change-Id: Iabaf8f41e82fb7c2f881057bedb4c7757dcf1bce diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index eb36343..e7703df 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -341,7 +341,7 @@ $(call gb_ResTarget_get_target,%) : $(gb_Helper_MISCDUMMY) \ -lip=$(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION) \ -lip=$(gb_ResTarget_DEFIMAGESLOCATION)res/$(LANGUAGE) \ -lip=$(gb_ResTarget_DEFIMAGESLOCATION)res \ - -subMODULE=$(dir $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)) \ + -subMODULE=$(gb_ResTarget_DEFIMAGESLOCATION) \ -subGLOBALRES=$(gb_ResTarget_DEFIMAGESLOCATION)res \ -oil=$(dir $(call gb_ResTarget_get_imagelist_target,$*)) \ $(filter-out $(gb_Helper_MISCDUMMY) $(gb_ResTarget_RSCTARGET),$^)" \ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
