diff options
author | Michael Meeks <michael.meeks@novell.com> | 2011-03-15 17:08:53 +0000 |
---|---|---|
committer | Michael Meeks <michael.meeks@novell.com> | 2011-03-15 17:11:39 +0000 |
commit | d6e212ab75c766646695d0dd8867e011d7b92e81 (patch) | |
tree | 9de0a22a154c04f5d689d7ac35b61d0562c02dd9 /sw | |
parent | Fix the build - methods in xmldump.cxx debug-only (diff) | |
download | core-d6e212ab75c766646695d0dd8867e011d7b92e81.tar.gz core-d6e212ab75c766646695d0dd8867e011d7b92e81.zip |
fix pretty borders post merge (missing .src compile)
Diffstat (limited to 'sw')
-rw-r--r-- | sw/AllLangResTarget_sw.mk | 2 | ||||
-rw-r--r-- | sw/source/ui/uno/unofreg.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk index d59ddd700a92..2ea8bfc0b332 100644 --- a/sw/AllLangResTarget_sw.mk +++ b/sw/AllLangResTarget_sw.mk @@ -38,6 +38,7 @@ $(eval $(call gb_SrsTarget_set_include,sw/res,\ -I$(OUTDIR)/inc \ -I$(WORKDIR)/inc/sw \ -I$(SRCDIR)/sw/inc \ + -I$(SRCDIR)/sw/source/core/inc \ -I$(SRCDIR)/sw/source/core/undo \ -I$(SRCDIR)/sw/source/core/unocore \ -I$(SRCDIR)/sw/source/ui/chrdlg \ @@ -65,6 +66,7 @@ $(eval $(call gb_SrsTarget_set_include,sw/res,\ )) $(eval $(call gb_SrsTarget_add_files,sw/res,\ + sw/source/core/layout/pagefrm.src \ sw/source/core/undo/undo.src \ sw/source/core/unocore/unocore.src \ sw/source/ui/app/app.src \ diff --git a/sw/source/ui/uno/unofreg.cxx b/sw/source/ui/uno/unofreg.cxx index d74485f7ab42..f63f21e12c6f 100644 --- a/sw/source/ui/uno/unofreg.cxx +++ b/sw/source/ui/uno/unofreg.cxx @@ -362,14 +362,12 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( SwUnoModule_createInstance, SwUnoModule_getSupportedServiceNames() ); } - // --> OD 2007-05-24 #i73788# else if( comp_FinalThreadManager::_getImplementationName().equalsAsciiL( pImplName, nImplNameLen ) ) { pRet = ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, entries); } - // <-- if( xFactory.is()) { |