[Libreoffice-commits] .: officecfg/Configuration_officecfg.mk officecfg/registry postprocess/packregistry sd/source

[Libreoffice Gerrit user]

 officecfg/Configuration_officecfg.mk  |    2 +-
 officecfg/registry/files.mk           |    2 +-
 postprocess/packregistry/makefile.mk  |    1 +
 sd/source/ui/remotecontrol/Server.cxx |    6 +++---
 4 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 4cce7027a6e700a6a7392b806c3d059172268f6d
Author: Andrzej J.R. Hunt <andrzej at ahunt.org>
Date:   Wed Sep 19 11:10:32 2012 +0200

    Rename Impress-sdremote.xcs to ImpressSdRemote.xcs + add to postprocess.
    
    Change-Id: Iead72e5dca861a422507cf70d9b35366c701c84a

diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk
index 89b6203..7f823b8 100644
--- a/officecfg/Configuration_officecfg.mk
+++ b/officecfg/Configuration_officecfg.mk
@@ -121,7 +121,7 @@ $(eval $(call gb_Configuration_add_schemas,registry,officecfg/registry/schema,\
 
 ifeq ($(ENABLE_SDREMOTE),YES)
 $(eval $(call gb_Configuration_add_schemas,registry,officecfg/registry/schema,\
-        org/openoffice/Office/Impress-sdremote.xcs \
+    org/openoffice/Office/ImpressSdRemote.xcs \
 ))
 endif
 
diff --git a/officecfg/registry/files.mk b/officecfg/registry/files.mk
index 5e93fb4..257ead3 100644
--- a/officecfg/registry/files.mk
+++ b/officecfg/registry/files.mk
@@ -22,7 +22,7 @@ officecfg_FILES := \
     Office/FormWizard \
     Office/Histories \
     Office/Impress \
-	$(if $(filter YES,$(ENABLE_SDREMOTE)),Office/Impress-sdremote) \
+	$(if $(filter YES,$(ENABLE_SDREMOTE)),Office/ImpressSdRemote) \
     Office/Java \
     Office/Jobs \
     Office/Labels \
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index 9a8b330..59f2614 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -152,6 +152,7 @@ MY_FILES_main = \
     $(MY_XCS)/Office/FormWizard.xcs \
     $(MY_XCS)/Office/Histories.xcs \
     $(MY_XCS)/Office/Impress.xcs \
+    $(MY_XCS)/Office/ImpressSdRemote.xcs \
     $(MY_XCS)/Office/Java.xcs \
     $(MY_XCS)/Office/Jobs.xcs \
     $(MY_XCS)/Office/Labels.xcs \
diff --git a/sd/source/ui/remotecontrol/Server.cxx b/sd/source/ui/remotecontrol/Server.cxx
index 685af34..4092754 100644
--- a/sd/source/ui/remotecontrol/Server.cxx
+++ b/sd/source/ui/remotecontrol/Server.cxx
@@ -11,7 +11,7 @@
 #include <vector>
 
 #include "officecfg/Office/Common.hxx"
-#include "officecfg/Office/Impress-sdremote.hxx"
+#include "officecfg/Office/ImpressSdRemote.hxx"
 
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
@@ -126,7 +126,7 @@ void RemoteServer::execute()
 
             // Check if we already have this server.
             Reference< XNameAccess > const xConfig = officecfg::Office
-                ::Impress_sdremote::Content::AuthorisedRemotes::get();
+                ::ImpressSdRemote::Content::AuthorisedRemotes::get();
             Sequence< OUString > aNames = xConfig->getElementNames();
             bool aFound = false;
             for ( int i = 0; i < aNames.getLength(); i++ )
@@ -234,7 +234,7 @@ sal_Bool RemoteServer::connectClient( ClientInfo* pClient, rtl::OUString aPin )
         // Save in settings first
         boost::shared_ptr< ConfigurationChanges > aChanges = ConfigurationChanges::create();
         Reference< XNameContainer > const xConfig = officecfg::Office
-            ::Impress_sdremote::Content::AuthorisedRemotes::get( aChanges );
+            ::ImpressSdRemote::Content::AuthorisedRemotes::get( aChanges );
 
         Reference<XSingleServiceFactory> xChildFactory (
             xConfig, UNO_QUERY);