From 112093daa854b8ad9c722bd647da0a9115b0f7e3 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 16 Apr 2010 23:04:00 +0200 Subject: CWS gnumake2: move delivered header files from xmloff/inc to xmloff/inc/xmloff; removed unused code --- xmloff/source/style/DashStyle.cxx | 4 ++-- xmloff/source/style/FillStyleContext.cxx | 12 ++++++------ xmloff/source/style/GradientStyle.cxx | 4 ++-- xmloff/source/style/HatchStyle.cxx | 4 ++-- xmloff/source/style/ImageStyle.cxx | 4 ++-- xmloff/source/style/MarkerStyle.cxx | 4 ++-- xmloff/source/style/PageHeaderFooterContext.cxx | 2 +- xmloff/source/style/PageMasterImportContext.cxx | 2 +- xmloff/source/style/PageMasterStyleMap.cxx | 2 +- xmloff/source/style/TransGradientStyle.cxx | 2 +- xmloff/source/style/VisAreaContext.cxx | 4 ++-- xmloff/source/style/VisAreaExport.cxx | 4 ++-- xmloff/source/style/WordWrapPropertyHdl.cxx | 2 +- xmloff/source/style/XMLBackgroundImageContext.cxx | 2 +- xmloff/source/style/XMLBackgroundImageExport.cxx | 2 +- xmloff/source/style/XMLClipPropertyHandler.cxx | 2 +- xmloff/source/style/XMLFontAutoStylePool.cxx | 2 +- xmloff/source/style/XMLFontStylesContext.cxx | 2 +- xmloff/source/style/XMLFootnoteSeparatorExport.cxx | 2 +- xmloff/source/style/XMLFootnoteSeparatorImport.cxx | 2 +- xmloff/source/style/XMLPageExport.cxx | 2 +- xmloff/source/style/impastp4.cxx | 2 +- xmloff/source/style/numehelp.cxx | 4 ++-- xmloff/source/style/prstylei.cxx | 4 ++-- xmloff/source/style/styleexp.cxx | 4 ++-- xmloff/source/style/xmlaustp.cxx | 4 ++-- xmloff/source/style/xmlexppr.cxx | 2 +- xmloff/source/style/xmlimppr.cxx | 8 ++++---- xmloff/source/style/xmlnume.cxx | 4 ++-- xmloff/source/style/xmlnumfe.cxx | 2 +- xmloff/source/style/xmlnumfi.cxx | 2 +- xmloff/source/style/xmlnumi.cxx | 4 ++-- xmloff/source/style/xmlstyle.cxx | 2 +- xmloff/source/style/xmltabe.cxx | 4 ++-- xmloff/source/style/xmltabi.cxx | 4 ++-- 35 files changed, 58 insertions(+), 58 deletions(-) (limited to 'xmloff/source/style') diff --git a/xmloff/source/style/DashStyle.cxx b/xmloff/source/style/DashStyle.cxx index f3a40e1b04e4..9532c2b05fc6 100644 --- a/xmloff/source/style/DashStyle.cxx +++ b/xmloff/source/style/DashStyle.cxx @@ -32,11 +32,11 @@ #include "precompiled_xmloff.hxx" #include #include -#include "DashStyle.hxx" +#include "xmloff/DashStyle.hxx" #include #include #include -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include #include #include diff --git a/xmloff/source/style/FillStyleContext.cxx b/xmloff/source/style/FillStyleContext.cxx index 970ed5f5a92b..6d26bced807f 100644 --- a/xmloff/source/style/FillStyleContext.cxx +++ b/xmloff/source/style/FillStyleContext.cxx @@ -33,15 +33,15 @@ #include #include "FillStyleContext.hxx" #include -#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 #include -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include using namespace ::com::sun::star; diff --git a/xmloff/source/style/GradientStyle.cxx b/xmloff/source/style/GradientStyle.cxx index fc3f199f9c50..b737b051083a 100644 --- a/xmloff/source/style/GradientStyle.cxx +++ b/xmloff/source/style/GradientStyle.cxx @@ -30,12 +30,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" -#include "GradientStyle.hxx" +#include "xmloff/GradientStyle.hxx" #include #include #include #include -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include #include #include diff --git a/xmloff/source/style/HatchStyle.cxx b/xmloff/source/style/HatchStyle.cxx index ac40a6ee4c10..8ec80d79a5e2 100644 --- a/xmloff/source/style/HatchStyle.cxx +++ b/xmloff/source/style/HatchStyle.cxx @@ -30,11 +30,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" -#include "HatchStyle.hxx" +#include "xmloff/HatchStyle.hxx" #include #include #include -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include #include #include diff --git a/xmloff/source/style/ImageStyle.cxx b/xmloff/source/style/ImageStyle.cxx index dfae79a1a07d..6ed0aee1c43a 100644 --- a/xmloff/source/style/ImageStyle.cxx +++ b/xmloff/source/style/ImageStyle.cxx @@ -30,12 +30,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" -#include "ImageStyle.hxx" +#include "xmloff/ImageStyle.hxx" #include #include #include #include -#include"xmlnmspe.hxx" +#include"xmloff/xmlnmspe.hxx" #include #include #include diff --git a/xmloff/source/style/MarkerStyle.cxx b/xmloff/source/style/MarkerStyle.cxx index ad7dcb6e1792..b5afcfe2899a 100644 --- a/xmloff/source/style/MarkerStyle.cxx +++ b/xmloff/source/style/MarkerStyle.cxx @@ -30,12 +30,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 #include #include -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include #include #include diff --git a/xmloff/source/style/PageHeaderFooterContext.cxx b/xmloff/source/style/PageHeaderFooterContext.cxx index ce715d03850a..c91fc58086f5 100644 --- a/xmloff/source/style/PageHeaderFooterContext.cxx +++ b/xmloff/source/style/PageHeaderFooterContext.cxx @@ -39,7 +39,7 @@ #ifndef _XMLOFF_PAGEPHEADERFOOTERCONTEXT_HXX #include "PageHeaderFooterContext.hxx" #endif -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include #include "PagePropertySetContext.hxx" diff --git a/xmloff/source/style/PageMasterImportContext.cxx b/xmloff/source/style/PageMasterImportContext.cxx index cc9d42bb0cfd..95b34aa4554d 100644 --- a/xmloff/source/style/PageMasterImportContext.cxx +++ b/xmloff/source/style/PageMasterImportContext.cxx @@ -33,7 +33,7 @@ #include "PageMasterImportContext.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include #include "PageMasterPropHdl.hxx" #include "PagePropertySetContext.hxx" diff --git a/xmloff/source/style/PageMasterStyleMap.cxx b/xmloff/source/style/PageMasterStyleMap.cxx index 4b3bccf69680..8ef64063cddf 100644 --- a/xmloff/source/style/PageMasterStyleMap.cxx +++ b/xmloff/source/style/PageMasterStyleMap.cxx @@ -34,7 +34,7 @@ #ifndef _XMLOFF_PAGEMASTERSTYLEMAP_HXX #include #endif -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include using namespace ::xmloff::token; diff --git a/xmloff/source/style/TransGradientStyle.cxx b/xmloff/source/style/TransGradientStyle.cxx index 297440bcc5eb..e8440e3fa08e 100644 --- a/xmloff/source/style/TransGradientStyle.cxx +++ b/xmloff/source/style/TransGradientStyle.cxx @@ -35,7 +35,7 @@ #include #include #include -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include #include #include diff --git a/xmloff/source/style/VisAreaContext.cxx b/xmloff/source/style/VisAreaContext.cxx index c6f589406738..230faf0b9a55 100644 --- a/xmloff/source/style/VisAreaContext.cxx +++ b/xmloff/source/style/VisAreaContext.cxx @@ -35,9 +35,9 @@ // INCLUDE --------------------------------------------------------------- -#include "VisAreaContext.hxx" +#include "xmloff/VisAreaContext.hxx" #include -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include #include #include diff --git a/xmloff/source/style/VisAreaExport.cxx b/xmloff/source/style/VisAreaExport.cxx index 979a5364b93c..38a709299cdf 100644 --- a/xmloff/source/style/VisAreaExport.cxx +++ b/xmloff/source/style/VisAreaExport.cxx @@ -31,9 +31,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" #include -#include "VisAreaExport.hxx" +#include "xmloff/VisAreaExport.hxx" #include -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include #include #include diff --git a/xmloff/source/style/WordWrapPropertyHdl.cxx b/xmloff/source/style/WordWrapPropertyHdl.cxx index 128efe4a2a8b..a14d83166f77 100644 --- a/xmloff/source/style/WordWrapPropertyHdl.cxx +++ b/xmloff/source/style/WordWrapPropertyHdl.cxx @@ -32,7 +32,7 @@ #include "precompiled_xmloff.hxx" #include #include -#include "xmlkywd.hxx" +#include "xmloff/xmlkywd.hxx" #include #include #include diff --git a/xmloff/source/style/XMLBackgroundImageContext.cxx b/xmloff/source/style/XMLBackgroundImageContext.cxx index e240aa7fcb95..e6aa1a567785 100644 --- a/xmloff/source/style/XMLBackgroundImageContext.cxx +++ b/xmloff/source/style/XMLBackgroundImageContext.cxx @@ -34,7 +34,7 @@ #include #include #include -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include #include #include diff --git a/xmloff/source/style/XMLBackgroundImageExport.cxx b/xmloff/source/style/XMLBackgroundImageExport.cxx index 3c3908ef3243..70eaf32c4aff 100644 --- a/xmloff/source/style/XMLBackgroundImageExport.cxx +++ b/xmloff/source/style/XMLBackgroundImageExport.cxx @@ -32,7 +32,7 @@ #include "precompiled_xmloff.hxx" #include -#include +#include #include #include #include diff --git a/xmloff/source/style/XMLClipPropertyHandler.cxx b/xmloff/source/style/XMLClipPropertyHandler.cxx index b5e61e886f0a..e01f763113c8 100644 --- a/xmloff/source/style/XMLClipPropertyHandler.cxx +++ b/xmloff/source/style/XMLClipPropertyHandler.cxx @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include using ::rtl::OUString; diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx b/xmloff/source/style/XMLFontAutoStylePool.cxx index a5c662ef33a7..54a2f0f3d895 100644 --- a/xmloff/source/style/XMLFontAutoStylePool.cxx +++ b/xmloff/source/style/XMLFontAutoStylePool.cxx @@ -33,7 +33,7 @@ #include #include #include -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include #include #ifndef _XMLOFF_PROPERTYHANDLER_FONTTYPES_HXX diff --git a/xmloff/source/style/XMLFontStylesContext.cxx b/xmloff/source/style/XMLFontStylesContext.cxx index 4de58bbf232e..5793b504182b 100644 --- a/xmloff/source/style/XMLFontStylesContext.cxx +++ b/xmloff/source/style/XMLFontStylesContext.cxx @@ -38,7 +38,7 @@ #include #endif #include -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include #ifndef _XMLOFF_PROPERTYHANDLER_FONTTYPES_HXX #include "fonthdl.hxx" diff --git a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx index a59708ab8055..4ba98dee3505 100644 --- a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx +++ b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx @@ -33,7 +33,7 @@ #include "XMLFootnoteSeparatorExport.hxx" #include #include -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include #include #include diff --git a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx index 4e4c61caeed2..1a074fe9da0f 100644 --- a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx +++ b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx @@ -42,7 +42,7 @@ #include #include #include -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include #include diff --git a/xmloff/source/style/XMLPageExport.cxx b/xmloff/source/style/XMLPageExport.cxx index 8b41be1ef99b..57fd9a2b18c1 100644 --- a/xmloff/source/style/XMLPageExport.cxx +++ b/xmloff/source/style/XMLPageExport.cxx @@ -32,7 +32,7 @@ #include "precompiled_xmloff.hxx" #include #include -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include #include #include diff --git a/xmloff/source/style/impastp4.cxx b/xmloff/source/style/impastp4.cxx index 946b613473db..20d8a147fba0 100644 --- a/xmloff/source/style/impastp4.cxx +++ b/xmloff/source/style/impastp4.cxx @@ -34,7 +34,7 @@ #include #include #include -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include #include "impastpl.hxx" #include diff --git a/xmloff/source/style/numehelp.cxx b/xmloff/source/style/numehelp.cxx index c75207d9e094..64234eea3fbf 100644 --- a/xmloff/source/style/numehelp.cxx +++ b/xmloff/source/style/numehelp.cxx @@ -31,10 +31,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" -#include "numehelp.hxx" +#include "xmloff/numehelp.hxx" #include -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include #include #include diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx index 20aa552886f9..8ed1ba1ce4a0 100644 --- a/xmloff/source/style/prstylei.cxx +++ b/xmloff/source/style/prstylei.cxx @@ -36,7 +36,7 @@ #ifndef __SGI_STL_SET #include #endif -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include #include #include @@ -52,7 +52,7 @@ #include #endif #include -#include "xmlerror.hxx" +#include "xmloff/xmlerror.hxx" using ::rtl::OUString; using ::rtl::OUStringBuffer; diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx index f03c0ac9a78b..c83f99cc10b0 100644 --- a/xmloff/source/style/styleexp.cxx +++ b/xmloff/source/style/styleexp.cxx @@ -36,13 +36,13 @@ #include #endif #include -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include #ifndef _XMLOFF_XMLITMAP_HXX //#include "xmlitmap.hxx" #endif #include -#include "xmlkywd.hxx" +#include "xmloff/xmlkywd.hxx" #include #include #include diff --git a/xmloff/source/style/xmlaustp.cxx b/xmloff/source/style/xmlaustp.cxx index 32c53ceb724a..51da6b94850f 100644 --- a/xmloff/source/style/xmlaustp.cxx +++ b/xmloff/source/style/xmlaustp.cxx @@ -37,10 +37,10 @@ #include "impastpl.hxx" #include #include -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include #include -#include "XMLTextListAutoStylePool.hxx" +#include "xmloff/XMLTextListAutoStylePool.hxx" #ifndef _XMLOFF_PAGEMASTERSTYLEMAP_HXX #include diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx index 05d85e74d1a7..8fccb1aa650e 100644 --- a/xmloff/source/style/xmlexppr.cxx +++ b/xmloff/source/style/xmlexppr.cxx @@ -46,7 +46,7 @@ #include #include #include -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include #include #include diff --git a/xmloff/source/style/xmlimppr.cxx b/xmloff/source/style/xmlimppr.cxx index 71ac9c5aac4c..5b923ab7cf7d 100644 --- a/xmloff/source/style/xmlimppr.cxx +++ b/xmloff/source/style/xmlimppr.cxx @@ -43,11 +43,11 @@ #include #include -#include "xmlkywd.hxx" -#include "unoatrcn.hxx" -#include "xmlnmspe.hxx" +#include "xmloff/xmlkywd.hxx" +#include "xmloff/unoatrcn.hxx" +#include "xmloff/xmlnmspe.hxx" #include -#include "xmlerror.hxx" +#include "xmloff/xmlerror.hxx" #include #include "xmloff/contextid.hxx" diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx index 7233c0f7da8f..967140965523 100644 --- a/xmloff/source/style/xmlnume.cxx +++ b/xmloff/source/style/xmlnume.cxx @@ -33,7 +33,7 @@ #include #include #include -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include #include #ifndef _XMLOFF_PROPERTYHANDLER_FONTTYPES_HXX @@ -55,7 +55,7 @@ // <-- #include #include -#include "XMLTextListAutoStylePool.hxx" +#include "xmloff/XMLTextListAutoStylePool.hxx" #include #include #include diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx index aa5aa2315c3e..3f76bd5468fe 100644 --- a/xmloff/source/style/xmlnumfe.cxx +++ b/xmloff/source/style/xmlnumfe.cxx @@ -52,7 +52,7 @@ #include #include -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include #include #include diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx index 89b300bd0bc0..bd11efa9d8f6 100644 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -48,7 +48,7 @@ #include #include -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include #include #include diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx index 66f10e7274c6..16c8fd79afce 100644 --- a/xmloff/source/style/xmlnumi.cxx +++ b/xmloff/source/style/xmlnumi.cxx @@ -37,7 +37,7 @@ #include #include -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include #include #include @@ -56,7 +56,7 @@ #include #include -#include "i18nmap.hxx" +#include "xmloff/i18nmap.hxx" #include #ifndef _XMLOFF_PROPERTYHANDLER_FONTTYPES_HXX #include "fonthdl.hxx" diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx index 17a7c0206988..adc25c22a72b 100644 --- a/xmloff/source/style/xmlstyle.cxx +++ b/xmloff/source/style/xmlstyle.cxx @@ -49,7 +49,7 @@ #include #include #include -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include #ifndef _XMLOFF_FAMILIES_HXX diff --git a/xmloff/source/style/xmltabe.cxx b/xmloff/source/style/xmltabe.cxx index 3cf20f3420f5..05495c23af7e 100644 --- a/xmloff/source/style/xmltabe.cxx +++ b/xmloff/source/style/xmltabe.cxx @@ -36,11 +36,11 @@ #include #include #include -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include #include #include -#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 4f7672289523..6cd55e56362b 100644 --- a/xmloff/source/style/xmltabi.cxx +++ b/xmloff/source/style/xmltabi.cxx @@ -34,11 +34,11 @@ #include #include #include -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include #include #include -#include "i18nmap.hxx" +#include "xmloff/i18nmap.hxx" #include #include "xmltabi.hxx" -- cgit From 41f6595dd78fe26cd6b5585c9e93951cc49f6e04 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 20 Jul 2010 18:01:48 +0200 Subject: sw34bf01: #i77438#: xmloff: apply patch by cyhawk --- xmloff/source/style/MarkerStyle.cxx | 6 +++--- xmloff/source/style/fonthdl.cxx | 6 +++--- xmloff/source/style/xmlnumi.cxx | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'xmloff/source/style') diff --git a/xmloff/source/style/MarkerStyle.cxx b/xmloff/source/style/MarkerStyle.cxx index 4835691b5909..7f134bd65176 100644 --- a/xmloff/source/style/MarkerStyle.cxx +++ b/xmloff/source/style/MarkerStyle.cxx @@ -212,7 +212,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(); @@ -229,7 +229,7 @@ sal_Bool XMLMarkerStyleExport::exportXML( } } - for(b = 0L; b < nPointCount; b++) + for (b = 0; b < nPointCount; b++) { const awt::Point aPoint = pPoints[b]; @@ -259,7 +259,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/fonthdl.cxx b/xmloff/source/style/fonthdl.cxx index 89ad6e9db8b8..c91a7edcfc03 100644 --- a/xmloff/source/style/fonthdl.cxx +++ b/xmloff/source/style/fonthdl.cxx @@ -136,12 +136,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. @@ -173,7 +173,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++ ) diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx index 7306c7d5f0de..72efeabaaca4 100644 --- a/xmloff/source/style/xmlnumi.cxx +++ b/xmloff/source/style/xmlnumi.cxx @@ -374,7 +374,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; @@ -471,7 +471,7 @@ Sequence SvxXMLListLevelStyleContext_Impl::GetProperties( { sal_Int16 eType; - sal_Int32 nCount = 0L; + sal_Int32 nCount = 0; if( bBullet ) { eType = NumberingType::CHAR_SPECIAL; @@ -480,7 +480,7 @@ Sequence SvxXMLListLevelStyleContext_Impl::GetProperties( if( bImage ) { eType = NumberingType::BITMAP; - nCount = 15L; + nCount = 15; if( (sImageURL.getLength() > 0L) || xBase64Stream.is() ) nCount++; @@ -490,7 +490,7 @@ Sequence SvxXMLListLevelStyleContext_Impl::GetProperties( eType = NumberingType::ARABIC; GetImport().GetMM100UnitConverter().convertNumFormat( eType, sNumFormat, sNumLetterSync, sal_True ); - nCount = 15L; + nCount = 15; } if( ( bBullet || bNum ) && nRelSize ) @@ -505,7 +505,7 @@ Sequence SvxXMLListLevelStyleContext_Impl::GetProperties( if( nCount > 0 ) { beans::PropertyValue *pProps = aPropSeq.getArray(); - sal_Int32 nPos = 0L; + sal_Int32 nPos = 0; pProps[nPos].Name = OUString::createFromAscii( XML_UNO_NAME_NRULE_NUMBERINGTYPE ); pProps[nPos++].Value <<= (sal_Int16)eType ; -- cgit From c05087b295acf86ce13105b0cc67b82feb92f45a Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Fri, 19 Nov 2010 21:45:41 +0100 Subject: gnumake2: removing old dmake file in migrated modules --- xmloff/source/style/makefile.mk | 219 ---------------------------------------- 1 file changed, 219 deletions(-) delete mode 100644 xmloff/source/style/makefile.mk (limited to 'xmloff/source/style') 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 -# -# 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 -- cgit From 9233ec54a1708a98aa19c7b2f607c128f228539f Mon Sep 17 00:00:00 2001 From: Carsten Driesner Date: Fri, 14 Jan 2011 17:19:25 +0100 Subject: removetooltypes01: #i112600# Remove tool types from binfilter, starmath, svx, toolkit and xmloff --- xmloff/source/style/XMLFontAutoStylePool.cxx | 4 ++-- xmloff/source/style/impastp4.cxx | 18 +++++++++--------- xmloff/source/style/xmlstyle.cxx | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'xmloff/source/style') diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx b/xmloff/source/style/XMLFontAutoStylePool.cxx index ad01b5b1e9d3..0337ff32136f 100644 --- a/xmloff/source/style/XMLFontAutoStylePool.cxx +++ b/xmloff/source/style/XMLFontAutoStylePool.cxx @@ -172,7 +172,7 @@ OUString XMLFontAutoStylePool::Add( OUString sPoolName; XMLFontAutoStylePoolEntry_Impl aTmp( rFamilyName, rStyleName, nFamily, nPitch, eEnc ); - sal_uIntPtr nPos; + sal_uLong nPos; if( pPool->Seek_Entry( &aTmp, &nPos ) ) { sPoolName = pPool->GetObject( nPos )->GetName(); @@ -226,7 +226,7 @@ OUString XMLFontAutoStylePool::Add( OUString sName; XMLFontAutoStylePoolEntry_Impl aTmp( rFamilyName, rStyleName, nFamily, nPitch, eEnc ); - sal_uIntPtr nPos; + sal_uLong nPos; if( pPool->Seek_Entry( &aTmp, &nPos ) ) { sName = pPool->GetObject( nPos )->GetName(); diff --git a/xmloff/source/style/impastp4.cxx b/xmloff/source/style/impastp4.cxx index 3e429ca65417..38d4f8698761 100644 --- a/xmloff/source/style/impastp4.cxx +++ b/xmloff/source/style/impastp4.cxx @@ -67,7 +67,7 @@ SvXMLAutoStylePoolP_Impl::SvXMLAutoStylePoolP_Impl( SvXMLExport& rExp) SvXMLAutoStylePoolP_Impl::~SvXMLAutoStylePoolP_Impl() { for (;;) { - XMLFamilyData_Impl* pData = maFamilyList.Remove( sal_uIntPtr(0) ); + XMLFamilyData_Impl* pData = maFamilyList.Remove( sal_uLong(0) ); if (pData == NULL) { break; } @@ -88,7 +88,7 @@ void SvXMLAutoStylePoolP_Impl::AddFamily( sal_Bool bAsFamily ) { // store family in a list if not already stored - sal_uIntPtr nPos; + sal_uLong nPos; sal_uInt16 nExportFlags = GetExport().getExportFlags(); sal_Bool bStylesOnly = (nExportFlags & EXPORT_STYLES) != 0 && (nExportFlags & EXPORT_CONTENT) == 0; @@ -116,7 +116,7 @@ void SvXMLAutoStylePoolP_Impl::RegisterName( sal_Int32 nFamily, const OUString& { SvXMLAutoStylePoolNamesP_Impl *pNames = 0; - sal_uIntPtr nPos; + sal_uLong nPos; XMLFamilyData_Impl aTmp( nFamily ); if( maFamilyList.Seek_Entry( &aTmp, &nPos ) ) pNames = maFamilyList.GetObject( nPos )->mpNameList; @@ -187,7 +187,7 @@ sal_Bool SvXMLAutoStylePoolP_Impl::Add(OUString& rName, sal_Int32 nFamily, bool bDontSeek ) { sal_Bool bRet(sal_False); - sal_uIntPtr nPos; + sal_uLong nPos; XMLFamilyData_Impl *pFamily = 0; XMLFamilyData_Impl aTemporary( nFamily ); @@ -237,7 +237,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); - sal_uIntPtr nPos; + sal_uLong nPos; XMLFamilyData_Impl *pFamily = 0; XMLFamilyData_Impl aTemporary( nFamily ); @@ -276,7 +276,7 @@ sal_Bool SvXMLAutoStylePoolP_Impl::AddNamed(const OUString& rName, sal_Int32 nFa OUString SvXMLAutoStylePoolP_Impl::AddToCache( sal_Int32 nFamily, const OUString& rParent ) { - sal_uIntPtr nPos; + sal_uLong nPos; XMLFamilyData_Impl *pFamily = 0; XMLFamilyData_Impl aTmp( nFamily ); @@ -308,7 +308,7 @@ OUString SvXMLAutoStylePoolP_Impl::Find( sal_Int32 nFamily, { OUString sName; - sal_uIntPtr nPos; + sal_uLong nPos; XMLFamilyData_Impl aTemporary( nFamily ); XMLFamilyData_Impl *pFamily = 0; if( maFamilyList.Seek_Entry( &aTemporary, &nPos ) ) @@ -335,7 +335,7 @@ OUString SvXMLAutoStylePoolP_Impl::FindAndRemoveCached( sal_Int32 nFamily ) cons { OUString sName; - sal_uIntPtr nPos; + sal_uLong nPos; XMLFamilyData_Impl aTmp( nFamily ); XMLFamilyData_Impl *pFamily = 0; if( maFamilyList.Seek_Entry( &aTmp, &nPos ) ) @@ -377,7 +377,7 @@ void SvXMLAutoStylePoolP_Impl::exportXML( sal_uInt32 nCount = 0; // Get list of parents for current family (nFamily) - sal_uIntPtr nPos; + sal_uLong nPos; XMLFamilyData_Impl aTmp( nFamily ); XMLFamilyData_Impl *pFamily = 0; if( maFamilyList.Seek_Entry( &aTmp, &nPos ) ) diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx index 4977a37e45f3..cce7d30577f3 100644 --- a/xmloff/source/style/xmlstyle.cxx +++ b/xmloff/source/style/xmlstyle.cxx @@ -384,7 +384,7 @@ const SvXMLStyleContext *SvXMLStylesContext_Impl::FindStyleChildContext( if( pIndices ) { SvXMLStyleIndex_Impl aIndex( nFamily, rName ); - sal_uIntPtr nPos = 0; + sal_uLong nPos = 0; if( pIndices->Seek_Entry( &aIndex, &nPos ) ) pStyle = pIndices->GetObject( nPos )->GetStyle(); } -- cgit