summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--officecfg/Configuration_officecfg.mk6
-rw-r--r--officecfg/registry/cppheader.xsl18
-rw-r--r--officecfg/registry/files.mk1
-rw-r--r--officecfg/registry/schema/org/openoffice/Office/Impress-sdremote.xcs63
-rw-r--r--officecfg/registry/schema/org/openoffice/Office/Impress.xcs19
-rw-r--r--postprocess/packregistry/makefile.mk1
-rw-r--r--sd/source/ui/remotecontrol/Server.cxx8
7 files changed, 31 insertions, 85 deletions
diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk
index 7f823b8690f6..682a3e25a4a7 100644
--- a/officecfg/Configuration_officecfg.mk
+++ b/officecfg/Configuration_officecfg.mk
@@ -119,12 +119,6 @@ $(eval $(call gb_Configuration_add_schemas,registry,officecfg/registry/schema,\
org/openoffice/ucb/Store.xcs \
))
-ifeq ($(ENABLE_SDREMOTE),YES)
-$(eval $(call gb_Configuration_add_schemas,registry,officecfg/registry/schema,\
- org/openoffice/Office/ImpressSdRemote.xcs \
-))
-endif
-
$(eval $(call gb_Configuration_add_datas,registry,officecfg/registry/data,\
org/openoffice/Inet.xcu \
org/openoffice/System.xcu \
diff --git a/officecfg/registry/cppheader.xsl b/officecfg/registry/cppheader.xsl
index ac7dce79ee00..372876ec3adc 100644
--- a/officecfg/registry/cppheader.xsl
+++ b/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="translate($ns1, '-', '_')"/>
+ <xsl:value-of select="$ns1"/>
<xsl:if test="$ns2">
<xsl:text> { namespace </xsl:text>
- <xsl:value-of select="translate($ns2, '-', '_')"/>
+ <xsl:value-of select="$ns2"/>
<xsl:if test="$ns3">
<xsl:text> { namespace </xsl:text>
- <xsl:value-of select="translate($ns3, '-', '_')"/>
+ <xsl:value-of select="$ns3"/>
</xsl:if>
</xsl:if>
<xsl:text> {&#xA;</xsl:text>
diff --git a/officecfg/registry/files.mk b/officecfg/registry/files.mk
index 257ead3a5f0b..4413da4149b8 100644
--- a/officecfg/registry/files.mk
+++ b/officecfg/registry/files.mk
@@ -22,7 +22,6 @@ officecfg_FILES := \
Office/FormWizard \
Office/Histories \
Office/Impress \
- $(if $(filter YES,$(ENABLE_SDREMOTE)),Office/ImpressSdRemote) \
Office/Java \
Office/Jobs \
Office/Labels \
diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress-sdremote.xcs b/officecfg/registry/schema/org/openoffice/Office/Impress-sdremote.xcs
deleted file mode 100644
index b78a138893bc..000000000000
--- a/officecfg/registry/schema/org/openoffice/Office/Impress-sdremote.xcs
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************ -->
-<!DOCTYPE oor:component-schema SYSTEM "../../../../component-schema.dtd">
-<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="Impress-sdremote" oor:package="org.openoffice.Office" xml:lang="en-US">
- <info>
- <author>AF</author>
- <desc >Contains configuration items related to the Impress application.</desc>
- </info>
- <import oor:component="org.openoffice.Office.Common"/>
- <templates>
- <group oor:name="AuthorisedRemote">
- <info>
- <author>ajrhunt</author>
- <desc>
- A Remote Control Device that has been authorised for connection.
- </desc>
- </info>
- <prop oor:name="PIN" oor:type="xs:string">
- <info>
- <desc>The PIN used by the device for authentication.</desc>
- </info>
- </prop>
- </group>
- </templates>
- <component>
- <group oor:name="Content">
- <info>
- <desc>Contains content related configuration items.</desc>
- </info>
- <set oor:name="AuthorisedRemotes" oor:node-type="AuthorisedRemote">
- <info>
- <author>ajrhunt</author>
- <desc>Contains a list of remote control devices that can connect without user confirmation.</desc>
- </info>
- </set>
- </group>
- </component>
-</oor:component-schema>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
index 582ecbf15870..aad00d35b07e 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
@@ -90,6 +90,19 @@
</info>
</prop>
</group>
+ <group oor:name="AuthorisedRemote">
+ <info>
+ <author>ajrhunt</author>
+ <desc>
+ A Remote Control Device that has been authorised for connection.
+ </desc>
+ </info>
+ <prop oor:name="PIN" oor:type="xs:string">
+ <info>
+ <desc>The PIN used by the device for authentication.</desc>
+ </info>
+ </prop>
+ </group>
</templates>
<component>
<group oor:name="Layout">
@@ -655,6 +668,12 @@
<value>5000</value>
</prop>
</group>
+ <set oor:name="AuthorisedRemotes" oor:node-type="AuthorisedRemote">
+ <info>
+ <author>ajrhunt</author>
+ <desc>Contains a list of remote control devices that can connect without user confirmation.</desc>
+ </info>
+ </set>
</group>
<group oor:name="Snap">
<info>
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index 59f2614c6fc5..9a8b33067fd8 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -152,7 +152,6 @@ 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 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);
generated by cgit (git 2.34.1) at 2024-07-20 23:28:11 +0000