summaryrefslogtreecommitdiff
path: root/framework/source/xml
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2008-06-24 16:07:22 +0000
committerKurt Zenker <kz@openoffice.org>2008-06-24 16:07:22 +0000
commit427ecc6c34de5ec2e9cc2d7b2599d972e2bd1686 (patch)
tree5a45c79b8e3ec1cedb32a58d8bb26ceafb14c52d /framework/source/xml
parent1fa70d2df96b184e1084617c2cfd9f39a6ab817a (diff)
INTEGRATION: CWS obo30 (1.7.40); FILE MERGED
2008/06/06 06:38:58 obo 1.7.40.2: #i90100# EOL missing 2008/05/30 08:31:13 obo 1.7.40.1: #i90100# ambigous Reference during ENABLE_PCH build
Diffstat (limited to 'framework/source/xml')
-rw-r--r--framework/source/xml/toolboxconfiguration.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/framework/source/xml/toolboxconfiguration.cxx b/framework/source/xml/toolboxconfiguration.cxx
index 18ca38405a..b165ec89f1 100644
--- a/framework/source/xml/toolboxconfiguration.cxx
+++ b/framework/source/xml/toolboxconfiguration.cxx
@@ -1,13 +1,13 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: toolboxconfiguration.cxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
* This file is part of OpenOffice.org.
*
@@ -58,7 +58,6 @@
// namespace
//_________________________________________________________________________________________________________________
-using namespace ::rtl;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
using namespace ::com::sun::star::lang;
@@ -86,7 +85,7 @@ static Reference< XDocumentHandler > GetSaxWriter(
}
// #110897#
-sal_Bool ToolBoxConfiguration::LoadToolBox(
+sal_Bool ToolBoxConfiguration::LoadToolBox(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rInputStream,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& rToolbarConfiguration )
@@ -126,7 +125,7 @@ sal_Bool ToolBoxConfiguration::LoadToolBox(
// #110897#
-sal_Bool ToolBoxConfiguration::StoreToolBox(
+sal_Bool ToolBoxConfiguration::StoreToolBox(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rOutputStream,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rToolbarConfiguration )
@@ -157,3 +156,4 @@ sal_Bool ToolBoxConfiguration::StoreToolBox(
}
}
+