l10ntooling18: merge

12 files changed, 156 insertions, 82 deletions

diff --git a/desktop/source/deployment/deployment.map b/desktop/source/deployment/deployment.map
deleted file mode 100644
index 563b3d86a5d0..000000000000
--- a/desktop/source/deployment/deployment.map
+++ /dev/null
@@ -1,8 +0,0 @@
-UDK_3_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-    *;
-};
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 31019948f043..2d0733dfbae3 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -90,8 +90,7 @@ using ::rtl::OUString;
 
 namespace dp_gui {
 
-#define ICON_OFFSET         50
-#define TOP_OFFSET           3
+#define TOP_OFFSET           5
 #define LINE_SIZE            4
 #define PROGRESS_WIDTH      60
 #define PROGRESS_HEIGHT     14
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index b95a7e5f8cfb..2e02a90f59fd 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -520,10 +520,10 @@ void ExtensionBox_Impl::DrawRow( const Rectangle& rRect, const TEntry_Impl pEntr
     else
         aImage = isHCMode() ? pEntry->m_aIconHC : pEntry->m_aIcon;
     Size aImageSize = aImage.GetSizePixel();
-    if ( ( aImageSize.Width() <= ICON_HEIGHT ) && ( aImageSize.Height() <= ICON_HEIGHT ) )
-        DrawImage( Point( aPos.X()+((ICON_HEIGHT-aImageSize.Width())/2), aPos.Y()+((ICON_HEIGHT-aImageSize.Height())/2) ), aImage );
+    if ( ( aImageSize.Width() <= ICON_WIDTH ) && ( aImageSize.Height() <= ICON_HEIGHT ) )
+        DrawImage( Point( aPos.X()+((ICON_WIDTH-aImageSize.Width())/2), aPos.Y()+((ICON_HEIGHT-aImageSize.Height())/2) ), aImage );
     else
-        DrawImage( aPos, Size( ICON_HEIGHT, ICON_HEIGHT ), aImage );
+        DrawImage( aPos, Size( ICON_WIDTH, ICON_HEIGHT ), aImage );
 
     // Setup fonts
     Font aStdFont( GetFont() );
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
index 18487dffe6e1..ad62bfd1a2d8 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
@@ -45,9 +45,10 @@
 namespace dp_gui {
 
 #define SMALL_ICON_SIZE     16
-#define TOP_OFFSET           3
+#define TOP_OFFSET           5
 #define ICON_HEIGHT         42
-#define ICON_OFFSET         50
+#define ICON_WIDTH          47
+#define ICON_OFFSET         72
 #define RIGHT_ICON_OFFSET    5
 #define SPACE_BETWEEN        3
 
diff --git a/desktop/source/deployment/gui/makefile.mk b/desktop/source/deployment/gui/makefile.mk
index b55ad49421fc..6a9c7b6bbb38 100644
--- a/desktop/source/deployment/gui/makefile.mk
+++ b/desktop/source/deployment/gui/makefile.mk
@@ -60,7 +60,7 @@ SLOFILES = \
         $(SLO)$/descedit.obj
 
 SHL1TARGET = $(TARGET)$(DLLPOSTFIX).uno
-SHL1VERSIONMAP = ..$/deployment.map
+SHL1VERSIONMAP = $(SOLARENV)/src/component.map
 
 SHL1STDLIBS = \
         $(SALLIB) \
diff --git a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
index f9b3e1d989f1..38a1870782ed 100644
--- a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
+++ b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
@@ -53,6 +53,15 @@ namespace rtl { class OUString; }
 
 namespace dp_misc {
 
+struct DESKTOP_DEPLOYMENTMISC_DLLPUBLIC SimpleLicenseAttributes
+{
+    ::rtl::OUString acceptBy;
+    //Attribute suppress-on-update. Default is false.
+    bool suppressOnUpdate;
+    //Attribute suppress-if-required. Default is false.
+    bool suppressIfRequired;
+};
+
 /**
    Access to the content of an XML <code>description</code> element.
 
@@ -132,6 +141,13 @@ public:
     */
     ::rtl::OUString getLocalizedLicenseURL() const;
 
+    /** returns the attributes of the simple-license element
+
+        As long as there is a simple-license element, the function will return
+        the structure. If it does not exist, then the optional object is uninitialized.
+    */
+    ::boost::optional<SimpleLicenseAttributes> getSimpleLicenseAttributes() const;
+
     /** returns the localized display name of the extensions.
 
         In case there is no localized display-name then an empty string is returned.
diff --git a/desktop/source/deployment/makefile.mk b/desktop/source/deployment/makefile.mk
index f11f87ad56cd..7eda0f582e15 100644
--- a/desktop/source/deployment/makefile.mk
+++ b/desktop/source/deployment/makefile.mk
@@ -49,7 +49,7 @@ INCPRE += inc
 DLLPRE =
 
 SHL1TARGET = $(TARGET)$(DLLPOSTFIX).uno
-SHL1VERSIONMAP = deployment.map
+SHL1VERSIONMAP = $(SOLARENV)/src/component.map
 
 SHL1LIBS = \
     $(SLB)$/deployment_manager.lib \
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index 165efbaeca5a..3f13cb021aae 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -542,11 +542,19 @@ OUString PackageManagerImpl::insertToActivationLayer(
     {
         // inflate content:
         ::rtl::OUStringBuffer buf;
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.zip://") );
-        buf.append( ::rtl::Uri::encode( sourceContent.getURL(),
-                                        rtl_UriCharClassRegName,
-                                        rtl_UriEncodeIgnoreEscapes,
-                                        RTL_TEXTENCODING_UTF8 ) );
+        if (!sourceContent.isFolder())
+        {
+            buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.zip://") );
+            buf.append( ::rtl::Uri::encode( sourceContent.getURL(),
+                                            rtl_UriCharClassRegName,
+                                            rtl_UriEncodeIgnoreEscapes,
+                                            RTL_TEXTENCODING_UTF8 ) );
+        }
+        else
+        {
+            //Folder. No need to unzip, just copy
+            buf.append(sourceContent.getURL());
+        }
         buf.append( static_cast<sal_Unicode>('/') );
         sourceContent = ::ucbhelper::Content(
             buf.makeStringAndClear(), xCmdEnv );
diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
index 587e31bebfb9..28f45918e9e2 100644
--- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
+++ b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
@@ -370,6 +370,50 @@ css::uno::Sequence< ::rtl::OUString > DescriptionInfoset::getUrls(
 
 }
 
+::boost::optional<SimpleLicenseAttributes>
+DescriptionInfoset::getSimpleLicenseAttributes() const
+{
+    //Check if the node exist
+    css::uno::Reference< css::xml::dom::XNode > n;
+    if (m_element.is()) {
+        try {
+            n = m_xpath->selectSingleNode(m_element,
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "/desc:description/desc:registration/desc:simple-license/@accept-by")));
+        } catch (css::xml::xpath::XPathException &) {
+            // ignore
+        }
+        if (n.is())
+        {
+            SimpleLicenseAttributes attributes;
+            attributes.acceptBy =
+                getNodeValueFromExpression(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "/desc:description/desc:registration/desc:simple-license/@accept-by")));
+
+            ::boost::optional< ::rtl::OUString > suppressOnUpdate = getOptionalValue(
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "/desc:description/desc:registration/desc:simple-license/@suppress-on-update")));
+            if (suppressOnUpdate)
+                attributes.suppressOnUpdate = (*suppressOnUpdate).trim().equalsIgnoreAsciiCase(
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("true")));
+            else
+                attributes.suppressOnUpdate = false;
+
+            ::boost::optional< ::rtl::OUString > suppressIfRequired = getOptionalValue(
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "/desc:description/desc:registration/desc:simple-license/@suppress-if-required")));
+            if (suppressIfRequired)
+                attributes.suppressIfRequired = (*suppressIfRequired).trim().equalsIgnoreAsciiCase(
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("true")));
+            else
+                attributes.suppressIfRequired = false;
+
+            return ::boost::optional<SimpleLicenseAttributes>(attributes);
+        }
+    }
+    return ::boost::optional<SimpleLicenseAttributes>();
+}
+
 ::rtl::OUString DescriptionInfoset::getLocalizedDescriptionURL() const
 {
     return getLocalizedHREFAttrFromChild(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
diff --git a/desktop/source/deployment/misc/dp_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx
index bb93f78689b6..4a144f3fdf20 100644
--- a/desktop/source/deployment/misc/dp_platform.cxx
+++ b/desktop/source/deployment/misc/dp_platform.cxx
@@ -47,8 +47,11 @@
 #define PLATFORM_LINUX_MIPS_EL      "linux_mips_el"
 #define PLATFORM_LINUX_MIPS_EB      "linux_mips_eb"
 #define PLATFORM_LINUX_IA64         "linux_ia64"
+#define PLATFORM_LINUX_M68K         "linux_m68k"
 #define PLATFORM_LINUX_S390         "linux_s390"
 #define PLATFORM_LINUX_S390x        "linux_s390x"
+#define PLATFORM_LINUX_HPPA         "linux_hppa"
+#define PLATFORM_LINUX_ALPHA        "linux_alpha"
 
 
 
@@ -142,10 +145,16 @@ namespace
             ret = checkOSandCPU(OUSTR("Linux"), OUSTR("MIPS_EB"));
         else if (token.equals(OUSTR(PLATFORM_LINUX_IA64)))
             ret = checkOSandCPU(OUSTR("Linux"), OUSTR("IA64"));
+        else if (token.equals(OUSTR(PLATFORM_LINUX_M68K)))
+            ret = checkOSandCPU(OUSTR("Linux"), OUSTR("M68K"));
         else if (token.equals(OUSTR(PLATFORM_LINUX_S390)))
             ret = checkOSandCPU(OUSTR("Linux"), OUSTR("S390"));
         else if (token.equals(OUSTR(PLATFORM_LINUX_S390x)))
             ret = checkOSandCPU(OUSTR("Linux"), OUSTR("S390x"));
+        else if (token.equals(OUSTR(PLATFORM_LINUX_HPPA)))
+            ret = checkOSandCPU(OUSTR("Linux"), OUSTR("HPPA"));
+        else if (token.equals(OUSTR(PLATFORM_LINUX_ALPHA)))
+            ret = checkOSandCPU(OUSTR("Linux"), OUSTR("ALPHA"));
         else if (token.equals(OUSTR(PLATFORM_SOLARIS_SPARC)))
             ret = checkOSandCPU(OUSTR("Solaris"), OUSTR("SPARC"));
         else if (token.equals(OUSTR(PLATFORM_SOLARIS_SPARC64)))
diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx
index c6572364aac0..c56131a1015c 100644
--- a/desktop/source/deployment/registry/dp_registry.cxx
+++ b/desktop/source/deployment/registry/dp_registry.cxx
@@ -181,6 +181,7 @@ OUString normalizeMediaType( OUString const & mediaType )
 }
 
 //______________________________________________________________________________
+
 void PackageRegistryImpl::insertBackend(
     Reference<deployment::XPackageRegistry> const & xBackend )
 {
@@ -201,7 +202,8 @@ void PackageRegistryImpl::insertBackend(
         ::std::pair<t_string2registry::iterator, bool> mb_insertion(
             m_mediaType2backend.insert( t_string2registry::value_type(
                                             mediaType, xBackend ) ) );
-        if (mb_insertion.second) {
+        if (mb_insertion.second)
+        {
             // add parameterless media-type, too:
             sal_Int32 semi = mediaType.indexOf( ';' );
             if (semi >= 0) {
@@ -210,9 +212,13 @@ void PackageRegistryImpl::insertBackend(
                         mediaType.copy( 0, semi ), xBackend ) );
             }
             const OUString fileFilter( xPackageType->getFileFilter() );
+            //The package backend shall also be called to determine the mediatype
+            //(XPackageRegistry.bindPackage) when the URL points to a directory.
+            const bool bExtension = mediaType.equals(OUSTR("application/vnd.sun.star.package-bundle"));
             if (fileFilter.getLength() == 0 ||
                 fileFilter.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("*.*") ) ||
-                fileFilter.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("*") ))
+                fileFilter.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("*") ) ||
+                bExtension)
             {
                 m_ambiguousBackends.insert( xBackend );
             }
@@ -351,7 +357,10 @@ Reference<deployment::XPackageRegistry> PackageRegistryImpl::create(
         }
     }
 
-    // insert bundle be:
+    // Insert bundle back-end.
+    // Always register as last, because we want to add extensions also as folders
+    // and as a default we accept every folder, which was not recognized by the other
+    // backends.
     that->insertBackend(
         ::dp_registry::backend::bundle::create(
             that, context, cachePath, readOnly, xComponentContext ) );
@@ -445,7 +454,8 @@ Reference<deployment::XPackage> PackageRegistryImpl::bindPackage(
     {
         ::ucbhelper::Content ucbContent;
         if (create_ucb_content(
-                &ucbContent, url, xCmdEnv, false /* no throw */ ))
+                &ucbContent, url, xCmdEnv, false /* no throw */ )
+                && !ucbContent.isFolder())
         {
             OUString title( ucbContent.getPropertyValue(
                                 StrTitle::get() ).get<OUString>() );
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index cfe5be59dad0..b0b4a918c7a3 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -70,7 +70,7 @@
 #include "com/sun/star/xml/dom/XDocumentBuilder.hpp"
 #include "com/sun/star/xml/xpath/XXPathAPI.hpp"
 #include "com/sun/star/deployment/XPackageManager.hpp"
-
+#include "boost/optional.hpp"
 #include <vector>
 #include <stdio.h>
 
@@ -287,7 +287,7 @@ BackendImpl::BackendImpl(
                                    m_xBundleTypeInfo->getShortDescription(),
                                    RID_IMG_DEF_PACKAGE_BUNDLE,
                                    RID_IMG_DEF_PACKAGE_BUNDLE_HC ) ),
-      m_typeInfos( 2 )
+    m_typeInfos(2)
 {
     m_typeInfos[ 0 ] = m_xBundleTypeInfo;
     m_typeInfos[ 1 ] = m_xLegacyBundleTypeInfo;
@@ -342,17 +342,32 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
         ::ucbhelper::Content ucbContent;
         if (create_ucb_content( &ucbContent, url, xCmdEnv ))
         {
-            const OUString title( ucbContent.getPropertyValue(
-                                      StrTitle::get() ).get<OUString>() );
-            if (title.endsWithIgnoreAsciiCaseAsciiL(
-                    RTL_CONSTASCII_STRINGPARAM(".oxt") ) ||
-                title.endsWithIgnoreAsciiCaseAsciiL(
-                    RTL_CONSTASCII_STRINGPARAM(".uno.pkg") ))
-                mediaType = OUSTR("application/vnd.sun.star.package-bundle");
-            else if (title.endsWithIgnoreAsciiCaseAsciiL(
-                         RTL_CONSTASCII_STRINGPARAM(".zip") ))
-                mediaType =
-                    OUSTR("application/vnd.sun.star.legacy-package-bundle");
+            if (ucbContent.isFolder())
+            {
+                //Every .oxt, uno.pkg file must contain a META-INF folder
+                ::ucbhelper::Content metaInfContent;
+                if (create_ucb_content(
+                    &metaInfContent, makeURL( url, OUSTR("META-INF/manifest.xml") ),
+                    xCmdEnv, false /* no throw */ ))
+                {
+                     mediaType = OUSTR("application/vnd.sun.star.package-bundle");
+                }
+                //No support of legacy bundles, because every folder could be one.
+            }
+            else
+            {
+                const OUString title( ucbContent.getPropertyValue(
+                                          StrTitle::get() ).get<OUString>() );
+                if (title.endsWithIgnoreAsciiCaseAsciiL(
+                        RTL_CONSTASCII_STRINGPARAM(".oxt") ) ||
+                    title.endsWithIgnoreAsciiCaseAsciiL(
+                        RTL_CONSTASCII_STRINGPARAM(".uno.pkg") ))
+                    mediaType = OUSTR("application/vnd.sun.star.package-bundle");
+                else if (title.endsWithIgnoreAsciiCaseAsciiL(
+                             RTL_CONSTASCII_STRINGPARAM(".zip") ))
+                    mediaType =
+                        OUSTR("application/vnd.sun.star.legacy-package-bundle");
+            }
         }
         if (mediaType.getLength() == 0)
             throw lang::IllegalArgumentException(
@@ -583,21 +598,12 @@ bool BackendImpl::PackageImpl::checkDependencies(
 {
     try
     {
-        css::uno::Reference<css::xml::dom::XNode> xRoot = desc.getRootElement();
-        css::uno::Reference<css::xml::xpath::XXPathAPI> xPath =
-            getDescriptionInfoset().getXpath();
-
-        css::uno::Reference<css::xml::dom::XNode> nodeSimpleLic;
-        try {
-            nodeSimpleLic = xPath->selectSingleNode(xRoot,
-            OUSTR("/desc:description/desc:registration/desc:simple-license"));
-        } catch (css::xml::xpath::XPathException &) {
-            // ignore
-        }
-
-        if (!nodeSimpleLic.is())
+        DescriptionInfoset info = getDescriptionInfoset();
+        ::boost::optional<SimpleLicenseAttributes> simplLicAttr
+            = info.getSimpleLicenseAttributes();
+       if (! simplLicAttr)
             return true;
-        OUString sLic = getDescriptionInfoset().getLocalizedLicenseURL();
+        OUString sLic = info.getLocalizedLicenseURL();
         //If we do not get a localized licence then there is an error in the description.xml
         //This should be handled by using a validating parser. Therefore we assume that no
         //license is available.
@@ -606,23 +612,20 @@ bool BackendImpl::PackageImpl::checkDependencies(
                 OUSTR("Could not obtain path to license. Possible error in description.xml"), 0, Any());
         OUString sHref = desc.getExtensionRootUrl() + OUSTR("/") + sLic;
            OUString sLicense = getTextFromURL(xCmdEnv, sHref);
-        //determine who has to agree to the license
-        css::uno::Reference<css::xml::xpath::XXPathObject> nodeAttribWho3 =
-            xPath->eval(nodeSimpleLic,
-            OUSTR("@accept-by"));
-        OUString sAccept = nodeAttribWho3->getString().trim();
+        ////determine who has to agree to the license
         //check correct value for attribute
-        if ( ! (sAccept.equals(OUSTR("user")) || sAccept.equals(OUSTR("admin"))))
+        if ( ! (simplLicAttr->acceptBy.equals(OUSTR("user")) || simplLicAttr->acceptBy.equals(OUSTR("admin"))))
             throw css::deployment::DeploymentException(
                 OUSTR("Could not obtain attribute simple-lincense@accept-by or it has no valid value"), 0, Any());
 
         //If if @accept-by="user" then every user needs to accept the license before it can be installed.
-        //Therefore we must prevent the installation as shared extension.
+        //Therefore we must prevent the installation as shared extension unless suppress-if-required="true"
         OSL_ASSERT(aContextName.getLength());
-        if (sAccept.equals(OUSTR("user")) && aContextName.equals(OUSTR("shared")))
+        if (simplLicAttr->acceptBy.equals(OUSTR("user")) && aContextName.equals(OUSTR("shared")))
         {
-        css::deployment::LicenseIndividualAgreementException exc =
-            css::deployment::LicenseIndividualAgreementException(OUString(), 0, m_name);
+            css::deployment::LicenseIndividualAgreementException
+                exc = css::deployment::LicenseIndividualAgreementException(
+                OUString(), 0, m_name, simplLicAttr->suppressIfRequired);
 
             bool approve = false;
             bool abort = false;
@@ -632,32 +635,24 @@ bool BackendImpl::PackageImpl::checkDependencies(
                     OUSTR("Could not interact with user."), 0, Any());
                if (abort == true)
                 return false;
-            //We should always prevent installation
-            OSL_ASSERT(0);
-        }
 
-        //determine optional attribute simple-license@suppressOnUpdate
-        css::uno::Reference<css::xml::dom::XElement> elemSimpleLic(nodeSimpleLic, css::uno::UNO_QUERY_THROW);
-        sal_Bool bSuppress = sal_False;
-        if (elemSimpleLic->hasAttribute(OUSTR("suppress-on-update")))
-        {
-            if (elemSimpleLic->getAttribute(OUSTR("suppress-on-update")).equals(OUSTR("true")))
-                bSuppress = sal_True;
+            //If the unopkg --suppress-license was used and simplLicAttr->suppressIfRequired == true,
+            //then the user implicitely accepts the license
         }
 
         //Only use interaction if there is no version of this extension already installed
         //and the suppress-on-update flag is not set for the new extension
-        // bInstalled | bSuppress | show license
+        // bInstalled | bSuppressOnUpdate | show license
         //----------------------------------------
-        //      0     |      0    |     1
-        //      0     |      1    |     1
-        //      1     |      0    |     1
-        //      1     |      1    |     0
+        //      0     |      0            |     1
+        //      0     |      1            |     1
+        //      1     |      0            |     1
+        //      1     |      1            |     0
 
-        if ( !(bInstalled && bSuppress))
+        if ( !(bInstalled && simplLicAttr->suppressOnUpdate))
         {
-            css::deployment::LicenseException licExc =
-                css::deployment::LicenseException(OUString(), 0, m_name, sLicense);
+            css::deployment::LicenseException licExc(
+                OUString(), 0, m_name, sLicense, simplLicAttr->suppressIfRequired);
             bool approve = false;
             bool abort = false;
             if (! interactContinuation(
@@ -1323,7 +1318,7 @@ void BackendImpl::PackageImpl::scanBundle(
     {
         OSL_ENSURE( 0, "### missing META-INF/manifest.xml file!" );
         return;
-}
+    }
 
 
     const lang::Locale officeLocale = getOfficeLocale();