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 /officecfg/Configuration_officecfg.mk | |
parent | Return empty string for null notes to avoid showing null in UI. (diff) | |
download | core-9cabd6afcb424067ef93a43dc77d94d6914e631f.tar.gz core-9cabd6afcb424067ef93a43dc77d94d6914e631f.zip |
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 'officecfg/Configuration_officecfg.mk')
-rw-r--r-- | officecfg/Configuration_officecfg.mk | 6 |
1 files changed, 0 insertions, 6 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 \ |