[Libreoffice-commits] .: Branch 'integration/dev300_m98' - sal/osl stoc/source

[Michael Meeks]

 sal/osl/w32/file_url.cxx                      |   16 -------------
 stoc/source/corereflection/crefl.cxx          |   32 --------------------------
 stoc/source/javavm/javavm.cxx                 |   31 -------------------------
 stoc/source/simpleregistry/simpleregistry.cxx |    2 +
 4 files changed, 2 insertions(+), 79 deletions(-)

New commits:
commit 49b7ef01b64ac7fb0dfc17edd6a8a5f71dab26f6
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Tue Feb 15 11:49:01 2011 +0000

    fixup more merge conflicts

diff --git a/sal/osl/w32/file_url.cxx b/sal/osl/w32/file_url.cxx
index f43756f..b119c10 100644
--- a/sal/osl/w32/file_url.cxx
+++ b/sal/osl/w32/file_url.cxx
@@ -277,7 +277,6 @@ DWORD IsValidFilePath(rtl_uString *path, LPCTSTR *lppError, DWORD dwFlags, rtl_u
         else if ( 2 == _tcsspn( lpszPath, CHARSET_SEPARATOR ) )
         {
             /* The UNC path notation */
-<<<<<<< HEAD
             lpComponent = lpszPath + 2;
             dwCandidatPathType = PATHTYPE_ABSOLUTE_UNC;
         }
@@ -285,15 +284,6 @@ DWORD IsValidFilePath(rtl_uString *path, LPCTSTR *lppError, DWORD dwFlags, rtl_u
         {
             /* Local path verification. Must start with <drive>: */
             lpComponent = lpszPath + 2;
-=======
-            lpComponent = lpszPath + 2;
-            dwCandidatPathType = PATHTYPE_ABSOLUTE_UNC;
-        }
-        else if ( _istalpha( lpszPath[0] ) && ':' == lpszPath[1] )
-        {
-            /* Local path verification. Must start with <drive>: */
-            lpComponent = lpszPath + 2;
->>>>>>> stage/premerge/dev300_m98
             dwCandidatPathType = PATHTYPE_ABSOLUTE_LOCAL;
         }
 
@@ -438,15 +428,9 @@ static sal_Int32 PathRemoveFileSpec(LPTSTR lpPath, LPTSTR lpFileName, sal_Int32
                     _tcscpy( lpFileName, lpLastDelimiter + 1 );
                     *(++lpLastDelimiter) = 0;
                     nRemoved = nDelLen - 1;
-<<<<<<< HEAD
-                }
-        }
-    }
-=======
                 }
         }
     }
->>>>>>> stage/premerge/dev300_m98
 
     return nRemoved;
 }
diff --git a/stoc/source/corereflection/crefl.cxx b/stoc/source/corereflection/crefl.cxx
index 19bb625..d39e287 100644
--- a/stoc/source/corereflection/crefl.cxx
+++ b/stoc/source/corereflection/crefl.cxx
@@ -507,38 +507,6 @@ void SAL_CALL component_getImplementationEnvironment(
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 //==================================================================================================
-<<<<<<< HEAD
-sal_Bool SAL_CALL component_writeInfo(
-    void * pServiceManager, void * pRegistryKey )
-{
-    if (component_writeInfoHelper( pServiceManager, pRegistryKey, g_entries ))
-    {
-        try
-        {
-            // register singleton
-            registry::XRegistryKey * pKey =
-                reinterpret_cast< registry::XRegistryKey * >( pRegistryKey );
-            Reference< registry::XRegistryKey > xKey(
-                pKey->createKey(
-                    OUSTR(IMPLNAME "/UNO/SINGLETONS/com.sun.star.reflection.theCoreReflection") ) );
-            xKey->setStringValue( OUSTR("com.sun.star.reflection.CoreReflection") );
-            return sal_True;
-        }
-        catch (Exception & exc)
-        {
-#if OSL_DEBUG_LEVEL > 0
-            OString cstr( OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ) );
-            OSL_ENSURE( 0, cstr.getStr() );
-#else
-            (void) exc; // unused
-#endif
-        }
-    }
-    return sal_False;
-}
-//==================================================================================================
-=======
->>>>>>> stage/premerge/dev300_m98
 void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index a7065ea..d364c45 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -616,37 +616,6 @@ component_getImplementationEnvironment(sal_Char const ** pEnvTypeName,
     *pEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-<<<<<<< HEAD
-extern "C" sal_Bool SAL_CALL component_writeInfo(void * pServiceManager,
-                                                 void * pRegistryKey)
-{
-    if (cppu::component_writeInfoHelper(pServiceManager, pRegistryKey,
-                                        aServiceImplementation))
-    {
-        try
-        {
-            css::uno::Reference< css::registry::XRegistryKey >(
-                    reinterpret_cast< css::registry::XRegistryKey * >(
-                        pRegistryKey)->
-                createKey(
-                    rtl::OUString(
-                        RTL_CONSTASCII_USTRINGPARAM(
-                            "com.sun.star.comp.stoc.JavaVirtualMachine"
-                            "/UNO/SINGLETONS/"
-                            "com.sun.star.java.theJavaVirtualMachine"))))->
-                setStringValue(serviceGetServiceName());
-            return true;
-        }
-        catch (css::uno::Exception &)
-        {
-            OSL_ENSURE(false, "com.sun.star.uno.Exception caught");
-        }
-    }
-    return false;
-}
-
-=======
->>>>>>> stage/premerge/dev300_m98
 extern "C" void * SAL_CALL component_getFactory(sal_Char const * pImplName,
                                                 void * pServiceManager,
                                                 void * pRegistryKey)
diff --git a/stoc/source/simpleregistry/simpleregistry.cxx b/stoc/source/simpleregistry/simpleregistry.cxx
index 0496995..4ec5465 100644
--- a/stoc/source/simpleregistry/simpleregistry.cxx
+++ b/stoc/source/simpleregistry/simpleregistry.cxx
@@ -1318,4 +1318,6 @@ rtl::OUString simreg_getImplementationName() {
         RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.stoc.SimpleRegistry"));
 }
 
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */