diff options
author | Mathias Bauer <mba@openoffice.org> | 2010-11-29 13:41:51 +0100 |
---|---|---|
committer | Mathias Bauer <mba@openoffice.org> | 2010-11-29 13:41:51 +0100 |
commit | c926c86c914574ec94e809c14392c86e2c54cb04 (patch) | |
tree | 98f04e7264b203c32288ee7b7ff5c2e544ec440c /xmloff/source/forms | |
parent | dac3d8ca475971249a0015cb55207688055b41f5 (diff) |
CWS gnumake2: fix some build breakers in svtools, xmloff and framework
Diffstat (limited to 'xmloff/source/forms')
-rwxr-xr-x | xmloff/source/forms/form_handler_factory.hxx | 50 | ||||
-rwxr-xr-x | xmloff/source/forms/handler/makefile.mk | 55 | ||||
-rwxr-xr-x | xmloff/source/forms/property_handler.hxx | 84 | ||||
-rwxr-xr-x | xmloff/source/forms/property_ids.hxx | 56 | ||||
-rwxr-xr-x | xmloff/source/forms/property_meta_data.cxx | 2 |
5 files changed, 1 insertions, 246 deletions
diff --git a/xmloff/source/forms/form_handler_factory.hxx b/xmloff/source/forms/form_handler_factory.hxx deleted file mode 100755 index 62bf94f74aa8..000000000000 --- a/xmloff/source/forms/form_handler_factory.hxx +++ /dev/null @@ -1,50 +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. - * - ************************************************************************/ - -#ifndef XMLOFF_FORM_HANDLER_FACTORY_HXX -#define XMLOFF_FORM_HANDLER_FACTORY_HXX - -#include "property_handler.hxx" - -//...................................................................................................................... -namespace xmloff -{ -//...................................................................................................................... - - //================================================================================================================== - //= FormHandlerFactory - //================================================================================================================== - class FormHandlerFactory - { - public: - static PPropertyHandler getFormPropertyHandler( const PropertyId i_propertyId ); - }; - -//...................................................................................................................... -} // namespace xmloff -//...................................................................................................................... - -#endif // XMLOFF_FORM_HANDLER_FACTORY_HXX diff --git a/xmloff/source/forms/handler/makefile.mk b/xmloff/source/forms/handler/makefile.mk deleted file mode 100755 index 574537ffd474..000000000000 --- a/xmloff/source/forms/handler/makefile.mk +++ /dev/null @@ -1,55 +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=form_handlers - -INCEXT=.. - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE: $(PRJ)/util/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)/form_handler_factory.obj \ - $(SLO)/property_handler_base.obj \ - $(SLO)/vcl_date_handler.obj \ - $(SLO)/vcl_time_handler.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - -test: - echo $(INCLUDE)
\ No newline at end of file diff --git a/xmloff/source/forms/property_handler.hxx b/xmloff/source/forms/property_handler.hxx deleted file mode 100755 index 247b4f17f798..000000000000 --- a/xmloff/source/forms/property_handler.hxx +++ /dev/null @@ -1,84 +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. - * - ************************************************************************/ - -#ifndef XMLOFF_PROPERTY_HANDLER_HXX -#define XMLOFF_PROPERTY_HANDLER_HXX - -#include "property_ids.hxx" - -#include <com/sun/star/uno/Any.hxx> - -#include <rtl/ref.hxx> - -#include <map> -#include <vector> - -//...................................................................................................................... -namespace xmloff -{ -//...................................................................................................................... - - typedef ::std::map< PropertyId, ::com::sun::star::uno::Any > PropertyValues; - - //================================================================================================================== - //= IPropertyHandler - //================================================================================================================== - class IPropertyHandler : public ::rtl::IReference - { - public: - /** retrieves the XML attribute value for the given property values - */ - virtual ::rtl::OUString - getAttributeValue( const PropertyValues& i_propertyValues ) const = 0; - - /** is a convenience method for XML attributes whose value comprises of only one UNO API property - */ - virtual ::rtl::OUString - getAttributeValue( const ::com::sun::star::uno::Any& i_propertyValue ) const = 0; - - /** retrieves the values of the properties controlled by an XML attributed, described by a given attribute value - */ - virtual bool - getPropertyValues( const ::rtl::OUString i_attributeValue, PropertyValues& o_propertyValues ) const = 0; - - virtual ~IPropertyHandler() { } - }; - - //================================================================================================================== - //= PPropertyHandler - //================================================================================================================== - typedef ::rtl::Reference< IPropertyHandler > PPropertyHandler; - - //================================================================================================================== - //= PropertyHandlerFactory - //================================================================================================================== - typedef PPropertyHandler (*PropertyHandlerFactory)( const PropertyId i_propertyId ); - -//...................................................................................................................... -} // namespace xmloff -//...................................................................................................................... - -#endif // XMLOFF_PROPERTY_HANDLER_HXX diff --git a/xmloff/source/forms/property_ids.hxx b/xmloff/source/forms/property_ids.hxx deleted file mode 100755 index 31004f2d9ff2..000000000000 --- a/xmloff/source/forms/property_ids.hxx +++ /dev/null @@ -1,56 +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. - * - ************************************************************************/ - -#ifndef XMLOFF_PROPERTY_IDS_HXX -#define XMLOFF_PROPERTY_IDS_HXX - -//...................................................................................................................... -namespace xmloff -{ -//...................................................................................................................... - - //================================================================================================================== - //= PropertyId - //================================================================================================================== - enum PropertyId - { - PID_DATE_MIN, - PID_DATE_MAX, - PID_DEFAULT_DATE, - PID_DATE, - PID_TIME_MIN, - PID_TIME_MAX, - PID_DEFAULT_TIME, - PID_TIME, - - PID_INVALID - }; - -//...................................................................................................................... -} // namespace xmloff -//...................................................................................................................... - -#endif // XMLOFF_PROPERTY_IDS_HXX diff --git a/xmloff/source/forms/property_meta_data.cxx b/xmloff/source/forms/property_meta_data.cxx index 7f058d14b9b7..7dd5277cff28 100755 --- a/xmloff/source/forms/property_meta_data.cxx +++ b/xmloff/source/forms/property_meta_data.cxx @@ -30,7 +30,7 @@ #include "form_handler_factory.hxx" #include "strings.hxx" #include "xmloff/xmltoken.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <tools/diagnose_ex.h> #include <tools/debug.hxx> |