officecfg: generate header for Impress-sdremote, handle "-" in xcs name

Change-Id: I3f965a293cb6cbd5cafe42e1a05565282f2e10c7

officecfg/registry/cppheader.xsl

@@ -65,29 +65,29 @@
     <xsl:param name="path"/>
     <xsl:text>#ifndef INCLUDED_OFFICECFG_</xsl:text>
     <xsl:value-of
-        select="translate($ns1, 'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/>
+        select="translate($ns1, 'abcdefghijklmnopqrstuvwxyz-', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/>
     <xsl:if test="$ns2">
       <xsl:text>_</xsl:text>
       <xsl:value-of
-          select="translate($ns2, 'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/>
+          select="translate($ns2, 'abcdefghijklmnopqrstuvwxyz-', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/>
       <xsl:if test="$ns3">
         <xsl:text>_</xsl:text>
         <xsl:value-of
-            select="translate($ns3, 'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/>
+            select="translate($ns3, 'abcdefghijklmnopqrstuvwxyz-', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/>
       </xsl:if>
     </xsl:if>
     <xsl:text>_HXX&#xA;</xsl:text>
     <xsl:text>#define INCLUDED_OFFICECFG_</xsl:text>
     <xsl:value-of
-        select="translate($ns1, 'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/>
+        select="translate($ns1, 'abcdefghijklmnopqrstuvwxyz-', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/>
     <xsl:if test="$ns2">
       <xsl:text>_</xsl:text>
       <xsl:value-of
-          select="translate($ns2, 'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/>
+          select="translate($ns2, 'abcdefghijklmnopqrstuvwxyz-', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/>
       <xsl:if test="$ns3">
         <xsl:text>_</xsl:text>
         <xsl:value-of
-            select="translate($ns3, 'abcdefghijklmnopqrstuvwxyz', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/>
+            select="translate($ns3, 'abcdefghijklmnopqrstuvwxyz-', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/>
       </xsl:if>
     </xsl:if>
     <xsl:text>_HXX&#xA;</xsl:text>
@@ -113,13 +113,13 @@
       <xsl:text>#include "comphelper/configuration.hxx"&#xA;</xsl:text>
       <xsl:text>&#xA;</xsl:text>
       <xsl:text>namespace officecfg { namespace </xsl:text>
-      <xsl:value-of select="$ns1"/>
+      <xsl:value-of select="translate($ns1, '-', '_')"/>
       <xsl:if test="$ns2">
         <xsl:text> { namespace </xsl:text>
-        <xsl:value-of select="$ns2"/>
+        <xsl:value-of select="translate($ns2, '-', '_')"/>
         <xsl:if test="$ns3">
           <xsl:text> { namespace </xsl:text>
-          <xsl:value-of select="$ns3"/>
+          <xsl:value-of select="translate($ns3, '-', '_')"/>
         </xsl:if>
       </xsl:if>
       <xsl:text> {&#xA;</xsl:text>

officecfg/registry/files.mk

-officecfg_FILES = \
+officecfg_FILES := \
     FirstStartWizard \
     Inet \
     Interaction \
@@ -22,6 +22,7 @@ officecfg_FILES = \
     Office/FormWizard \
     Office/Histories \
     Office/Impress \
+	$(if $(filter YES,$(ENABLE_SDREMOTE)),Office/Impress-sdremote) \
     Office/Java \
     Office/Jobs \
     Office/Labels \

sd/source/ui/remotecontrol/Server.cxx

@@ -125,7 +125,8 @@ void RemoteServer::execute()
             while ( aLine.getLength() > 0 );
 
             // Check if we already have this server.
-            Reference< XNameAccess > xConfig = officecfg::Office::Impress-sdremote::Content::AuthorisedRemotes::get();
+            Reference< XNameAccess > const xConfig = officecfg::Office
+                ::Impress_sdremote::Content::AuthorisedRemotes::get();
             Sequence< OUString > aNames = xConfig->getElementNames();
             bool aFound = false;
             for ( int i = 0; i < aNames.getLength(); i++ )
@@ -232,7 +233,8 @@ sal_Bool RemoteServer::connectClient( ClientInfo* pClient, rtl::OUString aPin )
     {
         // Save in settings first
         boost::shared_ptr< ConfigurationChanges > aChanges = ConfigurationChanges::create();
-        Reference< XNameContainer > xConfig = officecfg::Office::Impress-sdremote::Content::AuthorisedRemotes::get( aChanges );
+        Reference< XNameContainer > const xConfig = officecfg::Office
+            ::Impress_sdremote::Content::AuthorisedRemotes::get( aChanges );
 
         Reference<XSingleServiceFactory> xChildFactory (
             xConfig, UNO_QUERY);