jl152 import 263445 from native0jl:#i77196# supporting extension help

1 files changed, 303 insertions, 280 deletions

diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx
index 5ca9822e2d..3b3c3d5070 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -46,7 +46,7 @@
 #include <com/sun/star/uri/XUriReferenceFactory.hpp>
 #include <com/sun/star/uri/XVndSunStarExpandUrl.hpp>
 #include <com/sun/star/script/XInvocation.hpp>
-
+#include "boost/optional.hpp"
 
 using namespace ::dp_misc;
 using namespace ::com::sun::star;
@@ -80,11 +80,15 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
             Reference<XCommandEnvironment> const & xCmdEnv );
 
     public:
-        inline PackageImpl(
+        PackageImpl(
             ::rtl::Reference<PackageRegistryBackend> const & myBackend,
             OUString const & url, OUString const & name,
             Reference<deployment::XPackageTypeInfo> const & xPackageType,
             bool bRemoved, OUString const & identifier);
+
+        //XPackage
+        virtual css::beans::Optional< ::rtl::OUString > SAL_CALL getRegistrationDataURL()
+            throw (deployment::ExtensionRemovedException, css::uno::RuntimeException);
     };
     friend class PackageImpl;
 
@@ -98,13 +102,13 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
             Reference<ucb::XCommandEnvironment> const & xCmdEnv);
     void implCollectXhpFiles( const rtl::OUString& aDir,
         std::vector< rtl::OUString >& o_rXhpFileVector );
-    rtl::OUString getFlagFileURL( Reference< deployment::XPackage > xPackage, const char* pFlagStr );
-    rtl::OUString getRegisteredFlagFileURL( Reference< deployment::XPackage > xPackage );
-    rtl::OUString getCompiledFlagFileURL( Reference< deployment::XPackage > xPackage );
-    rtl::OUString expandURL( const rtl::OUString& aURL );
+// 	rtl::OUString getFlagFileURL( Reference< deployment::XPackage > xPackage, const char* pFlagStr );
+// 	rtl::OUString getRegisteredFlagFileURL( Reference< deployment::XPackage > xPackage );
+// 	rtl::OUString getCompiledFlagFileURL( Reference< deployment::XPackage > xPackage );
+//	rtl::OUString expandURL( const rtl::OUString& aURL );
 
     void addDataToDb(OUString const & url, HelpBackendDb::Data const & data);
-    HelpBackendDb::Data readDataFromDb(OUString const & url);
+    ::boost::optional<HelpBackendDb::Data> readDataFromDb(OUString const & url);
     void deleteDataFromDb(OUString const & url);
 
     Reference< ucb::XSimpleFileAccess > getFileAccess( void );
@@ -208,10 +212,10 @@ void BackendImpl::addDataToDb(
         m_backendDb->addEntry(url, data);
 }
 
-HelpBackendDb::Data BackendImpl::readDataFromDb(
+::boost::optional<HelpBackendDb::Data> BackendImpl::readDataFromDb(
     OUString const & url)
 {
-    HelpBackendDb::Data data;
+    ::boost::optional<HelpBackendDb::Data> data;
     if (m_backendDb.get())
         data = m_backendDb->getEntry(url);
     return data;
@@ -232,7 +236,12 @@ BackendImpl::PackageImpl::PackageImpl(
     : Package( myBackend, url, name, name, xPackageType, bRemoved, identifier)
 {
         if (bRemoved)
-            m_dbData = getMyBackend()->readDataFromDb(url);
+        {
+            ::boost::optional<HelpBackendDb::Data> opt = 
+                getMyBackend()->readDataFromDb(url);
+            if (opt)
+                m_dbData = *opt;
+        }
 }
 
 // Package
@@ -259,11 +268,10 @@ BackendImpl::PackageImpl::isRegistered_(
     Reference<XCommandEnvironment> const & )
 {
     BackendImpl * that = getMyBackend();
-    Reference< deployment::XPackage > xThisPackage( this );
-    rtl::OUString aRegisteredFlagFile = that->getRegisteredFlagFileURL( xThisPackage );
 
-    Reference< ucb::XSimpleFileAccess > xSFA = that->getFileAccess();
-    bool bReg = xSFA->exists( aRegisteredFlagFile );
+    bool bReg = false;
+    if (that->readDataFromDb(getURL()))
+        bReg = true;
 
     return beans::Optional< beans::Ambiguous<sal_Bool> >( true, beans::Ambiguous<sal_Bool>( bReg, false ) );
 }
@@ -291,6 +299,23 @@ void BackendImpl::PackageImpl::processPackage_(
 //         getMyBackend()->deleteDataFromDb(getURL());
 }
 
+beans::Optional< OUString > BackendImpl::PackageImpl::getRegistrationDataURL()
+    throw (deployment::ExtensionRemovedException,
+           css::uno::RuntimeException)
+{
+    if (m_bRemoved)
+        throw deployment::ExtensionRemovedException();
+
+    ::boost::optional<HelpBackendDb::Data> data =
+          getMyBackend()->readDataFromDb(getURL());
+    
+    if (data)
+        return beans::Optional<OUString>(true, data->dataUrl);
+
+    return beans::Optional<OUString>(true, OUString());    
+}
+
+
 //##############################################################################
 
 static rtl::OUString aSlash( rtl::OUString::createFromAscii( "/" ) );
@@ -305,232 +330,230 @@ void BackendImpl::implProcessHelp
     if (doRegisterPackage)
     {
         HelpBackendDb::Data data;
-        Reference< ucb::XSimpleFileAccess > xSFA = getFileAccess();
+        const OUString sHelpFolder = createFolder(OUString(), xCmdEnv);
+        data.dataUrl = sHelpFolder;
 
-        rtl::OUString aRegisteredFlagFile = getRegisteredFlagFileURL( xPackage );
-        if( !doRegisterPackage )
+        Reference< ucb::XSimpleFileAccess > xSFA = getFileAccess();
+        rtl::OUString aHelpURL = xPackage->getURL();
+        rtl::OUString aExpandedHelpURL = dp_misc::expandUnoRcUrl( aHelpURL );
+        rtl::OUString aName = xPackage->getName();
+        if( !xSFA->isFolder( aExpandedHelpURL ) )
         {
-            if( xSFA->exists( aRegisteredFlagFile ) )
-                xSFA->kill( aRegisteredFlagFile );
-            return;
+            rtl::OUString aErrStr = getResourceString( RID_STR_HELPPROCESSING_GENERAL_ERROR );
+            aErrStr += rtl::OUString::createFromAscii( "No help folder" );
+            OWeakObject* oWeakThis = static_cast<OWeakObject *>(this);
+            throw deployment::DeploymentException( rtl::OUString(), oWeakThis,
+                                                   makeAny( uno::Exception( aErrStr, oWeakThis ) ) );
         }
 
-        bool bCompile = true;
-        rtl::OUString aCompiledFlagFile = getCompiledFlagFileURL( xPackage );
-        if( xSFA->exists( aCompiledFlagFile ) )
-            bCompile = false;
-
-        if( bCompile )
+        Reference<XComponentContext> const & xContext = getComponentContext();
+        Reference< script::XInvocation > xInvocation;
+        if( xContext.is() )
         {
-            OUString sHelpFolder = createFolder(OUString(), xCmdEnv);
-            data.dataUrl = sHelpFolder;
-            rtl::OUString aHelpURL = xPackage->getURL();
-            rtl::OUString aExpandedHelpURL = expandURL( aHelpURL );
-            rtl::OUString aName = xPackage->getName();
-            if( !xSFA->isFolder( aExpandedHelpURL ) )
+            try
             {
-                rtl::OUString aErrStr = getResourceString( RID_STR_HELPPROCESSING_GENERAL_ERROR );
-                aErrStr += rtl::OUString::createFromAscii( "No help folder" );
-                OWeakObject* oWeakThis = static_cast<OWeakObject *>(this);
-                throw deployment::DeploymentException( rtl::OUString(), oWeakThis,
-                                                       makeAny( uno::Exception( aErrStr, oWeakThis ) ) );
+                xInvocation = Reference< script::XInvocation >( 
+                    xContext->getServiceManager()->createInstanceWithContext( rtl::OUString::createFromAscii(
+                                                                                  "com.sun.star.help.HelpIndexer" ), xContext ) , UNO_QUERY );
             }
-
-            Reference<XComponentContext> const & xContext = getComponentContext();
-            Reference< script::XInvocation > xInvocation;
-            if( xContext.is() )
+            catch (Exception &)
             {
-                try
-                {
-                    xInvocation = Reference< script::XInvocation >( 
-                        xContext->getServiceManager()->createInstanceWithContext( rtl::OUString::createFromAscii(
-                                                                                      "com.sun.star.help.HelpIndexer" ), xContext ) , UNO_QUERY );
-                }
-                catch (Exception &)
-                {
-                    // i98680: Survive missing lucene
-                }
+                // i98680: Survive missing lucene
             }
+        }
 
-            // Scan languages
-            Sequence< rtl::OUString > aLanguageFolderSeq = xSFA->getFolderContents( aExpandedHelpURL, true );
-            sal_Int32 nLangCount = aLanguageFolderSeq.getLength();
-            const rtl::OUString* pSeq = aLanguageFolderSeq.getConstArray();
-            for( sal_Int32 iLang = 0 ; iLang < nLangCount ; ++iLang )
+        // Scan languages
+        Sequence< rtl::OUString > aLanguageFolderSeq = xSFA->getFolderContents( aExpandedHelpURL, true );
+        sal_Int32 nLangCount = aLanguageFolderSeq.getLength();
+        const rtl::OUString* pSeq = aLanguageFolderSeq.getConstArray();
+        for( sal_Int32 iLang = 0 ; iLang < nLangCount ; ++iLang )
+        {
+            rtl::OUString aLangURL = pSeq[iLang];
+            if( xSFA->isFolder( aLangURL ) )
             {
-                rtl::OUString aLangURL = pSeq[iLang];
-                if( xSFA->isFolder( aLangURL ) )
+                std::vector< rtl::OUString > aXhpFileVector;
+
+                // Delete (old) files in any case to allow compiler to be started every time
+//                 rtl::OUString aLangWithPureNameURL( aLangURL );
+//                 aLangWithPureNameURL += aSlash;
+//                 aLangWithPureNameURL += aHelpStr;
+//                 rtl::OUString aDbFile( aLangWithPureNameURL );
+//                 aDbFile += rtl::OUString::createFromAscii( ".db" );
+//                 if( xSFA->exists( aDbFile ) )
+//                     xSFA->kill( aDbFile );
+//                 rtl::OUString aHtFile( aLangWithPureNameURL );
+//                 aHtFile += rtl::OUString::createFromAscii( ".ht" );
+//                 if( xSFA->exists( aHtFile ) )
+//                     xSFA->kill( aHtFile );
+//                 rtl::OUString aKeyFile( aLangWithPureNameURL );
+//                 aKeyFile += rtl::OUString::createFromAscii( ".key" );
+//                 if( xSFA->exists( aKeyFile ) )
+//                     xSFA->kill( aKeyFile );
+
+                // calculate jar file URL
+                sal_Int32 indexStartSegment = aLangURL.lastIndexOf('/');
+                // for example "/en"
+                OUString langFolderURLSegment(
+                    aLangURL.copy(
+                        indexStartSegment + 1, aLangURL.getLength() - indexStartSegment - 1));
+
+                //create the folder in the "temporary folder"
+                ::ucbhelper::Content langFolderContent;
+                const OUString langFolderDest = makeURL(sHelpFolder, langFolderURLSegment);
+                const OUString langFolderDestExpanded = ::dp_misc::expandUnoRcUrl(langFolderDest);
+                ::dp_misc::create_folder(
+                    &langFolderContent,
+                    langFolderDest, xCmdEnv);
+                
+                rtl::OUString aJarFile(
+                    makeURL(sHelpFolder, langFolderURLSegment + aSlash + aHelpStr +
+                            OUSTR(".jar")));
+//                 aJarFile += aSlash;
+//                 aJarFile += aHelpStr;
+//                 aJarFile += rtl::OUString::createFromAscii( ".jar" );
+                // remove in any case to clean up
+//                 if( xSFA->exists( aJarFile ) )
+//                     xSFA->kill( aJarFile );
+                aJarFile = ::dp_misc::expandUnoRcUrl(aJarFile);
+                
+                rtl::OUString aEncodedJarFilePath = rtl::Uri::encode(
+                    aJarFile, rtl_UriCharClassPchar,
+                    rtl_UriEncodeIgnoreEscapes,
+                    RTL_TEXTENCODING_UTF8 );
+                rtl::OUString aDestBasePath = rtl::OUString::createFromAscii( "vnd.sun.star.pkg://" );
+                aDestBasePath += aEncodedJarFilePath;
+                aDestBasePath += rtl::OUString::createFromAscii( "/" );
+
+                sal_Int32 nLenLangFolderURL = aLangURL.getLength() + 1;
+
+                Sequence< rtl::OUString > aSubLangSeq = xSFA->getFolderContents( aLangURL, true );
+                sal_Int32 nSubLangCount = aSubLangSeq.getLength();
+                const rtl::OUString* pSubLangSeq = aSubLangSeq.getConstArray();
+                for( sal_Int32 iSubLang = 0 ; iSubLang < nSubLangCount ; ++iSubLang )
                 {
-                    std::vector< rtl::OUString > aXhpFileVector;
-
-                    // Delete (old) files in any case to allow compiler to be started every time
-                    rtl::OUString aLangWithPureNameURL( aLangURL );
-                    aLangWithPureNameURL += aSlash;
-                    aLangWithPureNameURL += aHelpStr;
-                    rtl::OUString aDbFile( aLangWithPureNameURL );
-                    aDbFile += rtl::OUString::createFromAscii( ".db" );
-                    if( xSFA->exists( aDbFile ) )
-                        xSFA->kill( aDbFile );
-                    rtl::OUString aHtFile( aLangWithPureNameURL );
-                    aHtFile += rtl::OUString::createFromAscii( ".ht" );
-                    if( xSFA->exists( aHtFile ) )
-                        xSFA->kill( aHtFile );
-                    rtl::OUString aKeyFile( aLangWithPureNameURL );
-                    aKeyFile += rtl::OUString::createFromAscii( ".key" );
-                    if( xSFA->exists( aKeyFile ) )
-                        xSFA->kill( aKeyFile );
-
-                    // calculate jar file URL
-                    rtl::OUString aJarFile( aLangURL );
-                    aJarFile += aSlash;
-                    aJarFile += aHelpStr;
-                    aJarFile += rtl::OUString::createFromAscii( ".jar" );
-                    // remove in any case to clean up
-                    if( xSFA->exists( aJarFile ) )
-                        xSFA->kill( aJarFile );
-
-                    rtl::OUString aEncodedJarFilePath = rtl::Uri::encode( aJarFile,
-                                                                          rtl_UriCharClassPchar, rtl_UriEncodeIgnoreEscapes, RTL_TEXTENCODING_UTF8 );
-                    rtl::OUString aDestBasePath = rtl::OUString::createFromAscii( "vnd.sun.star.pkg://" );
-                    aDestBasePath += aEncodedJarFilePath;
-                    aDestBasePath += rtl::OUString::createFromAscii( "/" );
-
-                    sal_Int32 nLenLangFolderURL = aLangURL.getLength() + 1;
-
-                    Sequence< rtl::OUString > aSubLangSeq = xSFA->getFolderContents( aLangURL, true );
-                    sal_Int32 nSubLangCount = aSubLangSeq.getLength();
-                    const rtl::OUString* pSubLangSeq = aSubLangSeq.getConstArray();
-                    for( sal_Int32 iSubLang = 0 ; iSubLang < nSubLangCount ; ++iSubLang )
-                    {
-                        rtl::OUString aSubFolderURL = pSubLangSeq[iSubLang];
-                        if( !xSFA->isFolder( aSubFolderURL ) )
-                            continue;
+                    rtl::OUString aSubFolderURL = pSubLangSeq[iSubLang];
+                    if( !xSFA->isFolder( aSubFolderURL ) )
+                        continue;
 
-                        implCollectXhpFiles( aSubFolderURL, aXhpFileVector );
+                    implCollectXhpFiles( aSubFolderURL, aXhpFileVector );
 
-                        // Copy to package (later: move?)
-                        rtl::OUString aDestPath = aDestBasePath;
-                        rtl::OUString aPureFolderName = aSubFolderURL.copy( nLenLangFolderURL );
-                        aDestPath += aPureFolderName;
-                        xSFA->copy( aSubFolderURL, aDestPath );
-                    }
+                    // Copy to package (later: move?)
+                    rtl::OUString aDestPath = aDestBasePath;
+                    rtl::OUString aPureFolderName = aSubFolderURL.copy( nLenLangFolderURL );
+                    aDestPath += aPureFolderName;
+                    xSFA->copy( aSubFolderURL, aDestPath );
+                }
+                //Copy help.tree to the temp folder in the help backend folder
+//                xSFA->copy(aLangURL + OUSTR("/help.tree"), langFolderDestExpanded + OUSTR("/help.tree"));
 
-                    // Call compiler
-                    sal_Int32 nXhpFileCount = aXhpFileVector.size();
-                    rtl::OUString* pXhpFiles = new rtl::OUString[nXhpFileCount];
-                    for( sal_Int32 iXhp = 0 ; iXhp < nXhpFileCount ; ++iXhp )
-                    {
-                        rtl::OUString aXhpFile = aXhpFileVector[iXhp];
-                        rtl::OUString aXhpRelFile = aXhpFile.copy( nLenLangFolderURL );
-                        pXhpFiles[iXhp] = aXhpRelFile;
-                    }
+                // Call compiler
+                sal_Int32 nXhpFileCount = aXhpFileVector.size();
+                rtl::OUString* pXhpFiles = new rtl::OUString[nXhpFileCount];
+                for( sal_Int32 iXhp = 0 ; iXhp < nXhpFileCount ; ++iXhp )
+                {
+                    rtl::OUString aXhpFile = aXhpFileVector[iXhp];
+                    rtl::OUString aXhpRelFile = aXhpFile.copy( nLenLangFolderURL );
+                    pXhpFiles[iXhp] = aXhpRelFile;
+                }
 
-                    rtl::OUString aOfficeHelpPath( SvtPathOptions().GetHelpPath() );
-                    rtl::OUString aOfficeHelpPathFileURL;
-                    ::osl::File::getFileURLFromSystemPath( aOfficeHelpPath, aOfficeHelpPathFileURL ); 
+                rtl::OUString aOfficeHelpPath( SvtPathOptions().GetHelpPath() );
+                rtl::OUString aOfficeHelpPathFileURL;
+                ::osl::File::getFileURLFromSystemPath( aOfficeHelpPath, aOfficeHelpPathFileURL ); 
 
-                    HelpProcessingErrorInfo aErrorInfo;
-                    bool bSuccess = compileExtensionHelp( aOfficeHelpPathFileURL, aHelpStr, aLangURL,
-                                                          nXhpFileCount, pXhpFiles, aErrorInfo );
+                HelpProcessingErrorInfo aErrorInfo;
+                bool bSuccess = compileExtensionHelp(
+                    aOfficeHelpPathFileURL, aHelpStr, aLangURL,
+                    nXhpFileCount, pXhpFiles,
+                    langFolderDestExpanded, aErrorInfo );
 
-                    if( bSuccess && xInvocation.is() )
-                    {
-                        Sequence<uno::Any> aParamsSeq( 6 );
-
-                        aParamsSeq[0] = uno::makeAny( rtl::OUString::createFromAscii( "-lang" ) );
-
-                        rtl::OUString aLang;
-                        sal_Int32 nLastSlash = aLangURL.lastIndexOf( '/' );
-                        if( nLastSlash != -1 )
-                            aLang = aLangURL.copy( nLastSlash + 1 );
-                        else
-                            aLang = rtl::OUString::createFromAscii( "en" );
-                        aParamsSeq[1] = uno::makeAny( aLang );
-
-                        aParamsSeq[2] = uno::makeAny( rtl::OUString::createFromAscii( "-mod" ) );
-                        aParamsSeq[3] = uno::makeAny( rtl::OUString::createFromAscii( "help" ) );
-
-                        aParamsSeq[4] = uno::makeAny( rtl::OUString::createFromAscii( "-zipdir" ) );
-                        rtl::OUString aSystemPath;
-                        osl::FileBase::getSystemPathFromFileURL( aLangURL, aSystemPath );
-                        aParamsSeq[5] = uno::makeAny( aSystemPath );
-
-                        Sequence< sal_Int16 > aOutParamIndex;
-                        Sequence< uno::Any > aOutParam;
-                        uno::Any aRet = xInvocation->invoke( rtl::OUString::createFromAscii( "createIndex" ),
-                                                             aParamsSeq, aOutParamIndex, aOutParam );
-                    }
+                if( bSuccess && xInvocation.is() )
+                {
+                    Sequence<uno::Any> aParamsSeq( 6 );
+
+                    aParamsSeq[0] = uno::makeAny( rtl::OUString::createFromAscii( "-lang" ) );
+
+                    rtl::OUString aLang;
+                    sal_Int32 nLastSlash = aLangURL.lastIndexOf( '/' );
+                    if( nLastSlash != -1 )
+                        aLang = aLangURL.copy( nLastSlash + 1 );
+                    else
+                        aLang = rtl::OUString::createFromAscii( "en" );
+                    aParamsSeq[1] = uno::makeAny( aLang );
+
+                    aParamsSeq[2] = uno::makeAny( rtl::OUString::createFromAscii( "-mod" ) );
+                    aParamsSeq[3] = uno::makeAny( rtl::OUString::createFromAscii( "help" ) );
+
+                    aParamsSeq[4] = uno::makeAny( rtl::OUString::createFromAscii( "-zipdir" ) );
+                    rtl::OUString aSystemPath;
+//                    osl::FileBase::getSystemPathFromFileURL( aLangURL, aSystemPath );
+                    osl::FileBase::getSystemPathFromFileURL(
+                        langFolderDestExpanded, aSystemPath );
+                    aParamsSeq[5] = uno::makeAny( aSystemPath );
+
+                    Sequence< sal_Int16 > aOutParamIndex;
+                    Sequence< uno::Any > aOutParam;
+                    uno::Any aRet = xInvocation->invoke( rtl::OUString::createFromAscii( "createIndex" ),
+                                                         aParamsSeq, aOutParamIndex, aOutParam );
+                }
 
-                    if( !bSuccess )
+                if( !bSuccess )
+                {
+                    USHORT nErrStrId = 0;
+                    switch( aErrorInfo.m_eErrorClass )
+                    {
+                    case HELPPROCESSING_GENERAL_ERROR:
+                    case HELPPROCESSING_INTERNAL_ERROR:		nErrStrId = RID_STR_HELPPROCESSING_GENERAL_ERROR; break;
+                    case HELPPROCESSING_XMLPARSING_ERROR:	nErrStrId = RID_STR_HELPPROCESSING_XMLPARSING_ERROR; break;
+                    default: ;
+                    };
+
+                    rtl::OUString aErrStr;
+                    if( nErrStrId != 0 )
                     {
-                        USHORT nErrStrId = 0;
-                        switch( aErrorInfo.m_eErrorClass )
+                        aErrStr = getResourceString( nErrStrId );
+
+                        // Remoce CR/LF
+                        rtl::OUString aErrMsg( aErrorInfo.m_aErrorMsg );
+                        sal_Unicode nCR = 13, nLF = 10;
+                        sal_Int32 nSearchCR = aErrMsg.indexOf( nCR );
+                        sal_Int32 nSearchLF = aErrMsg.indexOf( nLF );
+                        sal_Int32 nCopy;
+                        if( nSearchCR != -1 || nSearchLF != -1 )
                         {
-                        case HELPPROCESSING_GENERAL_ERROR:
-                        case HELPPROCESSING_INTERNAL_ERROR:		nErrStrId = RID_STR_HELPPROCESSING_GENERAL_ERROR; break;
-                        case HELPPROCESSING_XMLPARSING_ERROR:	nErrStrId = RID_STR_HELPPROCESSING_XMLPARSING_ERROR; break;
-                        default: ;
-                        };
-
-                        rtl::OUString aErrStr;
-                        if( nErrStrId != 0 )
+                            if( nSearchCR == -1 )
+                                nCopy = nSearchLF;
+                            else if( nSearchLF == -1 )
+                                nCopy = nSearchCR;
+                            else
+                                nCopy = ( nSearchCR < nSearchLF ) ? nSearchCR : nSearchLF;
+
+                            aErrMsg = aErrMsg.copy( 0, nCopy );
+                        }
+                        aErrStr += aErrMsg;
+                        if( nErrStrId == RID_STR_HELPPROCESSING_XMLPARSING_ERROR && aErrorInfo.m_aXMLParsingFile.getLength() )
                         {
-                            aErrStr = getResourceString( nErrStrId );
-
-                            // Remoce CR/LF
-                            rtl::OUString aErrMsg( aErrorInfo.m_aErrorMsg );
-                            sal_Unicode nCR = 13, nLF = 10;
-                            sal_Int32 nSearchCR = aErrMsg.indexOf( nCR );
-                            sal_Int32 nSearchLF = aErrMsg.indexOf( nLF );
-                            sal_Int32 nCopy;
-                            if( nSearchCR != -1 || nSearchLF != -1 )
-                            {
-                                if( nSearchCR == -1 )
-                                    nCopy = nSearchLF;
-                                else if( nSearchLF == -1 )
-                                    nCopy = nSearchCR;
-                                else
-                                    nCopy = ( nSearchCR < nSearchLF ) ? nSearchCR : nSearchLF;
-
-                                aErrMsg = aErrMsg.copy( 0, nCopy );
-                            }
-                            aErrStr += aErrMsg;
-                            if( nErrStrId == RID_STR_HELPPROCESSING_XMLPARSING_ERROR && aErrorInfo.m_aXMLParsingFile.getLength() )
+                            aErrStr += rtl::OUString::createFromAscii( " in " );
+
+                            rtl::OUString aDecodedFile = rtl::Uri::decode( aErrorInfo.m_aXMLParsingFile,
+                                                                           rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 );
+                            aErrStr += aDecodedFile;
+                            if( aErrorInfo.m_nXMLParsingLine != -1 )
                             {
-                                aErrStr += rtl::OUString::createFromAscii( " in " );
-
-                                rtl::OUString aDecodedFile = rtl::Uri::decode( aErrorInfo.m_aXMLParsingFile,
-                                                                               rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 );
-                                aErrStr += aDecodedFile;
-                                if( aErrorInfo.m_nXMLParsingLine != -1 )
-                                {
-                                    aErrStr += rtl::OUString::createFromAscii( ", line " );
-                                    aErrStr += ::rtl::OUString::valueOf( aErrorInfo.m_nXMLParsingLine );
-                                }
+                                aErrStr += rtl::OUString::createFromAscii( ", line " );
+                                aErrStr += ::rtl::OUString::valueOf( aErrorInfo.m_nXMLParsingLine );
                             }
                         }
-
-                        OWeakObject* oWeakThis = static_cast<OWeakObject *>(this);
-                        throw deployment::DeploymentException( rtl::OUString(), oWeakThis,
-                                                               makeAny( uno::Exception( aErrStr, oWeakThis ) ) );
                     }
+
+                    OWeakObject* oWeakThis = static_cast<OWeakObject *>(this);
+                    throw deployment::DeploymentException( rtl::OUString(), oWeakThis,
+                                                           makeAny( uno::Exception( aErrStr, oWeakThis ) ) );
                 }
             }
-
-            // Write compiled flag file (this code is only reached in case of success)
-            Reference< io::XOutputStream > xOutputStream = xSFA->openFileWrite( aCompiledFlagFile );
-            if( xOutputStream.is() )
-                xOutputStream->closeOutput();
-
-        }	// if( bCompile )
-
-        // Write registered flag file (this code is only reached in case of success)
-        if( !xSFA->exists( aRegisteredFlagFile ) )
-        {
-            Reference< io::XOutputStream > xOutputStream = xSFA->openFileWrite( aRegisteredFlagFile );
-            if( xOutputStream.is() )
-                xOutputStream->closeOutput();
         }
+
+        //Writing the data entry replaces writing the flag file. If we got to this
+        //point the registration was successful.
         addDataToDb(xPackage->getURL(), data);
     }
     else
@@ -539,75 +562,75 @@ void BackendImpl::implProcessHelp
     }
 }
 
-rtl::OUString BackendImpl::getFlagFileURL( Reference< deployment::XPackage > xPackage, const char* pFlagStr )
-{
-    rtl::OUString aRetURL;
-    if( !xPackage.is() )
-        return aRetURL;
-    rtl::OUString aHelpURL = xPackage->getURL();
-    aRetURL = expandURL( aHelpURL );
-    aRetURL += rtl::OUString::createFromAscii( pFlagStr );
-    return aRetURL;
-}
-
-rtl::OUString BackendImpl::getRegisteredFlagFileURL( Reference< deployment::XPackage > xPackage )
-{
-    return getFlagFileURL( xPackage, "/RegisteredFlag" );
-}
-
-rtl::OUString BackendImpl::getCompiledFlagFileURL( Reference< deployment::XPackage > xPackage )
-{
-    return getFlagFileURL( xPackage, "/CompiledFlag" );
-}
-
-rtl::OUString BackendImpl::expandURL( const rtl::OUString& aURL )
-{
-    static Reference< util::XMacroExpander > xMacroExpander;
-    static Reference< uri::XUriReferenceFactory > xFac;
-
-    if( !xMacroExpander.is() || !xFac.is() )
-    {
-        Reference<XComponentContext> const & xContext = getComponentContext();
-        if( xContext.is() )
-        {
-            xFac = Reference< uri::XUriReferenceFactory >(
-                xContext->getServiceManager()->createInstanceWithContext( rtl::OUString::createFromAscii(
-                "com.sun.star.uri.UriReferenceFactory"), xContext ) , UNO_QUERY );
-        }
-        if( !xFac.is() )
-        {
-            throw RuntimeException(
-                ::rtl::OUString::createFromAscii( 
-                "dp_registry::backend::help::BackendImpl::expandURL(), "
-                "could not instatiate UriReferenceFactory." ),
-                Reference< XInterface >() );
-        }
-
-        xMacroExpander = Reference< util::XMacroExpander >(
-            xContext->getValueByName(
-            ::rtl::OUString::createFromAscii( "/singletons/com.sun.star.util.theMacroExpander" ) ),
-            UNO_QUERY_THROW );
-     }
-
-    rtl::OUString aRetURL = aURL;
-    if( xMacroExpander.is() )
-    {
-        Reference< uri::XUriReference > uriRef;
-        for (;;)
-        {
-            uriRef = Reference< uri::XUriReference >( xFac->parse( aRetURL ), UNO_QUERY );
-            if ( uriRef.is() )
-            {
-                Reference < uri::XVndSunStarExpandUrl > sxUri( uriRef, UNO_QUERY );
-                if( !sxUri.is() )
-                    break;
-
-                aRetURL = sxUri->expand( xMacroExpander );
-            }
-        }
-     }
-    return aRetURL;
-}
+// rtl::OUString BackendImpl::getFlagFileURL( Reference< deployment::XPackage > xPackage, const char* pFlagStr )
+// {
+// 	rtl::OUString aRetURL;
+// 	if( !xPackage.is() )
+// 		return aRetURL;
+// 	rtl::OUString aHelpURL = xPackage->getURL();
+// 	aRetURL = expandURL( aHelpURL );
+// 	aRetURL += rtl::OUString::createFromAscii( pFlagStr );
+// 	return aRetURL;
+// }
+
+// rtl::OUString BackendImpl::getRegisteredFlagFileURL( Reference< deployment::XPackage > xPackage )
+// {
+// 	return getFlagFileURL( xPackage, "/RegisteredFlag" );
+// }
+
+// rtl::OUString BackendImpl::getCompiledFlagFileURL( Reference< deployment::XPackage > xPackage )
+// {
+// 	return getFlagFileURL( xPackage, "/CompiledFlag" );
+// }
+
+// rtl::OUString BackendImpl::expandURL( const rtl::OUString& aURL )
+// {
+// 	static Reference< util::XMacroExpander > xMacroExpander;
+// 	static Reference< uri::XUriReferenceFactory > xFac;
+
+// 	if( !xMacroExpander.is() || !xFac.is() )
+// 	{
+// 		Reference<XComponentContext> const & xContext = getComponentContext();
+// 		if( xContext.is() )
+// 		{
+// 			xFac = Reference< uri::XUriReferenceFactory >(
+// 				xContext->getServiceManager()->createInstanceWithContext( rtl::OUString::createFromAscii(
+// 				"com.sun.star.uri.UriReferenceFactory"), xContext ) , UNO_QUERY );
+// 		}
+// 		if( !xFac.is() )
+// 		{
+// 			throw RuntimeException(
+// 				::rtl::OUString::createFromAscii( 
+// 				"dp_registry::backend::help::BackendImpl::expandURL(), "
+// 				"could not instatiate UriReferenceFactory." ),
+// 				Reference< XInterface >() );
+// 		}
+
+// 		xMacroExpander = Reference< util::XMacroExpander >(
+// 			xContext->getValueByName(
+// 			::rtl::OUString::createFromAscii( "/singletons/com.sun.star.util.theMacroExpander" ) ),
+// 			UNO_QUERY_THROW );
+//  	}
+
+// 	rtl::OUString aRetURL = aURL;
+// 	if( xMacroExpander.is() )
+// 	{
+// 		Reference< uri::XUriReference > uriRef;
+// 		for (;;)
+// 		{
+// 			uriRef = Reference< uri::XUriReference >( xFac->parse( aRetURL ), UNO_QUERY );
+// 			if ( uriRef.is() )
+// 			{
+// 				Reference < uri::XVndSunStarExpandUrl > sxUri( uriRef, UNO_QUERY );
+// 				if( !sxUri.is() )
+// 					break;
+
+// 				aRetURL = sxUri->expand( xMacroExpander );
+// 			}
+// 		}
+//  	}
+// 	return aRetURL;
+// }
 
 void BackendImpl::implCollectXhpFiles( const rtl::OUString& aDir,
     std::vector< rtl::OUString >& o_rXhpFileVector )