[Libreoffice-commits] .: Branch 'integration/dev300_m101' - sw/AllLangResTarget_sw.mk sw/source

[Michael Meeks]

 sw/AllLangResTarget_sw.mk    |    2 ++
 sw/source/ui/uno/unofreg.cxx |    2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0ed4d06c3277bc80ba1b927945298713d293c9a2
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Tue Mar 15 17:08:53 2011 +0000

    fix pretty borders post merge (missing .src compile)

diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index d59ddd7..2ea8bfc 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 4b0b8e6..2382a65 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())
         {