diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-09-19 12:11:01 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-09-19 12:15:38 +0200 |
| commit | 9cabd6afcb424067ef93a43dc77d94d6914e631f (patch) | |
| tree | 3ec63353e765e3a11d6914b3942834dc8e4d51fa /sd/source | |
| parent | b1cd18bcd1d93c72c6ce84de42e58046bdaf8d1d (diff) | |
Fold ImpressSdRemote.xcs back into Impress.xcs
This effectively reverts 8c5cd962353dd9ce8234211a66547eb057202eb5 "config split
for sdremote" (what was the rationale for that, anyway? having the two little
additions in Impress.xcs always should not be a big deal),
63a73c119c188e6a4b22fb99fc2571f200073bde "Hopefully fix the remote config access
to work with the new schema.", ee5403b98bf0e89693a14f7a1ae5658d9e5eb730
"officecfg: generate header for Impress-sdremote, handle "-" in xcs name", and
4cce7027a6e700a6a7392b806c3d059172268f6d "Rename Impress-sdremote.xcs to
ImpressSdRemote.xcs + add to postprocess."
Change-Id: Iba6162a3c1d9e688960c794265bd04128f58cc0c
Diffstat (limited to 'sd/source')
| -rw-r--r-- | sd/source/ui/remotecontrol/Server.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sd/source/ui/remotecontrol/Server.cxx b/sd/source/ui/remotecontrol/Server.cxx index 4092754ec1eb..388ef9d21305 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/ImpressSdRemote.hxx" +#include "officecfg/Office/Impress.hxx" #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XNameContainer.hpp> @@ -125,8 +125,7 @@ void RemoteServer::execute() while ( aLine.getLength() > 0 ); // Check if we already have this server. - Reference< XNameAccess > const xConfig = officecfg::Office - ::ImpressSdRemote::Content::AuthorisedRemotes::get(); + Reference< XNameAccess > const xConfig = officecfg::Office::Impress::Misc::AuthorisedRemotes::get(); Sequence< OUString > aNames = xConfig->getElementNames(); bool aFound = false; for ( int i = 0; i < aNames.getLength(); i++ ) @@ -233,8 +232,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 - ::ImpressSdRemote::Content::AuthorisedRemotes::get( aChanges ); + Reference< XNameContainer > const xConfig = officecfg::Office::Impress::Misc::AuthorisedRemotes::get( aChanges ); Reference<XSingleServiceFactory> xChildFactory ( xConfig, UNO_QUERY); |