Kaydet (Commit) 4cce7027 authored tarafından Andrzej J.R. Hunt's avatar Andrzej J.R. Hunt

Rename Impress-sdremote.xcs to ImpressSdRemote.xcs + add to postprocess.

Change-Id: Iead72e5dca861a422507cf70d9b35366c701c84a
üst 88303a83
...@@ -121,7 +121,7 @@ $(eval $(call gb_Configuration_add_schemas,registry,officecfg/registry/schema,\ ...@@ -121,7 +121,7 @@ $(eval $(call gb_Configuration_add_schemas,registry,officecfg/registry/schema,\
ifeq ($(ENABLE_SDREMOTE),YES) ifeq ($(ENABLE_SDREMOTE),YES)
$(eval $(call gb_Configuration_add_schemas,registry,officecfg/registry/schema,\ $(eval $(call gb_Configuration_add_schemas,registry,officecfg/registry/schema,\
org/openoffice/Office/Impress-sdremote.xcs \ org/openoffice/Office/ImpressSdRemote.xcs \
)) ))
endif endif
......
...@@ -22,7 +22,7 @@ officecfg_FILES := \ ...@@ -22,7 +22,7 @@ officecfg_FILES := \
Office/FormWizard \ Office/FormWizard \
Office/Histories \ Office/Histories \
Office/Impress \ Office/Impress \
$(if $(filter YES,$(ENABLE_SDREMOTE)),Office/Impress-sdremote) \ $(if $(filter YES,$(ENABLE_SDREMOTE)),Office/ImpressSdRemote) \
Office/Java \ Office/Java \
Office/Jobs \ Office/Jobs \
Office/Labels \ Office/Labels \
......
...@@ -152,6 +152,7 @@ MY_FILES_main = \ ...@@ -152,6 +152,7 @@ MY_FILES_main = \
$(MY_XCS)/Office/FormWizard.xcs \ $(MY_XCS)/Office/FormWizard.xcs \
$(MY_XCS)/Office/Histories.xcs \ $(MY_XCS)/Office/Histories.xcs \
$(MY_XCS)/Office/Impress.xcs \ $(MY_XCS)/Office/Impress.xcs \
$(MY_XCS)/Office/ImpressSdRemote.xcs \
$(MY_XCS)/Office/Java.xcs \ $(MY_XCS)/Office/Java.xcs \
$(MY_XCS)/Office/Jobs.xcs \ $(MY_XCS)/Office/Jobs.xcs \
$(MY_XCS)/Office/Labels.xcs \ $(MY_XCS)/Office/Labels.xcs \
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include <vector> #include <vector>
#include "officecfg/Office/Common.hxx" #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/XNameAccess.hpp>
#include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/container/XNameContainer.hpp>
...@@ -126,7 +126,7 @@ void RemoteServer::execute() ...@@ -126,7 +126,7 @@ void RemoteServer::execute()
// Check if we already have this server. // Check if we already have this server.
Reference< XNameAccess > const xConfig = officecfg::Office Reference< XNameAccess > const xConfig = officecfg::Office
::Impress_sdremote::Content::AuthorisedRemotes::get(); ::ImpressSdRemote::Content::AuthorisedRemotes::get();
Sequence< OUString > aNames = xConfig->getElementNames(); Sequence< OUString > aNames = xConfig->getElementNames();
bool aFound = false; bool aFound = false;
for ( int i = 0; i < aNames.getLength(); i++ ) for ( int i = 0; i < aNames.getLength(); i++ )
...@@ -234,7 +234,7 @@ sal_Bool RemoteServer::connectClient( ClientInfo* pClient, rtl::OUString aPin ) ...@@ -234,7 +234,7 @@ sal_Bool RemoteServer::connectClient( ClientInfo* pClient, rtl::OUString aPin )
// Save in settings first // Save in settings first
boost::shared_ptr< ConfigurationChanges > aChanges = ConfigurationChanges::create(); boost::shared_ptr< ConfigurationChanges > aChanges = ConfigurationChanges::create();
Reference< XNameContainer > const xConfig = officecfg::Office Reference< XNameContainer > const xConfig = officecfg::Office
::Impress_sdremote::Content::AuthorisedRemotes::get( aChanges ); ::ImpressSdRemote::Content::AuthorisedRemotes::get( aChanges );
Reference<XSingleServiceFactory> xChildFactory ( Reference<XSingleServiceFactory> xChildFactory (
xConfig, UNO_QUERY); xConfig, UNO_QUERY);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment