[Libreoffice-commits] .: svgio/inc svgio/Library_svgio.mk svgio/Module_svgio.mk svgio/Package_inc.mk svgio/source svgio/svgio.component
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Nov 22 02:52:29 PST 2012
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(-)
New commits:
commit 722fffd68854c57c5d8f82bd71d8799d9982f016
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Nov 22 11:51:47 2012 +0100
Some svgio clean-up
Change-Id: I48adf3b0500f3e4e37fbe444f8a0773d273e09d2
diff --git a/svgio/Library_svgio.mk b/svgio/Library_svgio.mk
index 3c8f6ba..0e4250d 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 f1b3b7b..8b827fc 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 5aed798..0000000
--- 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 db5227c..0000000
--- 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 e694392..0000000
--- 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 c28ff11..0000000
--- 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 55d056a..ebd9daa 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 <svgio/svgiodllapi.h>
#include <svgio/svgreader/svgnode.hxx>
//////////////////////////////////////////////////////////////////////////////
diff --git a/svgio/inc/svgio/svgreader/svgcirclenode.hxx b/svgio/inc/svgio/svgreader/svgcirclenode.hxx
index ddfde9c..bb1f903 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 <svgio/svgiodllapi.h>
#include <svgio/svgreader/svgnode.hxx>
#include <svgio/svgreader/svgstyleattributes.hxx>
diff --git a/svgio/inc/svgio/svgreader/svgclippathnode.hxx b/svgio/inc/svgio/svgreader/svgclippathnode.hxx
index 95d485a..1b3b681 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 <svgio/svgiodllapi.h>
#include <svgio/svgreader/svgnode.hxx>
#include <svgio/svgreader/svgstyleattributes.hxx>
diff --git a/svgio/inc/svgio/svgreader/svgdocument.hxx b/svgio/inc/svgio/svgreader/svgdocument.hxx
index b8d29ac..6a5c316 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 <svgio/svgiodllapi.h>
#include <boost/utility.hpp>
#include <svgio/svgreader/svgnode.hxx>
diff --git a/svgio/inc/svgio/svgreader/svgdocumenthandler.hxx b/svgio/inc/svgio/svgreader/svgdocumenthandler.hxx
index 04ced2e..2bdd56a 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 <svgio/svgiodllapi.h>
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <svgio/svgreader/svgdocument.hxx>
diff --git a/svgio/inc/svgio/svgreader/svgellipsenode.hxx b/svgio/inc/svgio/svgreader/svgellipsenode.hxx
index 5e501c6..52d2324 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 <svgio/svgiodllapi.h>
#include <svgio/svgreader/svgnode.hxx>
#include <svgio/svgreader/svgstyleattributes.hxx>
diff --git a/svgio/inc/svgio/svgreader/svggnode.hxx b/svgio/inc/svgio/svgreader/svggnode.hxx
index 0bd334d..7398ed2 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 <svgio/svgiodllapi.h>
#include <svgio/svgreader/svgnode.hxx>
#include <svgio/svgreader/svgstyleattributes.hxx>
diff --git a/svgio/inc/svgio/svgreader/svggradientnode.hxx b/svgio/inc/svgio/svgreader/svggradientnode.hxx
index 7e9e336..4b3e4d2 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 <svgio/svgiodllapi.h>
#include <svgio/svgreader/svgnode.hxx>
#include <svgio/svgreader/svgstyleattributes.hxx>
#include <drawinglayer/primitive2d/svggradientprimitive2d.hxx>
diff --git a/svgio/inc/svgio/svgreader/svggradientstopnode.hxx b/svgio/inc/svgio/svgreader/svggradientstopnode.hxx
index 274b25e..8ddbff7 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 <svgio/svgiodllapi.h>
#include <svgio/svgreader/svgnode.hxx>
#include <svgio/svgreader/svgstyleattributes.hxx>
diff --git a/svgio/inc/svgio/svgreader/svgimagenode.hxx b/svgio/inc/svgio/svgreader/svgimagenode.hxx
index afdf886..11c3cd0 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 <svgio/svgiodllapi.h>
#include <svgio/svgreader/svgnode.hxx>
#include <svgio/svgreader/svgstyleattributes.hxx>
diff --git a/svgio/inc/svgio/svgreader/svglinenode.hxx b/svgio/inc/svgio/svgreader/svglinenode.hxx
index 4ee18b7..e2d5add 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 <svgio/svgiodllapi.h>
#include <svgio/svgreader/svgnode.hxx>
#include <svgio/svgreader/svgstyleattributes.hxx>
diff --git a/svgio/inc/svgio/svgreader/svgmarkernode.hxx b/svgio/inc/svgio/svgreader/svgmarkernode.hxx
index 947f509..71a3c49 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 <svgio/svgiodllapi.h>
#include <svgio/svgreader/svgnode.hxx>
#include <svgio/svgreader/svgstyleattributes.hxx>
diff --git a/svgio/inc/svgio/svgreader/svgmasknode.hxx b/svgio/inc/svgio/svgreader/svgmasknode.hxx
index a5914d7..c382b60 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 <svgio/svgiodllapi.h>
#include <svgio/svgreader/svgnode.hxx>
#include <svgio/svgreader/svgstyleattributes.hxx>
diff --git a/svgio/inc/svgio/svgreader/svgnode.hxx b/svgio/inc/svgio/svgreader/svgnode.hxx
index 5b3a269..42c3d7c 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 <svgio/svgiodllapi.h>
#include <svgio/svgreader/svgtools.hxx>
#include <svgio/svgreader/svgtoken.hxx>
#include <svgio/svgreader/svgpaint.hxx>
diff --git a/svgio/inc/svgio/svgreader/svgpaint.hxx b/svgio/inc/svgio/svgreader/svgpaint.hxx
index 361125d..9ac6682 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 <svgio/svgiodllapi.h>
#include <basegfx/color/bcolor.hxx>
//////////////////////////////////////////////////////////////////////////////
diff --git a/svgio/inc/svgio/svgreader/svgpathnode.hxx b/svgio/inc/svgio/svgreader/svgpathnode.hxx
index a7506ce..c149fae 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 <svgio/svgiodllapi.h>
#include <svgio/svgreader/svgnode.hxx>
#include <svgio/svgreader/svgstyleattributes.hxx>
diff --git a/svgio/inc/svgio/svgreader/svgpatternnode.hxx b/svgio/inc/svgio/svgreader/svgpatternnode.hxx
index 946fdbf..888fd3d 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 <svgio/svgiodllapi.h>
#include <svgio/svgreader/svgnode.hxx>
#include <svgio/svgreader/svgstyleattributes.hxx>
diff --git a/svgio/inc/svgio/svgreader/svgpolynode.hxx b/svgio/inc/svgio/svgreader/svgpolynode.hxx
index 5ebd807..0ce9096 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 <svgio/svgiodllapi.h>
#include <svgio/svgreader/svgnode.hxx>
#include <svgio/svgreader/svgstyleattributes.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/svgio/inc/svgio/svgreader/svgrectnode.hxx b/svgio/inc/svgio/svgreader/svgrectnode.hxx
index f6e10ea..01b46c9 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 <svgio/svgiodllapi.h>
#include <svgio/svgreader/svgnode.hxx>
#include <svgio/svgreader/svgstyleattributes.hxx>
diff --git a/svgio/inc/svgio/svgreader/svgstyleattributes.hxx b/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
index 042fa66..ee1edf5 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 <svgio/svgiodllapi.h>
#include <svgio/svgreader/svgpaint.hxx>
#include <svgio/svgreader/svgnode.hxx>
#include <vcl/vclenum.hxx>
diff --git a/svgio/inc/svgio/svgreader/svgstylenode.hxx b/svgio/inc/svgio/svgreader/svgstylenode.hxx
index 37a7ef7..cd98d4b 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 <svgio/svgiodllapi.h>
#include <svgio/svgreader/svgnode.hxx>
#include <svgio/svgreader/svgstyleattributes.hxx>
diff --git a/svgio/inc/svgio/svgreader/svgsvgnode.hxx b/svgio/inc/svgio/svgreader/svgsvgnode.hxx
index 0da6874..f052aeb 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 <svgio/svgiodllapi.h>
#include <svgio/svgreader/svgstyleattributes.hxx>
//////////////////////////////////////////////////////////////////////////////
diff --git a/svgio/inc/svgio/svgreader/svgsymbolnode.hxx b/svgio/inc/svgio/svgreader/svgsymbolnode.hxx
index b4fd042..c03fb28 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 <svgio/svgiodllapi.h>
#include <svgio/svgreader/svgstyleattributes.hxx>
//////////////////////////////////////////////////////////////////////////////
diff --git a/svgio/inc/svgio/svgreader/svgtextnode.hxx b/svgio/inc/svgio/svgreader/svgtextnode.hxx
index 59ff27e..e34ff0b 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 <svgio/svgiodllapi.h>
#include <svgio/svgreader/svgnode.hxx>
#include <svgio/svgreader/svgstyleattributes.hxx>
#include <svgio/svgreader/svgcharacternode.hxx>
diff --git a/svgio/inc/svgio/svgreader/svgtextpathnode.hxx b/svgio/inc/svgio/svgreader/svgtextpathnode.hxx
index 8c9a1d1..d12b63c 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 <svgio/svgiodllapi.h>
#include <svgio/svgreader/svgnode.hxx>
#include <svgio/svgreader/svgstyleattributes.hxx>
#include <svgio/svgreader/svgpathnode.hxx>
diff --git a/svgio/inc/svgio/svgreader/svgtoken.hxx b/svgio/inc/svgio/svgreader/svgtoken.hxx
index c0c68fb..0519d9c 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 <svgio/svgiodllapi.h>
#include <rtl/ustring.hxx>
#include <boost/unordered_map.hpp>
diff --git a/svgio/inc/svgio/svgreader/svgtools.hxx b/svgio/inc/svgio/svgreader/svgtools.hxx
index 5f9645e..12c70a4 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 <svgio/svgiodllapi.h>
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
#include <basegfx/color/bcolor.hxx>
#include <basegfx/polygon/b2dpolypolygon.hxx>
diff --git a/svgio/inc/svgio/svgreader/svgtrefnode.hxx b/svgio/inc/svgio/svgreader/svgtrefnode.hxx
index 782faa1..e2442fb 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 <svgio/svgiodllapi.h>
#include <svgio/svgreader/svgnode.hxx>
#include <svgio/svgreader/svgstyleattributes.hxx>
#include <svgio/svgreader/svgtextnode.hxx>
diff --git a/svgio/inc/svgio/svgreader/svgtspannode.hxx b/svgio/inc/svgio/svgreader/svgtspannode.hxx
index 24bf968..b48c76c 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 <svgio/svgiodllapi.h>
#include <svgio/svgreader/svgcharacternode.hxx>
#include <svgio/svgreader/svgstyleattributes.hxx>
#include <svgio/svgreader/svgtools.hxx>
diff --git a/svgio/inc/svgio/svgreader/svgusenode.hxx b/svgio/inc/svgio/svgreader/svgusenode.hxx
index d7613e6..e53a19e 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 <svgio/svgiodllapi.h>
#include <svgio/svgreader/svgnode.hxx>
#include <svgio/svgreader/svgstyleattributes.hxx>
diff --git a/svgio/source/svguno/svguno.cxx b/svgio/source/svguno/svguno.cxx
index 41cc461..0f241bc 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 <svgio/svgiodllapi.h>
-#include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/uno/RuntimeException.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <uno/environment.h>
-#include <cppuhelper/factory.hxx>
+#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 d08080f..26a81c0 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 <com/sun/star/graphic/XSvgParser.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <cppuhelper/implbase2.hxx>
#include <svgio/svgreader/svgdocumenthandler.hxx>
#include <com/sun/star/xml/sax/XParser.hpp>
+#include <com/sun/star/xml/sax/Parser.hpp>
#include <com/sun/star/xml/sax/InputSource.hpp>
-#include <comphelper/processfactory.hxx>
#include <drawinglayer/geometry/viewinformation2d.hxx>
+#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 0000000..861f322
--- /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 ddba965..f9f5f1f 100644
--- a/svgio/svgio.component
+++ b/svgio/svgio.component
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="svgio"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="svgio::svgreader::XSvgParser">
<service name="com.sun.star.graphic.SvgTools"/>
More information about the Libreoffice-commits
mailing list