From 722fffd68854c57c5d8f82bd71d8799d9982f016 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 22 Nov 2012 11:51:47 +0100 Subject: Some svgio clean-up Change-Id: I48adf3b0500f3e4e37fbe444f8a0773d273e09d2 --- svgio/Library_svgio.mk | 10 +-- svgio/Module_svgio.mk | 1 - svgio/Package_inc.mk | 50 --------------- svgio/inc/pch/precompiled_svgio.cxx | 22 ------- svgio/inc/pch/precompiled_svgio.hxx | 25 -------- svgio/inc/svgio/svgiodllapi.h | 33 ---------- svgio/inc/svgio/svgreader/svgcharacternode.hxx | 1 - svgio/inc/svgio/svgreader/svgcirclenode.hxx | 1 - svgio/inc/svgio/svgreader/svgclippathnode.hxx | 1 - svgio/inc/svgio/svgreader/svgdocument.hxx | 1 - svgio/inc/svgio/svgreader/svgdocumenthandler.hxx | 1 - svgio/inc/svgio/svgreader/svgellipsenode.hxx | 1 - svgio/inc/svgio/svgreader/svggnode.hxx | 1 - svgio/inc/svgio/svgreader/svggradientnode.hxx | 1 - svgio/inc/svgio/svgreader/svggradientstopnode.hxx | 1 - svgio/inc/svgio/svgreader/svgimagenode.hxx | 1 - svgio/inc/svgio/svgreader/svglinenode.hxx | 1 - svgio/inc/svgio/svgreader/svgmarkernode.hxx | 1 - svgio/inc/svgio/svgreader/svgmasknode.hxx | 1 - svgio/inc/svgio/svgreader/svgnode.hxx | 1 - svgio/inc/svgio/svgreader/svgpaint.hxx | 1 - svgio/inc/svgio/svgreader/svgpathnode.hxx | 1 - svgio/inc/svgio/svgreader/svgpatternnode.hxx | 1 - svgio/inc/svgio/svgreader/svgpolynode.hxx | 1 - svgio/inc/svgio/svgreader/svgrectnode.hxx | 1 - svgio/inc/svgio/svgreader/svgstyleattributes.hxx | 1 - svgio/inc/svgio/svgreader/svgstylenode.hxx | 1 - svgio/inc/svgio/svgreader/svgsvgnode.hxx | 1 - svgio/inc/svgio/svgreader/svgsymbolnode.hxx | 1 - svgio/inc/svgio/svgreader/svgtextnode.hxx | 1 - svgio/inc/svgio/svgreader/svgtextpathnode.hxx | 1 - svgio/inc/svgio/svgreader/svgtoken.hxx | 1 - svgio/inc/svgio/svgreader/svgtools.hxx | 1 - svgio/inc/svgio/svgreader/svgtrefnode.hxx | 1 - svgio/inc/svgio/svgreader/svgtspannode.hxx | 1 - svgio/inc/svgio/svgreader/svgusenode.hxx | 1 - svgio/source/svguno/svguno.cxx | 78 +++++------------------ svgio/source/svguno/xsvgparser.cxx | 23 ++++--- svgio/source/svguno/xsvgparser.hxx | 53 +++++++++++++++ svgio/svgio.component | 2 +- 40 files changed, 88 insertions(+), 239 deletions(-) delete mode 100644 svgio/Package_inc.mk delete mode 100644 svgio/inc/pch/precompiled_svgio.cxx delete mode 100644 svgio/inc/pch/precompiled_svgio.hxx delete mode 100644 svgio/inc/svgio/svgiodllapi.h create mode 100644 svgio/source/svguno/xsvgparser.hxx diff --git a/svgio/Library_svgio.mk b/svgio/Library_svgio.mk index 3c8f6bade8bd..0e4250d7761a 100644 --- a/svgio/Library_svgio.mk +++ b/svgio/Library_svgio.mk @@ -20,20 +20,16 @@ $(eval $(call gb_Library_Library,svgio)) $(eval $(call gb_Library_set_componentfile,svgio,svgio/svgio)) -$(eval $(call gb_Library_use_packages,svgio,\ - svgio_inc \ +$(eval $(call gb_Library_set_include,svgio,\ + $$(INCLUDE) \ + -I$(SRCDIR)/svgio/inc \ )) $(eval $(call gb_Library_use_sdk_api,svgio)) -$(eval $(call gb_Library_add_defs,svgio,\ - -DSVGIO_DLLIMPLEMENTATION \ -)) - $(eval $(call gb_Library_use_libraries,svgio,\ basegfx \ drawinglayer \ - comphelper \ cppu \ cppuhelper \ sal \ diff --git a/svgio/Module_svgio.mk b/svgio/Module_svgio.mk index f1b3b7b88c53..8b827fcb0fd6 100644 --- a/svgio/Module_svgio.mk +++ b/svgio/Module_svgio.mk @@ -20,7 +20,6 @@ $(eval $(call gb_Module_Module,svgio)) $(eval $(call gb_Module_add_targets,svgio,\ Library_svgio \ - Package_inc \ )) # vim: set noet ts=4 sw=4: diff --git a/svgio/Package_inc.mk b/svgio/Package_inc.mk deleted file mode 100644 index 5aed79891b7e..000000000000 --- a/svgio/Package_inc.mk +++ /dev/null @@ -1,50 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -$(eval $(call gb_Package_Package,svgio_inc,$(SRCDIR)/svgio/inc)) -$(eval $(call gb_Package_add_file,svgio_inc,inc/svgio/svgiodllapi.h,svgio/svgiodllapi.h)) -$(eval $(call gb_Package_add_file,svgio_inc,inc/svgio/svgreader/svgcharacternode.hxx,svgio/svgreader/svgcharacternode.hxx)) -$(eval $(call gb_Package_add_file,svgio_inc,inc/svgio/svgreader/svgcirclenode.hxx,svgio/svgreader/svgcirclenode.hxx)) -$(eval $(call gb_Package_add_file,svgio_inc,inc/svgio/svgreader/svgclippathnode.hxx,svgio/svgreader/svgclippathnode.hxx)) -$(eval $(call gb_Package_add_file,svgio_inc,inc/svgio/svgreader/svgdocument.hxx,svgio/svgreader/svgdocument.hxx)) -$(eval $(call gb_Package_add_file,svgio_inc,inc/svgio/svgreader/svgdocumenthandler.hxx,svgio/svgreader/svgdocumenthandler.hxx)) -$(eval $(call gb_Package_add_file,svgio_inc,inc/svgio/svgreader/svgellipsenode.hxx,svgio/svgreader/svgellipsenode.hxx)) -$(eval $(call gb_Package_add_file,svgio_inc,inc/svgio/svgreader/svggnode.hxx,svgio/svgreader/svggnode.hxx)) -$(eval $(call gb_Package_add_file,svgio_inc,inc/svgio/svgreader/svggradientnode.hxx,svgio/svgreader/svggradientnode.hxx)) -$(eval $(call gb_Package_add_file,svgio_inc,inc/svgio/svgreader/svggradientstopnode.hxx,svgio/svgreader/svggradientstopnode.hxx)) -$(eval $(call gb_Package_add_file,svgio_inc,inc/svgio/svgreader/svgimagenode.hxx,svgio/svgreader/svgimagenode.hxx)) -$(eval $(call gb_Package_add_file,svgio_inc,inc/svgio/svgreader/svglinenode.hxx,svgio/svgreader/svglinenode.hxx)) -$(eval $(call gb_Package_add_file,svgio_inc,inc/svgio/svgreader/svgnode.hxx,svgio/svgreader/svgnode.hxx)) -$(eval $(call gb_Package_add_file,svgio_inc,inc/svgio/svgreader/svgmarkernode.hxx,svgio/svgreader/svgmarkernode.hxx)) -$(eval $(call gb_Package_add_file,svgio_inc,inc/svgio/svgreader/svgmasknode.hxx,svgio/svgreader/svgmasknode.hxx)) -$(eval $(call gb_Package_add_file,svgio_inc,inc/svgio/svgreader/svgpaint.hxx,svgio/svgreader/svgpaint.hxx)) -$(eval $(call gb_Package_add_file,svgio_inc,inc/svgio/svgreader/svgpathnode.hxx,svgio/svgreader/svgpathnode.hxx)) -$(eval $(call gb_Package_add_file,svgio_inc,inc/svgio/svgreader/svgpatternnode.hxx,svgio/svgreader/svgpatternnode.hxx)) -$(eval $(call gb_Package_add_file,svgio_inc,inc/svgio/svgreader/svgpolynode.hxx,svgio/svgreader/svgpolynode.hxx)) -$(eval $(call gb_Package_add_file,svgio_inc,inc/svgio/svgreader/svgrectnode.hxx,svgio/svgreader/svgrectnode.hxx)) -$(eval $(call gb_Package_add_file,svgio_inc,inc/svgio/svgreader/svgstyleattributes.hxx,svgio/svgreader/svgstyleattributes.hxx)) -$(eval $(call gb_Package_add_file,svgio_inc,inc/svgio/svgreader/svgstylenode.hxx,svgio/svgreader/svgstylenode.hxx)) -$(eval $(call gb_Package_add_file,svgio_inc,inc/svgio/svgreader/svgsvgnode.hxx,svgio/svgreader/svgsvgnode.hxx)) -$(eval $(call gb_Package_add_file,svgio_inc,inc/svgio/svgreader/svgsymbolnode.hxx,svgio/svgreader/svgsymbolnode.hxx)) -$(eval $(call gb_Package_add_file,svgio_inc,inc/svgio/svgreader/svgtextnode.hxx,svgio/svgreader/svgtextnode.hxx)) -$(eval $(call gb_Package_add_file,svgio_inc,inc/svgio/svgreader/svgtoken.hxx,svgio/svgreader/svgtoken.hxx)) -$(eval $(call gb_Package_add_file,svgio_inc,inc/svgio/svgreader/svgtrefnode.hxx,svgio/svgreader/svgtrefnode.hxx)) -$(eval $(call gb_Package_add_file,svgio_inc,inc/svgio/svgreader/svgtools.hxx,svgio/svgreader/svgtools.hxx)) -$(eval $(call gb_Package_add_file,svgio_inc,inc/svgio/svgreader/svgtextpathnode.hxx,svgio/svgreader/svgtextpathnode.hxx)) -$(eval $(call gb_Package_add_file,svgio_inc,inc/svgio/svgreader/svgtspannode.hxx,svgio/svgreader/svgtspannode.hxx)) -$(eval $(call gb_Package_add_file,svgio_inc,inc/svgio/svgreader/svgusenode.hxx,svgio/svgreader/svgusenode.hxx)) diff --git a/svgio/inc/pch/precompiled_svgio.cxx b/svgio/inc/pch/precompiled_svgio.cxx deleted file mode 100644 index db5227c1d1b0..000000000000 --- a/svgio/inc/pch/precompiled_svgio.cxx +++ /dev/null @@ -1,22 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "precompiled_svgio.hxx" - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svgio/inc/pch/precompiled_svgio.hxx b/svgio/inc/pch/precompiled_svgio.hxx deleted file mode 100644 index e694392e65be..000000000000 --- a/svgio/inc/pch/precompiled_svgio.hxx +++ /dev/null @@ -1,25 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -// MARKER(update_precomp.py): Generated on 2006-09-01 17:49:30.796084 - -#ifdef PRECOMPILED_HEADERS -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svgio/inc/svgio/svgiodllapi.h b/svgio/inc/svgio/svgiodllapi.h deleted file mode 100644 index c28ff1192427..000000000000 --- a/svgio/inc/svgio/svgiodllapi.h +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef INCLUDED_SVGIODLLAPI_H -#define INCLUDED_SVGIODLLAPI_H - -#include "sal/types.h" - -#if defined(SVGIO_DLLIMPLEMENTATION) -#define SVGIO_DLLPUBLIC SAL_DLLPUBLIC_EXPORT -#else -#define SVGIO_DLLPUBLIC SAL_DLLPUBLIC_IMPORT -#endif -#define SVGIO_DLLPRIVATE SAL_DLLPRIVATE - -#endif /* INCLUDED_SVGIODLLAPI_H */ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svgio/inc/svgio/svgreader/svgcharacternode.hxx b/svgio/inc/svgio/svgreader/svgcharacternode.hxx index 55d056aadd52..ebd9daa8f344 100644 --- a/svgio/inc/svgio/svgreader/svgcharacternode.hxx +++ b/svgio/inc/svgio/svgreader/svgcharacternode.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SVGIO_SVGREADER_SVGCHARACTERNODE_HXX #define INCLUDED_SVGIO_SVGREADER_SVGCHARACTERNODE_HXX -#include #include ////////////////////////////////////////////////////////////////////////////// diff --git a/svgio/inc/svgio/svgreader/svgcirclenode.hxx b/svgio/inc/svgio/svgreader/svgcirclenode.hxx index ddfde9caab00..bb1f9039fc3b 100644 --- a/svgio/inc/svgio/svgreader/svgcirclenode.hxx +++ b/svgio/inc/svgio/svgreader/svgcirclenode.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SVGIO_SVGREADER_SVGCIRCLENODE_HXX #define INCLUDED_SVGIO_SVGREADER_SVGCIRCLENODE_HXX -#include #include #include diff --git a/svgio/inc/svgio/svgreader/svgclippathnode.hxx b/svgio/inc/svgio/svgreader/svgclippathnode.hxx index 95d485ac5dad..1b3b6817bf8c 100644 --- a/svgio/inc/svgio/svgreader/svgclippathnode.hxx +++ b/svgio/inc/svgio/svgreader/svgclippathnode.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SVGIO_SVGREADER_SVGCLIPPATHNODE_HXX #define INCLUDED_SVGIO_SVGREADER_SVGCLIPPATHNODE_HXX -#include #include #include diff --git a/svgio/inc/svgio/svgreader/svgdocument.hxx b/svgio/inc/svgio/svgreader/svgdocument.hxx index b8d29ac14f78..6a5c31617216 100644 --- a/svgio/inc/svgio/svgreader/svgdocument.hxx +++ b/svgio/inc/svgio/svgreader/svgdocument.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SVGIO_SVGREADER_SVGDOCUMENT_HXX #define INCLUDED_SVGIO_SVGREADER_SVGDOCUMENT_HXX -#include #include #include diff --git a/svgio/inc/svgio/svgreader/svgdocumenthandler.hxx b/svgio/inc/svgio/svgreader/svgdocumenthandler.hxx index 04ced2ec1cc3..2bdd56a4a0f1 100644 --- a/svgio/inc/svgio/svgreader/svgdocumenthandler.hxx +++ b/svgio/inc/svgio/svgreader/svgdocumenthandler.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SVGIO_SVGREADER_SVGDOCUMENTHANDLER_HXX #define INCLUDED_SVGIO_SVGREADER_SVGDOCUMENTHANDLER_HXX -#include #include #include diff --git a/svgio/inc/svgio/svgreader/svgellipsenode.hxx b/svgio/inc/svgio/svgreader/svgellipsenode.hxx index 5e501c666a87..52d232428fc0 100644 --- a/svgio/inc/svgio/svgreader/svgellipsenode.hxx +++ b/svgio/inc/svgio/svgreader/svgellipsenode.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SVGIO_SVGREADER_SVGELLIPSENODE_HXX #define INCLUDED_SVGIO_SVGREADER_SVGELLIPSENODE_HXX -#include #include #include diff --git a/svgio/inc/svgio/svgreader/svggnode.hxx b/svgio/inc/svgio/svgreader/svggnode.hxx index 0bd334dd9257..7398ed211e51 100644 --- a/svgio/inc/svgio/svgreader/svggnode.hxx +++ b/svgio/inc/svgio/svgreader/svggnode.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SVGIO_SVGREADER_SVGGNODE_HXX #define INCLUDED_SVGIO_SVGREADER_SVGGNODE_HXX -#include #include #include diff --git a/svgio/inc/svgio/svgreader/svggradientnode.hxx b/svgio/inc/svgio/svgreader/svggradientnode.hxx index 7e9e336bf229..4b3e4d2b79ac 100644 --- a/svgio/inc/svgio/svgreader/svggradientnode.hxx +++ b/svgio/inc/svgio/svgreader/svggradientnode.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SVGIO_SVGREADER_SVGGRADIENTNODE_HXX #define INCLUDED_SVGIO_SVGREADER_SVGGRADIENTNODE_HXX -#include #include #include #include diff --git a/svgio/inc/svgio/svgreader/svggradientstopnode.hxx b/svgio/inc/svgio/svgreader/svggradientstopnode.hxx index 274b25e61891..8ddbff794e35 100644 --- a/svgio/inc/svgio/svgreader/svggradientstopnode.hxx +++ b/svgio/inc/svgio/svgreader/svggradientstopnode.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SVGIO_SVGREADER_SVGGRADIENTSTOPNODE_HXX #define INCLUDED_SVGIO_SVGREADER_SVGGRADIENTSTOPNODE_HXX -#include #include #include diff --git a/svgio/inc/svgio/svgreader/svgimagenode.hxx b/svgio/inc/svgio/svgreader/svgimagenode.hxx index afdf886ab2c3..11c3cd0bdc05 100644 --- a/svgio/inc/svgio/svgreader/svgimagenode.hxx +++ b/svgio/inc/svgio/svgreader/svgimagenode.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SVGIO_SVGREADER_SVGIMAGENODE_HXX #define INCLUDED_SVGIO_SVGREADER_SVGIMAGENODE_HXX -#include #include #include diff --git a/svgio/inc/svgio/svgreader/svglinenode.hxx b/svgio/inc/svgio/svgreader/svglinenode.hxx index 4ee18b7bfa32..e2d5addef069 100644 --- a/svgio/inc/svgio/svgreader/svglinenode.hxx +++ b/svgio/inc/svgio/svgreader/svglinenode.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SVGIO_SVGREADER_SVGLINENODE_HXX #define INCLUDED_SVGIO_SVGREADER_SVGLINENODE_HXX -#include #include #include diff --git a/svgio/inc/svgio/svgreader/svgmarkernode.hxx b/svgio/inc/svgio/svgreader/svgmarkernode.hxx index 947f5099bd3a..71a3c4944aae 100644 --- a/svgio/inc/svgio/svgreader/svgmarkernode.hxx +++ b/svgio/inc/svgio/svgreader/svgmarkernode.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SVGIO_SVGREADER_SVGMARKERNODE_HXX #define INCLUDED_SVGIO_SVGREADER_SVGMARKERNODE_HXX -#include #include #include diff --git a/svgio/inc/svgio/svgreader/svgmasknode.hxx b/svgio/inc/svgio/svgreader/svgmasknode.hxx index a5914d7eb327..c382b607edcb 100644 --- a/svgio/inc/svgio/svgreader/svgmasknode.hxx +++ b/svgio/inc/svgio/svgreader/svgmasknode.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SVGIO_SVGREADER_SVGMASKNODE_HXX #define INCLUDED_SVGIO_SVGREADER_SVGMASKNODE_HXX -#include #include #include diff --git a/svgio/inc/svgio/svgreader/svgnode.hxx b/svgio/inc/svgio/svgreader/svgnode.hxx index 5b3a2694dd18..42c3d7c14e94 100644 --- a/svgio/inc/svgio/svgreader/svgnode.hxx +++ b/svgio/inc/svgio/svgreader/svgnode.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SVGIO_SVGREADER_SVGNODE_HXX #define INCLUDED_SVGIO_SVGREADER_SVGNODE_HXX -#include #include #include #include diff --git a/svgio/inc/svgio/svgreader/svgpaint.hxx b/svgio/inc/svgio/svgreader/svgpaint.hxx index 361125d107df..9ac66827ad60 100644 --- a/svgio/inc/svgio/svgreader/svgpaint.hxx +++ b/svgio/inc/svgio/svgreader/svgpaint.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SVGIO_SVGREADER_SVGPAINT_HXX #define INCLUDED_SVGIO_SVGREADER_SVGPAINT_HXX -#include #include ////////////////////////////////////////////////////////////////////////////// diff --git a/svgio/inc/svgio/svgreader/svgpathnode.hxx b/svgio/inc/svgio/svgreader/svgpathnode.hxx index a7506cee7f8e..c149faed19f9 100644 --- a/svgio/inc/svgio/svgreader/svgpathnode.hxx +++ b/svgio/inc/svgio/svgreader/svgpathnode.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SVGIO_SVGREADER_SVGPATHNODE_HXX #define INCLUDED_SVGIO_SVGREADER_SVGPATHNODE_HXX -#include #include #include diff --git a/svgio/inc/svgio/svgreader/svgpatternnode.hxx b/svgio/inc/svgio/svgreader/svgpatternnode.hxx index 946fdbfcb1a5..888fd3d94fca 100644 --- a/svgio/inc/svgio/svgreader/svgpatternnode.hxx +++ b/svgio/inc/svgio/svgreader/svgpatternnode.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SVGIO_SVGREADER_SVGPATTERNNODE_HXX #define INCLUDED_SVGIO_SVGREADER_SVGPATTERNNODE_HXX -#include #include #include diff --git a/svgio/inc/svgio/svgreader/svgpolynode.hxx b/svgio/inc/svgio/svgreader/svgpolynode.hxx index 5ebd8076bb58..0ce90960f6dc 100644 --- a/svgio/inc/svgio/svgreader/svgpolynode.hxx +++ b/svgio/inc/svgio/svgreader/svgpolynode.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SVGIO_SVGREADER_SVGPOLYNODE_HXX #define INCLUDED_SVGIO_SVGREADER_SVGPOLYNODE_HXX -#include #include #include #include diff --git a/svgio/inc/svgio/svgreader/svgrectnode.hxx b/svgio/inc/svgio/svgreader/svgrectnode.hxx index f6e10eac2e98..01b46c9c75b1 100644 --- a/svgio/inc/svgio/svgreader/svgrectnode.hxx +++ b/svgio/inc/svgio/svgreader/svgrectnode.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SVGIO_SVGREADER_SVGRECTNODE_HXX #define INCLUDED_SVGIO_SVGREADER_SVGRECTNODE_HXX -#include #include #include diff --git a/svgio/inc/svgio/svgreader/svgstyleattributes.hxx b/svgio/inc/svgio/svgreader/svgstyleattributes.hxx index 042fa66a9ade..ee1edf5ad67f 100644 --- a/svgio/inc/svgio/svgreader/svgstyleattributes.hxx +++ b/svgio/inc/svgio/svgreader/svgstyleattributes.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SVGIO_SVGREADER_SVGSTYLEATTRIBUTES_HXX #define INCLUDED_SVGIO_SVGREADER_SVGSTYLEATTRIBUTES_HXX -#include #include #include #include diff --git a/svgio/inc/svgio/svgreader/svgstylenode.hxx b/svgio/inc/svgio/svgreader/svgstylenode.hxx index 37a7ef7d8eb3..cd98d4bbd6d0 100644 --- a/svgio/inc/svgio/svgreader/svgstylenode.hxx +++ b/svgio/inc/svgio/svgreader/svgstylenode.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SVGIO_SVGREADER_SVGSTYLENODE_HXX #define INCLUDED_SVGIO_SVGREADER_SVGSTYLENODE_HXX -#include #include #include diff --git a/svgio/inc/svgio/svgreader/svgsvgnode.hxx b/svgio/inc/svgio/svgreader/svgsvgnode.hxx index 0da68741b636..f052aeb2c883 100644 --- a/svgio/inc/svgio/svgreader/svgsvgnode.hxx +++ b/svgio/inc/svgio/svgreader/svgsvgnode.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SVGIO_SVGREADER_SVGSVGNODE_HXX #define INCLUDED_SVGIO_SVGREADER_SVGSVGNODE_HXX -#include #include ////////////////////////////////////////////////////////////////////////////// diff --git a/svgio/inc/svgio/svgreader/svgsymbolnode.hxx b/svgio/inc/svgio/svgreader/svgsymbolnode.hxx index b4fd0428c7d3..c03fb288cf13 100644 --- a/svgio/inc/svgio/svgreader/svgsymbolnode.hxx +++ b/svgio/inc/svgio/svgreader/svgsymbolnode.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SVGIO_SVGREADER_SVGSYMBOLNODE_HXX #define INCLUDED_SVGIO_SVGREADER_SVGSYMBOLNODE_HXX -#include #include ////////////////////////////////////////////////////////////////////////////// diff --git a/svgio/inc/svgio/svgreader/svgtextnode.hxx b/svgio/inc/svgio/svgreader/svgtextnode.hxx index 59ff27eac756..e34ff0b78b25 100644 --- a/svgio/inc/svgio/svgreader/svgtextnode.hxx +++ b/svgio/inc/svgio/svgreader/svgtextnode.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SVGIO_SVGREADER_SVGTEXTNODE_HXX #define INCLUDED_SVGIO_SVGREADER_SVGTEXTNODE_HXX -#include #include #include #include diff --git a/svgio/inc/svgio/svgreader/svgtextpathnode.hxx b/svgio/inc/svgio/svgreader/svgtextpathnode.hxx index 8c9a1d13281f..d12b63cd0c3f 100644 --- a/svgio/inc/svgio/svgreader/svgtextpathnode.hxx +++ b/svgio/inc/svgio/svgreader/svgtextpathnode.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SVGIO_SVGREADER_SVGTEXTPATHNODE_HXX #define INCLUDED_SVGIO_SVGREADER_SVGTEXTPATHNODE_HXX -#include #include #include #include diff --git a/svgio/inc/svgio/svgreader/svgtoken.hxx b/svgio/inc/svgio/svgreader/svgtoken.hxx index c0c68fbef3ba..0519d9c14680 100644 --- a/svgio/inc/svgio/svgreader/svgtoken.hxx +++ b/svgio/inc/svgio/svgreader/svgtoken.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SVGIO_SVGREADER_SVGTOKEN_HXX #define INCLUDED_SVGIO_SVGREADER_SVGTOKEN_HXX -#include #include #include diff --git a/svgio/inc/svgio/svgreader/svgtools.hxx b/svgio/inc/svgio/svgreader/svgtools.hxx index 5f9645e6d0cf..12c70a49dd28 100644 --- a/svgio/inc/svgio/svgreader/svgtools.hxx +++ b/svgio/inc/svgio/svgreader/svgtools.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SVGIO_SVGREADER_SVGTOOLS_HXX #define INCLUDED_SVGIO_SVGREADER_SVGTOOLS_HXX -#include #include #include #include diff --git a/svgio/inc/svgio/svgreader/svgtrefnode.hxx b/svgio/inc/svgio/svgreader/svgtrefnode.hxx index 782faa17d089..e2442fb7a6f7 100644 --- a/svgio/inc/svgio/svgreader/svgtrefnode.hxx +++ b/svgio/inc/svgio/svgreader/svgtrefnode.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SVGIO_SVGREADER_SVGTREFNODE_HXX #define INCLUDED_SVGIO_SVGREADER_SVGTREFNODE_HXX -#include #include #include #include diff --git a/svgio/inc/svgio/svgreader/svgtspannode.hxx b/svgio/inc/svgio/svgreader/svgtspannode.hxx index 24bf96812fb7..b48c76cd5fc6 100644 --- a/svgio/inc/svgio/svgreader/svgtspannode.hxx +++ b/svgio/inc/svgio/svgreader/svgtspannode.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SVGIO_SVGREADER_SVGTSPANNODE_HXX #define INCLUDED_SVGIO_SVGREADER_SVGTSPANNODE_HXX -#include #include #include #include diff --git a/svgio/inc/svgio/svgreader/svgusenode.hxx b/svgio/inc/svgio/svgreader/svgusenode.hxx index d7613e68092f..e53a19e90d07 100644 --- a/svgio/inc/svgio/svgreader/svgusenode.hxx +++ b/svgio/inc/svgio/svgreader/svgusenode.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SVGIO_SVGREADER_USENODE_HXX #define INCLUDED_SVGIO_SVGREADER_USENODE_HXX -#include #include #include diff --git a/svgio/source/svguno/svguno.cxx b/svgio/source/svguno/svguno.cxx index 41cc46168b82..0f241bcfe344 100644 --- a/svgio/source/svguno/svguno.cxx +++ b/svgio/source/svguno/svguno.cxx @@ -17,76 +17,30 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "sal/config.h" -////////////////////////////////////////////////////////////////////////////// +#include "cppuhelper/factory.hxx" +#include "cppuhelper/implementationentry.hxx" +#include "sal/types.h" -using namespace ::com::sun::star; +#include "xsvgparser.hxx" -////////////////////////////////////////////////////////////////////////////// -// predefines +namespace { -namespace svgio -{ - namespace svgreader - { - extern uno::Sequence< rtl::OUString > SAL_CALL XSvgParser_getSupportedServiceNames(); - extern rtl::OUString SAL_CALL XSvgParser_getImplementationName(); - extern uno::Reference< uno::XInterface > SAL_CALL XSvgParser_createInstance( const uno::Reference< lang::XMultiServiceFactory > & ); - } // end of namespace svgreader -} // end of namespace svgio - -////////////////////////////////////////////////////////////////////////////// -// component_getImplementationEnvironment +static cppu::ImplementationEntry const services[] = { + { &svgio::svgreader::XSvgParser_createInstance, + &svgio::svgreader::XSvgParser_getImplementationName, + &svgio::svgreader::XSvgParser_getSupportedServiceNames, + &cppu::createSingleComponentFactory, 0, 0 }, + { 0, 0, 0, 0, 0, 0 } }; -extern "C" -{ - SVGIO_DLLPUBLIC void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ ) - { - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; - } } -////////////////////////////////////////////////////////////////////////////// -// component_getFactory - -extern "C" +extern "C" SAL_DLLPUBLIC void * SAL_CALL svgio_component_getFactory( + char const * pImplName, void * pServiceManager, void * pRegistryKey) { - SVGIO_DLLPUBLIC void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ ) - { - uno::Reference< lang::XSingleServiceFactory > xFactory; - void* pRet = 0; - - if(svgio::svgreader::XSvgParser_getImplementationName().equalsAscii(pImplName)) - { - xFactory = ::cppu::createSingleFactory( - reinterpret_cast< lang::XMultiServiceFactory * >(pServiceManager), - svgio::svgreader::XSvgParser_getImplementationName(), - svgio::svgreader::XSvgParser_createInstance, - svgio::svgreader::XSvgParser_getSupportedServiceNames()); - } - - if(xFactory.is()) - { - xFactory->acquire(); - pRet = xFactory.get(); - } - - return pRet; - } + return cppu::component_getFactoryHelper( + pImplName, pServiceManager, pRegistryKey, services); } -////////////////////////////////////////////////////////////////////////////// -// eof - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svgio/source/svguno/xsvgparser.cxx b/svgio/source/svguno/xsvgparser.cxx index d08080f8fb13..26a81c0b5e75 100644 --- a/svgio/source/svguno/xsvgparser.cxx +++ b/svgio/source/svguno/xsvgparser.cxx @@ -17,15 +17,19 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include "sal/config.h" + #include #include #include #include #include +#include #include -#include #include +#include "xsvgparser.hxx" + ////////////////////////////////////////////////////////////////////////////// using namespace ::com::sun::star; @@ -42,9 +46,12 @@ namespace svgio XSvgParser(const XSvgParser&); XSvgParser& operator=(const XSvgParser&); + uno::Reference< uno::XComponentContext > context_; + protected: public: - XSvgParser(); + XSvgParser( + uno::Reference< uno::XComponentContext > const & context); virtual ~XSvgParser(); // XSvgParser @@ -80,9 +87,9 @@ namespace svgio return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "svgio::svgreader::XSvgParser" ) ); } - uno::Reference< uno::XInterface > SAL_CALL XSvgParser_createInstance(const uno::Reference< lang::XMultiServiceFactory >&) + uno::Reference< uno::XInterface > SAL_CALL XSvgParser_createInstance(const uno::Reference< uno::XComponentContext >& context) { - return static_cast< ::cppu::OWeakObject* >(new XSvgParser); + return static_cast< ::cppu::OWeakObject* >(new XSvgParser(context)); } } // end of namespace svgreader } // end of namespace svgio @@ -93,7 +100,9 @@ namespace svgio { namespace svgreader { - XSvgParser::XSvgParser() + XSvgParser::XSvgParser( + uno::Reference< uno::XComponentContext > const & context): + context_(context) { } @@ -121,9 +130,7 @@ namespace svgio // get parser uno::Reference< xml::sax::XParser > xParser( - comphelper::getProcessServiceFactory()->createInstance( - rtl::OUString::createFromAscii("com.sun.star.xml.sax.Parser") ), - uno::UNO_QUERY_THROW ); + xml::sax::Parser::create(context_)); // connect parser and filter xParser->setDocumentHandler(xSvgDocHdl); diff --git a/svgio/source/svguno/xsvgparser.hxx b/svgio/source/svguno/xsvgparser.hxx new file mode 100644 index 000000000000..861f322a0f8b --- /dev/null +++ b/svgio/source/svguno/xsvgparser.hxx @@ -0,0 +1,53 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#ifndef INCLUDED_SVGIO_SOURCE_SVGUNO_XSVGPARSER_HXX +#define INCLUDED_SVGIO_SOURCE_SVGUNO_XSVGPARSER_HXX + +#include "sal/config.h" + +#include "com/sun/star/uno/Reference.hxx" +#include "com/sun/star/uno/Sequence.hxx" +#include "sal/types.h" + +namespace com { namespace sun { namespace star { + namespace uno { + class XComponentContext; + class XInterface; + } +} } } +namespace rtl { class OUString; } + +namespace svgio { namespace svgreader { + +com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL +XSvgParser_createInstance( + com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > + const &); + +rtl::OUString SAL_CALL XSvgParser_getImplementationName(); + +com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL +XSvgParser_getSupportedServiceNames(); + +} } + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svgio/svgio.component b/svgio/svgio.component index ddba96500dec..f9f5f1f81fc3 100644 --- a/svgio/svgio.component +++ b/svgio/svgio.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - -- cgit