summaryrefslogtreecommitdiff
path: root/xmlhelp
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2008-03-25 14:21:52 +0000
committerOliver Bolte <obo@openoffice.org>2008-03-25 14:21:52 +0000
commit7ee70d73d2f4413b28a66537b07b05ffc59b9764 (patch)
treeeda001ea543bd5f358ffee966fc28819ab87676d /xmlhelp
parent926c7b208317e2e69ee45103b807ace45a57cb6f (diff)
INTEGRATION: CWS ucbfixes06 (1.23.10); FILE MERGED
2008/01/21 15:30:21 kso 1.23.10.2: #i85425# - cleanup of CVS module. 2008/01/21 12:24:49 kso 1.23.10.1: #i85139# - Adapted to changed ucbhelper API.
Diffstat (limited to 'xmlhelp')
-rw-r--r--xmlhelp/source/cxxhelp/provider/provider.cxx27
1 files changed, 10 insertions, 17 deletions
diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx
index b0761463a14a..cb1eee95523c 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.cxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: provider.cxx,v $
*
- * $Revision: 1.23 $
+ * $Revision: 1.24 $
*
- * last change: $Author: ihi $ $Date: 2007-11-19 13:00:56 $
+ * last change: $Author: obo $ $Date: 2008-03-25 15:21:52 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -52,18 +52,6 @@
#ifndef _UCBHELPER_CONTENTIDENTIFIER_HXX
#include <ucbhelper/contentidentifier.hxx>
#endif
-#ifndef _DATABASES_HXX_
-#include <provider/databases.hxx>
-#endif
-#ifndef _PROVIDER_HXX
-#include <provider/provider.hxx>
-#endif
-#ifndef _CONTENT_HXX
-#include <provider/content.hxx>
-#endif
-#ifndef _DATABASES_HXX_
-#include <provider/databases.hxx>
-#endif
#ifndef _COM_SUN_STAR_FRAME_XCONFIGMANAGER_HPP_
#include <com/sun/star/frame/XConfigManager.hpp>
#endif
@@ -88,6 +76,11 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
+#include "databases.hxx"
+#include "provider.hxx"
+#include "content.hxx"
+#include "databases.hxx"
+
using namespace com::sun::star;
using namespace chelp;
@@ -253,6 +246,9 @@ ContentProvider::queryContent(
xContent = new Content( m_xSMgr, this, xCanonicId, m_pDatabases );
+ // register new content
+ registerNewContent( xContent );
+
// Further checks
if ( !xContent->getIdentifier().is() )
@@ -272,9 +268,6 @@ ContentProvider::dispose()
}
}
-
-#include <provider/debughelper.hxx>
-
void SAL_CALL
ContentProvider::elementReplaced(const container::ContainerEvent& Event)
throw (uno::RuntimeException)