Kaydet (Commit) d6e212ab authored tarafından Michael Meeks's avatar Michael Meeks

fix pretty borders post merge (missing .src compile)

üst 4a586f32
...@@ -38,6 +38,7 @@ $(eval $(call gb_SrsTarget_set_include,sw/res,\ ...@@ -38,6 +38,7 @@ $(eval $(call gb_SrsTarget_set_include,sw/res,\
-I$(OUTDIR)/inc \ -I$(OUTDIR)/inc \
-I$(WORKDIR)/inc/sw \ -I$(WORKDIR)/inc/sw \
-I$(SRCDIR)/sw/inc \ -I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/source/core/undo \ -I$(SRCDIR)/sw/source/core/undo \
-I$(SRCDIR)/sw/source/core/unocore \ -I$(SRCDIR)/sw/source/core/unocore \
-I$(SRCDIR)/sw/source/ui/chrdlg \ -I$(SRCDIR)/sw/source/ui/chrdlg \
...@@ -65,6 +66,7 @@ $(eval $(call gb_SrsTarget_set_include,sw/res,\ ...@@ -65,6 +66,7 @@ $(eval $(call gb_SrsTarget_set_include,sw/res,\
)) ))
$(eval $(call gb_SrsTarget_add_files,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/undo/undo.src \
sw/source/core/unocore/unocore.src \ sw/source/core/unocore/unocore.src \
sw/source/ui/app/app.src \ sw/source/ui/app/app.src \
......
...@@ -362,14 +362,12 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( ...@@ -362,14 +362,12 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
SwUnoModule_createInstance, SwUnoModule_createInstance,
SwUnoModule_getSupportedServiceNames() ); SwUnoModule_getSupportedServiceNames() );
} }
// --> OD 2007-05-24 #i73788#
else if( comp_FinalThreadManager::_getImplementationName().equalsAsciiL( else if( comp_FinalThreadManager::_getImplementationName().equalsAsciiL(
pImplName, nImplNameLen ) ) pImplName, nImplNameLen ) )
{ {
pRet = ::cppu::component_getFactoryHelper( pRet = ::cppu::component_getFactoryHelper(
pImplName, pServiceManager, pRegistryKey, entries); pImplName, pServiceManager, pRegistryKey, entries);
} }
// <--
if( xFactory.is()) if( xFactory.is())
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment