diff options
Diffstat (limited to 'xmloff/source/style')
119 files changed, 180 insertions, 401 deletions
diff --git a/xmloff/source/style/AttributeContainerHandler.cxx b/xmloff/source/style/AttributeContainerHandler.cxx index 94c0f2e25ef2..94c0f2e25ef2 100644..100755 --- a/xmloff/source/style/AttributeContainerHandler.cxx +++ b/xmloff/source/style/AttributeContainerHandler.cxx diff --git a/xmloff/source/style/DashStyle.cxx b/xmloff/source/style/DashStyle.cxx index 70090810ca45..6f0e403f607a 100644..100755 --- a/xmloff/source/style/DashStyle.cxx +++ b/xmloff/source/style/DashStyle.cxx @@ -30,11 +30,11 @@ #include "precompiled_xmloff.hxx" #include <com/sun/star/drawing/DashStyle.hpp> #include <com/sun/star/drawing/LineDash.hpp> -#include "DashStyle.hxx" +#include "xmloff/DashStyle.hxx" #include <xmloff/attrlist.hxx> #include <xmloff/nmspmap.hxx> #include <xmloff/xmluconv.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmlexp.hxx> #include <xmloff/xmlimp.hxx> diff --git a/xmloff/source/style/DrawAspectHdl.cxx b/xmloff/source/style/DrawAspectHdl.cxx index 754e22b27d47..754e22b27d47 100644..100755 --- a/xmloff/source/style/DrawAspectHdl.cxx +++ b/xmloff/source/style/DrawAspectHdl.cxx diff --git a/xmloff/source/style/DrawAspectHdl.hxx b/xmloff/source/style/DrawAspectHdl.hxx index c644c0dc85fb..c644c0dc85fb 100644..100755 --- a/xmloff/source/style/DrawAspectHdl.hxx +++ b/xmloff/source/style/DrawAspectHdl.hxx diff --git a/xmloff/source/style/EnumPropertyHdl.cxx b/xmloff/source/style/EnumPropertyHdl.cxx index dcf31f47c06a..55c3a60491ad 100644..100755 --- a/xmloff/source/style/EnumPropertyHdl.cxx +++ b/xmloff/source/style/EnumPropertyHdl.cxx @@ -53,7 +53,7 @@ XMLEnumPropertyHdl::~XMLEnumPropertyHdl() sal_Bool XMLEnumPropertyHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const { - USHORT nValue = 0; + sal_uInt16 nValue = 0; if( SvXMLUnitConverter::convertEnum( nValue, rStrImpValue, mpEnumMap ) ) { diff --git a/xmloff/source/style/FillStyleContext.cxx b/xmloff/source/style/FillStyleContext.cxx index 3be50f36e633..945a42aae6e5 100644..100755 --- a/xmloff/source/style/FillStyleContext.cxx +++ b/xmloff/source/style/FillStyleContext.cxx @@ -31,15 +31,15 @@ #include <com/sun/star/container/XNameContainer.hpp> #include "FillStyleContext.hxx" #include <xmloff/xmlimp.hxx> -#include "GradientStyle.hxx" -#include "HatchStyle.hxx" -#include "ImageStyle.hxx" +#include "xmloff/GradientStyle.hxx" +#include "xmloff/HatchStyle.hxx" +#include "xmloff/ImageStyle.hxx" #include "TransGradientStyle.hxx" -#include "MarkerStyle.hxx" -#include "DashStyle.hxx" +#include "xmloff/MarkerStyle.hxx" +#include "xmloff/DashStyle.hxx" #include <xmloff/families.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/XMLBase64ImportContext.hxx> using namespace ::com::sun::star; @@ -91,7 +91,7 @@ void XMLGradientStyleContext::EndElement() {} } -BOOL XMLGradientStyleContext::IsTransient() const +sal_Bool XMLGradientStyleContext::IsTransient() const { return sal_True; } @@ -137,7 +137,7 @@ void XMLHatchStyleContext::EndElement() {} } -BOOL XMLHatchStyleContext::IsTransient() const +sal_Bool XMLHatchStyleContext::IsTransient() const { return sal_True; } @@ -217,7 +217,7 @@ void XMLBitmapStyleContext::EndElement() {} } -BOOL XMLBitmapStyleContext::IsTransient() const +sal_Bool XMLBitmapStyleContext::IsTransient() const { return sal_True; } @@ -264,7 +264,7 @@ void XMLTransGradientStyleContext::EndElement() {} } -BOOL XMLTransGradientStyleContext::IsTransient() const +sal_Bool XMLTransGradientStyleContext::IsTransient() const { return sal_True; } @@ -310,7 +310,7 @@ void XMLMarkerStyleContext::EndElement() {} } -BOOL XMLMarkerStyleContext::IsTransient() const +sal_Bool XMLMarkerStyleContext::IsTransient() const { return sal_True; } @@ -356,7 +356,7 @@ void XMLDashStyleContext::EndElement() {} } -BOOL XMLDashStyleContext::IsTransient() const +sal_Bool XMLDashStyleContext::IsTransient() const { return sal_True; } diff --git a/xmloff/source/style/FillStyleContext.hxx b/xmloff/source/style/FillStyleContext.hxx index 3758fb18ccb6..b047ea42b5ef 100644..100755 --- a/xmloff/source/style/FillStyleContext.hxx +++ b/xmloff/source/style/FillStyleContext.hxx @@ -51,7 +51,7 @@ public: virtual void EndElement(); - virtual BOOL IsTransient() const; + virtual sal_Bool IsTransient() const; }; ////////////////////////////////////////////////////////////////////////////// @@ -72,7 +72,7 @@ public: virtual void EndElement(); - virtual BOOL IsTransient() const; + virtual sal_Bool IsTransient() const; }; ////////////////////////////////////////////////////////////////////////////// @@ -99,7 +99,7 @@ public: virtual void EndElement(); - virtual BOOL IsTransient() const; + virtual sal_Bool IsTransient() const; }; ////////////////////////////////////////////////////////////////////////////// @@ -120,7 +120,7 @@ public: virtual void EndElement(); - virtual BOOL IsTransient() const; + virtual sal_Bool IsTransient() const; }; ////////////////////////////////////////////////////////////////////////////// @@ -141,7 +141,7 @@ public: virtual void EndElement(); - virtual BOOL IsTransient() const; + virtual sal_Bool IsTransient() const; }; ////////////////////////////////////////////////////////////////////////////// @@ -162,7 +162,7 @@ public: virtual void EndElement(); - virtual BOOL IsTransient() const; + virtual sal_Bool IsTransient() const; }; #endif // _XMLOFF_FILLSTYLECONTEXTS_HXX_ diff --git a/xmloff/source/style/GradientStyle.cxx b/xmloff/source/style/GradientStyle.cxx index 8f6e860f8f05..9ba744aea6fd 100644..100755 --- a/xmloff/source/style/GradientStyle.cxx +++ b/xmloff/source/style/GradientStyle.cxx @@ -28,12 +28,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" -#include "GradientStyle.hxx" +#include "xmloff/GradientStyle.hxx" #include <com/sun/star/awt/Gradient.hpp> #include <xmloff/attrlist.hxx> #include <xmloff/nmspmap.hxx> #include <xmloff/xmluconv.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/ustring.hxx> diff --git a/xmloff/source/style/HatchStyle.cxx b/xmloff/source/style/HatchStyle.cxx index c5fe4f764865..c8a2be62a269 100644..100755 --- a/xmloff/source/style/HatchStyle.cxx +++ b/xmloff/source/style/HatchStyle.cxx @@ -28,11 +28,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" -#include "HatchStyle.hxx" +#include "xmloff/HatchStyle.hxx" #include <com/sun/star/drawing/Hatch.hpp> #include <xmloff/nmspmap.hxx> #include <xmloff/xmluconv.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmlexp.hxx> #include <xmloff/xmlimp.hxx> diff --git a/xmloff/source/style/ImageStyle.cxx b/xmloff/source/style/ImageStyle.cxx index 938b753702f2..89f19482ca72 100644..100755 --- a/xmloff/source/style/ImageStyle.cxx +++ b/xmloff/source/style/ImageStyle.cxx @@ -28,12 +28,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" -#include "ImageStyle.hxx" +#include "xmloff/ImageStyle.hxx" #include <com/sun/star/awt/XBitmap.hpp> #include <xmloff/attrlist.hxx> #include <xmloff/nmspmap.hxx> #include <xmloff/xmluconv.hxx> -#include"xmlnmspe.hxx" +#include"xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmlexp.hxx> #include <xmloff/xmlimp.hxx> diff --git a/xmloff/source/style/MarkerStyle.cxx b/xmloff/source/style/MarkerStyle.cxx index d70b04160f49..1235d9f18483 100644..100755 --- a/xmloff/source/style/MarkerStyle.cxx +++ b/xmloff/source/style/MarkerStyle.cxx @@ -28,12 +28,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" -#include "MarkerStyle.hxx" +#include "xmloff/MarkerStyle.hxx" #include "xexptran.hxx" #include <xmloff/attrlist.hxx> #include <xmloff/nmspmap.hxx> #include <xmloff/xmluconv.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmlexp.hxx> #include <xmloff/xmlimp.hxx> @@ -213,7 +213,7 @@ sal_Bool XMLMarkerStyleExport::exportXML( sal_Int32 a, b; sal_Bool bClosed(sal_False); - for(a = 0L; a < nOuterCnt; a++) + for (a = 0; a < nOuterCnt; a++) { drawing::PointSequence* pSequence = pOuterSequence++; const awt::Point *pPoints = pSequence->getConstArray(); @@ -230,7 +230,7 @@ sal_Bool XMLMarkerStyleExport::exportXML( } } - for(b = 0L; b < nPointCount; b++) + for (b = 0; b < nPointCount; b++) { const awt::Point aPoint = pPoints[b]; @@ -260,7 +260,7 @@ sal_Bool XMLMarkerStyleExport::exportXML( drawing::FlagSequence* pOuterFlags = aBezier.Flags.getArray(); SdXMLImExSvgDElement aSvgDElement(aViewBox); - for(a = 0L; a < nOuterCnt; a++) + for (a = 0; a < nOuterCnt; a++) { drawing::PointSequence* pSequence = pOuterSequence++; drawing::FlagSequence* pFlags = pOuterFlags++; diff --git a/xmloff/source/style/MultiPropertySetHelper.cxx b/xmloff/source/style/MultiPropertySetHelper.cxx index dc5e2eee6cc7..dc5e2eee6cc7 100644..100755 --- a/xmloff/source/style/MultiPropertySetHelper.cxx +++ b/xmloff/source/style/MultiPropertySetHelper.cxx diff --git a/xmloff/source/style/NamedBoolPropertyHdl.cxx b/xmloff/source/style/NamedBoolPropertyHdl.cxx index 8f008a65751e..8f008a65751e 100644..100755 --- a/xmloff/source/style/NamedBoolPropertyHdl.cxx +++ b/xmloff/source/style/NamedBoolPropertyHdl.cxx diff --git a/xmloff/source/style/PageHeaderFooterContext.cxx b/xmloff/source/style/PageHeaderFooterContext.cxx index 7ea8a8e42c5c..5661ec44c16a 100644..100755 --- a/xmloff/source/style/PageHeaderFooterContext.cxx +++ b/xmloff/source/style/PageHeaderFooterContext.cxx @@ -35,7 +35,7 @@ // INCLUDE --------------------------------------------------------------- #include "PageHeaderFooterContext.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include "PagePropertySetContext.hxx" @@ -46,7 +46,7 @@ using ::xmloff::token::XML_HEADER_FOOTER_PROPERTIES; //------------------------------------------------------------------ PageHeaderFooterContext::PageHeaderFooterContext( SvXMLImport& rImport, - USHORT nPrfx, + sal_uInt16 nPrfx, const rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>&, @@ -67,7 +67,7 @@ PageHeaderFooterContext::~PageHeaderFooterContext() { } -SvXMLImportContext *PageHeaderFooterContext::CreateChildContext( USHORT nPrefix, +SvXMLImportContext *PageHeaderFooterContext::CreateChildContext( sal_uInt16 nPrefix, const rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) diff --git a/xmloff/source/style/PageHeaderFooterContext.hxx b/xmloff/source/style/PageHeaderFooterContext.hxx index 53bab9a94bea..b47b99577ccd 100644..100755 --- a/xmloff/source/style/PageHeaderFooterContext.hxx +++ b/xmloff/source/style/PageHeaderFooterContext.hxx @@ -40,7 +40,7 @@ class PageHeaderFooterContext : public SvXMLImportContext public: - PageHeaderFooterContext( SvXMLImport& rImport, USHORT nPrfx, + PageHeaderFooterContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, @@ -51,7 +51,7 @@ public: virtual ~PageHeaderFooterContext(); - virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, + virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/xmloff/source/style/PageMasterExportPropMapper.cxx b/xmloff/source/style/PageMasterExportPropMapper.cxx index 38c74d128356..38c74d128356 100644..100755 --- a/xmloff/source/style/PageMasterExportPropMapper.cxx +++ b/xmloff/source/style/PageMasterExportPropMapper.cxx diff --git a/xmloff/source/style/PageMasterExportPropMapper.hxx b/xmloff/source/style/PageMasterExportPropMapper.hxx index 20617b0726de..20617b0726de 100644..100755 --- a/xmloff/source/style/PageMasterExportPropMapper.hxx +++ b/xmloff/source/style/PageMasterExportPropMapper.hxx diff --git a/xmloff/source/style/PageMasterImportContext.cxx b/xmloff/source/style/PageMasterImportContext.cxx index f1b2bd7af057..fbaff859da3f 100644..100755 --- a/xmloff/source/style/PageMasterImportContext.cxx +++ b/xmloff/source/style/PageMasterImportContext.cxx @@ -31,7 +31,7 @@ #include "PageMasterImportContext.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include "PageMasterPropHdl.hxx" #include "PagePropertySetContext.hxx" diff --git a/xmloff/source/style/PageMasterImportPropMapper.cxx b/xmloff/source/style/PageMasterImportPropMapper.cxx index ad3350767d96..ad3350767d96 100644..100755 --- a/xmloff/source/style/PageMasterImportPropMapper.cxx +++ b/xmloff/source/style/PageMasterImportPropMapper.cxx diff --git a/xmloff/source/style/PageMasterImportPropMapper.hxx b/xmloff/source/style/PageMasterImportPropMapper.hxx index e386104ed8c9..e386104ed8c9 100644..100755 --- a/xmloff/source/style/PageMasterImportPropMapper.hxx +++ b/xmloff/source/style/PageMasterImportPropMapper.hxx diff --git a/xmloff/source/style/PageMasterPropHdl.cxx b/xmloff/source/style/PageMasterPropHdl.cxx index 4fb090f32662..4fb090f32662 100644..100755 --- a/xmloff/source/style/PageMasterPropHdl.cxx +++ b/xmloff/source/style/PageMasterPropHdl.cxx diff --git a/xmloff/source/style/PageMasterPropHdl.hxx b/xmloff/source/style/PageMasterPropHdl.hxx index b2e1b6ade887..b2e1b6ade887 100644..100755 --- a/xmloff/source/style/PageMasterPropHdl.hxx +++ b/xmloff/source/style/PageMasterPropHdl.hxx diff --git a/xmloff/source/style/PageMasterPropHdlFactory.cxx b/xmloff/source/style/PageMasterPropHdlFactory.cxx index 3ff8a9c1a75d..3ff8a9c1a75d 100644..100755 --- a/xmloff/source/style/PageMasterPropHdlFactory.cxx +++ b/xmloff/source/style/PageMasterPropHdlFactory.cxx diff --git a/xmloff/source/style/PageMasterPropHdlFactory.hxx b/xmloff/source/style/PageMasterPropHdlFactory.hxx index 10b796c59640..10b796c59640 100644..100755 --- a/xmloff/source/style/PageMasterPropHdlFactory.hxx +++ b/xmloff/source/style/PageMasterPropHdlFactory.hxx diff --git a/xmloff/source/style/PageMasterPropMapper.cxx b/xmloff/source/style/PageMasterPropMapper.cxx index 97159c698f9c..97159c698f9c 100644..100755 --- a/xmloff/source/style/PageMasterPropMapper.cxx +++ b/xmloff/source/style/PageMasterPropMapper.cxx diff --git a/xmloff/source/style/PageMasterPropMapper.hxx b/xmloff/source/style/PageMasterPropMapper.hxx index 2b48501b75d7..2b48501b75d7 100644..100755 --- a/xmloff/source/style/PageMasterPropMapper.hxx +++ b/xmloff/source/style/PageMasterPropMapper.hxx diff --git a/xmloff/source/style/PageMasterStyleMap.cxx b/xmloff/source/style/PageMasterStyleMap.cxx index 95cf66dc5c9d..a593744fd4ae 100644..100755 --- a/xmloff/source/style/PageMasterStyleMap.cxx +++ b/xmloff/source/style/PageMasterStyleMap.cxx @@ -30,7 +30,7 @@ #include "precompiled_xmloff.hxx" #include <xmloff/PageMasterStyleMap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> using namespace ::xmloff::token; diff --git a/xmloff/source/style/PagePropertySetContext.cxx b/xmloff/source/style/PagePropertySetContext.cxx index a17e124fa2ee..a17e124fa2ee 100644..100755 --- a/xmloff/source/style/PagePropertySetContext.cxx +++ b/xmloff/source/style/PagePropertySetContext.cxx diff --git a/xmloff/source/style/PagePropertySetContext.hxx b/xmloff/source/style/PagePropertySetContext.hxx index ebe8718a8e0b..cfa2e554f77b 100644..100755 --- a/xmloff/source/style/PagePropertySetContext.hxx +++ b/xmloff/source/style/PagePropertySetContext.hxx @@ -56,7 +56,7 @@ public: virtual ~PagePropertySetContext(); using SvXMLPropertySetContext::CreateChildContext; - virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, + virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ::std::vector< XMLPropertyState > &rProperties, diff --git a/xmloff/source/style/SinglePropertySetInfoCache.cxx b/xmloff/source/style/SinglePropertySetInfoCache.cxx index 6282828e162f..6282828e162f 100644..100755 --- a/xmloff/source/style/SinglePropertySetInfoCache.cxx +++ b/xmloff/source/style/SinglePropertySetInfoCache.cxx diff --git a/xmloff/source/style/StyleMap.cxx b/xmloff/source/style/StyleMap.cxx index 66b9453f4bb8..66b9453f4bb8 100644..100755 --- a/xmloff/source/style/StyleMap.cxx +++ b/xmloff/source/style/StyleMap.cxx diff --git a/xmloff/source/style/TransGradientStyle.cxx b/xmloff/source/style/TransGradientStyle.cxx index 7f90d0e73c47..458ebd038368 100644..100755 --- a/xmloff/source/style/TransGradientStyle.cxx +++ b/xmloff/source/style/TransGradientStyle.cxx @@ -33,7 +33,7 @@ #include <xmloff/attrlist.hxx> #include <xmloff/nmspmap.hxx> #include <xmloff/xmluconv.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <rtl/ustrbuf.hxx> #include <rtl/ustring.hxx> #include <tools/debug.hxx> @@ -170,7 +170,7 @@ sal_Bool XMLTransGradientStyleImport::importXML( sal_Int32 aStartTransparency; SvXMLUnitConverter::convertPercent( aStartTransparency, rStrValue ); - UINT8 n = sal::static_int_cast< UINT8 >( + sal_uInt8 n = sal::static_int_cast< sal_uInt8 >( ( (100 - aStartTransparency) * 255 ) / 100 ); Color aColor( n, n, n ); @@ -182,7 +182,7 @@ sal_Bool XMLTransGradientStyleImport::importXML( sal_Int32 aEndTransparency; SvXMLUnitConverter::convertPercent( aEndTransparency, rStrValue ); - UINT8 n = sal::static_int_cast< UINT8 >( + sal_uInt8 n = sal::static_int_cast< sal_uInt8 >( ( (100 - aEndTransparency) * 255 ) / 100 ); Color aColor( n, n, n ); diff --git a/xmloff/source/style/VisAreaContext.cxx b/xmloff/source/style/VisAreaContext.cxx index 8517fd3e6b53..727d09293025 100644..100755 --- a/xmloff/source/style/VisAreaContext.cxx +++ b/xmloff/source/style/VisAreaContext.cxx @@ -33,9 +33,9 @@ // INCLUDE --------------------------------------------------------------- -#include "VisAreaContext.hxx" +#include "xmloff/VisAreaContext.hxx" #include <xmloff/xmltoken.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/xmlimp.hxx> @@ -47,7 +47,7 @@ using namespace ::xmloff::token; //------------------------------------------------------------------ XMLVisAreaContext::XMLVisAreaContext( SvXMLImport& rImport, - USHORT nPrfx, + sal_uInt16 nPrfx, const rtl::OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, Rectangle& rRect, const MapUnit aMapUnit ) : @@ -63,7 +63,7 @@ XMLVisAreaContext::XMLVisAreaContext( SvXMLImport& rImport, } XMLVisAreaContext::XMLVisAreaContext( SvXMLImport& rImport, - USHORT nPrfx, + sal_uInt16 nPrfx, const rtl::OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ::com::sun::star::awt::Rectangle& rRect, const sal_Int16 nMeasureUnit ) : @@ -89,7 +89,7 @@ void XMLVisAreaContext::process( const uno::Reference< xml::sax::XAttributeList> { rtl::OUString sAttrName = xAttrList->getNameByIndex( i ); rtl::OUString aLocalName; - USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( + sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); rtl::OUString sValue = xAttrList->getValueByIndex( i ); @@ -119,7 +119,7 @@ void XMLVisAreaContext::process( const uno::Reference< xml::sax::XAttributeList> } } -SvXMLImportContext *XMLVisAreaContext::CreateChildContext( USHORT nPrefix, +SvXMLImportContext *XMLVisAreaContext::CreateChildContext( sal_uInt16 nPrefix, const rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& ) diff --git a/xmloff/source/style/VisAreaExport.cxx b/xmloff/source/style/VisAreaExport.cxx index 61d7b425557e..5ed8dbb2a801 100644..100755 --- a/xmloff/source/style/VisAreaExport.cxx +++ b/xmloff/source/style/VisAreaExport.cxx @@ -29,9 +29,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" #include <com/sun/star/awt/Rectangle.hpp> -#include "VisAreaExport.hxx" +#include "xmloff/VisAreaExport.hxx" #include <xmloff/xmlexp.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> diff --git a/xmloff/source/style/WordWrapPropertyHdl.cxx b/xmloff/source/style/WordWrapPropertyHdl.cxx index c7fc2b26c8b0..c7fc2b26c8b0 100644..100755 --- a/xmloff/source/style/WordWrapPropertyHdl.cxx +++ b/xmloff/source/style/WordWrapPropertyHdl.cxx diff --git a/xmloff/source/style/XMLBackgroundImageContext.cxx b/xmloff/source/style/XMLBackgroundImageContext.cxx index 2af2991d2b34..4f3bd37d8a21 100644..100755 --- a/xmloff/source/style/XMLBackgroundImageContext.cxx +++ b/xmloff/source/style/XMLBackgroundImageContext.cxx @@ -32,7 +32,7 @@ #include <com/sun/star/io/XOutputStream.hpp> #include <xmloff/xmltkmap.hxx> #include <xmloff/xmluconv.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/nmspmap.hxx> diff --git a/xmloff/source/style/XMLBackgroundImageExport.cxx b/xmloff/source/style/XMLBackgroundImageExport.cxx index 8ba33e6acbeb..adeb55009ea4 100644..100755 --- a/xmloff/source/style/XMLBackgroundImageExport.cxx +++ b/xmloff/source/style/XMLBackgroundImageExport.cxx @@ -30,7 +30,7 @@ #include "precompiled_xmloff.hxx" #include <com/sun/star/style/GraphicLocation.hpp> -#include <xmlnmspe.hxx> +#include <xmloff/xmlnmspe.hxx> #include <xmloff/xmltoken.hxx> #include <rtl/ustrbuf.hxx> #include <xmloff/xmlexp.hxx> diff --git a/xmloff/source/style/XMLBitmapLogicalSizePropertyHandler.cxx b/xmloff/source/style/XMLBitmapLogicalSizePropertyHandler.cxx index 72fedc3c2081..72fedc3c2081 100644..100755 --- a/xmloff/source/style/XMLBitmapLogicalSizePropertyHandler.cxx +++ b/xmloff/source/style/XMLBitmapLogicalSizePropertyHandler.cxx diff --git a/xmloff/source/style/XMLBitmapRepeatOffsetPropertyHandler.cxx b/xmloff/source/style/XMLBitmapRepeatOffsetPropertyHandler.cxx index 6f7143d62da3..6f7143d62da3 100644..100755 --- a/xmloff/source/style/XMLBitmapRepeatOffsetPropertyHandler.cxx +++ b/xmloff/source/style/XMLBitmapRepeatOffsetPropertyHandler.cxx diff --git a/xmloff/source/style/XMLClipPropertyHandler.cxx b/xmloff/source/style/XMLClipPropertyHandler.cxx index af36556370ec..af36556370ec 100644..100755 --- a/xmloff/source/style/XMLClipPropertyHandler.cxx +++ b/xmloff/source/style/XMLClipPropertyHandler.cxx diff --git a/xmloff/source/style/XMLConstantsPropertyHandler.cxx b/xmloff/source/style/XMLConstantsPropertyHandler.cxx index 55c62fc8d810..55c62fc8d810 100644..100755 --- a/xmloff/source/style/XMLConstantsPropertyHandler.cxx +++ b/xmloff/source/style/XMLConstantsPropertyHandler.cxx diff --git a/xmloff/source/style/XMLElementPropertyContext.cxx b/xmloff/source/style/XMLElementPropertyContext.cxx index 1a9bf554a8e5..1a9bf554a8e5 100644..100755 --- a/xmloff/source/style/XMLElementPropertyContext.cxx +++ b/xmloff/source/style/XMLElementPropertyContext.cxx diff --git a/xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx b/xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx index ac23035e9683..ac23035e9683 100644..100755 --- a/xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx +++ b/xmloff/source/style/XMLFillBitmapSizePropertyHandler.cxx diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx b/xmloff/source/style/XMLFontAutoStylePool.cxx index 003dbca7baa5..fb749e6f4edc 100644..100755 --- a/xmloff/source/style/XMLFontAutoStylePool.cxx +++ b/xmloff/source/style/XMLFontAutoStylePool.cxx @@ -28,12 +28,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" - #include <tools/debug.hxx> #include <svl/cntnrsrt.hxx> #include <tools/fontenum.hxx> - -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> #include "fonthdl.hxx" @@ -175,7 +173,7 @@ OUString XMLFontAutoStylePool::Add( OUString sPoolName; XMLFontAutoStylePoolEntry_Impl aTmp( rFamilyName, rStyleName, nFamily, nPitch, eEnc ); - ULONG nPos; + sal_uLong nPos; if( pPool->Seek_Entry( &aTmp, &nPos ) ) { sPoolName = pPool->GetObject( nPos )->GetName(); @@ -229,7 +227,7 @@ OUString XMLFontAutoStylePool::Add( OUString sName; XMLFontAutoStylePoolEntry_Impl aTmp( rFamilyName, rStyleName, nFamily, nPitch, eEnc ); - ULONG nPos; + sal_uLong nPos; if( pPool->Seek_Entry( &aTmp, &nPos ) ) { sName = pPool->GetObject( nPos )->GetName(); diff --git a/xmloff/source/style/XMLFontStylesContext.cxx b/xmloff/source/style/XMLFontStylesContext.cxx index 27dfb317b654..d4823ccf03ee 100644..100755 --- a/xmloff/source/style/XMLFontStylesContext.cxx +++ b/xmloff/source/style/XMLFontStylesContext.cxx @@ -35,7 +35,7 @@ #include <rtl/logfile.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include "fonthdl.hxx" #include <xmloff/xmlimp.hxx> diff --git a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx index 49d704549c0c..ae775a96d9f7 100644..100755 --- a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx +++ b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx @@ -31,7 +31,7 @@ #include "XMLFootnoteSeparatorExport.hxx" #include <tools/debug.hxx> #include <xmloff/xmlexp.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmluconv.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmlprmap.hxx> diff --git a/xmloff/source/style/XMLFootnoteSeparatorExport.hxx b/xmloff/source/style/XMLFootnoteSeparatorExport.hxx index 6d268e16e40f..6d268e16e40f 100644..100755 --- a/xmloff/source/style/XMLFootnoteSeparatorExport.hxx +++ b/xmloff/source/style/XMLFootnoteSeparatorExport.hxx diff --git a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx index 6d56c0a34a30..9a6cb47228fd 100644..100755 --- a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx +++ b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx @@ -40,7 +40,7 @@ #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/xmlprmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/nmspmap.hxx> #include <xmloff/maptype.hxx> diff --git a/xmloff/source/style/XMLFootnoteSeparatorImport.hxx b/xmloff/source/style/XMLFootnoteSeparatorImport.hxx index 9c929c15315c..9c929c15315c 100644..100755 --- a/xmloff/source/style/XMLFootnoteSeparatorImport.hxx +++ b/xmloff/source/style/XMLFootnoteSeparatorImport.hxx diff --git a/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx b/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx index 96836b738d7c..96836b738d7c 100644..100755 --- a/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx +++ b/xmloff/source/style/XMLIsPercentagePropertyHandler.cxx diff --git a/xmloff/source/style/XMLPageExport.cxx b/xmloff/source/style/XMLPageExport.cxx index 68fcf192f6de..8df7116fc2cf 100644..100755 --- a/xmloff/source/style/XMLPageExport.cxx +++ b/xmloff/source/style/XMLPageExport.cxx @@ -30,7 +30,7 @@ #include "precompiled_xmloff.hxx" #include <xmloff/XMLPageExport.hxx> #include <tools/debug.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/style/XStyle.hpp> diff --git a/xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx b/xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx index b3f147cbbdcb..b3f147cbbdcb 100644..100755 --- a/xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx +++ b/xmloff/source/style/XMLPercentOrMeasurePropertyHandler.cxx diff --git a/xmloff/source/style/XMLRectangleMembersHandler.cxx b/xmloff/source/style/XMLRectangleMembersHandler.cxx index 9e9fef6d9c96..9e9fef6d9c96 100644..100755 --- a/xmloff/source/style/XMLRectangleMembersHandler.cxx +++ b/xmloff/source/style/XMLRectangleMembersHandler.cxx diff --git a/xmloff/source/style/adjushdl.cxx b/xmloff/source/style/adjushdl.cxx index fd050d028111..fd050d028111 100644..100755 --- a/xmloff/source/style/adjushdl.cxx +++ b/xmloff/source/style/adjushdl.cxx diff --git a/xmloff/source/style/adjushdl.hxx b/xmloff/source/style/adjushdl.hxx index 20a5c04207b5..20a5c04207b5 100644..100755 --- a/xmloff/source/style/adjushdl.hxx +++ b/xmloff/source/style/adjushdl.hxx diff --git a/xmloff/source/style/backhdl.cxx b/xmloff/source/style/backhdl.cxx index e6743dd9609e..e6743dd9609e 100644..100755 --- a/xmloff/source/style/backhdl.cxx +++ b/xmloff/source/style/backhdl.cxx diff --git a/xmloff/source/style/backhdl.hxx b/xmloff/source/style/backhdl.hxx index bef4912cb5e9..bef4912cb5e9 100644..100755 --- a/xmloff/source/style/backhdl.hxx +++ b/xmloff/source/style/backhdl.hxx diff --git a/xmloff/source/style/bordrhdl.cxx b/xmloff/source/style/bordrhdl.cxx index 7800f8ee3eb7..7800f8ee3eb7 100644..100755 --- a/xmloff/source/style/bordrhdl.cxx +++ b/xmloff/source/style/bordrhdl.cxx diff --git a/xmloff/source/style/bordrhdl.hxx b/xmloff/source/style/bordrhdl.hxx index eef72569c715..eef72569c715 100644..100755 --- a/xmloff/source/style/bordrhdl.hxx +++ b/xmloff/source/style/bordrhdl.hxx diff --git a/xmloff/source/style/breakhdl.cxx b/xmloff/source/style/breakhdl.cxx index dacbc0e81be6..dacbc0e81be6 100644..100755 --- a/xmloff/source/style/breakhdl.cxx +++ b/xmloff/source/style/breakhdl.cxx diff --git a/xmloff/source/style/breakhdl.hxx b/xmloff/source/style/breakhdl.hxx index 48c9ca12cc08..48c9ca12cc08 100644..100755 --- a/xmloff/source/style/breakhdl.hxx +++ b/xmloff/source/style/breakhdl.hxx diff --git a/xmloff/source/style/cdouthdl.cxx b/xmloff/source/style/cdouthdl.cxx index cf1577adceee..cf1577adceee 100644..100755 --- a/xmloff/source/style/cdouthdl.cxx +++ b/xmloff/source/style/cdouthdl.cxx diff --git a/xmloff/source/style/cdouthdl.hxx b/xmloff/source/style/cdouthdl.hxx index 46779e10c70c..46779e10c70c 100644..100755 --- a/xmloff/source/style/cdouthdl.hxx +++ b/xmloff/source/style/cdouthdl.hxx diff --git a/xmloff/source/style/chrhghdl.cxx b/xmloff/source/style/chrhghdl.cxx index 354ea985630c..d805d9a1274b 100644..100755 --- a/xmloff/source/style/chrhghdl.cxx +++ b/xmloff/source/style/chrhghdl.cxx @@ -80,7 +80,7 @@ sal_Bool XMLCharHeightHdl::exportXML( OUString& rStrExpValue, const uno::Any& rV float fSize = 0; if( rValue >>= fSize ) { - SvXMLUnitConverter::convertDouble( aOut, (double)fSize, TRUE, MAP_POINT, MAP_POINT ); + SvXMLUnitConverter::convertDouble( aOut, (double)fSize, sal_True, MAP_POINT, MAP_POINT ); aOut.append( sal_Unicode('p')); aOut.append( sal_Unicode('t')); } diff --git a/xmloff/source/style/chrhghdl.hxx b/xmloff/source/style/chrhghdl.hxx index 9d39294eb6c7..9d39294eb6c7 100644..100755 --- a/xmloff/source/style/chrhghdl.hxx +++ b/xmloff/source/style/chrhghdl.hxx diff --git a/xmloff/source/style/chrlohdl.cxx b/xmloff/source/style/chrlohdl.cxx index a7fedf6456a4..a7fedf6456a4 100644..100755 --- a/xmloff/source/style/chrlohdl.cxx +++ b/xmloff/source/style/chrlohdl.cxx diff --git a/xmloff/source/style/chrlohdl.hxx b/xmloff/source/style/chrlohdl.hxx index 1b1f46b3e08f..1b1f46b3e08f 100644..100755 --- a/xmloff/source/style/chrlohdl.hxx +++ b/xmloff/source/style/chrlohdl.hxx diff --git a/xmloff/source/style/csmaphdl.cxx b/xmloff/source/style/csmaphdl.cxx index 6bbd31057319..6bbd31057319 100644..100755 --- a/xmloff/source/style/csmaphdl.cxx +++ b/xmloff/source/style/csmaphdl.cxx diff --git a/xmloff/source/style/csmaphdl.hxx b/xmloff/source/style/csmaphdl.hxx index d437d1a7e559..d437d1a7e559 100644..100755 --- a/xmloff/source/style/csmaphdl.hxx +++ b/xmloff/source/style/csmaphdl.hxx diff --git a/xmloff/source/style/durationhdl.cxx b/xmloff/source/style/durationhdl.cxx index d25dcb6f911d..d25dcb6f911d 100644..100755 --- a/xmloff/source/style/durationhdl.cxx +++ b/xmloff/source/style/durationhdl.cxx diff --git a/xmloff/source/style/durationhdl.hxx b/xmloff/source/style/durationhdl.hxx index 356c5ddf5df1..356c5ddf5df1 100644..100755 --- a/xmloff/source/style/durationhdl.hxx +++ b/xmloff/source/style/durationhdl.hxx diff --git a/xmloff/source/style/escphdl.cxx b/xmloff/source/style/escphdl.cxx index f0bbd43f793b..f0bbd43f793b 100644..100755 --- a/xmloff/source/style/escphdl.cxx +++ b/xmloff/source/style/escphdl.cxx diff --git a/xmloff/source/style/escphdl.hxx b/xmloff/source/style/escphdl.hxx index e3021e3b26dc..e3021e3b26dc 100644..100755 --- a/xmloff/source/style/escphdl.hxx +++ b/xmloff/source/style/escphdl.hxx diff --git a/xmloff/source/style/fonthdl.cxx b/xmloff/source/style/fonthdl.cxx index 7324690edfbd..03f0ccfb69ee 100644..100755 --- a/xmloff/source/style/fonthdl.cxx +++ b/xmloff/source/style/fonthdl.cxx @@ -137,12 +137,12 @@ sal_Bool XMLFontFamilyNamePropHdl::exportXML( OUString& rStrExpValue, const uno: if( rValue >>= aStrFamilyName ) { OUStringBuffer sValue( aStrFamilyName.getLength() + 2L ); - sal_Int32 nPos = 0L; + sal_Int32 nPos = 0; do { sal_Int32 nFirst = nPos; nPos = aStrFamilyName.indexOf( sal_Unicode(';'), nPos ); - sal_Int32 nLast = (-1L == nPos ? aStrFamilyName.getLength() : nPos); + sal_Int32 nLast = (-1 == nPos ? aStrFamilyName.getLength() : nPos); // Set position to the character behind the ';', so we won't // forget this. @@ -174,7 +174,7 @@ sal_Bool XMLFontFamilyNamePropHdl::exportXML( OUString& rStrExpValue, const uno: sValue.append( sal_Unicode( ',' ) ); sValue.append( sal_Unicode( ' ' )); } - sal_Int32 nLen = nLast-nFirst+1L; + sal_Int32 nLen = nLast-nFirst+1; OUString sFamily( aStrFamilyName.copy( nFirst, nLen ) ); sal_Bool bQuote = sal_False; for( sal_Int32 i=0; i < nLen; i++ ) @@ -292,7 +292,7 @@ XMLFontPitchPropHdl::~XMLFontPitchPropHdl() sal_Bool XMLFontPitchPropHdl::importXML( const OUString& rStrImpValue, uno::Any& rValue, const SvXMLUnitConverter& ) const { - USHORT eNewPitch; + sal_uInt16 eNewPitch; sal_Bool bRet = SvXMLUnitConverter::convertEnum( eNewPitch, rStrImpValue, aFontPitchMapping ); if( bRet ) rValue <<= (sal_Int16)eNewPitch; diff --git a/xmloff/source/style/fonthdl.hxx b/xmloff/source/style/fonthdl.hxx index 3efb801ae3ac..3efb801ae3ac 100644..100755 --- a/xmloff/source/style/fonthdl.hxx +++ b/xmloff/source/style/fonthdl.hxx diff --git a/xmloff/source/style/impastp1.cxx b/xmloff/source/style/impastp1.cxx index 8cfdcb3d994a..8cfdcb3d994a 100644..100755 --- a/xmloff/source/style/impastp1.cxx +++ b/xmloff/source/style/impastp1.cxx diff --git a/xmloff/source/style/impastp2.cxx b/xmloff/source/style/impastp2.cxx index d152fe0c70bb..d152fe0c70bb 100644..100755 --- a/xmloff/source/style/impastp2.cxx +++ b/xmloff/source/style/impastp2.cxx diff --git a/xmloff/source/style/impastp3.cxx b/xmloff/source/style/impastp3.cxx index 0c51db505b17..0c51db505b17 100644..100755 --- a/xmloff/source/style/impastp3.cxx +++ b/xmloff/source/style/impastp3.cxx diff --git a/xmloff/source/style/impastp4.cxx b/xmloff/source/style/impastp4.cxx index 5596c66c3001..7e4d81efecc0 100644..100755 --- a/xmloff/source/style/impastp4.cxx +++ b/xmloff/source/style/impastp4.cxx @@ -32,7 +32,7 @@ #include <xmloff/xmlaustp.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/attrlist.hxx> #include "impastpl.hxx" #include <xmloff/xmlexppr.hxx> @@ -66,7 +66,7 @@ SvXMLAutoStylePoolP_Impl::SvXMLAutoStylePoolP_Impl( SvXMLExport& rExp) SvXMLAutoStylePoolP_Impl::~SvXMLAutoStylePoolP_Impl() { for (;;) { - XMLFamilyData_Impl* pData = maFamilyList.Remove( ULONG(0) ); + XMLFamilyData_Impl* pData = maFamilyList.Remove( sal_uLong(0) ); if (pData == NULL) { break; } @@ -87,7 +87,7 @@ void SvXMLAutoStylePoolP_Impl::AddFamily( sal_Bool bAsFamily ) { // store family in a list if not already stored - ULONG nPos; + sal_uLong nPos; sal_uInt16 nExportFlags = GetExport().getExportFlags(); sal_Bool bStylesOnly = (nExportFlags & EXPORT_STYLES) != 0 && (nExportFlags & EXPORT_CONTENT) == 0; @@ -115,7 +115,7 @@ void SvXMLAutoStylePoolP_Impl::RegisterName( sal_Int32 nFamily, const OUString& { SvXMLAutoStylePoolNamesP_Impl *pNames = 0; - ULONG nPos; + sal_uLong nPos; XMLFamilyData_Impl aTmp( nFamily ); if( maFamilyList.Seek_Entry( &aTmp, &nPos ) ) pNames = maFamilyList.GetObject( nPos )->mpNameList; @@ -186,7 +186,7 @@ sal_Bool SvXMLAutoStylePoolP_Impl::Add(OUString& rName, sal_Int32 nFamily, bool bDontSeek ) { sal_Bool bRet(sal_False); - ULONG nPos; + sal_uLong nPos; XMLFamilyData_Impl *pFamily = 0; XMLFamilyData_Impl aTemporary( nFamily ); @@ -235,7 +235,7 @@ sal_Bool SvXMLAutoStylePoolP_Impl::AddNamed(const OUString& rName, sal_Int32 nFa { // get family and parent the same way as in Add() sal_Bool bRet(sal_False); - ULONG nPos; + sal_uLong nPos; XMLFamilyData_Impl *pFamily = 0; XMLFamilyData_Impl aTemporary( nFamily ); @@ -274,7 +274,7 @@ sal_Bool SvXMLAutoStylePoolP_Impl::AddNamed(const OUString& rName, sal_Int32 nFa OUString SvXMLAutoStylePoolP_Impl::AddToCache( sal_Int32 nFamily, const OUString& rParent ) { - ULONG nPos; + sal_uLong nPos; XMLFamilyData_Impl *pFamily = 0; XMLFamilyData_Impl aTmp( nFamily ); @@ -305,7 +305,7 @@ OUString SvXMLAutoStylePoolP_Impl::Find( sal_Int32 nFamily, { OUString sName; - ULONG nPos; + sal_uLong nPos; XMLFamilyData_Impl aTemporary( nFamily ); XMLFamilyData_Impl *pFamily = 0; if( maFamilyList.Seek_Entry( &aTemporary, &nPos ) ) @@ -332,7 +332,7 @@ OUString SvXMLAutoStylePoolP_Impl::FindAndRemoveCached( sal_Int32 nFamily ) cons { OUString sName; - ULONG nPos; + sal_uLong nPos; XMLFamilyData_Impl aTmp( nFamily ); XMLFamilyData_Impl *pFamily = 0; if( maFamilyList.Seek_Entry( &aTmp, &nPos ) ) @@ -375,7 +375,7 @@ void SvXMLAutoStylePoolP_Impl::exportXML( sal_uInt32 nCount = 0; // Get list of parents for current family (nFamily) - ULONG nPos; + sal_uLong nPos; XMLFamilyData_Impl aTmp( nFamily ); XMLFamilyData_Impl *pFamily = 0; if( maFamilyList.Seek_Entry( &aTmp, &nPos ) ) diff --git a/xmloff/source/style/impastpl.hxx b/xmloff/source/style/impastpl.hxx index 5c79e2d8cf44..5c79e2d8cf44 100644..100755 --- a/xmloff/source/style/impastpl.hxx +++ b/xmloff/source/style/impastpl.hxx diff --git a/xmloff/source/style/kernihdl.cxx b/xmloff/source/style/kernihdl.cxx index 27ed1a5a318f..27ed1a5a318f 100644..100755 --- a/xmloff/source/style/kernihdl.cxx +++ b/xmloff/source/style/kernihdl.cxx diff --git a/xmloff/source/style/kernihdl.hxx b/xmloff/source/style/kernihdl.hxx index 958aabc3b479..958aabc3b479 100644..100755 --- a/xmloff/source/style/kernihdl.hxx +++ b/xmloff/source/style/kernihdl.hxx diff --git a/xmloff/source/style/lspachdl.cxx b/xmloff/source/style/lspachdl.cxx index 27fa7582cf46..27fa7582cf46 100644..100755 --- a/xmloff/source/style/lspachdl.cxx +++ b/xmloff/source/style/lspachdl.cxx diff --git a/xmloff/source/style/lspachdl.hxx b/xmloff/source/style/lspachdl.hxx index ab1fc8f53541..ab1fc8f53541 100644..100755 --- a/xmloff/source/style/lspachdl.hxx +++ b/xmloff/source/style/lspachdl.hxx diff --git a/xmloff/source/style/makefile.mk b/xmloff/source/style/makefile.mk deleted file mode 100644 index 3436b33b654b..000000000000 --- a/xmloff/source/style/makefile.mk +++ /dev/null @@ -1,219 +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=style - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE: $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -CXXFILES = \ - XMLPercentOrMeasurePropertyHandler.cxx \ - XMLIsPercentagePropertyHandler.cxx \ - XMLRectangleMembersHandler.cxx \ - adjushdl.cxx \ - backhdl.cxx \ - bordrhdl.cxx \ - breakhdl.cxx \ - cdouthdl.cxx \ - chrhghdl.cxx \ - chrlohdl.cxx \ - csmaphdl.cxx \ - escphdl.cxx \ - fonthdl.cxx \ - impastp1.cxx \ - impastp2.cxx \ - impastp3.cxx \ - impastp4.cxx \ - kernihdl.cxx \ - lspachdl.cxx \ - numehelp.cxx \ - opaquhdl.cxx \ - postuhdl.cxx \ - prhdlfac.cxx \ - prstylei.cxx \ - shadwhdl.cxx \ - shdwdhdl.cxx \ - styleexp.cxx \ - tabsthdl.cxx \ - undlihdl.cxx \ - uniref.cxx \ - weighhdl.cxx \ - xmlaustp.cxx \ - xmlbahdl.cxx \ - xmlexppr.cxx \ - xmlimppr.cxx \ - xmlnume.cxx \ - xmlnumfe.cxx \ - xmlnumfi.cxx \ - xmlnumi.cxx \ - xmlprcon.cxx \ - xmlprhdl.cxx \ - xmlprmap.cxx \ - xmlstyle.cxx \ - xmltabe.cxx \ - xmltabi.cxx \ - DashStyle.cxx \ - EnumPropertyHdl.cxx \ - FillStyleContext.cxx \ - GradientStyle.cxx \ - HatchStyle.cxx \ - ImageStyle.cxx \ - MarkerStyle.cxx \ - MultiPropertySetHelper.cxx \ - SinglePropertySetInfoCache.cxx \ - DashStyle.cxx \ - AttributeContainerHandler.cxx \ - NamedBoolPropertyHdl.cxx \ - TransGradientStyle.cxx \ - XMLBackgroundImageContext.cxx \ - XMLBackgroundImageExport.cxx \ - XMLClipPropertyHandler.cxx \ - XMLConstantsPropertyHandler.cxx \ - XMLElementPropertyContext.cxx \ - XMLFootnoteSeparatorExport.cxx \ - XMLFootnoteSeparatorImport.cxx \ - XMLFontAutoStylePool.cxx \ - XMLFontStylesContext.cxx \ - XMLPageExport.cxx \ - PageMasterPropHdl.cxx \ - PageMasterPropHdlFactory.cxx \ - PageMasterStyleMap.cxx \ - PageMasterPropMapper.cxx \ - PageMasterExportPropMapper.cxx \ - PageMasterImportPropMapper.cxx \ - PageMasterImportContext.cxx \ - PagePropertySetContext.cxx \ - PageHeaderFooterContext.cxx \ - StyleMap.cxx \ - XMLBitmapRepeatOffsetPropertyHandler.cxx \ - XMLFillBitmapSizePropertyHandler.cxx \ - XMLBitmapLogicalSizePropertyHandler.cxx \ - durationhdl.cxx \ - VisAreaExport.cxx \ - VisAreaContext.cxx \ - DrawAspectHdl.cxx - - -SLOFILES = \ - $(SLO)$/XMLPercentOrMeasurePropertyHandler.obj \ - $(SLO)$/XMLIsPercentagePropertyHandler.obj \ - $(SLO)$/XMLRectangleMembersHandler.obj \ - $(SLO)$/adjushdl.obj \ - $(SLO)$/backhdl.obj \ - $(SLO)$/bordrhdl.obj \ - $(SLO)$/breakhdl.obj \ - $(SLO)$/cdouthdl.obj \ - $(SLO)$/chrhghdl.obj \ - $(SLO)$/chrlohdl.obj \ - $(SLO)$/csmaphdl.obj \ - $(SLO)$/escphdl.obj \ - $(SLO)$/fonthdl.obj \ - $(SLO)$/impastp1.obj \ - $(SLO)$/impastp2.obj \ - $(SLO)$/impastp3.obj \ - $(SLO)$/impastp4.obj \ - $(SLO)$/kernihdl.obj \ - $(SLO)$/lspachdl.obj \ - $(SLO)$/numehelp.obj \ - $(SLO)$/opaquhdl.obj \ - $(SLO)$/postuhdl.obj \ - $(SLO)$/prhdlfac.obj \ - $(SLO)$/prstylei.obj \ - $(SLO)$/shadwhdl.obj \ - $(SLO)$/shdwdhdl.obj \ - $(SLO)$/styleexp.obj \ - $(SLO)$/tabsthdl.obj \ - $(SLO)$/undlihdl.obj \ - $(SLO)$/uniref.obj \ - $(SLO)$/weighhdl.obj \ - $(SLO)$/xmlaustp.obj \ - $(SLO)$/xmlbahdl.obj \ - $(SLO)$/xmlexppr.obj \ - $(SLO)$/xmlimppr.obj \ - $(SLO)$/xmlnume.obj \ - $(SLO)$/xmlnumfe.obj \ - $(SLO)$/xmlnumfi.obj \ - $(SLO)$/xmlnumi.obj \ - $(SLO)$/xmlprcon.obj \ - $(SLO)$/xmlprhdl.obj \ - $(SLO)$/xmlprmap.obj \ - $(SLO)$/xmlstyle.obj \ - $(SLO)$/xmltabe.obj \ - $(SLO)$/xmltabi.obj \ - $(SLO)$/DashStyle.obj \ - $(SLO)$/EnumPropertyHdl.obj \ - $(SLO)$/FillStyleContext.obj \ - $(SLO)$/GradientStyle.obj \ - $(SLO)$/HatchStyle.obj \ - $(SLO)$/ImageStyle.obj \ - $(SLO)$/MarkerStyle.obj \ - $(SLO)$/MultiPropertySetHelper.obj \ - $(SLO)$/SinglePropertySetInfoCache.obj \ - $(SLO)$/NamedBoolPropertyHdl.obj \ - $(SLO)$/TransGradientStyle.obj \ - $(SLO)$/XMLBackgroundImageContext.obj \ - $(SLO)$/XMLBackgroundImageExport.obj \ - $(SLO)$/XMLClipPropertyHandler.obj \ - $(SLO)$/XMLConstantsPropertyHandler.obj \ - $(SLO)$/AttributeContainerHandler.obj \ - $(SLO)$/XMLElementPropertyContext.obj \ - $(SLO)$/XMLFootnoteSeparatorExport.obj \ - $(SLO)$/XMLFootnoteSeparatorImport.obj \ - $(SLO)$/XMLFontAutoStylePool.obj \ - $(SLO)$/XMLFontStylesContext.obj \ - $(SLO)$/XMLPageExport.obj \ - $(SLO)$/PageMasterPropHdl.obj \ - $(SLO)$/PageMasterPropHdlFactory.obj \ - $(SLO)$/PageMasterStyleMap.obj \ - $(SLO)$/PageMasterPropMapper.obj \ - $(SLO)$/PageMasterExportPropMapper.obj \ - $(SLO)$/PageMasterImportPropMapper.obj \ - $(SLO)$/PageMasterImportContext.obj \ - $(SLO)$/PagePropertySetContext.obj \ - $(SLO)$/PageHeaderFooterContext.obj \ - $(SLO)$/StyleMap.obj \ - $(SLO)$/WordWrapPropertyHdl.obj \ - $(SLO)$/XMLBitmapRepeatOffsetPropertyHandler.obj \ - $(SLO)$/XMLFillBitmapSizePropertyHandler.obj \ - $(SLO)$/XMLBitmapLogicalSizePropertyHandler.obj \ - $(SLO)$/durationhdl.obj \ - $(SLO)$/VisAreaExport.obj \ - $(SLO)$/VisAreaContext.obj \ - $(SLO)$/DrawAspectHdl.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk diff --git a/xmloff/source/style/numehelp.cxx b/xmloff/source/style/numehelp.cxx index 8a40908407f5..a5c1680ede53 100644..100755 --- a/xmloff/source/style/numehelp.cxx +++ b/xmloff/source/style/numehelp.cxx @@ -29,10 +29,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" -#include "numehelp.hxx" +#include "xmloff/numehelp.hxx" #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmluconv.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmlexp.hxx> diff --git a/xmloff/source/style/opaquhdl.cxx b/xmloff/source/style/opaquhdl.cxx index 8ef05d56894d..8ef05d56894d 100644..100755 --- a/xmloff/source/style/opaquhdl.cxx +++ b/xmloff/source/style/opaquhdl.cxx diff --git a/xmloff/source/style/opaquhdl.hxx b/xmloff/source/style/opaquhdl.hxx index 0c013936fda0..0c013936fda0 100644..100755 --- a/xmloff/source/style/opaquhdl.hxx +++ b/xmloff/source/style/opaquhdl.hxx diff --git a/xmloff/source/style/postuhdl.cxx b/xmloff/source/style/postuhdl.cxx index 6a8c104fca3a..6a8c104fca3a 100644..100755 --- a/xmloff/source/style/postuhdl.cxx +++ b/xmloff/source/style/postuhdl.cxx diff --git a/xmloff/source/style/postuhdl.hxx b/xmloff/source/style/postuhdl.hxx index fffe77ee7f72..fffe77ee7f72 100644..100755 --- a/xmloff/source/style/postuhdl.hxx +++ b/xmloff/source/style/postuhdl.hxx diff --git a/xmloff/source/style/prhdlfac.cxx b/xmloff/source/style/prhdlfac.cxx index b0652788a927..b0652788a927 100644..100755 --- a/xmloff/source/style/prhdlfac.cxx +++ b/xmloff/source/style/prhdlfac.cxx diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx index b96dc754a5fe..c0261eb0852c 100644..100755 --- a/xmloff/source/style/prstylei.cxx +++ b/xmloff/source/style/prstylei.cxx @@ -32,7 +32,7 @@ #include <tools/debug.hxx> #include <set> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmlprcon.hxx> #include <com/sun/star/style/XStyle.hpp> @@ -46,7 +46,7 @@ #include <xmloff/prstylei.hxx> #include <xmloff/attrlist.hxx> -#include "xmlerror.hxx" +#include "xmloff/xmlerror.hxx" using ::rtl::OUString; using ::rtl::OUStringBuffer; diff --git a/xmloff/source/style/shadwhdl.cxx b/xmloff/source/style/shadwhdl.cxx index 03fcb8a4eaf9..03fcb8a4eaf9 100644..100755 --- a/xmloff/source/style/shadwhdl.cxx +++ b/xmloff/source/style/shadwhdl.cxx diff --git a/xmloff/source/style/shadwhdl.hxx b/xmloff/source/style/shadwhdl.hxx index 6cb957778f01..6cb957778f01 100644..100755 --- a/xmloff/source/style/shadwhdl.hxx +++ b/xmloff/source/style/shadwhdl.hxx diff --git a/xmloff/source/style/shdwdhdl.cxx b/xmloff/source/style/shdwdhdl.cxx index c6e2279239db..c6e2279239db 100644..100755 --- a/xmloff/source/style/shdwdhdl.cxx +++ b/xmloff/source/style/shdwdhdl.cxx diff --git a/xmloff/source/style/shdwdhdl.hxx b/xmloff/source/style/shdwdhdl.hxx index aba2f6c2c67a..aba2f6c2c67a 100644..100755 --- a/xmloff/source/style/shdwdhdl.hxx +++ b/xmloff/source/style/shdwdhdl.hxx diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx index 01ee3a49b008..ec9038578faa 100644..100755 --- a/xmloff/source/style/styleexp.cxx +++ b/xmloff/source/style/styleexp.cxx @@ -34,7 +34,7 @@ #include <svl/svstdarr.hxx> #endif #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/attrlist.hxx> @@ -439,7 +439,7 @@ void XMLStyleExport::exportStyleFamily( { if( !bUsed || xStyle->isInUse() ) { - BOOL bExported = exportStyle( xStyle, rXMLFamily, rPropMapper, + sal_Bool bExported = exportStyle( xStyle, rXMLFamily, rPropMapper, xStyles,pPrefix ); if( bUsed && bFirstStyle && bExported ) { diff --git a/xmloff/source/style/tabsthdl.cxx b/xmloff/source/style/tabsthdl.cxx index c4e84b88858c..c4e84b88858c 100644..100755 --- a/xmloff/source/style/tabsthdl.cxx +++ b/xmloff/source/style/tabsthdl.cxx diff --git a/xmloff/source/style/tabsthdl.hxx b/xmloff/source/style/tabsthdl.hxx index 008cbcbf2291..008cbcbf2291 100644..100755 --- a/xmloff/source/style/tabsthdl.hxx +++ b/xmloff/source/style/tabsthdl.hxx diff --git a/xmloff/source/style/undlihdl.cxx b/xmloff/source/style/undlihdl.cxx index 85f72a06cdc8..85f72a06cdc8 100644..100755 --- a/xmloff/source/style/undlihdl.cxx +++ b/xmloff/source/style/undlihdl.cxx diff --git a/xmloff/source/style/undlihdl.hxx b/xmloff/source/style/undlihdl.hxx index 60818cc35657..60818cc35657 100644..100755 --- a/xmloff/source/style/undlihdl.hxx +++ b/xmloff/source/style/undlihdl.hxx diff --git a/xmloff/source/style/uniref.cxx b/xmloff/source/style/uniref.cxx index 342df9fa1a51..342df9fa1a51 100644..100755 --- a/xmloff/source/style/uniref.cxx +++ b/xmloff/source/style/uniref.cxx diff --git a/xmloff/source/style/weighhdl.cxx b/xmloff/source/style/weighhdl.cxx index 85cbb5f7b30d..9955d446e66f 100644..100755 --- a/xmloff/source/style/weighhdl.cxx +++ b/xmloff/source/style/weighhdl.cxx @@ -52,7 +52,7 @@ using namespace ::xmloff::token; struct FontWeightMapper { float fWeight; - USHORT nValue; + sal_uInt16 nValue; }; FontWeightMapper const aFontWeightMap[] = diff --git a/xmloff/source/style/weighhdl.hxx b/xmloff/source/style/weighhdl.hxx index 5ac66dd18aff..5ac66dd18aff 100644..100755 --- a/xmloff/source/style/weighhdl.hxx +++ b/xmloff/source/style/weighhdl.hxx diff --git a/xmloff/source/style/xmlaustp.cxx b/xmloff/source/style/xmlaustp.cxx index 9a32b08dbdab..669a4a169531 100644..100755 --- a/xmloff/source/style/xmlaustp.cxx +++ b/xmloff/source/style/xmlaustp.cxx @@ -35,10 +35,10 @@ #include "impastpl.hxx" #include <xmloff/xmlaustp.hxx> #include <xmloff/families.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmlexp.hxx> -#include "XMLTextListAutoStylePool.hxx" +#include "xmloff/XMLTextListAutoStylePool.hxx" #include <xmloff/PageMasterStyleMap.hxx> #include "PageMasterExportPropMapper.hxx" diff --git a/xmloff/source/style/xmlbahdl.cxx b/xmloff/source/style/xmlbahdl.cxx index af4fcaba8f3c..af4fcaba8f3c 100644..100755 --- a/xmloff/source/style/xmlbahdl.cxx +++ b/xmloff/source/style/xmlbahdl.cxx diff --git a/xmloff/source/style/xmlbahdl.hxx b/xmloff/source/style/xmlbahdl.hxx index 80f75b0159c7..80f75b0159c7 100644..100755 --- a/xmloff/source/style/xmlbahdl.hxx +++ b/xmloff/source/style/xmlbahdl.hxx diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx index 51f62b9f69cc..c13de7e1765d 100644..100755 --- a/xmloff/source/style/xmlexppr.cxx +++ b/xmloff/source/style/xmlexppr.cxx @@ -44,7 +44,7 @@ #include <xmloff/xmltoken.hxx> #include <xmloff/attrlist.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmlexp.hxx> #include <xmloff/xmlprmap.hxx> #include <xmloff/PropertySetInfoHash.hxx> diff --git a/xmloff/source/style/xmlimppr.cxx b/xmloff/source/style/xmlimppr.cxx index 4ba2a107bba6..92747da29722 100644..100755 --- a/xmloff/source/style/xmlimppr.cxx +++ b/xmloff/source/style/xmlimppr.cxx @@ -41,10 +41,10 @@ #include <xmloff/xmlimppr.hxx> #include <xmloff/xmlimp.hxx> -#include "unoatrcn.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/unoatrcn.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> -#include "xmlerror.hxx" +#include "xmloff/xmlerror.hxx" #include <tools/debug.hxx> #include "xmloff/contextid.hxx" @@ -137,7 +137,7 @@ void SvXMLImportPropertyMapper::importXML( sal_Int32 nStartIdx, sal_Int32 nEndIdx ) const { - INT16 nAttr = xAttrList->getLength(); + sal_Int16 nAttr = xAttrList->getLength(); Reference< XNameContainer > xAttrContainer; @@ -145,11 +145,11 @@ void SvXMLImportPropertyMapper::importXML( nStartIdx = 0; if( -1 == nEndIdx ) nEndIdx = maPropMapper->GetEntryCount(); - for( INT16 i=0; i < nAttr; i++ ) + for( sal_Int16 i=0; i < nAttr; i++ ) { const OUString& rAttrName = xAttrList->getNameByIndex( i ); OUString aLocalName, aPrefix, aNamespace; - USHORT nPrefix = rNamespaceMap.GetKeyByAttrName( rAttrName, &aPrefix, + sal_uInt16 nPrefix = rNamespaceMap.GetKeyByAttrName( rAttrName, &aPrefix, &aLocalName, &aNamespace ); if( XML_NAMESPACE_XMLNS == nPrefix ) @@ -369,7 +369,7 @@ bool SvXMLImportPropertyMapper::handleSpecialItem( return mxNextMapper->handleSpecialItem( rProperty, rProperties, rValue, rUnitConverter, rNamespaceMap ); else - return FALSE; + return sal_False; } void SvXMLImportPropertyMapper::FillPropertySequence( diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx index 02e8d69a028e..8e4ead1ccf51 100644..100755 --- a/xmloff/source/style/xmlnume.cxx +++ b/xmloff/source/style/xmlnume.cxx @@ -49,11 +49,11 @@ #include <tools/debug.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> #include "fonthdl.hxx" -#include "XMLTextListAutoStylePool.hxx" +#include "xmloff/XMLTextListAutoStylePool.hxx" #include <xmloff/xmlnume.hxx> #include <xmloff/xmlexp.hxx> #include <tools/fontenum.hxx> @@ -110,7 +110,7 @@ void SvxXMLNumRuleExport::exportLevelStyles( const uno::Reference< ::com::sun::s } } -void SvxXMLNumRuleExport::exportLevelStyle( INT32 nLevel, +void SvxXMLNumRuleExport::exportLevelStyle( sal_Int32 nLevel, const uno::Sequence<beans::PropertyValue>& rProps, sal_Bool bOutline ) { diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx index 3aed2bd40e5c..a867fb53e9cf 100644..100755 --- a/xmloff/source/style/xmlnumfe.cxx +++ b/xmloff/source/style/xmlnumfe.cxx @@ -47,7 +47,7 @@ #include <com/sun/star/i18n/NativeNumberXmlAttributes.hpp> #include <xmloff/xmlnumfe.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmluconv.hxx> #include <xmloff/attrlist.hxx> #include <xmloff/nmspmap.hxx> @@ -800,7 +800,7 @@ xub_StrLen lcl_FindSymbol( const String& sUpperStr, const String& sCurString ) sal_Bool SvXMLNumFmtExport::WriteTextWithCurrency_Impl( const OUString& rString, const ::com::sun::star::lang::Locale& rLocale ) { - // returns TRUE if currency element was written + // returns sal_True if currency element was written sal_Bool bRet = sal_False; @@ -834,7 +834,7 @@ sal_Bool SvXMLNumFmtExport::WriteTextWithCurrency_Impl( const OUString& rString, else AddToTextElement_Impl( rString ); // simple text - return bRet; // TRUE: currency element written + return bRet; // sal_True: currency element written } //------------------------------------------------------------------------- @@ -876,7 +876,7 @@ sal_Bool lcl_IsInEmbedded( const SvXMLEmbeddedTextEntryArr& rEmbeddedEntries, sa return sal_False; // not found } -BOOL lcl_IsDefaultDateFormat( const SvNumberformat& rFormat, sal_Bool bSystemDate, NfIndexTableOffset eBuiltIn ) +sal_Bool lcl_IsDefaultDateFormat( const SvNumberformat& rFormat, sal_Bool bSystemDate, NfIndexTableOffset eBuiltIn ) { // make an extra loop to collect date elements, to check if it is a default format // before adding the automatic-order attribute @@ -937,7 +937,7 @@ BOOL lcl_IsDefaultDateFormat( const SvNumberformat& rFormat, sal_Bool bSystemDat } if ( bDateNoDefault ) - return FALSE; // additional elements + return sal_False; // additional elements else { NfIndexTableOffset eFound = (NfIndexTableOffset) SvXMLNumFmtDefaults::GetDefaultDateFormat( @@ -1046,7 +1046,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt // automatic ordering for currency and date formats // only used for some built-in formats - BOOL bAutoOrder = ( eBuiltIn == NF_CURRENCY_1000INT || eBuiltIn == NF_CURRENCY_1000DEC2 || + sal_Bool bAutoOrder = ( eBuiltIn == NF_CURRENCY_1000INT || eBuiltIn == NF_CURRENCY_1000DEC2 || eBuiltIn == NF_CURRENCY_1000INT_RED || eBuiltIn == NF_CURRENCY_1000DEC2_RED || eBuiltIn == NF_CURRENCY_1000DEC2_DASHED || eBuiltIn == NF_DATE_SYSTEM_SHORT || eBuiltIn == NF_DATE_SYSTEM_LONG || @@ -1059,16 +1059,16 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt // format source (for date and time formats) // only used for some built-in formats - BOOL bSystemDate = ( eBuiltIn == NF_DATE_SYSTEM_SHORT || + sal_Bool bSystemDate = ( eBuiltIn == NF_DATE_SYSTEM_SHORT || eBuiltIn == NF_DATE_SYSTEM_LONG || eBuiltIn == NF_DATETIME_SYSTEM_SHORT_HHMM ); - BOOL bLongSysDate = ( eBuiltIn == NF_DATE_SYSTEM_LONG ); + sal_Bool bLongSysDate = ( eBuiltIn == NF_DATE_SYSTEM_LONG ); // check if the format definition matches the key if ( bAutoOrder && ( nFmtType == NUMBERFORMAT_DATE || nFmtType == NUMBERFORMAT_DATETIME ) && !lcl_IsDefaultDateFormat( rFormat, bSystemDate, eBuiltIn ) ) { - bAutoOrder = bSystemDate = bLongSysDate = FALSE; // don't write automatic-order attribute then + bAutoOrder = bSystemDate = bLongSysDate = sal_False; // don't write automatic-order attribute then } if ( bAutoOrder && @@ -1183,7 +1183,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt if ( bExpFound && pElemStr ) nExpDigits += pElemStr->Len(); else if ( !bDecDashes && pElemStr && pElemStr->GetChar(0) == '-' ) - bDecDashes = TRUE; + bDecDashes = sal_True; else if ( !bVarDecimals && !bInInteger && pElemStr && pElemStr->GetChar(0) == '#' ) { // If the decimal digits string starts with a '#', variable @@ -1206,7 +1206,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt bInInteger = sal_False; break; case NF_SYMBOLTYPE_CURRENCY: - bCurrFound = TRUE; + bCurrFound = sal_True; break; case NF_SYMBOLTYPE_CURREXT: if (pElemStr) diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx index 5dc4f27ecd2e..a09c88233066 100644..100755 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -43,7 +43,7 @@ #include <xmloff/xmlnumfi.hxx> #include <xmloff/xmltkmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmlictxt.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/xmluconv.hxx> @@ -81,8 +81,8 @@ struct SvXMLEmbeddedElement nFormatPos(nFP), aText(rT) {} // comparison operators for PTRARR sorting - sorted by position - BOOL operator ==( const SvXMLEmbeddedElement& r ) const { return nFormatPos == r.nFormatPos; } - BOOL operator < ( const SvXMLEmbeddedElement& r ) const { return nFormatPos < r.nFormatPos; } + sal_Bool operator ==( const SvXMLEmbeddedElement& r ) const { return nFormatPos == r.nFormatPos; } + sal_Bool operator < ( const SvXMLEmbeddedElement& r ) const { return nFormatPos < r.nFormatPos; } }; typedef SvXMLEmbeddedElement* SvXMLEmbeddedElementPtr; @@ -154,14 +154,14 @@ class SvXMLNumFmtElementContext : public SvXMLImportContext rtl::OUString sCalendar; public: - SvXMLNumFmtElementContext( SvXMLImport& rImport, USHORT nPrfx, + SvXMLNumFmtElementContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName, SvXMLNumFormatContext& rParentContext, sal_uInt16 nNewType, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual ~SvXMLNumFmtElementContext(); - virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, + virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -179,14 +179,14 @@ class SvXMLNumFmtEmbeddedTextContext : public SvXMLImportContext sal_Int32 nTextPosition; public: - SvXMLNumFmtEmbeddedTextContext( SvXMLImport& rImport, USHORT nPrfx, + SvXMLNumFmtEmbeddedTextContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName, SvXMLNumFmtElementContext& rParentContext, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual ~SvXMLNumFmtEmbeddedTextContext(); - virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, + virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -202,14 +202,14 @@ class SvXMLNumFmtMapContext : public SvXMLImportContext rtl::OUString sName; public: - SvXMLNumFmtMapContext( SvXMLImport& rImport, USHORT nPrfx, + SvXMLNumFmtMapContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName, SvXMLNumFormatContext& rParentContext, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual ~SvXMLNumFmtMapContext(); - virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, + virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -225,14 +225,14 @@ class SvXMLNumFmtPropContext : public SvXMLImportContext sal_Bool bColSet; public: - SvXMLNumFmtPropContext( SvXMLImport& rImport, USHORT nPrfx, + SvXMLNumFmtPropContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName, SvXMLNumFormatContext& rParentContext, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual ~SvXMLNumFmtPropContext(); - virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, + virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -414,8 +414,8 @@ SvXMLNumImpData::~SvXMLNumImpData() sal_uInt32 SvXMLNumImpData::GetKeyForName( const rtl::OUString& rName ) { - USHORT nCount = aNameEntries.Count(); - for (USHORT i=0; i<nCount; i++) + sal_uInt16 nCount = aNameEntries.Count(); + for (sal_uInt16 i=0; i<nCount; i++) { const SvXMLNumFmtEntry* pObj = aNameEntries[i]; if ( pObj->aName == rName ) @@ -431,8 +431,8 @@ void SvXMLNumImpData::AddKey( sal_uInt32 nKey, const rtl::OUString& rName, sal_B // if there is already an entry for this key without the bRemoveAfterUse flag, // clear the flag for this entry, too - USHORT nCount = aNameEntries.Count(); - for (USHORT i=0; i<nCount; i++) + sal_uInt16 nCount = aNameEntries.Count(); + for (sal_uInt16 i=0; i<nCount; i++) { SvXMLNumFmtEntry* pObj = aNameEntries[i]; if ( pObj->nKey == nKey && !pObj->bRemoveAfterUse ) @@ -454,8 +454,8 @@ void SvXMLNumImpData::AddKey( sal_uInt32 nKey, const rtl::OUString& rName, sal_B void SvXMLNumImpData::SetUsed( sal_uInt32 nKey ) { - USHORT nCount = aNameEntries.Count(); - for (USHORT i=0; i<nCount; i++) + sal_uInt16 nCount = aNameEntries.Count(); + for (sal_uInt16 i=0; i<nCount; i++) { SvXMLNumFmtEntry* pObj = aNameEntries[i]; if ( pObj->nKey == nKey ) @@ -478,8 +478,8 @@ void SvXMLNumImpData::RemoveVolatileFormats() if ( !pFormatter ) return; - USHORT nCount = aNameEntries.Count(); - for (USHORT i=0; i<nCount; i++) + sal_uInt16 nCount = aNameEntries.Count(); + for (sal_uInt16 i=0; i<nCount; i++) { const SvXMLNumFmtEntry* pObj = aNameEntries[i]; if ( pObj->bRemoveAfterUse ) @@ -622,7 +622,7 @@ const LocaleDataWrapper& SvXMLNumImpData::GetLocaleData( LanguageType nLang ) // SvXMLNumFmtMapContext::SvXMLNumFmtMapContext( SvXMLImport& rImport, - USHORT nPrfx, const rtl::OUString& rLName, + sal_uInt16 nPrfx, const rtl::OUString& rLName, SvXMLNumFormatContext& rParentContext, const uno::Reference<xml::sax::XAttributeList>& xAttrList ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -650,7 +650,7 @@ SvXMLNumFmtMapContext::~SvXMLNumFmtMapContext() } SvXMLImportContext* SvXMLNumFmtMapContext::CreateChildContext( - USHORT nPrfx, const rtl::OUString& rLName, + sal_uInt16 nPrfx, const rtl::OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& ) { // no elements supported - use default context @@ -673,7 +673,7 @@ void SvXMLNumFmtMapContext::EndElement() // SvXMLNumFmtPropContext::SvXMLNumFmtPropContext( SvXMLImport& rImport, - USHORT nPrfx, const rtl::OUString& rLName, + sal_uInt16 nPrfx, const rtl::OUString& rLName, SvXMLNumFormatContext& rParentContext, const uno::Reference<xml::sax::XAttributeList>& xAttrList ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -697,7 +697,7 @@ SvXMLNumFmtPropContext::~SvXMLNumFmtPropContext() } SvXMLImportContext* SvXMLNumFmtPropContext::CreateChildContext( - USHORT nPrfx, const rtl::OUString& rLName, + sal_uInt16 nPrfx, const rtl::OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& ) { // no elements supported - use default context @@ -721,7 +721,7 @@ void SvXMLNumFmtPropContext::EndElement() // SvXMLNumFmtEmbeddedTextContext::SvXMLNumFmtEmbeddedTextContext( SvXMLImport& rImport, - USHORT nPrfx, const rtl::OUString& rLName, + sal_uInt16 nPrfx, const rtl::OUString& rLName, SvXMLNumFmtElementContext& rParentContext, const uno::Reference<xml::sax::XAttributeList>& xAttrList ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -750,7 +750,7 @@ SvXMLNumFmtEmbeddedTextContext::~SvXMLNumFmtEmbeddedTextContext() } SvXMLImportContext* SvXMLNumFmtEmbeddedTextContext::CreateChildContext( - USHORT nPrfx, const rtl::OUString& rLName, + sal_uInt16 nPrfx, const rtl::OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& ) { // no elements supported - use default context @@ -925,15 +925,15 @@ void lcl_EnquoteIfNecessary( rtl::OUStringBuffer& rContent, const SvXMLNumFormat // SvXMLNumFmtElementContext::SvXMLNumFmtElementContext( SvXMLImport& rImport, - USHORT nPrfx, const rtl::OUString& rLName, + sal_uInt16 nPrfx, const rtl::OUString& rLName, SvXMLNumFormatContext& rParentContext, sal_uInt16 nNewType, const uno::Reference<xml::sax::XAttributeList>& xAttrList ) : SvXMLImportContext( rImport, nPrfx, rLName ), rParent( rParentContext ), nType( nNewType ), nElementLang( LANGUAGE_SYSTEM ), - bLong( FALSE ), - bTextual( FALSE ) + bLong( sal_False ), + bTextual( sal_False ) { OUString sLanguage, sCountry; sal_Int32 nAttrVal; @@ -1021,7 +1021,7 @@ SvXMLNumFmtElementContext::~SvXMLNumFmtElementContext() } SvXMLImportContext* SvXMLNumFmtElementContext::CreateChildContext( - USHORT nPrfx, const rtl::OUString& rLName, + sal_uInt16 nPrfx, const rtl::OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList ) { // only number:number supports number:embedded-text child element @@ -1050,8 +1050,8 @@ void SvXMLNumFmtElementContext::AddEmbeddedElement( sal_Int32 nFormatPos, const // there's already an element at this position - append text to existing element delete pObj; - USHORT nElementCount = aNumInfo.aEmbeddedElements.Count(); - for (USHORT i=0; i<nElementCount; i++) + sal_uInt16 nElementCount = aNumInfo.aEmbeddedElements.Count(); + for (sal_uInt16 i=0; i<nElementCount; i++) { pObj = aNumInfo.aEmbeddedElements[i]; if ( pObj->nFormatPos == nFormatPos ) @@ -1264,7 +1264,7 @@ sal_uInt16 SvXMLNumFmtDefaults::GetDefaultDateFormat( SvXMLDateElementAttributes // SvXMLNumFormatContext::SvXMLNumFormatContext( SvXMLImport& rImport, - USHORT nPrfx, const rtl::OUString& rLName, + sal_uInt16 nPrfx, const rtl::OUString& rLName, SvXMLNumImpData* pNewData, sal_uInt16 nNewType, const uno::Reference<xml::sax::XAttributeList>& xAttrList, SvXMLStylesContext& rStyles ) : @@ -1275,15 +1275,15 @@ SvXMLNumFormatContext::SvXMLNumFormatContext( SvXMLImport& rImport, nType( nNewType ), nKey(-1), nFormatLang( LANGUAGE_SYSTEM ), - bAutoOrder( FALSE ), - bFromSystem( FALSE ), - bTruncate( TRUE ), - bAutoDec( FALSE ), - bAutoInt( FALSE ), - bHasExtraText( FALSE ), - bHasLongDoW( FALSE ), - bHasEra( FALSE ), - bHasDateTime( FALSE ), + bAutoOrder( sal_False ), + bFromSystem( sal_False ), + bTruncate( sal_True ), + bAutoDec( sal_False ), + bAutoInt( sal_False ), + bHasExtraText( sal_False ), + bHasLongDoW( sal_False ), + bHasEra( sal_False ), + bHasDateTime( sal_False ), bRemoveAfterUse( sal_False ), eDateDOW( XML_DEA_NONE ), eDateDay( XML_DEA_NONE ), @@ -1386,7 +1386,7 @@ SvXMLNumFormatContext::SvXMLNumFormatContext( SvXMLImport& rImport, } SvXMLNumFormatContext::SvXMLNumFormatContext( SvXMLImport& rImport, - USHORT nPrfx, const rtl::OUString& rLName, + sal_uInt16 nPrfx, const rtl::OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, const sal_Int32 nTempKey, SvXMLStylesContext& rStyles ) : @@ -1397,15 +1397,15 @@ SvXMLNumFormatContext::SvXMLNumFormatContext( SvXMLImport& rImport, nType( 0 ), nKey(nTempKey), nFormatLang( LANGUAGE_SYSTEM ), - bAutoOrder( FALSE ), - bFromSystem( FALSE ), - bTruncate( TRUE ), - bAutoDec( FALSE ), - bAutoInt( FALSE ), - bHasExtraText( FALSE ), - bHasLongDoW( FALSE ), - bHasEra( FALSE ), - bHasDateTime( FALSE ), + bAutoOrder( sal_False ), + bFromSystem( sal_False ), + bTruncate( sal_True ), + bAutoDec( sal_False ), + bAutoInt( sal_False ), + bHasExtraText( sal_False ), + bHasLongDoW( sal_False ), + bHasEra( sal_False ), + bHasDateTime( sal_False ), bRemoveAfterUse( sal_False ), eDateDOW( XML_DEA_NONE ), eDateDay( XML_DEA_NONE ), @@ -1424,7 +1424,7 @@ SvXMLNumFormatContext::~SvXMLNumFormatContext() } SvXMLImportContext* SvXMLNumFormatContext::CreateChildContext( - USHORT nPrfx, const rtl::OUString& rLName, + sal_uInt16 nPrfx, const rtl::OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList ) { SvXMLImportContext* pContext = NULL; @@ -1752,7 +1752,7 @@ void SvXMLNumFormatContext::AddNumber( const SvXMLNumberInfo& rInfo ) nGenPrec = 0; // generate format without decimals... sal_Bool bGrouping = rInfo.bGrouping; - USHORT nEmbeddedCount = rInfo.aEmbeddedElements.Count(); + sal_uInt16 nEmbeddedCount = rInfo.aEmbeddedElements.Count(); if ( nEmbeddedCount ) bGrouping = sal_False; // grouping and embedded characters can't be used together @@ -1795,7 +1795,7 @@ void SvXMLNumFormatContext::AddNumber( const SvXMLNumberInfo& rInfo ) } // aEmbeddedElements is sorted with ascending positions - loop is from right to left - for (USHORT nElement = 0; nElement < nEmbeddedCount; nElement++) + for (sal_uInt16 nElement = 0; nElement < nEmbeddedCount; nElement++) { const SvXMLEmbeddedElement* pObj = rInfo.aEmbeddedElements[nElement]; sal_Int32 nFormatPos = pObj->nFormatPos; @@ -2127,7 +2127,7 @@ void SvXMLNumFormatContext::AddColor( const Color& rColor ) for ( sal_uInt16 i=0; i<XML_NUMF_COLORCOUNT; i++ ) if ( rColor == aNumFmtStdColors[i] ) { - aColName = OUString( pFormatter->GetKeyword( nFormatLang, sal::static_int_cast< USHORT >(NF_KEY_FIRSTCOLOR + i) ) ); + aColName = OUString( pFormatter->GetKeyword( nFormatLang, sal::static_int_cast< sal_uInt16 >(NF_KEY_FIRSTCOLOR + i) ) ); break; } @@ -2199,7 +2199,7 @@ SvXMLNumFmtHelper::~SvXMLNumFmtHelper() } SvXMLStyleContext* SvXMLNumFmtHelper::CreateChildContext( SvXMLImport& rImport, - USHORT nPrefix, const OUString& rLocalName, + sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, SvXMLStylesContext& rStyles ) { diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx index bb53f968d8b3..c410cb6d5daa 100644..100755 --- a/xmloff/source/style/xmlnumi.cxx +++ b/xmloff/source/style/xmlnumi.cxx @@ -50,12 +50,12 @@ #include <xmloff/xmltkmap.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmlimp.hxx> #include <xmloff/XMLBase64ImportContext.hxx> #include <xmloff/xmltoken.hxx> -#include "i18nmap.hxx" +#include <xmloff/i18nmap.hxx> #include <xmloff/xmluconv.hxx> #include "fonthdl.hxx" #include <xmloff/XMLFontStylesContext.hxx> @@ -364,7 +364,7 @@ SvxXMLListLevelStyleContext_Impl::SvxXMLListLevelStyleContext_Impl( if( nLevel >= 1L ) nLevel--; else - nLevel = 0L; + nLevel = 0; break; case XML_TOK_TEXT_LEVEL_ATTR_STYLE_NAME: sTextStyleName = rValue; @@ -461,7 +461,7 @@ Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties( { sal_Int16 eType; - sal_Int32 nCount = 0L; + sal_Int32 nCount = 0; if( bBullet ) { eType = NumberingType::CHAR_SPECIAL; @@ -470,7 +470,7 @@ Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties( if( bImage ) { eType = NumberingType::BITMAP; - nCount = 15L; + nCount = 15; if( (sImageURL.getLength() > 0L) || xBase64Stream.is() ) nCount++; @@ -480,7 +480,7 @@ Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties( eType = NumberingType::ARABIC; GetImport().GetMM100UnitConverter().convertNumFormat( eType, sNumFormat, sNumLetterSync, sal_True ); - nCount = 15L; + nCount = 15; } if( ( bBullet || bNum ) && nRelSize ) @@ -495,7 +495,7 @@ Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties( if( nCount > 0 ) { beans::PropertyValue *pProps = aPropSeq.getArray(); - sal_Int32 nPos = 0L; + sal_Int32 nPos = 0; pProps[nPos].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_NUMBERINGTYPE )); pProps[nPos++].Value <<= (sal_Int16)eType ; diff --git a/xmloff/source/style/xmlprcon.cxx b/xmloff/source/style/xmlprcon.cxx index 45d19dcc86d3..84c0cee372e3 100644..100755 --- a/xmloff/source/style/xmlprcon.cxx +++ b/xmloff/source/style/xmlprcon.cxx @@ -40,7 +40,7 @@ using namespace ::com::sun::star; using namespace ::std; SvXMLPropertySetContext::SvXMLPropertySetContext( - SvXMLImport& rImp, USHORT nPrfx, + SvXMLImport& rImp, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< xml::sax::XAttributeList >& xAttrList, sal_uInt32 nFam, @@ -65,7 +65,7 @@ SvXMLPropertySetContext::~SvXMLPropertySetContext() } SvXMLImportContext *SvXMLPropertySetContext::CreateChildContext( - USHORT nPrefix, + sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& xAttrList ) { @@ -93,7 +93,7 @@ SvXMLImportContext *SvXMLPropertySetContext::CreateChildContext( SvXMLImportItemMapper with the mid flag MID_FLAG_ELEMENT */ SvXMLImportContext *SvXMLPropertySetContext::CreateChildContext( - USHORT nPrefix, + sal_uInt16 nPrefix, const rtl::OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >&, ::std::vector< XMLPropertyState > &, diff --git a/xmloff/source/style/xmlprhdl.cxx b/xmloff/source/style/xmlprhdl.cxx index b43377c8f70d..b43377c8f70d 100644..100755 --- a/xmloff/source/style/xmlprhdl.cxx +++ b/xmloff/source/style/xmlprhdl.cxx diff --git a/xmloff/source/style/xmlprmap.cxx b/xmloff/source/style/xmlprmap.cxx index 766f25bfa426..766f25bfa426 100644..100755 --- a/xmloff/source/style/xmlprmap.cxx +++ b/xmloff/source/style/xmlprmap.cxx diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx index e1bd865aedf3..c64c783698d4 100644..100755 --- a/xmloff/source/style/xmlstyle.cxx +++ b/xmloff/source/style/xmlstyle.cxx @@ -44,7 +44,7 @@ #include <svl/cntnrsrt.hxx> #include <svl/itemset.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/families.hxx> @@ -211,7 +211,7 @@ void SvXMLStyleContext::Finish( sal_Bool /*bOverwrite*/ ) { } -BOOL SvXMLStyleContext::IsTransient() const +sal_Bool SvXMLStyleContext::IsTransient() const { return sal_False; } @@ -360,7 +360,7 @@ const SvXMLStyleContext *SvXMLStylesContext_Impl::FindStyleChildContext( #endif ((SvXMLStylesContext_Impl *)this)->pIndices = new SvXMLStyleIndices_Impl( - sal::static_int_cast< USHORT >( aStyles.size() ), 5 ); + sal::static_int_cast< sal_uInt16 >( aStyles.size() ), 5 ); for( size_t i = 0; i < aStyles.size(); i++ ) { SvXMLStyleIndex_Impl* pStyleIndex = new SvXMLStyleIndex_Impl( aStyles[ i ] ); @@ -378,7 +378,7 @@ const SvXMLStyleContext *SvXMLStylesContext_Impl::FindStyleChildContext( if( pIndices ) { SvXMLStyleIndex_Impl aIndex( nFamily, rName ); - ULONG nPos = 0; + sal_uLong nPos = 0; if( pIndices->Seek_Entry( &aIndex, &nPos ) ) pStyle = pIndices->GetObject( nPos )->GetStyle(); } diff --git a/xmloff/source/style/xmltabe.cxx b/xmloff/source/style/xmltabe.cxx index c705a42055bd..b4725e6c9837 100644..100755 --- a/xmloff/source/style/xmltabe.cxx +++ b/xmloff/source/style/xmltabe.cxx @@ -34,11 +34,11 @@ #include <com/sun/star/style/TabAlign.hpp> #include <rtl/ustrbuf.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/xmlexp.hxx> -#include "xmltabe.hxx" +#include "xmloff/xmltabe.hxx" using ::rtl::OUString; using ::rtl::OUStringBuffer; diff --git a/xmloff/source/style/xmltabi.cxx b/xmloff/source/style/xmltabi.cxx index 338e1018ca80..a5c92fb5469d 100644..100755 --- a/xmloff/source/style/xmltabi.cxx +++ b/xmloff/source/style/xmltabi.cxx @@ -32,11 +32,11 @@ #include <rtl/ustrbuf.hxx> #include <xmloff/xmltkmap.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include <xmloff/xmlimp.hxx> #include <com/sun/star/style/TabStop.hpp> #include <xmloff/xmltoken.hxx> -#include "i18nmap.hxx" +#include "xmloff/i18nmap.hxx" #include <xmloff/xmluconv.hxx> #include "xmltabi.hxx" |