diff options
author | Mikhail Voytenko <mav@openoffice.org> | 2011-01-06 14:57:12 +0100 |
---|---|---|
committer | Mikhail Voytenko <mav@openoffice.org> | 2011-01-06 14:57:12 +0100 |
commit | 8ff51afa0dcd4e5e644e923131ee72435c80b57b (patch) | |
tree | d63f6b6e298485b5f29f60c7af25baca46f59375 /xmloff/source/transform | |
parent | fa1f3c352c6126b24ab5af87ea4ebea742c546c2 (diff) | |
parent | 794c821e4d48c34aa376cdc7b6ab2cb029d9574d (diff) |
removetooltypes01: rebase to DEV300_m96
Diffstat (limited to 'xmloff/source/transform')
28 files changed, 28 insertions, 131 deletions
diff --git a/xmloff/source/transform/ChartOASISTContext.cxx b/xmloff/source/transform/ChartOASISTContext.cxx index a294ee6e9388..26a07e1920d4 100644 --- a/xmloff/source/transform/ChartOASISTContext.cxx +++ b/xmloff/source/transform/ChartOASISTContext.cxx @@ -29,7 +29,7 @@ #include "precompiled_xmloff.hxx" #include "ChartOASISTContext.hxx" #include "MutableAttrList.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include "ActionMapTypesOASIS.hxx" #include "AttrTransformerAction.hxx" #include "TransformerActions.hxx" diff --git a/xmloff/source/transform/ChartOOoTContext.cxx b/xmloff/source/transform/ChartOOoTContext.cxx index 832cd1e216a1..5e5420002d7d 100644 --- a/xmloff/source/transform/ChartOOoTContext.cxx +++ b/xmloff/source/transform/ChartOOoTContext.cxx @@ -29,7 +29,7 @@ #include "precompiled_xmloff.hxx" #include "ChartOOoTContext.hxx" #include "MutableAttrList.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #ifndef _XMLOFF_ACTIONMAPTYPESOOo_HXX #include "ActionMapTypesOOo.hxx" #endif diff --git a/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx b/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx index fa33d0c45b54..d1fea38db7f8 100644 --- a/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx +++ b/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx @@ -30,7 +30,7 @@ #include "ChartPlotAreaOASISTContext.hxx" #include "TransformerBase.hxx" #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include "DeepTContext.hxx" #include "ActionMapTypesOASIS.hxx" diff --git a/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx b/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx index b920d3fd7868..19c4fa580e3a 100644 --- a/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx +++ b/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx @@ -30,7 +30,7 @@ #include "ChartPlotAreaOOoTContext.hxx" #include "TransformerBase.hxx" #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include "DeepTContext.hxx" #include "ActionMapTypesOOo.hxx" diff --git a/xmloff/source/transform/ControlOASISTContext.cxx b/xmloff/source/transform/ControlOASISTContext.cxx index 8cf8e0df7815..4b87cb4fe80b 100644 --- a/xmloff/source/transform/ControlOASISTContext.cxx +++ b/xmloff/source/transform/ControlOASISTContext.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" #include "MutableAttrList.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> #include "ActionMapTypesOASIS.hxx" #include "AttrTransformerAction.hxx" diff --git a/xmloff/source/transform/ControlOOoTContext.cxx b/xmloff/source/transform/ControlOOoTContext.cxx index 94d6ae1862b6..2317cf52cf50 100644 --- a/xmloff/source/transform/ControlOOoTContext.cxx +++ b/xmloff/source/transform/ControlOOoTContext.cxx @@ -30,7 +30,7 @@ #include "ControlOOoTContext.hxx" #include "IgnoreTContext.hxx" #include "MutableAttrList.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include "ActionMapTypesOOo.hxx" #include "ElemTransformerAction.hxx" #include "TransformerActions.hxx" diff --git a/xmloff/source/transform/DlgOASISTContext.cxx b/xmloff/source/transform/DlgOASISTContext.cxx index 08d6682a7491..bfe62162847a 100644 --- a/xmloff/source/transform/DlgOASISTContext.cxx +++ b/xmloff/source/transform/DlgOASISTContext.cxx @@ -29,7 +29,7 @@ #include "precompiled_xmloff.hxx" #include "DlgOASISTContext.hxx" #include "MutableAttrList.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include "ActionMapTypesOASIS.hxx" #include "AttrTransformerAction.hxx" #include "TransformerActions.hxx" diff --git a/xmloff/source/transform/DocumentTContext.cxx b/xmloff/source/transform/DocumentTContext.cxx index 33b5b2c5dd24..5e4d749826ac 100644 --- a/xmloff/source/transform/DocumentTContext.cxx +++ b/xmloff/source/transform/DocumentTContext.cxx @@ -34,7 +34,7 @@ #include <com/sun/star/beans/XPropertySetInfo.hpp> #include <xmloff/nmspmap.hxx> #include <xmloff/xmltoken.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #ifndef _XMLOFF_TRANSFOERMERBASE_HXX #include "TransformerBase.hxx" diff --git a/xmloff/source/transform/EventMap.cxx b/xmloff/source/transform/EventMap.cxx index c8bb7694bc6b..6c18e8e559ba 100644 --- a/xmloff/source/transform/EventMap.cxx +++ b/xmloff/source/transform/EventMap.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" #include "EventMap.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" XMLTransformerEventMapEntry aTransformerEventMap[] = diff --git a/xmloff/source/transform/EventOASISTContext.cxx b/xmloff/source/transform/EventOASISTContext.cxx index cee3f19f4d29..24488b7694be 100644 --- a/xmloff/source/transform/EventOASISTContext.cxx +++ b/xmloff/source/transform/EventOASISTContext.cxx @@ -30,7 +30,7 @@ #include "EventOASISTContext.hxx" #include "EventMap.hxx" #include "MutableAttrList.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include "ActionMapTypesOASIS.hxx" #include "AttrTransformerAction.hxx" #include "TransformerActions.hxx" diff --git a/xmloff/source/transform/EventOOoTContext.cxx b/xmloff/source/transform/EventOOoTContext.cxx index 8f90bc66e475..3b63935817c8 100644 --- a/xmloff/source/transform/EventOOoTContext.cxx +++ b/xmloff/source/transform/EventOOoTContext.cxx @@ -30,7 +30,7 @@ #include "EventOOoTContext.hxx" #include "EventMap.hxx" #include "MutableAttrList.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #ifndef _XMLOFF_ACTIONMAPTYPESOOo_HXX #include "ActionMapTypesOOo.hxx" #endif diff --git a/xmloff/source/transform/FormPropOASISTContext.cxx b/xmloff/source/transform/FormPropOASISTContext.cxx index 57ec2b33cf20..518618f4059d 100644 --- a/xmloff/source/transform/FormPropOASISTContext.cxx +++ b/xmloff/source/transform/FormPropOASISTContext.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" #include "MutableAttrList.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> #include "ActionMapTypesOASIS.hxx" #include "AttrTransformerAction.hxx" diff --git a/xmloff/source/transform/FormPropOOoTContext.cxx b/xmloff/source/transform/FormPropOOoTContext.cxx index bbe70d7789de..54682b3e0c03 100644 --- a/xmloff/source/transform/FormPropOOoTContext.cxx +++ b/xmloff/source/transform/FormPropOOoTContext.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" #include "MutableAttrList.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> #include "IgnoreTContext.hxx" #ifndef _XMLOFF_ACTIONMAPTYPESOOo_HXX diff --git a/xmloff/source/transform/FrameOASISTContext.cxx b/xmloff/source/transform/FrameOASISTContext.cxx index 084af4ab595c..3c9439111aec 100644 --- a/xmloff/source/transform/FrameOASISTContext.cxx +++ b/xmloff/source/transform/FrameOASISTContext.cxx @@ -30,7 +30,7 @@ #include "FrameOASISTContext.hxx" #include "IgnoreTContext.hxx" #include "MutableAttrList.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include "ActionMapTypesOASIS.hxx" #include "ElemTransformerAction.hxx" #include "TransformerActions.hxx" diff --git a/xmloff/source/transform/FrameOOoTContext.cxx b/xmloff/source/transform/FrameOOoTContext.cxx index bda9526e366d..b36d0c29f258 100644 --- a/xmloff/source/transform/FrameOOoTContext.cxx +++ b/xmloff/source/transform/FrameOOoTContext.cxx @@ -30,7 +30,7 @@ #include "FrameOOoTContext.hxx" #include "IgnoreTContext.hxx" #include "MutableAttrList.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> #include "ActionMapTypesOOo.hxx" #include "AttrTransformerAction.hxx" diff --git a/xmloff/source/transform/MergeElemTContext.cxx b/xmloff/source/transform/MergeElemTContext.cxx index 337bce70e32a..a88194952499 100644 --- a/xmloff/source/transform/MergeElemTContext.cxx +++ b/xmloff/source/transform/MergeElemTContext.cxx @@ -36,7 +36,7 @@ #include "AttrTransformerAction.hxx" #include "ElemTransformerAction.hxx" #include "IgnoreTContext.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" using ::rtl::OUString; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/transform/MetaTContext.cxx b/xmloff/source/transform/MetaTContext.cxx index 3ee3d6f082d6..e05312cb3413 100644 --- a/xmloff/source/transform/MetaTContext.cxx +++ b/xmloff/source/transform/MetaTContext.cxx @@ -33,7 +33,7 @@ #include <com/sun/star/xml/sax/XAttributeList.hpp> #include <xmloff/nmspmap.hxx> #include <xmloff/xmltoken.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #ifndef _XMLOFF_TRANSFOERMERBASE_HXX #include "TransformerBase.hxx" diff --git a/xmloff/source/transform/MetaTContext.hxx b/xmloff/source/transform/MetaTContext.hxx index b2a0317175ed..5af650cb50b7 100644 --- a/xmloff/source/transform/MetaTContext.hxx +++ b/xmloff/source/transform/MetaTContext.hxx @@ -29,7 +29,7 @@ #define _XMLOFF_METATCONTEXT_HXX #include <rtl/ref.hxx> -#include "functional.hxx" +#include "xmloff/functional.hxx" #include <map> diff --git a/xmloff/source/transform/NotesTContext.cxx b/xmloff/source/transform/NotesTContext.cxx index 31457e3ce229..31ccbdf48c5b 100644 --- a/xmloff/source/transform/NotesTContext.cxx +++ b/xmloff/source/transform/NotesTContext.cxx @@ -33,7 +33,7 @@ #include <com/sun/star/xml/sax/XAttributeList.hpp> #include <xmloff/nmspmap.hxx> #include <xmloff/xmltoken.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #ifndef _XMLOFF_TRANSFOERMERBASE_HXX #include "TransformerBase.hxx" diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx index 4afa5a40c2ca..103202c48866 100644 --- a/xmloff/source/transform/OOo2Oasis.cxx +++ b/xmloff/source/transform/OOo2Oasis.cxx @@ -31,7 +31,7 @@ #include <rtl/ustrbuf.hxx> #include <comphelper/processfactory.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include "MutableAttrList.hxx" #include "DeepTContext.hxx" diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx index 5292c931a609..4f0bd1303afb 100644 --- a/xmloff/source/transform/Oasis2OOo.cxx +++ b/xmloff/source/transform/Oasis2OOo.cxx @@ -31,7 +31,7 @@ #include <rtl/uuid.h> #include <rtl/ustrbuf.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include "DeepTContext.hxx" #include "MetaTContext.hxx" diff --git a/xmloff/source/transform/PropertyActionsOASIS.cxx b/xmloff/source/transform/PropertyActionsOASIS.cxx index e544836a043c..3abafaa5a13e 100644 --- a/xmloff/source/transform/PropertyActionsOASIS.cxx +++ b/xmloff/source/transform/PropertyActionsOASIS.cxx @@ -27,7 +27,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include "PropType.hxx" #include "FamilyType.hxx" #include "PropertyActionsOASIS.hxx" diff --git a/xmloff/source/transform/PropertyActionsOOo.cxx b/xmloff/source/transform/PropertyActionsOOo.cxx index bb3e66ff13b6..bc91561de206 100644 --- a/xmloff/source/transform/PropertyActionsOOo.cxx +++ b/xmloff/source/transform/PropertyActionsOOo.cxx @@ -27,7 +27,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include "PropType.hxx" #include "PropertyActionsOOo.hxx" diff --git a/xmloff/source/transform/StyleOASISTContext.cxx b/xmloff/source/transform/StyleOASISTContext.cxx index 6c0aba3bb798..ca444e176a0b 100644 --- a/xmloff/source/transform/StyleOASISTContext.cxx +++ b/xmloff/source/transform/StyleOASISTContext.cxx @@ -34,7 +34,7 @@ #include <rtl/ustrbuf.hxx> #include <xmloff/nmspmap.hxx> #include <xmloff/xmltoken.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include "PropType.hxx" #include "DeepTContext.hxx" #include "ProcAttrTContext.hxx" diff --git a/xmloff/source/transform/StyleOOoTContext.cxx b/xmloff/source/transform/StyleOOoTContext.cxx index d3a5af703812..dc0cfb75a100 100644 --- a/xmloff/source/transform/StyleOOoTContext.cxx +++ b/xmloff/source/transform/StyleOOoTContext.cxx @@ -33,7 +33,7 @@ #include <com/sun/star/xml/sax/XAttributeList.hpp> #include <xmloff/nmspmap.hxx> #include <xmloff/xmltoken.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include "PropType.hxx" #include "DeepTContext.hxx" #include "RenameElemTContext.hxx" diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx index 9a743f7e9067..61bb73120da6 100644 --- a/xmloff/source/transform/TransformerBase.cxx +++ b/xmloff/source/transform/TransformerBase.cxx @@ -33,7 +33,7 @@ #include <com/sun/star/i18n/UnicodeType.hpp> #include <comphelper/processfactory.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include "IgnoreTContext.hxx" #include "RenameElemTContext.hxx" #include "ProcAttrTContext.hxx" diff --git a/xmloff/source/transform/XMLFilterRegistration.cxx b/xmloff/source/transform/XMLFilterRegistration.cxx index 50e14db40e5d..f201474015fc 100644 --- a/xmloff/source/transform/XMLFilterRegistration.cxx +++ b/xmloff/source/transform/XMLFilterRegistration.cxx @@ -141,12 +141,12 @@ extern "C" { #endif -void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = NULL; if( pServiceManager ) diff --git a/xmloff/source/transform/makefile.mk b/xmloff/source/transform/makefile.mk deleted file mode 100644 index 031549fcb39b..000000000000 --- a/xmloff/source/transform/makefile.mk +++ /dev/null @@ -1,103 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ := ..$/.. -PRJNAME := xmloff -TARGET := xof -LIBTARGET=NO -ENABLE_EXCEPTIONS := TRUE - -.INCLUDE: settings.mk - -SHL1TARGET = $(TARGET)$(DLLPOSTFIX) -SHL1OBJS = \ - $(SLO)$/ChartOASISTContext.obj \ - $(SLO)$/ChartOOoTContext.obj \ - $(SLO)$/ChartPlotAreaOASISTContext.obj \ - $(SLO)$/ChartPlotAreaOOoTContext.obj \ - $(SLO)$/ControlOASISTContext.obj \ - $(SLO)$/ControlOOoTContext.obj \ - $(SLO)$/CreateElemTContext.obj \ - $(SLO)$/DeepTContext.obj \ - $(SLO)$/DlgOASISTContext.obj \ - $(SLO)$/DocumentTContext.obj \ - $(SLO)$/EventMap.obj \ - $(SLO)$/EventOASISTContext.obj \ - $(SLO)$/EventOOoTContext.obj \ - $(SLO)$/FlatTContext.obj \ - $(SLO)$/FormPropOASISTContext.obj \ - $(SLO)$/FormPropOOoTContext.obj \ - $(SLO)$/FrameOASISTContext.obj \ - $(SLO)$/FrameOOoTContext.obj \ - $(SLO)$/IgnoreTContext.obj \ - $(SLO)$/MergeElemTContext.obj \ - $(SLO)$/MetaTContext.obj \ - $(SLO)$/MutableAttrList.obj \ - $(SLO)$/NotesTContext.obj \ - $(SLO)$/OOo2Oasis.obj \ - $(SLO)$/Oasis2OOo.obj \ - $(SLO)$/PersAttrListTContext.obj \ - $(SLO)$/PersMixedContentTContext.obj \ - $(SLO)$/ProcAddAttrTContext.obj \ - $(SLO)$/ProcAttrTContext.obj \ - $(SLO)$/PropertyActionsOASIS.obj \ - $(SLO)$/PropertyActionsOOo.obj \ - $(SLO)$/RenameElemTContext.obj \ - $(SLO)$/StyleOASISTContext.obj \ - $(SLO)$/StyleOOoTContext.obj \ - $(SLO)$/TransformerActions.obj \ - $(SLO)$/TransformerBase.obj \ - $(SLO)$/TransformerContext.obj \ - $(SLO)$/TransformerTokenMap.obj \ - $(SLO)$/XMLFilterRegistration.obj - -SHL1STDLIBS = \ - $(COMPHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALHELPERLIB) \ - $(SALLIB) -.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" - SHL1STDLIBS += -lxo$(DLLPOSTFIX) -.ELSE - SHL1STDLIBS += ixo.lib -.ENDIF -SHL1VERSIONMAP = $(SOLARENV)/src/component.map -SHL1IMPLIB = i$(SHL1TARGET) -DEF1NAME = $(SHL1TARGET) - -SLOFILES = $(SHL1OBJS) - -.INCLUDE: target.mk - -ALLTAR : $(MISC)/xof.component - -$(MISC)/xof.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - xof.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt xof.component |