summaryrefslogtreecommitdiff
path: root/cppuhelper
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-12-21 11:11:47 +0100
committerStephan Bergmann <sbergman@redhat.com>2012-12-21 15:56:45 +0100
commit03739641088846c4cf76a0752619905a8a65f88c (patch)
treec444f46d11818990d8b1521a173986e739924027 /cppuhelper
parentf3051abde54e7a0bc3e2d184e31ac011e96d3e6b (diff)
Remove support for XML .rdbs froom SimpleRegistry service again
...this was a transitional hack to get XML-format service.rdbs in. Now that registry-based bootstrap_InitialComponentContext is gone, XML-format .rdbs need only be handled in cppuhelper/source/defaultbootstrap.cxx (so the textualservices stuff once duplicated to there now effectively moved there). Change-Id: Ifb93558768095c1b462fe4057ebf8724968cca77
Diffstat (limited to 'cppuhelper')
-rw-r--r--cppuhelper/source/defaultbootstrap.cxx10
1 files changed, 3 insertions, 7 deletions
diff --git a/cppuhelper/source/defaultbootstrap.cxx b/cppuhelper/source/defaultbootstrap.cxx
index 1fe1aa76e8bd..128ee64a9a1f 100644
--- a/cppuhelper/source/defaultbootstrap.cxx
+++ b/cppuhelper/source/defaultbootstrap.cxx
@@ -233,13 +233,9 @@ struct Data: private boost::noncopyable {
ImplementationMap singletons;
};
-// This is largely a copy from stoc/source/simpleregistry/textualservices.cxx
-// (which it obsoletes); cppuhelper's published interface concept makes it
-// difficult to make both places use a shared Parser implementation, so I
-// created a copy for now (until the whole stoc/source/simpleregistry stuff can
-// be removed in an incompatible LibreOffice version). For simplicity, this
-// code keeps throwing css::registry::InvalidRegistryException for invalid XML
-// rdbs (even though that does not fit the exception's name):
+// For simplicity, this code keeps throwing
+// css::registry::InvalidRegistryException for invalid XML rdbs (even though
+// that does not fit the exception's name):
class Parser: private boost::noncopyable {
public:
Parser(