diff options
| author | Jelle van der Waa <jelle@vdwaa.nl> | 2013-08-09 20:04:34 +0200 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-08-10 14:55:06 +0000 |
| commit | 4f360266cd1335861c182493bde6ade0e67b753b (patch) | |
| tree | 94fbebf42ab561d68b659fa0c0f80ab85abef2d8 /xmloff/source/draw | |
| parent | 9c8831244062202e9066b97be7082e72e1194866 (diff) | |
fdo#62475 removed pointless comments
Change-Id: I176886fbc9f3d9e2b8ad2308ac2b127d9c68d9a6
Reviewed-on: https://gerrit.libreoffice.org/5331
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'xmloff/source/draw')
46 files changed, 0 insertions, 871 deletions
diff --git a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx index dafadbf14961..0490ebea22c3 100644 --- a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx +++ b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx @@ -27,7 +27,6 @@ #include "XMLShapePropertySetContext.hxx" #include <xmloff/XMLGraphicsDefaultStyle.hxx> - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -39,8 +38,6 @@ using ::xmloff::token::XML_TEXT_PROPERTIES; using ::xmloff::token::XML_GRAPHIC_PROPERTIES; using ::xmloff::token::XML_PARAGRAPH_PROPERTIES; -// --------------------------------------------------------------------- - TYPEINIT1( XMLGraphicsDefaultStyle, XMLPropStyleContext ); XMLGraphicsDefaultStyle::XMLGraphicsDefaultStyle( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const Reference< XAttributeList >& xAttrList, SvXMLStylesContext& rStyles ) @@ -119,5 +116,4 @@ void XMLGraphicsDefaultStyle::SetDefaults() FillPropertySet( xDefaults ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/draw/XMLNumberStyles.cxx b/xmloff/source/draw/XMLNumberStyles.cxx index 26dd94a1063d..0fbbf792e551 100644 --- a/xmloff/source/draw/XMLNumberStyles.cxx +++ b/xmloff/source/draw/XMLNumberStyles.cxx @@ -31,7 +31,6 @@ using namespace ::xmloff::token; - struct SdXMLDataStyleNumber { enum XMLTokenEnum meNumberStyle; @@ -86,7 +85,6 @@ struct SdXMLDataStyleNumber #define DATA_STYLE_NUMBER_SECONDS 18 // <number:seconds/> #define DATA_STYLE_NUMBER_SECONDS_02 19 // <number:seconds number:/> - struct SdXMLFixedDataStyle { const char* mpName; @@ -312,8 +310,6 @@ const SdXMLFixedDataStyle* aSdXMLFixedTimeFormats[SdXMLTimeFormatCount] = &aSdXML_TimeStyle_7 }; - -/////////////////////////////////////////////////////////////////////// // export static void SdXMLExportDataStyleNumber( SdXMLExport& rExport, SdXMLDataStyleNumber& rElement ) @@ -478,8 +474,6 @@ OUString SdXMLNumberStylesExporter::getDateStyleName(const sal_Int32 nDateFormat } } - -/////////////////////////////////////////////////////////////////////// // import class SdXMLNumberFormatMemberImportContext : public SvXMLImportContext @@ -587,7 +581,6 @@ void SdXMLNumberFormatMemberImportContext::Characters( const OUString& rChars ) TYPEINIT1( SdXMLNumberFormatImportContext, SvXMLImportContext ); - SdXMLNumberFormatImportContext::SdXMLNumberFormatImportContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, SvXMLNumImpData* pNewData, sal_uInt16 nNewType, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, SvXMLStylesContext& rStyles) : SvXMLNumFormatContext(rImport, nPrfx, rLocalName, pNewData, nNewType, xAttrList, rStyles), mbAutomatic( sal_False ), diff --git a/xmloff/source/draw/XMLShapePropertySetContext.cxx b/xmloff/source/draw/XMLShapePropertySetContext.cxx index 22aacdf9cfdf..226954d632f1 100644 --- a/xmloff/source/draw/XMLShapePropertySetContext.cxx +++ b/xmloff/source/draw/XMLShapePropertySetContext.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "XMLShapePropertySetContext.hxx" #include <xmloff/xmlimp.hxx> #include <xmloff/xmlnumi.hxx> @@ -26,12 +25,9 @@ #include "sdpropls.hxx" - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -////////////////////////////////////////////////////////////////////////////// - TYPEINIT1( XMLShapePropertySetContext, SvXMLPropertySetContext ); XMLShapePropertySetContext::XMLShapePropertySetContext( diff --git a/xmloff/source/draw/XMLShapeStyleContext.cxx b/xmloff/source/draw/XMLShapeStyleContext.cxx index a35a1daa01cc..736a5d1614b7 100644 --- a/xmloff/source/draw/XMLShapeStyleContext.cxx +++ b/xmloff/source/draw/XMLShapeStyleContext.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/debug.hxx> #include <xmloff/XMLShapeStyleContext.hxx> #include "XMLShapePropertySetContext.hxx" @@ -34,7 +33,6 @@ #include "sdpropls.hxx" - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -43,8 +41,6 @@ using ::xmloff::token::XML_TEXT_PROPERTIES; using ::xmloff::token::XML_GRAPHIC_PROPERTIES; using ::xmloff::token::XML_PARAGRAPH_PROPERTIES; -////////////////////////////////////////////////////////////////////////////// - TYPEINIT1( XMLShapeStyleContext, XMLPropStyleContext ); XMLShapeStyleContext::XMLShapeStyleContext( diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx index 99beb23a349f..4ea26ce05d02 100644 --- a/xmloff/source/draw/animationimport.cxx +++ b/xmloff/source/draw/animationimport.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <xmloff/unointerfacetouniqueidentifiermapper.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XInitialization.hpp> @@ -67,7 +66,6 @@ #include "animations.hxx" #include "animationimport.hxx" - using namespace ::std; using namespace ::cppu; using namespace ::com::sun::star::beans; @@ -90,15 +88,6 @@ using ::com::sun::star::lang::XInitialization; namespace xmloff { -/////////////////////////////////////////////////////////////////////// - - - -/////////////////////////////////////////////////////////////////////// - - -/////////////////////////////////////////////////////////////////////// - class AnimationsImportHelperImpl { private: @@ -622,8 +611,6 @@ Any AnimationsImportHelperImpl::convertPath( const OUString& rValue ) return makeAny( rValue ); } -/////////////////////////////////////////////////////////////////////// - TYPEINIT1( AnimationNodeContext, SvXMLImportContext ); AnimationNodeContext::AnimationNodeContext( @@ -1253,8 +1240,6 @@ SvXMLImportContext * AnimationNodeContext::CreateChildContext( sal_uInt16 nPrefi return new SvXMLImportContext( GetImport(), nPrefix, rLocalName ); } -// -------------------------------------------------------------------- - class AnimationsImport: public SvXMLImport, public XAnimationNodeSupplier { public: @@ -1377,7 +1362,6 @@ void AnimationNodeContext::postProcessRootNode( SvXMLImport& /*rImport*/, const { Reference< XTransitionFilter > xTransFilter( xChildNode, UNO_QUERY_THROW ); - xPageProps->setPropertyValue("TransitionType", Any( xTransFilter->getTransition() ) ); xPageProps->setPropertyValue("TransitionSubtype", Any( xTransFilter->getSubtype() ) ); xPageProps->setPropertyValue("TransitionDirection", Any( xTransFilter->getDirection() ) ); diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx index f6964886d45e..3c73c033f8e9 100644 --- a/xmloff/source/draw/animimp.cxx +++ b/xmloff/source/draw/animimp.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <xmloff/unointerfacetouniqueidentifiermapper.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/presentation/AnimationEffect.hpp> @@ -37,7 +36,6 @@ #include "anim.hxx" #include "animimp.hxx" - using namespace ::std; using namespace ::cppu; using namespace ::com::sun::star; @@ -317,8 +315,6 @@ AnimationEffect ImplSdXMLgetEffect( XMLEffect eKind, XMLEffectDirection eDirecti } } -/////////////////////////////////////////////////////////////////////// - class AnimImpImpl { public: @@ -356,8 +352,6 @@ public: {} }; -/////////////////////////////////////////////////////////////////////// - enum XMLActionKind { XMLE_SHOW, @@ -449,7 +443,6 @@ XMLAnimationsSoundContext::~XMLAnimationsSoundContext() { } - TYPEINIT1( XMLAnimationsEffectContext, SvXMLImportContext ); XMLAnimationsEffectContext::XMLAnimationsEffectContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, AnimImpImpl* pImpl ) @@ -656,8 +649,6 @@ void XMLAnimationsEffectContext::EndElement() } } -/////////////////////////////////////////////////////////////////////// - TYPEINIT1( XMLAnimationsContext, SvXMLImportContext ); XMLAnimationsContext::XMLAnimationsContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, diff --git a/xmloff/source/draw/descriptionimp.cxx b/xmloff/source/draw/descriptionimp.cxx index 265918c6187d..66df45a976b0 100644 --- a/xmloff/source/draw/descriptionimp.cxx +++ b/xmloff/source/draw/descriptionimp.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/xml/sax/XAttributeList.hpp> #include <xmloff/xmltoken.hxx> @@ -27,7 +26,6 @@ #include "descriptionimp.hxx" - using namespace ::std; using namespace ::cppu; using namespace ::com::sun::star; @@ -38,8 +36,6 @@ using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::beans; using namespace ::xmloff::token; -/////////////////////////////////////////////////////////////////////// - TYPEINIT1( SdXMLDescriptionContext, SvXMLImportContext ); SdXMLDescriptionContext::SdXMLDescriptionContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, diff --git a/xmloff/source/draw/descriptionimp.hxx b/xmloff/source/draw/descriptionimp.hxx index 5b77fa96b9c0..0284116d1514 100644 --- a/xmloff/source/draw/descriptionimp.hxx +++ b/xmloff/source/draw/descriptionimp.hxx @@ -23,7 +23,6 @@ #include <xmloff/xmlictxt.hxx> #include <com/sun/star/drawing/XShape.hpp> -////////////////////////////////////////////////////////////////////////////// // office:events inside a shape class SdXMLDescriptionContext : public SvXMLImportContext diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx index ba288e63b02b..36e41561ec1f 100644 --- a/xmloff/source/draw/eventimp.cxx +++ b/xmloff/source/draw/eventimp.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/debug.hxx> #include <com/sun/star/document/XEventsSupplier.hpp> #include <com/sun/star/container/XNameReplace.hpp> @@ -38,7 +37,6 @@ #include "eventimp.hxx" #include "anim.hxx" - using namespace ::std; using namespace ::cppu; using namespace ::com::sun::star; @@ -53,8 +51,6 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::presentation; using namespace ::xmloff::token; -/////////////////////////////////////////////////////////////////////// - SvXMLEnumMapEntry const aXML_EventActions_EnumMap[] = { { XML_NONE, ClickAction_NONE }, @@ -74,8 +70,6 @@ SvXMLEnumMapEntry const aXML_EventActions_EnumMap[] = { XML_TOKEN_INVALID, 0 } }; -/////////////////////////////////////////////////////////////////////// - class SdXMLEventContext : public SvXMLImportContext { private: @@ -105,8 +99,6 @@ public: OUString msLanguage; }; -/////////////////////////////////////////////////////////////////////// - class XMLEventSoundContext : public SvXMLImportContext { SdXMLEventContext* mpParent; @@ -155,8 +147,6 @@ XMLEventSoundContext::~XMLEventSoundContext() { } -/////////////////////////////////////////////////////////////////////// - TYPEINIT1( SdXMLEventContext, SvXMLImportContext ); SdXMLEventContext::SdXMLEventContext( SvXMLImport& rImp, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, const Reference< XShape >& rxShape ) @@ -493,8 +483,6 @@ void SdXMLEventContext::EndElement() } while(0); } -/////////////////////////////////////////////////////////////////////// - TYPEINIT1( SdXMLEventsContext, SvXMLImportContext ); SdXMLEventsContext::SdXMLEventsContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, diff --git a/xmloff/source/draw/eventimp.hxx b/xmloff/source/draw/eventimp.hxx index 8704d9978fcf..59828d9ba4ea 100644 --- a/xmloff/source/draw/eventimp.hxx +++ b/xmloff/source/draw/eventimp.hxx @@ -23,7 +23,6 @@ #include <xmloff/xmlictxt.hxx> #include <com/sun/star/drawing/XShape.hpp> -////////////////////////////////////////////////////////////////////////////// // office:events inside a shape class SdXMLEventsContext : public SvXMLImportContext diff --git a/xmloff/source/draw/layerimp.hxx b/xmloff/source/draw/layerimp.hxx index c6754e179c04..c314bb87bf51 100644 --- a/xmloff/source/draw/layerimp.hxx +++ b/xmloff/source/draw/layerimp.hxx @@ -23,7 +23,6 @@ #include <xmloff/xmlictxt.hxx> #include <com/sun/star/container/XNameAccess.hpp> -////////////////////////////////////////////////////////////////////////////// // presentations:animations class SdXMLLayerSetContext : public SvXMLImportContext diff --git a/xmloff/source/draw/numithdl.cxx b/xmloff/source/draw/numithdl.cxx index 96043fa6be7e..75241da9e489 100644 --- a/xmloff/source/draw/numithdl.cxx +++ b/xmloff/source/draw/numithdl.cxx @@ -21,7 +21,6 @@ using namespace ::com::sun::star; -/////////////////////////////////////////////////////////////////////////////// // // class XMLNumRulePropHdl // diff --git a/xmloff/source/draw/propimp0.cxx b/xmloff/source/draw/propimp0.cxx index 82c1dda41c12..b9b55b316bb8 100644 --- a/xmloff/source/draw/propimp0.cxx +++ b/xmloff/source/draw/propimp0.cxx @@ -32,17 +32,12 @@ using namespace ::com::sun::star; -////////////////////////////////////////////////////////////////////////////// // implementation of graphic property Stroke - -////////////////////////////////////////////////////////////////////////////// // implementation of presentation page property Change -////////////////////////////////////////////////////////////////////////////// // implementation of an effect duration property handler - XMLDurationPropertyHdl::~XMLDurationPropertyHdl() { } @@ -84,10 +79,8 @@ sal_Bool XMLDurationPropertyHdl::exportXML( return sal_False; } -////////////////////////////////////////////////////////////////////////////// // implementation of an opacity property handler - XMLOpacityPropertyHdl::XMLOpacityPropertyHdl( SvXMLImport* pImport ) : mpImport( pImport ) { @@ -166,7 +159,6 @@ sal_Bool XMLOpacityPropertyHdl::exportXML( return bRet; } -////////////////////////////////////////////////////////////////////////////// // implementation of an text animation step amount XMLTextAnimationStepPropertyHdl::~XMLTextAnimationStepPropertyHdl() @@ -233,8 +225,6 @@ sal_Bool XMLTextAnimationStepPropertyHdl::exportXML( return bRet; } -////////////////////////////////////////////////////////////////////////////// - #include "sdxmlexp_impl.hxx" XMLDateTimeFormatHdl::XMLDateTimeFormatHdl( SvXMLExport* pExport ) diff --git a/xmloff/source/draw/propimp0.hxx b/xmloff/source/draw/propimp0.hxx index 0324a7e41a69..e20add963997 100644 --- a/xmloff/source/draw/propimp0.hxx +++ b/xmloff/source/draw/propimp0.hxx @@ -22,7 +22,6 @@ #include <xmloff/xmlprhdl.hxx> -////////////////////////////////////////////////////////////////////////////// // graphic property Stroke class XMLDurationPropertyHdl : public XMLPropertyHandler @@ -66,7 +65,6 @@ public: virtual sal_Bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; }; - #endif // _PROPIMP0_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx index 9fa89b35f7d7..bb709c799b7f 100644 --- a/xmloff/source/draw/sdpropls.cxx +++ b/xmloff/source/draw/sdpropls.cxx @@ -68,7 +68,6 @@ using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; - using namespace ::com::sun::star; using namespace ::xmloff::token; @@ -81,7 +80,6 @@ using namespace ::xmloff::token; #define PMAP(name,prefix,token,type,context) _MAP(name,prefix,token,type|XML_TYPE_PROP_PARAGRAPH,context) #define MAP_END() { 0L, 0, 0, XML_EMPTY, 0 ,0, SvtSaveOptions::ODFVER_010} -////////////////////////////////////////////////////////////////////////////// // entry list for graphic properties const XMLPropertyMapEntry aXMLSDProperties[] = @@ -292,7 +290,6 @@ const XMLPropertyMapEntry aXMLSDProperties[] = MAP_END() }; -////////////////////////////////////////////////////////////////////////////// // entry list for presentation page properties const XMLPropertyMapEntry aXMLSDPresPageProps[] = @@ -365,7 +362,6 @@ const XMLPropertyMapEntry aXMLTableShapeAttributes[] = MAP_END() }; -////////////////////////////////////////////////////////////////////////////// // implementation of factory for own graphic properties SvXMLEnumMapEntry aXML_LineStyle_EnumMap[] = @@ -500,7 +496,6 @@ SvXMLEnumMapEntry aXML_BitmapMode_EnumMap[] = { XML_TOKEN_INVALID, 0 } }; -////////////////////////////////////////////////////////////////////////////// // 3D EnumMaps SvXMLEnumMapEntry aXML_NormalsKind_EnumMap[] = @@ -732,8 +727,6 @@ SvXMLEnumMapEntry const pXML_Caption_Type_Enum[] = { XML_TOKEN_INVALID,0 } }; -////////////////////////////////////////////////////////////////////////////// - class XMLCaptionEscapeRelative : public XMLPropertyHandler { public: @@ -772,8 +765,6 @@ sal_Bool XMLCaptionEscapeRelative::exportXML( OUString& rStrExpValue, const Any& return sal_True; } -////////////////////////////////////////////////////////////////////////////// - class XMLMoveSizeProtectHdl : public XMLPropertyHandler { public: @@ -815,9 +806,6 @@ sal_Bool XMLMoveSizeProtectHdl::exportXML( OUString& rStrExpValue, const Any& rV return sal_True; } - -////////////////////////////////////////////////////////////////////////////// - class XMLSdHeaderFooterVisibilityTypeHdl : public XMLPropertyHandler { public: @@ -864,9 +852,6 @@ sal_Bool XMLSdHeaderFooterVisibilityTypeHdl::exportXML( return bRet; } - -////////////////////////////////////////////////////////////////////////////// - XMLSdPropHdlFactory::XMLSdPropHdlFactory( uno::Reference< frame::XModel > xModel, SvXMLImport& rImport ) : mxModel( xModel ), mpExport(0), mpImport( &rImport ) { @@ -964,7 +949,6 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy break; } - ////////////////////////////////////////////////////////////////// // 3D Properties case XML_SD_TYPE_BACKFACE_CULLING: @@ -1178,8 +1162,6 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy return pHdl; } -////////////////////////////////////////////////////////////////////////////// - XMLShapePropertySetMapper::XMLShapePropertySetMapper(const UniReference< XMLPropertyHandlerFactory >& rFactoryRef) : XMLPropertySetMapper( aXMLSDProperties, rFactoryRef ) { @@ -1189,8 +1171,6 @@ XMLShapePropertySetMapper::~XMLShapePropertySetMapper() { } -// ---------------------------------------- - XMLShapeExportPropertyMapper::XMLShapeExportPropertyMapper( const UniReference< XMLPropertySetMapper >& rMapper, SvXMLExport& rExport ) : SvXMLExportPropertyMapper( rMapper ) , maNumRuleExp( rExport ) @@ -1575,8 +1555,6 @@ void XMLShapeExportPropertyMapper::handleElementItem( } } -// ---------------------------------------- - XMLPageExportPropertyMapper::XMLPageExportPropertyMapper( const UniReference< XMLPropertySetMapper >& rMapper, SvXMLExport& rExport ) : SvXMLExportPropertyMapper( rMapper ), mrExport( rExport ), diff --git a/xmloff/source/draw/sdpropls.hxx b/xmloff/source/draw/sdpropls.hxx index 77bfe0053df7..3f55a330d60c 100644 --- a/xmloff/source/draw/sdpropls.hxx +++ b/xmloff/source/draw/sdpropls.hxx @@ -29,18 +29,15 @@ #include <xmloff/xmlprmap.hxx> #include <xmloff/xmlexppr.hxx> -////////////////////////////////////////////////////////////////////////////// // entry list for graphic properties extern const XMLPropertyMapEntry aXMLSDProperties[]; -////////////////////////////////////////////////////////////////////////////// // entry list for presentation page properties extern const XMLPropertyMapEntry aXMLSDPresPageProps[]; extern const XMLPropertyMapEntry aXMLSDPresPageProps_onlyHeadersFooter[]; -////////////////////////////////////////////////////////////////////////////// // types of own properties #define XML_SD_TYPE_STROKE (XML_SD_TYPES_START + 0) @@ -89,14 +86,12 @@ extern const XMLPropertyMapEntry aXMLSDPresPageProps_onlyHeadersFooter[]; #define XML_SD_TYPE_TEX_KIND (XML_SD_TYPES_START + 45 ) #define XML_SD_TYPE_TEX_MODE (XML_SD_TYPES_START + 46 ) -////////////////////////////////////////////////////////////////////////////// // #FontWork# types #define XML_SD_TYPE_FONTWORK_STYLE (XML_SD_TYPES_START + 47 ) #define XML_SD_TYPE_FONTWORK_ADJUST (XML_SD_TYPES_START + 48 ) #define XML_SD_TYPE_FONTWORK_SHADOW (XML_SD_TYPES_START + 49 ) #define XML_SD_TYPE_FONTWORK_FORM (XML_SD_TYPES_START + 50 ) -////////////////////////////////////////////////////////////////////////////// // Caption types #define XML_SD_TYPE_CAPTION_ANGLE_TYPE (XML_SD_TYPES_START + 60 ) #define XML_SD_TYPE_CAPTION_IS_ESC_REL (XML_SD_TYPES_START + 61 ) @@ -105,13 +100,10 @@ extern const XMLPropertyMapEntry aXMLSDPresPageProps_onlyHeadersFooter[]; #define XML_SD_TYPE_CAPTION_ESC_DIR (XML_SD_TYPES_START + 64 ) #define XML_SD_TYPE_CAPTION_TYPE (XML_SD_TYPES_START + 65 ) -////////////////////////////////////////////////////////////////////////////// // header & footer types #define XML_SD_TYPE_DATETIMEUPDATE (XML_SD_TYPES_START + 70 ) #define XML_SD_TYPE_DATETIME_FORMAT (XML_SD_TYPES_START + 71 ) -////////////////////////////////////////////////////////////////////////////// - // new types for merged style:protect attribute #define XML_SD_TYPE_MOVE_PROTECT (XML_SD_TYPES_START + 72 ) #define XML_SD_TYPE_SIZE_PROTECT (XML_SD_TYPES_START + 73 ) @@ -119,8 +111,6 @@ extern const XMLPropertyMapEntry aXMLSDPresPageProps_onlyHeadersFooter[]; // new type for style:mirror attribute #define XML_TYPE_SD_MIRROR (XML_SD_TYPES_START + 74 ) -////////////////////////////////////////////////////////////////////////////// - // new smil transition types for pages #define XML_SD_TYPE_TRANSITION_TYPE (XML_SD_TYPES_START + 75 ) #define XML_SD_TYPE_TRANSTIION_SUBTYPE (XML_SD_TYPES_START + 76 ) @@ -128,8 +118,6 @@ extern const XMLPropertyMapEntry aXMLSDPresPageProps_onlyHeadersFooter[]; #define XML_SD_TYPE_HEADER_FOOTER_VISIBILITY_TYPE (XML_SD_TYPES_START + 78 ) -////////////////////////////////////////////////////////////////////////////// - #define CTF_NUMBERINGRULES 1000 #define CTF_CONTROLWRITINGMODE 1001 #define CTF_WRITINGMODE 1002 @@ -157,7 +145,6 @@ extern const XMLPropertyMapEntry aXMLSDPresPageProps_onlyHeadersFooter[]; #define CTF_PAGE_TRANSITION_DIRECTION 1023 #define CTF_PAGE_TRANSITION_FADECOLOR 1024 -////////////////////////////////////////////////////////////////////////////// // #FontWork# #define CTF_FONTWORK_STYLE 1021 #define CTF_FONTWORK_ADJUST 1022 @@ -173,7 +160,6 @@ extern const XMLPropertyMapEntry aXMLSDPresPageProps_onlyHeadersFooter[]; #define CTF_FONTWORK_HIDEFORM 1032 #define CTF_FONTWORK_SHADOWTRANSPARENCE 1033 -////////////////////////////////////////////////////////////////////////////// // OLE part 1 #define CTF_SD_OLE_VIS_AREA_IMPORT_LEFT 1040 #define CTF_SD_OLE_VIS_AREA_IMPORT_TOP 1041 @@ -184,13 +170,11 @@ extern const XMLPropertyMapEntry aXMLSDPresPageProps_onlyHeadersFooter[]; #define CTF_SD_MOVE_PROTECT 1045 #define CTF_SD_SIZE_PROTECT 1046 -////////////////////////////////////////////////////////////////////////////// // caption #define CTF_CAPTION_ISESCREL 1047 #define CTF_CAPTION_ESCREL 1048 #define CTF_CAPTION_ESCABS 1049 -////////////////////////////////////////////////////////////////////////////// // header&footer #define CTF_HEADER_VISIBLE 1050 #define CTF_FOOTER_VISIBLE 1051 @@ -202,7 +186,6 @@ extern const XMLPropertyMapEntry aXMLSDPresPageProps_onlyHeadersFooter[]; #define CTF_DATE_TIME_FORMAT 1057 #define CTF_DATE_TIME_UPDATE 1058 -////////////////////////////////////////////////////////////////////////////// // OLE part 2 #define CTF_SD_OLE_ASPECT 1059 #define CTF_SD_OLE_VIS_AREA_EXPORT_LEFT 1060 @@ -210,18 +193,14 @@ extern const XMLPropertyMapEntry aXMLSDPresPageProps_onlyHeadersFooter[]; #define CTF_SD_OLE_VIS_AREA_EXPORT_WIDTH 1062 #define CTF_SD_OLE_VIS_AREA_EXPORT_HEIGHT 1063 -////////////////////////////////////////////////////////////////////////////// // enum maps for attributes extern SvXMLEnumMapEntry aXML_ConnectionKind_EnumMap[]; extern SvXMLEnumMapEntry aXML_CircleKind_EnumMap[]; -////////////////////////////////////////////////////////////////////////////// - /** contains the attribute to property mapping for a drawing layer table */ extern const XMLPropertyMapEntry aXMLTableShapeAttributes[]; -////////////////////////////////////////////////////////////////////////////// // factory for own graphic properties class SvXMLExport; diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 34beb140cd4b..2174743fe8b4 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -76,7 +76,6 @@ #include <com/sun/star/document/XDocumentProperties.hpp> #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -89,9 +88,6 @@ using namespace ::com::sun::star::geometry; using namespace ::com::sun::star::text; using namespace ::xmloff::token; - -////////////////////////////////////////////////////////////////////////////// - class ImpXMLEXPPageMasterInfo { sal_Int32 mnBorderBottom; @@ -192,8 +188,6 @@ void ImpXMLEXPPageMasterInfo::SetName(const OUString& rStr) msName = rStr; } -////////////////////////////////////////////////////////////////////////////// - #define IMP_AUTOLAYOUT_INFO_MAX (35L) class ImpXMLAutoLayoutInfo @@ -391,8 +385,6 @@ ImpXMLAutoLayoutInfo::ImpXMLAutoLayoutInfo(sal_uInt16 nTyp, ImpXMLEXPPageMasterI maPresRect.SetSize(aLayoutSize); } -////////////////////////////////////////////////////////////////////////////// - // #110680# SdXMLExport::SdXMLExport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, @@ -422,7 +414,6 @@ SdXMLExport::SdXMLExport( msPageLayoutNames( "PageLayoutNames" ) { - } // XExporter @@ -638,7 +629,6 @@ void SAL_CALL SdXMLExport::setSourceDocument( const Reference< lang::XComponent GetShapeExport()->enableHandleProgressBar(); } -////////////////////////////////////////////////////////////////////////////// // #82003# helper function for recursive object count sal_uInt32 SdXMLExport::ImpRecursiveObjectCount(Reference< drawing::XShapes > xShapes) { @@ -668,8 +658,6 @@ sal_uInt32 SdXMLExport::ImpRecursiveObjectCount(Reference< drawing::XShapes > xS return nRetval; } -////////////////////////////////////////////////////////////////////////////// - SdXMLExport::~SdXMLExport() { // cleanup factory, decrease refcount. Should lead to destruction. @@ -728,8 +716,6 @@ SdXMLExport::~SdXMLExport() } } -////////////////////////////////////////////////////////////////////////////// - void SdXMLExport::ImpPrepAutoLayoutInfos() { if(IsImpress()) @@ -829,8 +815,6 @@ sal_Bool SdXMLExport::ImpPrepAutoLayoutInfo(const Reference<XDrawPage>& xPage, O return bRetval; } -////////////////////////////////////////////////////////////////////////////// - void SdXMLExport::ImpWriteAutoLayoutInfos() { if( !mpAutoLayoutInfoList->empty() ) @@ -1217,8 +1201,6 @@ void SdXMLExport::ImpWriteAutoLayoutInfos() } } -////////////////////////////////////////////////////////////////////////////// - void SdXMLExport::ImpWriteAutoLayoutPlaceholder(XmlPlaceholder ePl, const Rectangle& rRect) { OUString aStr; @@ -1268,8 +1250,6 @@ void SdXMLExport::ImpWriteAutoLayoutPlaceholder(XmlPlaceholder ePl, const Rectan SvXMLElementExport aPPL(*this, XML_NAMESPACE_PRESENTATION, XML_PLACEHOLDER, sal_True, sal_True); } -////////////////////////////////////////////////////////////////////////////// - ImpXMLEXPPageMasterInfo* SdXMLExport::ImpGetOrCreatePageMasterInfo( Reference< XDrawPage > xMasterPage ) { bool bDoesExist = false; @@ -1343,8 +1323,6 @@ void SdXMLExport::ImpPrepPageMasterInfos() } } -////////////////////////////////////////////////////////////////////////////// - void SdXMLExport::ImpWritePageMasterInfos() { // write created page-masters, create names for these @@ -1411,8 +1389,6 @@ void SdXMLExport::ImpWritePageMasterInfos() } } -////////////////////////////////////////////////////////////////////////////// - ImpXMLEXPPageMasterInfo* SdXMLExport::ImpGetPageMasterInfoByName(const OUString& rName) { if(!rName.isEmpty() && !mpPageMasterInfoList->empty()) @@ -1432,8 +1408,6 @@ ImpXMLEXPPageMasterInfo* SdXMLExport::ImpGetPageMasterInfoByName(const OUString& return 0L; } -////////////////////////////////////////////////////////////////////////////// - void SdXMLExport::ImpPrepDrawPageInfos() { // create draw:style-name entries for page export @@ -1458,8 +1432,6 @@ void SdXMLExport::ImpPrepDrawPageInfos() } } -////////////////////////////////////////////////////////////////////////////// - static OUString findOrAppendImpl( std::vector< OUString >& rVector, const OUString& rText, const sal_Char* pPrefix ) { // search rVector if there is already a string that equals rText @@ -1570,8 +1542,6 @@ HeaderFooterPageSettingsImpl SdXMLExport::ImpPrepDrawPageHeaderFooterDecls( cons return aSettings; } -////////////////////////////////////////////////////////////////////////////// - void SdXMLExport::ImpWriteHeaderFooterDecls() { OUStringBuffer sBuffer; @@ -1648,8 +1618,6 @@ void SdXMLExport::ImplExportHeaderFooterDeclAttributes( const HeaderFooterPageSe AddAttribute( XML_NAMESPACE_PRESENTATION, XML_USE_DATE_TIME_NAME, aSettings.maStrDateTimeDeclName ); } -////////////////////////////////////////////////////////////////////////////// - OUString SdXMLExport::ImpCreatePresPageStyleName( Reference<XDrawPage> xDrawPage, bool bExportBackground /* = true */ ) { // create name @@ -1708,8 +1676,6 @@ OUString SdXMLExport::ImpCreatePresPageStyleName( Reference<XDrawPage> xDrawPage return sStyleName; } -////////////////////////////////////////////////////////////////////////////// - void SdXMLExport::ImpPrepMasterPageInfos() { // create draw:style-name entries for master page export @@ -1739,7 +1705,6 @@ void SdXMLExport::ImpPrepMasterPageInfos() } } -////////////////////////////////////////////////////////////////////////////// void SdXMLExport::ImpWritePresentationStyles() { if(IsImpress()) @@ -1770,8 +1735,6 @@ void SdXMLExport::ImpWritePresentationStyles() } } -////////////////////////////////////////////////////////////////////////////// - void SdXMLExport::SetProgress(sal_Int32 nProg) { // set progress view @@ -1779,7 +1742,6 @@ void SdXMLExport::SetProgress(sal_Int32 nProg) GetStatusIndicator()->setValue(nProg); } -////////////////////////////////////////////////////////////////////////////// // #82003# void SdXMLExport::_ExportMeta() @@ -1801,8 +1763,6 @@ void SdXMLExport::_ExportMeta() SvXMLExport::_ExportMeta(); } -////////////////////////////////////////////////////////////////////////////// - void SdXMLExport::_ExportFontDecls() { GetFontAutoStylePool(); // make sure the pool is created @@ -1891,7 +1851,6 @@ void SdXMLExport::_ExportContent() if( IsImpress() ) ImplExportHeaderFooterDeclAttributes( maDrawPagesHeaderFooterSettings[nPageInd] ); - OUString sNavigationOrder( getNavigationOrder( xDrawPage ) ); if( !sNavigationOrder.isEmpty() ) AddAttribute ( XML_NAMESPACE_DRAW, XML_NAV_ORDER, sNavigationOrder ); @@ -1994,8 +1953,6 @@ void SdXMLExport::_ExportContent() exportPresentationSettings(); } -////////////////////////////////////////////////////////////////////////////// - void SdXMLExport::exportPresentationSettings() { try @@ -2180,8 +2137,6 @@ void SdXMLExport::exportPresentationSettings() } } -////////////////////////////////////////////////////////////////////////////// - void SdXMLExport::_ExportStyles(sal_Bool bUsed) { GetPropertySetMapper()->SetAutoStyles( sal_False ); @@ -2220,8 +2175,6 @@ void SdXMLExport::_ExportStyles(sal_Bool bUsed) } } -////////////////////////////////////////////////////////////////////////////// - void SdXMLExport::_ExportAutoStyles() { Reference< beans::XPropertySet > xInfoSet( getExportInfo() ); @@ -2417,8 +2370,6 @@ void SdXMLExport::_ExportAutoStyles() GetTextParagraphExport()->exportTextAutoStyles(); } -////////////////////////////////////////////////////////////////////////////// - void SdXMLExport::_ExportMasterStyles() { // export layer @@ -2602,8 +2553,6 @@ void SdXMLExport::GetConfigurationSettings(uno::Sequence<beans::PropertyValue>& } } -////////////////////////////////////////////////////////////////////////////// - void SdXMLExport::addDataStyle(const sal_Int32 nNumberFormat, sal_Bool bTimeFormat ) { sal_Int32 nFormat = nNumberFormat; @@ -2622,15 +2571,11 @@ void SdXMLExport::addDataStyle(const sal_Int32 nNumberFormat, sal_Bool bTimeForm } } -////////////////////////////////////////////////////////////////////////////// - void SdXMLExport::exportDataStyles() { // there are no data styles to export in draw/impress yet } -////////////////////////////////////////////////////////////////////////////// - void SdXMLExport::exportAutoDataStyles() { SdXMLFormatMap::iterator aIter( maUsedDateStyles.begin() ); @@ -2648,8 +2593,6 @@ void SdXMLExport::exportAutoDataStyles() GetFormExport()->exportAutoControlNumberStyles(); } -////////////////////////////////////////////////////////////////////////////// - OUString SdXMLExport::getDataStyleName(const sal_Int32 nNumberFormat, sal_Bool bTimeFormat ) const { if( bTimeFormat ) @@ -2695,8 +2638,6 @@ OUString SdXMLExport::getNavigationOrder( const Reference< XDrawPage >& xDrawPag return sNavOrder.makeStringAndClear(); } -////////////////////////////////////////////////////////////////////////////// - void SdXMLExport::collectAnnotationAutoStyles( const Reference<XDrawPage>& xDrawPage ) { Reference< XAnnotationAccess > xAnnotationAccess( xDrawPage, UNO_QUERY ); @@ -2791,8 +2732,6 @@ void SdXMLExport::exportAnnotations( const Reference<XDrawPage>& xDrawPage ) } } -////////////////////////////////////////////////////////////////////////////// - #define SERVICE( classname, servicename, implementationname, draw, flags )\ uno::Sequence< OUString > SAL_CALL classname##_getSupportedServiceNames() throw()\ {\ diff --git a/xmloff/source/draw/sdxmlexp_impl.hxx b/xmloff/source/draw/sdxmlexp_impl.hxx index 506981d978f0..fd17b4d8b174 100644 --- a/xmloff/source/draw/sdxmlexp_impl.hxx +++ b/xmloff/source/draw/sdxmlexp_impl.hxx @@ -30,8 +30,6 @@ #include <vector> -////////////////////////////////////////////////////////////////////////////// - class Rectangle; class ImpXMLEXPPageMasterInfo; @@ -43,8 +41,6 @@ class XMLPageExportPropertyMapper; typedef ::std::vector< ImpXMLEXPPageMasterInfo* > ImpXMLEXPPageMasterList; typedef ::std::vector< ImpXMLAutoLayoutInfo* > ImpXMLAutoLayoutInfoList; -////////////////////////////////////////////////////////////////////////////// - enum XmlPlaceholder { XmlPlaceholderTitle, @@ -65,8 +61,6 @@ enum XmlPlaceholder DECLARE_STL_STDKEY_SET( sal_Int32, SdXMLFormatMap ); -////////////////////////////////////////////////////////////////////////////// - struct HeaderFooterPageSettingsImpl { OUString maStrHeaderDeclName; @@ -81,9 +75,6 @@ struct DateTimeDeclImpl sal_Int32 mnFormat; }; - -////////////////////////////////////////////////////////////////////////////// - class SdXMLExport : public SvXMLExport { com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > mxDocStyleFamilies; diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx index 2c5e302ac80e..c161ad160673 100644 --- a/xmloff/source/draw/sdxmlimp.cxx +++ b/xmloff/source/draw/sdxmlimp.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <osl/thread.h> #include <comphelper/processfactory.hxx> @@ -48,24 +47,9 @@ #include <com/sun/star/document/XDocumentProperties.hpp> #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> - using namespace ::com::sun::star; using namespace ::xmloff::token; -////////////////////////////////////////////////////////////////////////////// - - - - - - - - - - - -////////////////////////////////////////////////////////////////////////////// - class SdXMLBodyContext_Impl : public SvXMLImportContext { const SdXMLImport& GetSdImport() const @@ -103,8 +87,6 @@ SvXMLImportContext *SdXMLBodyContext_Impl::CreateChildContext( return GetSdImport().CreateBodyContext(rLocalName, xAttrList); } -////////////////////////////////////////////////////////////////////////////// - // NB: virtually inherit so we can multiply inherit properly // in SdXMLFlatDocContext_Impl class SdXMLDocContext_Impl : public virtual SvXMLImportContext @@ -128,8 +110,6 @@ public: const uno::Reference<xml::sax::XAttributeList>& xAttrList); }; -////////////////////////////////////////////////////////////////////////////// - SdXMLDocContext_Impl::SdXMLDocContext_Impl( SdXMLImport& rImport, sal_uInt16 nPrfx, @@ -139,16 +119,12 @@ SdXMLDocContext_Impl::SdXMLDocContext_Impl( { } -////////////////////////////////////////////////////////////////////////////// - SdXMLDocContext_Impl::~SdXMLDocContext_Impl() { } TYPEINIT1( SdXMLDocContext_Impl, SvXMLImportContext ); -////////////////////////////////////////////////////////////////////////////// - SvXMLImportContext *SdXMLDocContext_Impl::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, @@ -232,8 +208,6 @@ SvXMLImportContext *SdXMLDocContext_Impl::CreateChildContext( return pContext; } -////////////////////////////////////////////////////////////////////////////// - // context for flat file xml format class SdXMLFlatDocContext_Impl : public SdXMLDocContext_Impl, public SvXMLMetaDocumentContext @@ -279,8 +253,6 @@ SvXMLImportContext *SdXMLFlatDocContext_Impl::CreateChildContext( } } -////////////////////////////////////////////////////////////////////////////// - #define SERVICE(classname,servicename,implementationname,draw,flags)\ uno::Sequence< OUString > SAL_CALL classname##_getSupportedServiceNames() throw()\ {\ @@ -312,8 +284,6 @@ SERVICE( XMLDrawMetaImportOasis, "com.sun.star.comp.Draw.XMLOasisMetaImporter", SERVICE( XMLImpressSettingsImportOasis, "com.sun.star.comp.Impress.XMLOasisSettingsImporter", "XMLImpressSettingsImportOasis", sal_False, IMPORT_SETTINGS ) SERVICE( XMLDrawSettingsImportOasis, "com.sun.star.comp.Draw.XMLOasisSettingsImporter", "XMLImpressSettingsImportOasis", sal_True, IMPORT_SETTINGS ) -////////////////////////////////////////////////////////////////////////////// - // #110680# SdXMLImport::SdXMLImport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, @@ -445,8 +415,6 @@ void SAL_CALL SdXMLImport::initialize( const uno::Sequence< uno::Any >& aArgumen } } -////////////////////////////////////////////////////////////////////////////// - SdXMLImport::~SdXMLImport() throw () { // Styles or AutoStyles context? @@ -476,8 +444,6 @@ SdXMLImport::~SdXMLImport() throw () delete mpPresentationPlaceholderAttrTokenMap; } -////////////////////////////////////////////////////////////////////////////// - const SvXMLTokenMap& SdXMLImport::GetDocElemTokenMap() { if(!mpDocElemTokenMap) @@ -501,8 +467,6 @@ const SvXMLTokenMap& SdXMLImport::GetDocElemTokenMap() return *mpDocElemTokenMap; } -////////////////////////////////////////////////////////////////////////////// - const SvXMLTokenMap& SdXMLImport::GetBodyElemTokenMap() { if(!mpBodyElemTokenMap) @@ -524,8 +488,6 @@ const SvXMLTokenMap& SdXMLImport::GetBodyElemTokenMap() return *mpBodyElemTokenMap; } -////////////////////////////////////////////////////////////////////////////// - const SvXMLTokenMap& SdXMLImport::GetStylesElemTokenMap() { if(!mpStylesElemTokenMap) @@ -544,8 +506,6 @@ const SvXMLTokenMap& SdXMLImport::GetStylesElemTokenMap() return *mpStylesElemTokenMap; } -////////////////////////////////////////////////////////////////////////////// - const SvXMLTokenMap& SdXMLImport::GetMasterPageElemTokenMap() { if(!mpMasterPageElemTokenMap) @@ -563,8 +523,6 @@ const SvXMLTokenMap& SdXMLImport::GetMasterPageElemTokenMap() return *mpMasterPageElemTokenMap; } -////////////////////////////////////////////////////////////////////////////// - const SvXMLTokenMap& SdXMLImport::GetMasterPageAttrTokenMap() { if(!mpMasterPageAttrTokenMap) @@ -588,8 +546,6 @@ const SvXMLTokenMap& SdXMLImport::GetMasterPageAttrTokenMap() return *mpMasterPageAttrTokenMap; } -////////////////////////////////////////////////////////////////////////////// - const SvXMLTokenMap& SdXMLImport::GetPageMasterAttrTokenMap() { if(!mpPageMasterAttrTokenMap) @@ -606,8 +562,6 @@ const SvXMLTokenMap& SdXMLImport::GetPageMasterAttrTokenMap() return *mpPageMasterAttrTokenMap; } -////////////////////////////////////////////////////////////////////////////// - const SvXMLTokenMap& SdXMLImport::GetPageMasterStyleAttrTokenMap() { if(!mpPageMasterStyleAttrTokenMap) @@ -630,8 +584,6 @@ const SvXMLTokenMap& SdXMLImport::GetPageMasterStyleAttrTokenMap() return *mpPageMasterStyleAttrTokenMap; } -////////////////////////////////////////////////////////////////////////////// - const SvXMLTokenMap& SdXMLImport::GetDrawPageAttrTokenMap() { if(!mpDrawPageAttrTokenMap) @@ -658,8 +610,6 @@ const SvXMLTokenMap& SdXMLImport::GetDrawPageAttrTokenMap() return *mpDrawPageAttrTokenMap; } -////////////////////////////////////////////////////////////////////////////// - const SvXMLTokenMap& SdXMLImport::GetDrawPageElemTokenMap() { if(!mpDrawPageElemTokenMap) @@ -678,8 +628,6 @@ const SvXMLTokenMap& SdXMLImport::GetDrawPageElemTokenMap() return *mpDrawPageElemTokenMap; } -////////////////////////////////////////////////////////////////////////////// - const SvXMLTokenMap& SdXMLImport::GetPresentationPlaceholderAttrTokenMap() { if(!mpPresentationPlaceholderAttrTokenMap) @@ -700,8 +648,6 @@ const SvXMLTokenMap& SdXMLImport::GetPresentationPlaceholderAttrTokenMap() return *mpPresentationPlaceholderAttrTokenMap; } -////////////////////////////////////////////////////////////////////////////// - SvXMLImportContext *SdXMLImport::CreateContext(sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList) @@ -731,8 +677,6 @@ SvXMLImportContext *SdXMLImport::CreateContext(sal_uInt16 nPrefix, return pContext; } -////////////////////////////////////////////////////////////////////////////// - SvXMLImportContext *SdXMLImport::CreateMetaContext(const OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>&) { @@ -757,8 +701,6 @@ SvXMLImportContext *SdXMLImport::CreateMetaContext(const OUString& rLocalName, return pContext; } -////////////////////////////////////////////////////////////////////////////// - SvXMLImportContext *SdXMLImport::CreateBodyContext(const OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>&) { @@ -767,8 +709,6 @@ SvXMLImportContext *SdXMLImport::CreateBodyContext(const OUString& rLocalName, return pContext; } -////////////////////////////////////////////////////////////////////////////// - SvXMLStylesContext *SdXMLImport::CreateStylesContext(const OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList) { @@ -781,8 +721,6 @@ SvXMLStylesContext *SdXMLImport::CreateStylesContext(const OUString& rLocalName, return GetShapeImport()->GetStylesContext(); } -////////////////////////////////////////////////////////////////////////////// - SvXMLStylesContext *SdXMLImport::CreateAutoStylesContext(const OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList) { @@ -795,8 +733,6 @@ SvXMLStylesContext *SdXMLImport::CreateAutoStylesContext(const OUString& rLocalN return GetShapeImport()->GetAutoStylesContext(); } -////////////////////////////////////////////////////////////////////////////// - SvXMLImportContext* SdXMLImport::CreateMasterStylesContext(const OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>&) { @@ -810,8 +746,6 @@ SvXMLImportContext* SdXMLImport::CreateMasterStylesContext(const OUString& rLoca return mpMasterStylesContext; } -////////////////////////////////////////////////////////////////////////////// - SvXMLImportContext *SdXMLImport::CreateFontDeclsContext(const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ) { @@ -823,8 +757,6 @@ SvXMLImportContext *SdXMLImport::CreateFontDeclsContext(const OUString& rLocalNa return pFSContext; } -////////////////////////////////////////////////////////////////////////////// - SvXMLImportContext *SdXMLImport::CreateScriptContext( const OUString& rLocalName ) { @@ -836,8 +768,6 @@ SvXMLImportContext *SdXMLImport::CreateScriptContext( return pContext; } -////////////////////////////////////////////////////////////////////////////// - void SdXMLImport::SetViewSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aViewProps) { uno::Reference< beans::XPropertySet > xPropSet( GetModel(), uno::UNO_QUERY ); @@ -963,7 +893,6 @@ void SdXMLImport::SetStatistics( } } - // XServiceInfo OUString SAL_CALL SdXMLImport::getImplementationName() throw( uno::RuntimeException ) { diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx b/xmloff/source/draw/sdxmlimp_impl.hxx index 1a50eb9fc799..390cd5e54058 100644 --- a/xmloff/source/draw/sdxmlimp_impl.hxx +++ b/xmloff/source/draw/sdxmlimp_impl.hxx @@ -29,8 +29,6 @@ #include <vector> #include <xmloff/xmlimp.hxx> -////////////////////////////////////////////////////////////////////////////// - enum SdXMLDocElemTokenMap { XML_TOK_DOC_FONTDECLS, @@ -144,8 +142,6 @@ enum SdXMLPresentationPlaceholderAttrTokenMap XML_TOK_PRESENTATIONPLACEHOLDER_HEIGHT }; -////////////////////////////////////////////////////////////////////////////// - struct SdXMLltXDrawPageId { bool operator()(sal_Int32 nId1, sal_Int32 nId2 ) const @@ -156,14 +152,10 @@ struct SdXMLltXDrawPageId typedef std::map< sal_Int32, com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage >, SdXMLltXDrawPageId > DrawPageIdMap; -////////////////////////////////////////////////////////////////////////////// - class SvXMLUnitConverter; class SvXMLTokenMap; class SdXMLMasterStylesContext; -////////////////////////////////////////////////////////////////////////////// - struct DateTimeDeclContextImpl { OUString maStrText; @@ -176,8 +168,6 @@ struct DateTimeDeclContextImpl DECLARE_STL_USTRINGACCESS_MAP( OUString, HeaderFooterDeclMap ); DECLARE_STL_USTRINGACCESS_MAP( DateTimeDeclContextImpl, DateTimeDeclMap ); -////////////////////////////////////////////////////////////////////////////// - class SdXMLImport: public SvXMLImport { com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > mxDocStyleFamilies; diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index d9cf37534e7e..d56dea2cc547 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <memory> #include <xmloff/unointerfacetouniqueidentifiermapper.hxx> @@ -57,8 +56,6 @@ using namespace ::com::sun::star; using namespace ::xmloff::token; -////////////////////////////////////////////////////////////////////////////// - XMLShapeExport::XMLShapeExport(SvXMLExport& rExp, SvXMLExportPropertyMapper *pExtMapper ) : mrExport( rExp ), @@ -122,14 +119,10 @@ XMLShapeExport::XMLShapeExport(SvXMLExport& rExp, GetShapeTableExport(); } -/////////////////////////////////////////////////////////////////////// - XMLShapeExport::~XMLShapeExport() { } -/////////////////////////////////////////////////////////////////////// - // sj: replacing CustomShapes with standard objects that are also supported in OpenOffice.org format uno::Reference< drawing::XShape > XMLShapeExport::checkForCustomShapeReplacement( const uno::Reference< drawing::XShape >& xShape ) { @@ -204,9 +197,7 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap if ( xCustomShapeReplacement.is() ) aShapeInfo.xCustomShapeReplacement = xCustomShapeReplacement; - // ----------------------------- // first compute the shapes type - // ----------------------------- ImpCalcShapeType(xShape, aShapeInfo.meShapeType); // #i118485# enabled XmlShapeTypeDrawChartShape and XmlShapeTypeDrawOLE2Shape @@ -234,9 +225,7 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap if ( aShapeInfo.xCustomShapeReplacement.is() ) xPropSet.clear(); - // ---------------- // prep text styles - // ---------------- if( xPropSet.is() && bObjSupportsText ) { uno::Reference< text::XText > xText(xShape, uno::UNO_QUERY); @@ -257,9 +246,7 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap } } - // ------------------------------ // compute the shape parent style - // ------------------------------ if( xPropSet.is() ) { uno::Reference< beans::XPropertySetInfo > xPropertySetInfo( xPropSet->getPropertySetInfo() ); @@ -369,7 +356,6 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap { xPropStates = GetExport().GetTextParagraphExport()->GetParagraphPropertyMapper()->Filter( xPropSet ); - // ---------------------------------------------------------------------- // yet more additionally, we need to care for the ParaAdjust property if ( XmlShapeTypeDrawControlShape == aShapeInfo.meShapeType ) { @@ -401,7 +387,6 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap } } } - // ---------------------------------------------------------------------- nCount = 0; std::vector< XMLPropertyState >::iterator aIter = xPropStates.begin(); @@ -426,9 +411,7 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap } } - // ---------------------------------------- // prepare animation information if needed - // ---------------------------------------- if( mxAnimationsExporter.is() ) mxAnimationsExporter->prepare( xShape, mrExport ); @@ -471,10 +454,8 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap maShapeInfos.push_back( aShapeInfo ); maCurrentInfo = maShapeInfos.begin(); - // ----------------------------------------------------- // check for shape collections (group shape or 3d scene) // and collect contained shapes style infos - // ----------------------------------------------------- const uno::Reference< drawing::XShape >& xCollection = aShapeInfo.xCustomShapeReplacement.is() ? aShapeInfo.xCustomShapeReplacement : xShape; { @@ -486,8 +467,6 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap } } -/////////////////////////////////////////////////////////////////////// - namespace { class NewTextListsHelper @@ -523,7 +502,6 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape sal_Int32 nZIndex = 0; uno::Reference< beans::XPropertySet > xSet( xShape, uno::UNO_QUERY ); - ::std::auto_ptr< SvXMLElementExport > mpHyperlinkElement; // export hyperlinks with <a><shape/></a>. Currently only in draw since draw @@ -553,7 +531,6 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape SAL_WARN("xmloff", "XMLShapeExport::exportShape(): exception during hyperlink export"); } - if( xSet.is() ) xSet->getPropertyValue(msZIndex) >>= nZIndex; @@ -569,11 +546,8 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape const ImplXMLShapeExportInfo& aShapeInfo = aShapeInfoVector[nZIndex]; - #ifdef DBG_UTIL - // --------------------------------------- // check if this is the correct ShapesInfo - // --------------------------------------- uno::Reference< container::XChild > xChild( xShape, uno::UNO_QUERY ); if( xChild.is() ) { @@ -581,9 +555,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape DBG_ASSERT( xParent.is() && xParent.get() == (*maCurrentShapesIter).first.get(), "XMLShapeExport::exportShape(): Wrong call to XMLShapeExport::seekShapes()" ); } - // ----------------------------- // first compute the shapes type - // ----------------------------- { XmlShapeType eShapeType(XmlShapeTypeNotYetSet); ImpCalcShapeType(xShape, eShapeType); @@ -592,9 +564,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape } #endif - // ---------------------------------------- // collect animation information if needed - // ---------------------------------------- if( mxAnimationsExporter.is() ) mxAnimationsExporter->collect( xShape, mrExport ); @@ -623,9 +593,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape } } - // ------------------ // export style name - // ------------------ if( !aShapeInfo.msStyleName.isEmpty() ) { if(XML_STYLE_FAMILY_SD_GRAPHICS_ID == aShapeInfo.mnFamily) @@ -634,17 +602,13 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape mrExport.AddAttribute(XML_NAMESPACE_PRESENTATION, XML_STYLE_NAME, mrExport.EncodeStyleName( aShapeInfo.msStyleName) ); } - // ------------------ // export text style name - // ------------------ if( !aShapeInfo.msTextStyleName.isEmpty() ) { mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_TEXT_STYLE_NAME, aShapeInfo.msTextStyleName ); } - // -------------------------- // export shapes id if needed - // -------------------------- { uno::Reference< uno::XInterface > xRef( xShape, uno::UNO_QUERY ); const OUString& rShapeId = mrExport.getInterfaceToIdentifierMapper().getIdentifier( xRef ); @@ -654,9 +618,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape } } - // -------------------------- // export layer information - // -------------------------- if( IsLayerExportEnabled() ) { // check for group or scene shape and not export layer if this is one @@ -720,9 +682,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape onExport( xShape ); - // -------------------- // export shape element - // -------------------- switch(aShapeInfo.meShapeType) { case XmlShapeTypeDrawRectangleShape: @@ -904,8 +864,6 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape mrExport.ClearAttrList(); // clears the attributes } -/////////////////////////////////////////////////////////////////////// - // This method collects all automatic styles for the shapes inside the given XShapes collection void XMLShapeExport::collectShapesAutoStyles( const uno::Reference < drawing::XShapes >& xShapes ) { @@ -927,8 +885,6 @@ void XMLShapeExport::collectShapesAutoStyles( const uno::Reference < drawing::XS maCurrentShapesIter = aOldCurrentShapesIter; } -/////////////////////////////////////////////////////////////////////// - // This method exports all XShape inside the given XShapes collection void XMLShapeExport::exportShapes( const uno::Reference < drawing::XShapes >& xShapes, sal_Int32 nFeatures /* = SEF_DEFAULT */, awt::Point* pRefPoint /* = NULL */ ) { @@ -950,8 +906,6 @@ void XMLShapeExport::exportShapes( const uno::Reference < drawing::XShapes >& xS maCurrentShapesIter = aOldCurrentShapesIter; } -/////////////////////////////////////////////////////////////////////// - void XMLShapeExport::seekShapes( const uno::Reference< drawing::XShapes >& xShapes ) throw() { if( xShapes.is() ) @@ -977,8 +931,6 @@ void XMLShapeExport::seekShapes( const uno::Reference< drawing::XShapes >& xShap } } -/////////////////////////////////////////////////////////////////////// - void XMLShapeExport::exportAutoStyles() { // export all autostyle infos @@ -1007,8 +959,6 @@ void XMLShapeExport::exportAutoStyles() mxShapeTableExport->exportAutoStyles(); } -/////////////////////////////////////////////////////////////////////// - /// returns the export property mapper for external chaining SvXMLExportPropertyMapper* XMLShapeExport::CreateShapePropMapper( SvXMLExport& rExport ) @@ -1022,8 +972,6 @@ SvXMLExportPropertyMapper* XMLShapeExport::CreateShapePropMapper( return pResult; } -/////////////////////////////////////////////////////////////////////// - void XMLShapeExport::ImpCalcShapeType(const uno::Reference< drawing::XShape >& xShape, XmlShapeType& eShapeType) { @@ -1159,8 +1107,6 @@ void XMLShapeExport::ImpCalcShapeType(const uno::Reference< drawing::XShape >& x } } -/////////////////////////////////////////////////////////////////////// - extern SvXMLEnumMapEntry aXML_GlueAlignment_EnumMap[]; extern SvXMLEnumMapEntry aXML_GlueEscapeDirection_EnumMap[]; diff --git a/xmloff/source/draw/shapeexport2.cxx b/xmloff/source/draw/shapeexport2.cxx index a55d70b57be2..f9071211b1e1 100644 --- a/xmloff/source/draw/shapeexport2.cxx +++ b/xmloff/source/draw/shapeexport2.cxx @@ -53,13 +53,9 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/tuple/b2dtuple.hxx> - using namespace ::com::sun::star; using namespace ::xmloff::token; - -////////////////////////////////////////////////////////////////////////////// - void XMLShapeExport::ImpExportNewTrans(const uno::Reference< beans::XPropertySet >& xPropSet, sal_Int32 nFeatures, awt::Point* pRefPoint) { @@ -222,8 +218,6 @@ void XMLShapeExport::ImpExportNewTrans_FeaturesAndWrite(::basegfx::B2DTuple& rTR } } -////////////////////////////////////////////////////////////////////////////// - sal_Bool XMLShapeExport::ImpExportPresentationAttributes( const uno::Reference< beans::XPropertySet >& xPropSet, const OUString& rClass ) { sal_Bool bIsEmpty = sal_False; @@ -257,8 +251,6 @@ sal_Bool XMLShapeExport::ImpExportPresentationAttributes( const uno::Reference< return bIsEmpty; } -////////////////////////////////////////////////////////////////////////////// - void XMLShapeExport::ImpExportText( const uno::Reference< drawing::XShape >& xShape ) { uno::Reference< text::XText > xText( xShape, uno::UNO_QUERY ); @@ -270,7 +262,6 @@ void XMLShapeExport::ImpExportText( const uno::Reference< drawing::XShape >& xSh } } -////////////////////////////////////////////////////////////////////////////// #include <com/sun/star/presentation/ClickAction.hpp> #include <com/sun/star/presentation/AnimationSpeed.hpp> @@ -303,8 +294,6 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x sal_Int32 nFound = 0; - // extract properties from "OnClick" event -------------------------------- - OUString aClickEventType; presentation::ClickAction eClickAction = presentation::ClickAction_NONE; presentation::AnimationEffect eEffect = presentation::AnimationEffect_NONE; @@ -547,8 +536,6 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x } } -////////////////////////////////////////////////////////////////////////////// - /** #i68101# export shape Title and Description */ void XMLShapeExport::ImpExportDescription( const uno::Reference< drawing::XShape >& xShape ) { @@ -579,8 +566,6 @@ void XMLShapeExport::ImpExportDescription( const uno::Reference< drawing::XShape } } -////////////////////////////////////////////////////////////////////////////// - void XMLShapeExport::ImpExportGroupShape( const uno::Reference< drawing::XShape >& xShape, XmlShapeType, sal_Int32 nFeatures, awt::Point* pRefPoint) { uno::Reference< drawing::XShapes > xShapes(xShape, uno::UNO_QUERY); @@ -611,8 +596,6 @@ void XMLShapeExport::ImpExportGroupShape( const uno::Reference< drawing::XShape } } -////////////////////////////////////////////////////////////////////////////// - void XMLShapeExport::ImpExportTextBoxShape( const uno::Reference< drawing::XShape >& xShape, XmlShapeType eShapeType, sal_Int32 nFeatures, awt::Point* pRefPoint) @@ -687,7 +670,6 @@ void XMLShapeExport::ImpExportTextBoxShape( if(bIsPresShape) bIsEmptyPresObj = ImpExportPresentationAttributes( xPropSet, aStr ); - sal_Bool bCreateNewline( (nFeatures & SEF_EXPORT_NO_WS) == 0 ); // #86116#/#92210# SvXMLElementExport aElem( mrExport, XML_NAMESPACE_DRAW, XML_FRAME, bCreateNewline, sal_True ); @@ -716,8 +698,6 @@ void XMLShapeExport::ImpExportTextBoxShape( } } -////////////////////////////////////////////////////////////////////////////// - void XMLShapeExport::ImpExportRectangleShape( const uno::Reference< drawing::XShape >& xShape, XmlShapeType, sal_Int32 nFeatures, com::sun::star::awt::Point* pRefPoint) @@ -750,8 +730,6 @@ void XMLShapeExport::ImpExportRectangleShape( } } -////////////////////////////////////////////////////////////////////////////// - void XMLShapeExport::ImpExportLineShape( const uno::Reference< drawing::XShape >& xShape, XmlShapeType, sal_Int32 nFeatures, awt::Point* pRefPoint) @@ -864,8 +842,6 @@ void XMLShapeExport::ImpExportLineShape( } } -////////////////////////////////////////////////////////////////////////////// - void XMLShapeExport::ImpExportEllipseShape( const uno::Reference< drawing::XShape >& xShape, XmlShapeType, sal_Int32 nFeatures, awt::Point* pRefPoint) @@ -933,8 +909,6 @@ void XMLShapeExport::ImpExportEllipseShape( } } -////////////////////////////////////////////////////////////////////////////// - void XMLShapeExport::ImpExportPolygonShape( const uno::Reference< drawing::XShape >& xShape, XmlShapeType eShapeType, sal_Int32 nFeatures, awt::Point* pRefPoint) @@ -1081,8 +1055,6 @@ void XMLShapeExport::ImpExportPolygonShape( } } -////////////////////////////////////////////////////////////////////////////// - void XMLShapeExport::ImpExportGraphicObjectShape( const uno::Reference< drawing::XShape >& xShape, XmlShapeType eShapeType, sal_Int32 nFeatures, awt::Point* pRefPoint) @@ -1212,8 +1184,6 @@ void XMLShapeExport::ImpExportGraphicObjectShape( } } -////////////////////////////////////////////////////////////////////////////// - void XMLShapeExport::ImpExportChartShape( const uno::Reference< drawing::XShape >& xShape, XmlShapeType eShapeType, sal_Int32 nFeatures, awt::Point* pRefPoint, @@ -1222,8 +1192,6 @@ void XMLShapeExport::ImpExportChartShape( ImpExportOLE2Shape( xShape, eShapeType, nFeatures, pRefPoint, pAttrList ); } -////////////////////////////////////////////////////////////////////////////// - void XMLShapeExport::ImpExportControlShape( const uno::Reference< drawing::XShape >& xShape, XmlShapeType, sal_Int32 nFeatures, awt::Point* pRefPoint) @@ -1253,8 +1221,6 @@ void XMLShapeExport::ImpExportControlShape( ImpExportDescription( xShape ); // #i68101# } -////////////////////////////////////////////////////////////////////////////// - void XMLShapeExport::ImpExportConnectorShape( const uno::Reference< drawing::XShape >& xShape, XmlShapeType, sal_Int32 nFeatures /* = SEF_DEFAULT */, awt::Point* pRefPoint /* = NULL */) @@ -1489,8 +1455,6 @@ void XMLShapeExport::ImpExportConnectorShape( ImpExportText( xShape ); } -////////////////////////////////////////////////////////////////////////////// - void XMLShapeExport::ImpExportMeasureShape( const uno::Reference< drawing::XShape >& xShape, XmlShapeType, sal_Int32 nFeatures /* = SEF_DEFAULT */, awt::Point* pRefPoint /* = NULL */) @@ -1588,8 +1552,6 @@ void XMLShapeExport::ImpExportMeasureShape( mrExport.GetTextParagraphExport()->exportText( xText ); } -////////////////////////////////////////////////////////////////////////////// - void XMLShapeExport::ImpExportOLE2Shape( const uno::Reference< drawing::XShape >& xShape, XmlShapeType eShapeType, sal_Int32 nFeatures /* = SEF_DEFAULT */, awt::Point* pRefPoint /* = NULL */, @@ -1748,8 +1710,6 @@ void XMLShapeExport::ImpExportOLE2Shape( } } -////////////////////////////////////////////////////////////////////////////// - void XMLShapeExport::ImpExportPageShape( const uno::Reference< drawing::XShape >& xShape, XmlShapeType eShapeType, sal_Int32 nFeatures /* = SEF_DEFAULT */, awt::Point* pRefPoint /* = NULL */) @@ -1786,8 +1746,6 @@ void XMLShapeExport::ImpExportPageShape( } } -////////////////////////////////////////////////////////////////////////////// - void XMLShapeExport::ImpExportCaptionShape( const uno::Reference< drawing::XShape >& xShape, XmlShapeType, sal_Int32 nFeatures /* = SEF_DEFAULT */, awt::Point* pRefPoint /* = NULL */) @@ -1838,8 +1796,6 @@ void XMLShapeExport::ImpExportCaptionShape( } } -////////////////////////////////////////////////////////////////////////////// - void XMLShapeExport::ImpExportFrameShape( const uno::Reference< drawing::XShape >& xShape, XmlShapeType, sal_Int32 nFeatures, com::sun::star::awt::Point* pRefPoint) @@ -1874,8 +1830,6 @@ void XMLShapeExport::ImpExportFrameShape( } } -////////////////////////////////////////////////////////////////////////////// - void XMLShapeExport::ImpExportAppletShape( const uno::Reference< drawing::XShape >& xShape, XmlShapeType, sal_Int32 nFeatures, com::sun::star::awt::Point* pRefPoint) @@ -1931,8 +1885,6 @@ void XMLShapeExport::ImpExportAppletShape( } } -////////////////////////////////////////////////////////////////////////////// - void XMLShapeExport::ImpExportPluginShape( const uno::Reference< drawing::XShape >& xShape, XmlShapeType, sal_Int32 nFeatures, com::sun::star::awt::Point* pRefPoint) @@ -1955,7 +1907,6 @@ void XMLShapeExport::ImpExportPluginShape( mrExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED ); mrExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD ); - // export mime-type xPropSet->getPropertyValue("PluginMimeType") >>= aStr; if(!aStr.isEmpty()) @@ -1980,8 +1931,6 @@ void XMLShapeExport::ImpExportPluginShape( } } -////////////////////////////////////////////////////////////////////////////// - static void lcl_CopyStream( uno::Reference<io::XInputStream> const& xInStream, uno::Reference<embed::XStorage> const& xTarget, diff --git a/xmloff/source/draw/shapeexport3.cxx b/xmloff/source/draw/shapeexport3.cxx index 8d020ef6e4e7..a3b1cc437bcd 100644 --- a/xmloff/source/draw/shapeexport3.cxx +++ b/xmloff/source/draw/shapeexport3.cxx @@ -41,13 +41,9 @@ #include "xmloff/xmlnmspe.hxx" - using namespace ::com::sun::star; using namespace ::xmloff::token; - -////////////////////////////////////////////////////////////////////////////// - void XMLShapeExport::ImpExport3DSceneShape( const uno::Reference< drawing::XShape >& xShape, XmlShapeType, sal_Int32 nFeatures, awt::Point* pRefPoint) { uno::Reference< drawing::XShapes > xShapes(xShape, uno::UNO_QUERY); @@ -91,8 +87,6 @@ void XMLShapeExport::ImpExport3DSceneShape( const uno::Reference< drawing::XShap } } -////////////////////////////////////////////////////////////////////////////// - void XMLShapeExport::ImpExport3DShape( const uno::Reference< drawing::XShape >& xShape, XmlShapeType eShapeType, sal_Int32 /* nFeatures = SEF_DEFAULT */, awt::Point* /*pRefPoint = NULL */) @@ -307,8 +301,6 @@ void XMLShapeExport::ImpExport3DShape( } } -////////////////////////////////////////////////////////////////////////////// - /** helper for chart that adds all attributes of a 3d scene element to the export */ void XMLShapeExport::export3DSceneAttributes( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >& xPropSet ) { @@ -482,6 +474,4 @@ void XMLShapeExport::export3DLamps( const com::sun::star::uno::Reference< com::s } } -////////////////////////////////////////////////////////////////////////////// - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/draw/shapeexport4.cxx b/xmloff/source/draw/shapeexport4.cxx index 6d8b74371108..a87f73f5c597 100644 --- a/xmloff/source/draw/shapeexport4.cxx +++ b/xmloff/source/draw/shapeexport4.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/graphic/GraphicProvider.hpp> #include <com/sun/star/graphic/XGraphicProvider.hpp> @@ -74,8 +73,6 @@ using ::com::sun::star::uno::UNO_QUERY_THROW; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -////////////////////////////////////////////////////////////////////////////// - void ExportParameter( OUStringBuffer& rStrBuffer, const com::sun::star::drawing::EnhancedCustomShapeParameter& rParameter ) { if ( !rStrBuffer.isEmpty() ) @@ -1223,7 +1220,6 @@ void XMLShapeExport::ImpExportTableShape( const uno::Reference< drawing::XShape } } - uno::Reference< table::XColumnRowRange > xRange( xPropSet->getPropertyValue( msModel ), uno::UNO_QUERY_THROW ); GetShapeTableExport()->exportTable( xRange ); } diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx index 3e7711c5c0ac..64f36f6847eb 100644 --- a/xmloff/source/draw/shapeimport.cxx +++ b/xmloff/source/draw/shapeimport.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <tools/debug.hxx> #include <com/sun/star/text/PositionLayoutDir.hpp> @@ -43,13 +42,10 @@ #include <map> #include <vector> - using namespace ::std; using namespace ::com::sun::star; using namespace ::xmloff::token; -////////////////////////////////////////////////////////////////////////////// - struct ltint32 { bool operator()(const sal_Int32 p, sal_Int32 q) const @@ -111,8 +107,6 @@ struct XMLShapeImportHelperImpl sal_Bool mbIsPresentationShapesSupported; }; -////////////////////////////////////////////////////////////////////////////// - XMLShapeImportHelper::XMLShapeImportHelper( SvXMLImport& rImporter, const uno::Reference< frame::XModel>& rModel, @@ -183,8 +177,6 @@ XMLShapeImportHelper::XMLShapeImportHelper( mpImpl->mbIsPresentationShapesSupported = xInfo.is() && xInfo->supportsService( aSName ); } -////////////////////////////////////////////////////////////////////////////// - XMLShapeImportHelper::~XMLShapeImportHelper() { DBG_ASSERT( mpImpl->maConnections.empty(), "XMLShapeImportHelper::restoreConnections() was not called!" ); @@ -239,10 +231,6 @@ XMLShapeImportHelper::~XMLShapeImportHelper() delete mpImpl; } -////////////////////////////////////////////////////////////////////////////// - - - const SvXMLTokenMap& XMLShapeImportHelper::GetGroupShapeElemTokenMap() { if(!mpGroupShapeElemTokenMap) @@ -306,9 +294,6 @@ const SvXMLTokenMap& XMLShapeImportHelper::GetFrameShapeElemTokenMap() return *mpFrameShapeElemTokenMap; } -////////////////////////////////////////////////////////////////////////////// - - const SvXMLTokenMap& XMLShapeImportHelper::Get3DSceneShapeElemTokenMap() { if(!mp3DSceneShapeElemTokenMap) @@ -329,9 +314,6 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DSceneShapeElemTokenMap() return *mp3DSceneShapeElemTokenMap; } -////////////////////////////////////////////////////////////////////////////// - - const SvXMLTokenMap& XMLShapeImportHelper::Get3DObjectAttrTokenMap() { if(!mp3DObjectAttrTokenMap) @@ -349,9 +331,6 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DObjectAttrTokenMap() return *mp3DObjectAttrTokenMap; } -////////////////////////////////////////////////////////////////////////////// - - const SvXMLTokenMap& XMLShapeImportHelper::Get3DPolygonBasedAttrTokenMap() { if(!mp3DPolygonBasedAttrTokenMap) @@ -369,9 +348,6 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DPolygonBasedAttrTokenMap() return *mp3DPolygonBasedAttrTokenMap; } -////////////////////////////////////////////////////////////////////////////// - - const SvXMLTokenMap& XMLShapeImportHelper::Get3DCubeObjectAttrTokenMap() { if(!mp3DCubeObjectAttrTokenMap) @@ -389,9 +365,6 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DCubeObjectAttrTokenMap() return *mp3DCubeObjectAttrTokenMap; } -////////////////////////////////////////////////////////////////////////////// - - const SvXMLTokenMap& XMLShapeImportHelper::Get3DSphereObjectAttrTokenMap() { if(!mp3DSphereObjectAttrTokenMap) @@ -409,8 +382,6 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DSphereObjectAttrTokenMap() return *mp3DSphereObjectAttrTokenMap; } -////////////////////////////////////////////////////////////////////////////// - const SvXMLTokenMap& XMLShapeImportHelper::Get3DLightAttrTokenMap() { if(!mp3DLightAttrTokenMap) @@ -430,9 +401,6 @@ const SvXMLTokenMap& XMLShapeImportHelper::Get3DLightAttrTokenMap() return *mp3DLightAttrTokenMap; } -////////////////////////////////////////////////////////////////////////////// - - SvXMLShapeContext* XMLShapeImportHelper::Create3DSceneChildContext( SvXMLImport& rImport, sal_uInt16 p_nPrefix, @@ -495,24 +463,18 @@ SvXMLShapeContext* XMLShapeImportHelper::Create3DSceneChildContext( return pContext; } -////////////////////////////////////////////////////////////////////////////// - void XMLShapeImportHelper::SetStylesContext(SvXMLStylesContext* pNew) { mpStylesContext = pNew; mpStylesContext->AddRef(); } -////////////////////////////////////////////////////////////////////////////// - void XMLShapeImportHelper::SetAutoStylesContext(SvXMLStylesContext* pNew) { mpAutoStylesContext = pNew; mpAutoStylesContext->AddRef(); } -////////////////////////////////////////////////////////////////////////////// - SvXMLShapeContext* XMLShapeImportHelper::CreateGroupChildContext( SvXMLImport& rImport, sal_uInt16 p_nPrefix, @@ -663,7 +625,6 @@ SvXMLShapeContext* XMLShapeImportHelper::CreateFrameChildContext( pAttrList->AppendAttributeList( rFrameAttrList ); uno::Reference < xml::sax::XAttributeList > xAttrList = pAttrList; - switch(rTokenMap.Get(p_nPrefix, rLocalName)) { case XML_TOK_FRAME_TEXT_BOX: @@ -749,7 +710,6 @@ SvXMLImportContext *XMLShapeImportHelper::CreateFrameChildContext( return pContext; } - /** this function is called whenever the implementation classes like to add this new shape to the given XShapes. */ @@ -904,7 +864,6 @@ void XMLShapeImportHelper::popGroupAndSort() nCount -= rZList.size(); nCount -= rUnsortedList.size(); - if( nCount > 0 ) { // first update offsets of added shapes diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx index 06adb8a84951..f97aaacc41bb 100644 --- a/xmloff/source/draw/xexptran.cxx +++ b/xmloff/source/draw/xexptran.cxx @@ -33,15 +33,12 @@ #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/tools/unotools.hxx> - using namespace ::com::sun::star; -////////////////////////////////////////////////////////////////////////////// // Defines #define BORDER_INTEGERS_ARE_EQUAL (4) -////////////////////////////////////////////////////////////////////////////// // Predeclarations void Imp_SkipDouble(const OUString& rStr, sal_Int32& rPos, const sal_Int32 nLen); @@ -58,9 +55,6 @@ void Imp_CalcVectorValues(::basegfx::B2DVector& aVec1, ::basegfx::B2DVector& aVe bSameDirection = (nLen3 <= BORDER_INTEGERS_ARE_EQUAL); } - -////////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// // parsing help functions for simple chars void Imp_SkipSpaces(const OUString& rStr, sal_Int32& rPos, const sal_Int32 nLen) { @@ -90,8 +84,6 @@ void Imp_SkipSpacesAndClosingBraces(const OUString& rStr, sal_Int32& rPos, const rPos++; } -////////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// // parsing help functions for integer numbers bool Imp_IsOnNumberChar(const OUString& rStr, const sal_Int32 nPos, bool bSignAllowed = true) @@ -152,8 +144,6 @@ void Imp_PutNumberCharWithSpace(OUString& rStr, sal_Int32 nValue) Imp_PutNumberChar(rStr, nValue); } -////////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// // parsing help functions for double numbers void Imp_SkipDouble(const OUString& rStr, sal_Int32& rPos, const sal_Int32) @@ -256,8 +246,6 @@ void Imp_PutDoubleChar(OUString& rStr, const SvXMLUnitConverter& rConv, double f rStr += OUString(sStringBuffer.makeStringAndClear()); } -////////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// // base class of all 2D transform objects struct ImpSdXMLExpTransObj2DBase @@ -267,7 +255,6 @@ struct ImpSdXMLExpTransObj2DBase : mnType(nType) {} }; -////////////////////////////////////////////////////////////////////////////// // possible object types for 2D #define IMP_SDXMLEXP_TRANSOBJ2D_ROTATE 0x0000 @@ -277,7 +264,6 @@ struct ImpSdXMLExpTransObj2DBase #define IMP_SDXMLEXP_TRANSOBJ2D_SKEWY 0x0004 #define IMP_SDXMLEXP_TRANSOBJ2D_MATRIX 0x0005 -////////////////////////////////////////////////////////////////////////////// // classes of objects, different sizes struct ImpSdXMLExpTransObj2DRotate : public ImpSdXMLExpTransObj2DBase @@ -317,8 +303,6 @@ struct ImpSdXMLExpTransObj2DMatrix : public ImpSdXMLExpTransObj2DBase : ImpSdXMLExpTransObj2DBase(IMP_SDXMLEXP_TRANSOBJ2D_MATRIX), maMatrix(rNew) {} }; -////////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// // delete all entries in list void SdXMLImExTransform2D::EmptyList() @@ -371,7 +355,6 @@ void SdXMLImExTransform2D::EmptyList() maList.clear(); } -////////////////////////////////////////////////////////////////////////////// // add members void SdXMLImExTransform2D::AddRotate(double fNew) @@ -392,7 +375,6 @@ void SdXMLImExTransform2D::AddSkewX(double fNew) maList.push_back(new ImpSdXMLExpTransObj2DSkewX(fNew)); } -////////////////////////////////////////////////////////////////////////////// // gen string for export const OUString& SdXMLImExTransform2D::GetExportString(const SvXMLUnitConverter& rConv) { @@ -495,7 +477,6 @@ const OUString& SdXMLImExTransform2D::GetExportString(const SvXMLUnitConverter& return msString; } -////////////////////////////////////////////////////////////////////////////// // sets new string, parses it and generates entries void SdXMLImExTransform2D::SetString(const OUString& rNew, const SvXMLUnitConverter& rConv) { @@ -687,8 +668,6 @@ void SdXMLImExTransform2D::GetFullTransform(::basegfx::B2DHomMatrix& rFullTrans) } } -////////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// // base class of all 3D transform objects struct ImpSdXMLExpTransObj3DBase @@ -698,7 +677,6 @@ struct ImpSdXMLExpTransObj3DBase : mnType(nType) {} }; -////////////////////////////////////////////////////////////////////////////// // possible object types for 3D #define IMP_SDXMLEXP_TRANSOBJ3D_ROTATE_X 0x0000 @@ -708,7 +686,6 @@ struct ImpSdXMLExpTransObj3DBase #define IMP_SDXMLEXP_TRANSOBJ3D_TRANSLATE 0x0004 #define IMP_SDXMLEXP_TRANSOBJ3D_MATRIX 0x0005 -////////////////////////////////////////////////////////////////////////////// // classes of objects, different sizes struct ImpSdXMLExpTransObj3DRotateX : public ImpSdXMLExpTransObj3DBase @@ -748,8 +725,6 @@ struct ImpSdXMLExpTransObj3DMatrix : public ImpSdXMLExpTransObj3DBase : ImpSdXMLExpTransObj3DBase(IMP_SDXMLEXP_TRANSOBJ3D_MATRIX), maMatrix(rNew) {} }; -////////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// // delete all entries in list void SdXMLImExTransform3D::EmptyList() @@ -802,7 +777,6 @@ void SdXMLImExTransform3D::EmptyList() maList.clear(); } -////////////////////////////////////////////////////////////////////////////// // add members void SdXMLImExTransform3D::AddMatrix(const ::basegfx::B3DHomMatrix& rNew) @@ -831,7 +805,6 @@ void SdXMLImExTransform3D::AddHomogenMatrix(const drawing::HomogenMatrix& xHomMa AddMatrix(aExportMatrix); } -////////////////////////////////////////////////////////////////////////////// // gen string for export const OUString& SdXMLImExTransform3D::GetExportString(const SvXMLUnitConverter& rConv) { @@ -962,14 +935,12 @@ const OUString& SdXMLImExTransform3D::GetExportString(const SvXMLUnitConverter& return msString; } -////////////////////////////////////////////////////////////////////////////// // for Import: constructor with string, parses it and generates entries SdXMLImExTransform3D::SdXMLImExTransform3D(const OUString& rNew, const SvXMLUnitConverter& rConv) { SetString(rNew, rConv); } -////////////////////////////////////////////////////////////////////////////// // sets new string, parses it and generates entries void SdXMLImExTransform3D::SetString(const OUString& rNew, const SvXMLUnitConverter& rConv) { @@ -1221,9 +1192,6 @@ void SdXMLImExTransform3D::GetFullTransform(::basegfx::B3DHomMatrix& rFullTrans) } } -////////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// - SdXMLImExViewBox::SdXMLImExViewBox(sal_Int32 nX, sal_Int32 nY, sal_Int32 nW, sal_Int32 nH) : mnX( nX ), mnY( nY ), @@ -1294,9 +1262,6 @@ const OUString& SdXMLImExViewBox::GetExportString() return msString; } -////////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// - SdXMLImExPointsElement::SdXMLImExPointsElement(drawing::PointSequence* pPoints, const SdXMLImExViewBox& rViewBox, const awt::Point& rObjectPos, @@ -1457,9 +1422,6 @@ SdXMLImExPointsElement::SdXMLImExPointsElement(const OUString& rNew, } } -////////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// - SdXMLImExSvgDElement::SdXMLImExSvgDElement(const SdXMLImExViewBox& rViewBox, const SvXMLExport& rExport) : mrViewBox( rViewBox ), diff --git a/xmloff/source/draw/ximp3dobject.cxx b/xmloff/source/draw/ximp3dobject.cxx index 78f29da0603c..ae53e0a8a628 100644 --- a/xmloff/source/draw/ximp3dobject.cxx +++ b/xmloff/source/draw/ximp3dobject.cxx @@ -32,12 +32,8 @@ #include <com/sun/star/drawing/PolyPolygonShape3D.hpp> #include <com/sun/star/drawing/DoubleSequence.hpp> - using namespace ::com::sun::star; -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - TYPEINIT1( SdXML3DObjectContext, SdXMLShapeContext ); SdXML3DObjectContext::SdXML3DObjectContext( @@ -77,14 +73,10 @@ SdXML3DObjectContext::SdXML3DObjectContext( } } -////////////////////////////////////////////////////////////////////////////// - SdXML3DObjectContext::~SdXML3DObjectContext() { } -////////////////////////////////////////////////////////////////////////////// - void SdXML3DObjectContext::StartElement(const uno::Reference< xml::sax::XAttributeList>& xAttrList) { uno::Reference< beans::XPropertySet > xPropSet(mxShape, uno::UNO_QUERY); @@ -103,17 +95,12 @@ void SdXML3DObjectContext::StartElement(const uno::Reference< xml::sax::XAttribu } } -////////////////////////////////////////////////////////////////////////////// - void SdXML3DObjectContext::EndElement() { // call parent SdXMLShapeContext::EndElement(); } -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - TYPEINIT1( SdXML3DCubeObjectShapeContext, SdXML3DObjectContext); SdXML3DCubeObjectShapeContext::SdXML3DCubeObjectShapeContext( @@ -168,14 +155,10 @@ SdXML3DCubeObjectShapeContext::SdXML3DCubeObjectShapeContext( } } -////////////////////////////////////////////////////////////////////////////// - SdXML3DCubeObjectShapeContext::~SdXML3DCubeObjectShapeContext() { } -////////////////////////////////////////////////////////////////////////////// - void SdXML3DCubeObjectShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>& xAttrList) { // create shape @@ -214,17 +197,12 @@ void SdXML3DCubeObjectShapeContext::StartElement(const uno::Reference< xml::sax: } } -////////////////////////////////////////////////////////////////////////////// - void SdXML3DCubeObjectShapeContext::EndElement() { // call parent SdXML3DObjectContext::EndElement(); } -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - TYPEINIT1( SdXML3DSphereObjectShapeContext, SdXML3DObjectContext); SdXML3DSphereObjectShapeContext::SdXML3DSphereObjectShapeContext( @@ -279,14 +257,10 @@ SdXML3DSphereObjectShapeContext::SdXML3DSphereObjectShapeContext( } } -////////////////////////////////////////////////////////////////////////////// - SdXML3DSphereObjectShapeContext::~SdXML3DSphereObjectShapeContext() { } -////////////////////////////////////////////////////////////////////////////// - void SdXML3DSphereObjectShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>& xAttrList) { // create shape @@ -322,17 +296,12 @@ void SdXML3DSphereObjectShapeContext::StartElement(const uno::Reference< xml::sa } } -////////////////////////////////////////////////////////////////////////////// - void SdXML3DSphereObjectShapeContext::EndElement() { // call parent SdXML3DObjectContext::EndElement(); } -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - TYPEINIT1( SdXML3DPolygonBasedShapeContext, SdXML3DObjectContext ); SdXML3DPolygonBasedShapeContext::SdXML3DPolygonBasedShapeContext( @@ -369,14 +338,10 @@ SdXML3DPolygonBasedShapeContext::SdXML3DPolygonBasedShapeContext( } } -////////////////////////////////////////////////////////////////////////////// - SdXML3DPolygonBasedShapeContext::~SdXML3DPolygonBasedShapeContext() { } -////////////////////////////////////////////////////////////////////////////// - void SdXML3DPolygonBasedShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>& xAttrList) { uno::Reference< beans::XPropertySet > xPropSet(mxShape, uno::UNO_QUERY); @@ -441,17 +406,12 @@ void SdXML3DPolygonBasedShapeContext::StartElement(const uno::Reference< xml::sa } } -////////////////////////////////////////////////////////////////////////////// - void SdXML3DPolygonBasedShapeContext::EndElement() { // call parent SdXML3DObjectContext::EndElement(); } -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - TYPEINIT1( SdXML3DLatheObjectShapeContext, SdXML3DPolygonBasedShapeContext); SdXML3DLatheObjectShapeContext::SdXML3DLatheObjectShapeContext( @@ -465,14 +425,10 @@ SdXML3DLatheObjectShapeContext::SdXML3DLatheObjectShapeContext( { } -////////////////////////////////////////////////////////////////////////////// - SdXML3DLatheObjectShapeContext::~SdXML3DLatheObjectShapeContext() { } -////////////////////////////////////////////////////////////////////////////// - void SdXML3DLatheObjectShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>& xAttrList) { // create shape @@ -485,17 +441,12 @@ void SdXML3DLatheObjectShapeContext::StartElement(const uno::Reference< xml::sax } } -////////////////////////////////////////////////////////////////////////////// - void SdXML3DLatheObjectShapeContext::EndElement() { // call parent SdXML3DPolygonBasedShapeContext::EndElement(); } -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - TYPEINIT1( SdXML3DExtrudeObjectShapeContext, SdXML3DPolygonBasedShapeContext); SdXML3DExtrudeObjectShapeContext::SdXML3DExtrudeObjectShapeContext( @@ -509,14 +460,10 @@ SdXML3DExtrudeObjectShapeContext::SdXML3DExtrudeObjectShapeContext( { } -////////////////////////////////////////////////////////////////////////////// - SdXML3DExtrudeObjectShapeContext::~SdXML3DExtrudeObjectShapeContext() { } -////////////////////////////////////////////////////////////////////////////// - void SdXML3DExtrudeObjectShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>& xAttrList) { AddShape( "com.sun.star.drawing.Shape3DExtrudeObject" ); @@ -528,8 +475,6 @@ void SdXML3DExtrudeObjectShapeContext::StartElement(const uno::Reference< xml::s } } -////////////////////////////////////////////////////////////////////////////// - void SdXML3DExtrudeObjectShapeContext::EndElement() { // call parent diff --git a/xmloff/source/draw/ximp3dobject.hxx b/xmloff/source/draw/ximp3dobject.hxx index 42dcde876762..bfdb75788c56 100644 --- a/xmloff/source/draw/ximp3dobject.hxx +++ b/xmloff/source/draw/ximp3dobject.hxx @@ -30,7 +30,6 @@ #include <com/sun/star/drawing/Position3D.hpp> #include "ximpshap.hxx" -////////////////////////////////////////////////////////////////////////////// // common shape context class SdXML3DObjectContext : public SdXMLShapeContext @@ -56,7 +55,6 @@ public: virtual void EndElement(); }; -////////////////////////////////////////////////////////////////////////////// // dr3d:3dcube context class SdXML3DCubeObjectShapeContext : public SdXML3DObjectContext @@ -80,7 +78,6 @@ public: virtual void EndElement(); }; -////////////////////////////////////////////////////////////////////////////// // dr3d:3dsphere context class SdXML3DSphereObjectShapeContext : public SdXML3DObjectContext @@ -104,7 +101,6 @@ public: virtual void EndElement(); }; -////////////////////////////////////////////////////////////////////////////// // polygonbased context class SdXML3DPolygonBasedShapeContext : public SdXML3DObjectContext @@ -126,7 +122,6 @@ public: virtual void EndElement(); }; -////////////////////////////////////////////////////////////////////////////// // dr3d:3dlathe context class SdXML3DLatheObjectShapeContext : public SdXML3DPolygonBasedShapeContext @@ -145,7 +140,6 @@ public: virtual void EndElement(); }; -////////////////////////////////////////////////////////////////////////////// // dr3d:3dextrude context class SdXML3DExtrudeObjectShapeContext : public SdXML3DPolygonBasedShapeContext diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx index 563b21640cd9..4555e7bcd74e 100644 --- a/xmloff/source/draw/ximp3dscene.cxx +++ b/xmloff/source/draw/ximp3dscene.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <sax/tools/converter.hxx> #include "ximp3dscene.hxx" @@ -30,11 +29,9 @@ #include "eventimp.hxx" #include "descriptionimp.hxx" - using namespace ::com::sun::star; using namespace ::xmloff::token; -////////////////////////////////////////////////////////////////////////////// // dr3d:3dlight context SdXML3DLightContext::SdXML3DLightContext( @@ -88,8 +85,6 @@ SdXML3DLightContext::~SdXML3DLightContext() { } -////////////////////////////////////////////////////////////////////////////// - TYPEINIT1( SdXML3DSceneShapeContext, SdXMLShapeContext ); SdXML3DSceneShapeContext::SdXML3DSceneShapeContext( @@ -103,14 +98,10 @@ SdXML3DSceneShapeContext::SdXML3DSceneShapeContext( { } -////////////////////////////////////////////////////////////////////////////// - SdXML3DSceneShapeContext::~SdXML3DSceneShapeContext() { } -////////////////////////////////////////////////////////////////////////////// - void SdXML3DSceneShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>& xAttrList) { // create new 3DScene shape and add it to rShapes, use it @@ -149,8 +140,6 @@ void SdXML3DSceneShapeContext::StartElement(const uno::Reference< xml::sax::XAtt } } -////////////////////////////////////////////////////////////////////////////// - void SdXML3DSceneShapeContext::EndElement() { if(mxShape.is()) @@ -169,8 +158,6 @@ void SdXML3DSceneShapeContext::EndElement() } } -////////////////////////////////////////////////////////////////////////////// - SvXMLImportContext* SdXML3DSceneShapeContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList>& xAttrList ) @@ -211,8 +198,6 @@ SvXMLImportContext* SdXML3DSceneShapeContext::CreateChildContext( sal_uInt16 nPr return pContext; } -////////////////////////////////////////////////////////////////////////////// - SdXML3DSceneAttributesHelper::SdXML3DSceneAttributesHelper( SvXMLImport& rImporter ) : mrImport( rImporter ), mbSetTransform( sal_False ), diff --git a/xmloff/source/draw/ximp3dscene.hxx b/xmloff/source/draw/ximp3dscene.hxx index 8eea3ac00d27..5d8dc655b7f7 100644 --- a/xmloff/source/draw/ximp3dscene.hxx +++ b/xmloff/source/draw/ximp3dscene.hxx @@ -27,7 +27,6 @@ #include <tools/rtti.hxx> #include <ximpshap.hxx> -////////////////////////////////////////////////////////////////////////////// // dr3d:3dscene context class SdXML3DSceneShapeContext : public SdXMLShapeContext, public SdXML3DSceneAttributesHelper @@ -68,7 +67,6 @@ public: { return mxShapes; } }; - #endif // _XIMPGROUP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/draw/ximpbody.cxx b/xmloff/source/draw/ximpbody.cxx index 434d0d5d0bfc..825020050723 100644 --- a/xmloff/source/draw/ximpbody.cxx +++ b/xmloff/source/draw/ximpbody.cxx @@ -37,11 +37,8 @@ #include "PropertySetMerger.hxx" #include "animationimport.hxx" - using namespace ::com::sun::star; -////////////////////////////////////////////////////////////////////////////// - SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, @@ -209,14 +206,10 @@ SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport, DeleteAllShapes(); } -////////////////////////////////////////////////////////////////////////////// - SdXMLDrawPageContext::~SdXMLDrawPageContext() { } -////////////////////////////////////////////////////////////////////////////// - SvXMLImportContext *SdXMLDrawPageContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) @@ -286,23 +279,16 @@ void SdXMLDrawPageContext::EndElement() } } -////////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// - SdXMLBodyContext::SdXMLBodyContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName ) : SvXMLImportContext( rImport, nPrfx, rLocalName ) { } -////////////////////////////////////////////////////////////////////////////// - SdXMLBodyContext::~SdXMLBodyContext() { } -////////////////////////////////////////////////////////////////////////////// - SvXMLImportContext *SdXMLBodyContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, diff --git a/xmloff/source/draw/ximpbody.hxx b/xmloff/source/draw/ximpbody.hxx index 2e6b3b8d6337..f45acb9c4809 100644 --- a/xmloff/source/draw/ximpbody.hxx +++ b/xmloff/source/draw/ximpbody.hxx @@ -25,7 +25,6 @@ #include <xmloff/nmspmap.hxx> #include "ximppage.hxx" -////////////////////////////////////////////////////////////////////////////// // draw:page context class SdXMLDrawPageContext : public SdXMLGenericPageContext @@ -50,7 +49,6 @@ public: }; -////////////////////////////////////////////////////////////////////////////// // office:body context class SdXMLBodyContext : public SvXMLImportContext @@ -67,7 +65,6 @@ public: const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); }; - #endif // _XIMPBODY_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/draw/ximpgrp.cxx b/xmloff/source/draw/ximpgrp.cxx index 8747bdadb58c..895a35d7abb5 100644 --- a/xmloff/source/draw/ximpgrp.cxx +++ b/xmloff/source/draw/ximpgrp.cxx @@ -24,12 +24,9 @@ #include "eventimp.hxx" #include "descriptionimp.hxx" - using namespace ::com::sun::star; using namespace ::xmloff::token; -////////////////////////////////////////////////////////////////////////////// - TYPEINIT1( SdXMLGroupShapeContext, SvXMLImportContext ); SdXMLGroupShapeContext::SdXMLGroupShapeContext( @@ -42,14 +39,10 @@ SdXMLGroupShapeContext::SdXMLGroupShapeContext( { } -////////////////////////////////////////////////////////////////////////////// - SdXMLGroupShapeContext::~SdXMLGroupShapeContext() { } -////////////////////////////////////////////////////////////////////////////// - SvXMLImportContext* SdXMLGroupShapeContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList>& xAttrList ) @@ -85,8 +78,6 @@ SvXMLImportContext* SdXMLGroupShapeContext::CreateChildContext( sal_uInt16 nPref return pContext; } -////////////////////////////////////////////////////////////////////////////// - void SdXMLGroupShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>&) { // create new group shape and add it to rShapes, use it @@ -105,8 +96,6 @@ void SdXMLGroupShapeContext::StartElement(const uno::Reference< xml::sax::XAttri GetImport().GetShapeImport()->finishShape( mxShape, mxAttrList, mxShapes ); } -////////////////////////////////////////////////////////////////////////////// - void SdXMLGroupShapeContext::EndElement() { if( mxChildren.is() ) @@ -115,5 +104,4 @@ void SdXMLGroupShapeContext::EndElement() SdXMLShapeContext::EndElement(); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/draw/ximpgrp.hxx b/xmloff/source/draw/ximpgrp.hxx index b24414e91cb6..431ad4ed80e2 100644 --- a/xmloff/source/draw/ximpgrp.hxx +++ b/xmloff/source/draw/ximpgrp.hxx @@ -27,7 +27,6 @@ #include <tools/rtti.hxx> #include "ximpshap.hxx" -////////////////////////////////////////////////////////////////////////////// // draw:g context (RECURSIVE) class SdXMLGroupShapeContext : public SdXMLShapeContext @@ -60,7 +59,6 @@ public: { return mxShapes; } }; - #endif // _XIMPGROUP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/draw/ximplink.cxx b/xmloff/source/draw/ximplink.cxx index 92f99c004c28..fdea3d9c3731 100644 --- a/xmloff/source/draw/ximplink.cxx +++ b/xmloff/source/draw/ximplink.cxx @@ -21,12 +21,9 @@ #include "ximplink.hxx" #include <xmloff/xmltoken.hxx> - using namespace ::com::sun::star; using namespace ::xmloff::token; -////////////////////////////////////////////////////////////////////////////// - TYPEINIT1( SdXMLShapeLinkContext, SvXMLImportContext ); SdXMLShapeLinkContext::SdXMLShapeLinkContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes) @@ -48,14 +45,10 @@ SdXMLShapeLinkContext::SdXMLShapeLinkContext( SvXMLImport& rImport, sal_uInt16 n } } -////////////////////////////////////////////////////////////////////////////// - SdXMLShapeLinkContext::~SdXMLShapeLinkContext() { } -////////////////////////////////////////////////////////////////////////////// - SvXMLImportContext* SdXMLShapeLinkContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList>& xAttrList ) @@ -73,19 +66,14 @@ SvXMLImportContext* SdXMLShapeLinkContext::CreateChildContext( sal_uInt16 nPrefi } -////////////////////////////////////////////////////////////////////////////// - void SdXMLShapeLinkContext::StartElement(const uno::Reference< xml::sax::XAttributeList>& xAttr ) { SvXMLImportContext::StartElement( xAttr ); } -////////////////////////////////////////////////////////////////////////////// - void SdXMLShapeLinkContext::EndElement() { SvXMLImportContext::EndElement(); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/draw/ximplink.hxx b/xmloff/source/draw/ximplink.hxx index d2d33779787e..e02b0257b11a 100644 --- a/xmloff/source/draw/ximplink.hxx +++ b/xmloff/source/draw/ximplink.hxx @@ -27,7 +27,6 @@ #include <tools/rtti.hxx> #include "ximpshap.hxx" -////////////////////////////////////////////////////////////////////////////// // draw:a context // this should have been a SvXMLImportContext but CreateGroupChildContext() returns @@ -54,7 +53,6 @@ public: virtual void EndElement(); }; - #endif // _XIMPLINK_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/draw/ximpnote.cxx b/xmloff/source/draw/ximpnote.cxx index 52f90ad8f02e..be6e0271cd60 100644 --- a/xmloff/source/draw/ximpnote.cxx +++ b/xmloff/source/draw/ximpnote.cxx @@ -20,11 +20,8 @@ #include "ximpnote.hxx" #include <com/sun/star/presentation/XPresentationPage.hpp> - using namespace ::com::sun::star; -////////////////////////////////////////////////////////////////////////////// - SdXMLNotesContext::SdXMLNotesContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, @@ -91,14 +88,10 @@ SdXMLNotesContext::SdXMLNotesContext( SdXMLImport& rImport, } } -////////////////////////////////////////////////////////////////////////////// - SdXMLNotesContext::~SdXMLNotesContext() { } -////////////////////////////////////////////////////////////////////////////// - SvXMLImportContext *SdXMLNotesContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList>& xAttrList ) @@ -109,12 +102,6 @@ SvXMLImportContext *SdXMLNotesContext::CreateChildContext( sal_uInt16 nPrefix, // some special objects inside presentation:notes context // ... - - - - - - // call parent when no own context was created if(!pContext) pContext = SdXMLGenericPageContext::CreateChildContext(nPrefix, rLocalName, xAttrList); @@ -122,8 +109,6 @@ SvXMLImportContext *SdXMLNotesContext::CreateChildContext( sal_uInt16 nPrefix, return pContext; } -////////////////////////////////////////////////////////////////////////////// - void SdXMLNotesContext::EndElement() { SdXMLGenericPageContext::EndElement(); diff --git a/xmloff/source/draw/ximpnote.hxx b/xmloff/source/draw/ximpnote.hxx index 89ec7e3163b5..9927b4e98ad6 100644 --- a/xmloff/source/draw/ximpnote.hxx +++ b/xmloff/source/draw/ximpnote.hxx @@ -25,7 +25,6 @@ #include <xmloff/nmspmap.hxx> #include "ximppage.hxx" -////////////////////////////////////////////////////////////////////////////// // presentation:notes context class SdXMLNotesContext : public SdXMLGenericPageContext @@ -46,7 +45,6 @@ public: virtual void EndElement(); }; - #endif // _XIMPNOTES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx index f56af25022c0..41d4b15fcee8 100644 --- a/xmloff/source/draw/ximppage.cxx +++ b/xmloff/source/draw/ximppage.cxx @@ -38,7 +38,6 @@ #include <xmloff/unointerfacetouniqueidentifiermapper.hxx> #include <xmloff/xmluconv.hxx> - using namespace ::com::sun::star; using namespace ::xmloff::token; using namespace ::com::sun::star::uno; @@ -52,9 +51,6 @@ using namespace ::com::sun::star::office; using namespace ::com::sun::star::xml::sax; using namespace ::com::sun::star::geometry; - -////////////////////////////////////////////////////////////////////////////// - class DrawAnnotationContext : public SvXMLImportContext { @@ -200,8 +196,6 @@ void DrawAnnotationContext::EndElement() } } -////////////////////////////////////////////////////////////////////////////// - TYPEINIT1( SdXMLGenericPageContext, SvXMLImportContext ); SdXMLGenericPageContext::SdXMLGenericPageContext( @@ -228,14 +222,10 @@ SdXMLGenericPageContext::SdXMLGenericPageContext( } } -////////////////////////////////////////////////////////////////////////////// - SdXMLGenericPageContext::~SdXMLGenericPageContext() { } -////////////////////////////////////////////////////////////////////////////// - void SdXMLGenericPageContext::StartElement( const Reference< ::com::sun::star::xml::sax::XAttributeList >& ) { GetImport().GetShapeImport()->pushGroupForSorting( mxShapes ); @@ -244,8 +234,6 @@ void SdXMLGenericPageContext::StartElement( const Reference< ::com::sun::star::x GetImport().GetFormImport()->startPage( Reference< drawing::XDrawPage >::query( mxShapes ) ); } -////////////////////////////////////////////////////////////////////////////// - SvXMLImportContext* SdXMLGenericPageContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList>& xAttrList ) @@ -280,8 +268,6 @@ SvXMLImportContext* SdXMLGenericPageContext::CreateChildContext( sal_uInt16 nPre return pContext; } -////////////////////////////////////////////////////////////////////////////// - void SdXMLGenericPageContext::EndElement() { GetImport().GetShapeImport()->popGroupAndSort(); diff --git a/xmloff/source/draw/ximppage.hxx b/xmloff/source/draw/ximppage.hxx index cb5b01a63035..dc4338f1c819 100644 --- a/xmloff/source/draw/ximppage.hxx +++ b/xmloff/source/draw/ximppage.hxx @@ -28,7 +28,6 @@ #include <tools/rtti.hxx> #include "ximpshap.hxx" -////////////////////////////////////////////////////////////////////////////// // draw:g context (RECURSIVE) class SdXMLGenericPageContext : public SvXMLImportContext @@ -84,7 +83,6 @@ public: { return mxShapes; } }; - #endif // _XIMPGROUP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index 4909075f490c..b1a00c3a716f 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -79,7 +79,6 @@ #include <basegfx/point/b2dpoint.hxx> #include <basegfx/vector/b2dvector.hxx> - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing; @@ -115,8 +114,6 @@ SvXMLEnumMapEntry aXML_GlueEscapeDirection_EnumMap[] = { XML_TOKEN_INVALID, 0 } }; -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - static bool ImpIsEmptyURL( const OUString& rURL ) { if( rURL.isEmpty() ) @@ -130,8 +127,6 @@ static bool ImpIsEmptyURL( const OUString& rURL ) return false; } -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - TYPEINIT1( SvXMLShapeContext, SvXMLImportContext ); TYPEINIT1( SdXMLShapeContext, SvXMLShapeContext ); @@ -160,14 +155,10 @@ SdXMLShapeContext::SdXMLShapeContext( { } -////////////////////////////////////////////////////////////////////////////// - SdXMLShapeContext::~SdXMLShapeContext() { } -////////////////////////////////////////////////////////////////////////////// - SvXMLImportContext *SdXMLShapeContext::CreateChildContext( sal_uInt16 p_nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList>& xAttrList ) @@ -333,7 +324,6 @@ void SdXMLShapeContext::addGluePoint( const uno::Reference< xml::sax::XAttribute } } } -////////////////////////////////////////////////////////////////////////////// void SdXMLShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>&) { @@ -415,8 +405,6 @@ void SdXMLShapeContext::EndElement() mxLockable->removeActionLock(); } -////////////////////////////////////////////////////////////////////////////// - void SdXMLShapeContext::AddShape(uno::Reference< drawing::XShape >& xShape) { if(xShape.is()) @@ -483,8 +471,6 @@ void SdXMLShapeContext::AddShape(uno::Reference< drawing::XShape >& xShape) } -////////////////////////////////////////////////////////////////////////////// - void SdXMLShapeContext::AddShape(const char* pServiceName ) { uno::Reference< lang::XMultiServiceFactory > xServiceFact(GetImport().GetModel(), uno::UNO_QUERY); @@ -521,8 +507,6 @@ void SdXMLShapeContext::AddShape(const char* pServiceName ) } } -////////////////////////////////////////////////////////////////////////////// - void SdXMLShapeContext::SetTransformation() { if(mxShape.is()) @@ -588,8 +572,6 @@ void SdXMLShapeContext::SetTransformation() } } -////////////////////////////////////////////////////////////////////////////// - void SdXMLShapeContext::SetStyle( bool bSupportsStyle /* = true */) { try @@ -920,9 +902,6 @@ sal_Bool SdXMLShapeContext::isPresentationShape() const return sal_False; } -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - TYPEINIT1( SdXMLRectShapeContext, SdXMLShapeContext ); SdXMLRectShapeContext::SdXMLRectShapeContext( @@ -937,14 +916,10 @@ SdXMLRectShapeContext::SdXMLRectShapeContext( { } -////////////////////////////////////////////////////////////////////////////// - SdXMLRectShapeContext::~SdXMLRectShapeContext() { } -////////////////////////////////////////////////////////////////////////////// - // this is called from the parent group for each unparsed attribute in the attribute list void SdXMLRectShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { @@ -961,8 +936,6 @@ void SdXMLRectShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue ); } -////////////////////////////////////////////////////////////////////////////// - void SdXMLRectShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>& xAttrList) { // create rectangle shape @@ -995,9 +968,6 @@ void SdXMLRectShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib } } -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////3//////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - TYPEINIT1( SdXMLLineShapeContext, SdXMLShapeContext ); SdXMLLineShapeContext::SdXMLLineShapeContext( @@ -1015,14 +985,10 @@ SdXMLLineShapeContext::SdXMLLineShapeContext( { } -////////////////////////////////////////////////////////////////////////////// - SdXMLLineShapeContext::~SdXMLLineShapeContext() { } -////////////////////////////////////////////////////////////////////////////// - // this is called from the parent group for each unparsed attribute in the attribute list void SdXMLLineShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { @@ -1057,8 +1023,6 @@ void SdXMLLineShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue ); } -////////////////////////////////////////////////////////////////////////////// - void SdXMLLineShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>& xAttrList) { // #85920# use SetTransformation() to handle import of simple lines. @@ -1121,9 +1085,6 @@ void SdXMLLineShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib } } -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - TYPEINIT1( SdXMLEllipseShapeContext, SdXMLShapeContext ); SdXMLEllipseShapeContext::SdXMLEllipseShapeContext( @@ -1144,14 +1105,10 @@ SdXMLEllipseShapeContext::SdXMLEllipseShapeContext( { } -////////////////////////////////////////////////////////////////////////////// - SdXMLEllipseShapeContext::~SdXMLEllipseShapeContext() { } -////////////////////////////////////////////////////////////////////////////// - // this is called from the parent group for each unparsed attribute in the attribute list void SdXMLEllipseShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { @@ -1220,8 +1177,6 @@ void SdXMLEllipseShapeContext::processAttribute( sal_uInt16 nPrefix, const OUStr SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue ); } -////////////////////////////////////////////////////////////////////////////// - void SdXMLEllipseShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>& xAttrList) { // create rectangle shape @@ -1265,9 +1220,6 @@ void SdXMLEllipseShapeContext::StartElement(const uno::Reference< xml::sax::XAtt } } -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - TYPEINIT1( SdXMLPolygonShapeContext, SdXMLShapeContext ); SdXMLPolygonShapeContext::SdXMLPolygonShapeContext( @@ -1281,8 +1233,6 @@ SdXMLPolygonShapeContext::SdXMLPolygonShapeContext( { } -////////////////////////////////////////////////////////////////////////////// - // this is called from the parent group for each unparsed attribute in the attribute list void SdXMLPolygonShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { @@ -1306,14 +1256,10 @@ void SdXMLPolygonShapeContext::processAttribute( sal_uInt16 nPrefix, const OUStr SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue ); } -////////////////////////////////////////////////////////////////////////////// - SdXMLPolygonShapeContext::~SdXMLPolygonShapeContext() { } -////////////////////////////////////////////////////////////////////////////// - void SdXMLPolygonShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>& xAttrList) { // Add, set Style and properties from base shape @@ -1358,9 +1304,6 @@ void SdXMLPolygonShapeContext::StartElement(const uno::Reference< xml::sax::XAtt } } -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - TYPEINIT1( SdXMLPathShapeContext, SdXMLShapeContext ); SdXMLPathShapeContext::SdXMLPathShapeContext( @@ -1374,14 +1317,10 @@ SdXMLPathShapeContext::SdXMLPathShapeContext( { } -////////////////////////////////////////////////////////////////////////////// - SdXMLPathShapeContext::~SdXMLPathShapeContext() { } -////////////////////////////////////////////////////////////////////////////// - // this is called from the parent group for each unparsed attribute in the attribute list void SdXMLPathShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { @@ -1402,8 +1341,6 @@ void SdXMLPathShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue ); } -////////////////////////////////////////////////////////////////////////////// - void SdXMLPathShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>& xAttrList) { // create polygon shape @@ -1491,9 +1428,6 @@ void SdXMLPathShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib } } -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - TYPEINIT1( SdXMLTextBoxShapeContext, SdXMLShapeContext ); SdXMLTextBoxShapeContext::SdXMLTextBoxShapeContext( @@ -1508,14 +1442,10 @@ SdXMLTextBoxShapeContext::SdXMLTextBoxShapeContext( { } -////////////////////////////////////////////////////////////////////////////// - SdXMLTextBoxShapeContext::~SdXMLTextBoxShapeContext() { } -////////////////////////////////////////////////////////////////////////////// - // this is called from the parent group for each unparsed attribute in the attribute list void SdXMLTextBoxShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { @@ -1532,8 +1462,6 @@ void SdXMLTextBoxShapeContext::processAttribute( sal_uInt16 nPrefix, const OUStr SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue ); } -////////////////////////////////////////////////////////////////////////////// - void SdXMLTextBoxShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>&) { // create textbox shape @@ -1666,9 +1594,6 @@ void SdXMLTextBoxShapeContext::StartElement(const uno::Reference< xml::sax::XAtt } } -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - TYPEINIT1( SdXMLControlShapeContext, SdXMLShapeContext ); SdXMLControlShapeContext::SdXMLControlShapeContext( @@ -1682,14 +1607,10 @@ SdXMLControlShapeContext::SdXMLControlShapeContext( { } -////////////////////////////////////////////////////////////////////////////// - SdXMLControlShapeContext::~SdXMLControlShapeContext() { } -////////////////////////////////////////////////////////////////////////////// - // this is called from the parent group for each unparsed attribute in the attribute list void SdXMLControlShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { @@ -1738,9 +1659,6 @@ void SdXMLControlShapeContext::StartElement(const uno::Reference< xml::sax::XAtt } } -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - TYPEINIT1( SdXMLConnectorShapeContext, SdXMLShapeContext ); SdXMLConnectorShapeContext::SdXMLConnectorShapeContext( @@ -1762,14 +1680,10 @@ SdXMLConnectorShapeContext::SdXMLConnectorShapeContext( { } -////////////////////////////////////////////////////////////////////////////// - SdXMLConnectorShapeContext::~SdXMLConnectorShapeContext() { } -////////////////////////////////////////////////////////////////////////////// - // this is called from the parent group for each unparsed attribute in the attribute list void SdXMLConnectorShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { @@ -1889,8 +1803,6 @@ void SdXMLConnectorShapeContext::processAttribute( sal_uInt16 nPrefix, const OUS SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue ); } -////////////////////////////////////////////////////////////////////////////// - void SdXMLConnectorShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>& xAttrList) { // #107928# @@ -2007,9 +1919,6 @@ void SdXMLConnectorShapeContext::StartElement(const uno::Reference< xml::sax::XA } } -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - TYPEINIT1( SdXMLMeasureShapeContext, SdXMLShapeContext ); SdXMLMeasureShapeContext::SdXMLMeasureShapeContext( @@ -2025,8 +1934,6 @@ SdXMLMeasureShapeContext::SdXMLMeasureShapeContext( { } -////////////////////////////////////////////////////////////////////////////// - SdXMLMeasureShapeContext::~SdXMLMeasureShapeContext() { } @@ -2068,8 +1975,6 @@ void SdXMLMeasureShapeContext::processAttribute( sal_uInt16 nPrefix, const OUStr SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue ); } -////////////////////////////////////////////////////////////////////////////// - void SdXMLMeasureShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>& xAttrList) { // create Measure shape @@ -2126,9 +2031,6 @@ void SdXMLMeasureShapeContext::EndElement() SdXMLShapeContext::EndElement(); } -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - TYPEINIT1( SdXMLPageShapeContext, SdXMLShapeContext ); SdXMLPageShapeContext::SdXMLPageShapeContext( @@ -2143,14 +2045,10 @@ SdXMLPageShapeContext::SdXMLPageShapeContext( mbClearDefaultAttributes = false; } -////////////////////////////////////////////////////////////////////////////// - SdXMLPageShapeContext::~SdXMLPageShapeContext() { } -////////////////////////////////////////////////////////////////////////////// - // this is called from the parent group for each unparsed attribute in the attribute list void SdXMLPageShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { @@ -2166,8 +2064,6 @@ void SdXMLPageShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue ); } -////////////////////////////////////////////////////////////////////////////// - void SdXMLPageShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>& xAttrList) { // create Page shape @@ -2223,9 +2119,6 @@ void SdXMLPageShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib } } -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - TYPEINIT1( SdXMLCaptionShapeContext, SdXMLShapeContext ); SdXMLCaptionShapeContext::SdXMLCaptionShapeContext( @@ -2241,14 +2134,10 @@ SdXMLCaptionShapeContext::SdXMLCaptionShapeContext( { } -////////////////////////////////////////////////////////////////////////////// - SdXMLCaptionShapeContext::~SdXMLCaptionShapeContext() { } -////////////////////////////////////////////////////////////////////////////// - void SdXMLCaptionShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>& xAttrList) { // create Caption shape @@ -2331,9 +2220,6 @@ void SdXMLCaptionShapeContext::processAttribute( sal_uInt16 nPrefix, const OUStr SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue ); } -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - TYPEINIT1( SdXMLGraphicObjectShapeContext, SdXMLShapeContext ); SdXMLGraphicObjectShapeContext::SdXMLGraphicObjectShapeContext( @@ -2348,8 +2234,6 @@ SdXMLGraphicObjectShapeContext::SdXMLGraphicObjectShapeContext( { } -////////////////////////////////////////////////////////////////////////////// - // this is called from the parent group for each unparsed attribute in the attribute list void SdXMLGraphicObjectShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { @@ -2365,8 +2249,6 @@ void SdXMLGraphicObjectShapeContext::processAttribute( sal_uInt16 nPrefix, const SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue ); } -////////////////////////////////////////////////////////////////////////////// - void SdXMLGraphicObjectShapeContext::StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& ) { // create graphic object shape @@ -2472,9 +2354,6 @@ void SdXMLGraphicObjectShapeContext::EndElement() SdXMLShapeContext::EndElement(); } - -////////////////////////////////////////////////////////////////////////////// - SvXMLImportContext* SdXMLGraphicObjectShapeContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList ) @@ -2502,16 +2381,11 @@ SvXMLImportContext* SdXMLGraphicObjectShapeContext::CreateChildContext( return pContext; } -////////////////////////////////////////////////////////////////////////////// - SdXMLGraphicObjectShapeContext::~SdXMLGraphicObjectShapeContext() { } -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - TYPEINIT1( SdXMLChartShapeContext, SdXMLShapeContext ); SdXMLChartShapeContext::SdXMLChartShapeContext( @@ -2526,16 +2400,12 @@ SdXMLChartShapeContext::SdXMLChartShapeContext( { } -////////////////////////////////////////////////////////////////////////////// - SdXMLChartShapeContext::~SdXMLChartShapeContext() { if( mpChartContext ) delete mpChartContext; } -////////////////////////////////////////////////////////////////////////////// - void SdXMLChartShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>& xAttrList) { const sal_Bool bIsPresentation = isPresentationShape(); @@ -2586,7 +2456,6 @@ void SdXMLChartShapeContext::StartElement(const uno::Reference< xml::sax::XAttri } } - // set pos, size, shear and rotate SetTransformation(); @@ -2620,8 +2489,6 @@ SvXMLImportContext * SdXMLChartShapeContext::CreateChildContext( sal_uInt16 nPre return NULL; } -////////////////////////////////////////////////////////////////////////////// - TYPEINIT1( SdXMLObjectShapeContext, SdXMLShapeContext ); SdXMLObjectShapeContext::SdXMLObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, @@ -2837,8 +2704,6 @@ SvXMLImportContext* SdXMLObjectShapeContext::CreateChildContext( return pContext; } -////////////////////////////////////////////////////////////////////////////// - TYPEINIT1( SdXMLAppletShapeContext, SdXMLShapeContext ); SdXMLAppletShapeContext::SdXMLAppletShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, @@ -3002,8 +2867,6 @@ SvXMLImportContext * SdXMLAppletShapeContext::CreateChildContext( sal_uInt16 p_n return SdXMLShapeContext::CreateChildContext( p_nPrefix, rLocalName, xAttrList ); } -////////////////////////////////////////////////////////////////////////////// - TYPEINIT1( SdXMLPluginShapeContext, SdXMLShapeContext ); SdXMLPluginShapeContext::SdXMLPluginShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, @@ -3278,8 +3141,6 @@ SvXMLImportContext * SdXMLPluginShapeContext::CreateChildContext( sal_uInt16 p_n return SdXMLShapeContext::CreateChildContext( p_nPrefix, rLocalName, xAttrList ); } -////////////////////////////////////////////////////////////////////////////// - TYPEINIT1( SdXMLFloatingFrameShapeContext, SdXMLShapeContext ); SdXMLFloatingFrameShapeContext::SdXMLFloatingFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, @@ -3375,8 +3236,6 @@ void SdXMLFloatingFrameShapeContext::EndElement() SdXMLShapeContext::EndElement(); } -////////////////////////////////////////////////////////////////////////////// - TYPEINIT1( SdXMLFrameShapeContext, SdXMLShapeContext ); SdXMLFrameShapeContext::SdXMLFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, @@ -3671,14 +3530,10 @@ SdXMLCustomShapeContext::SdXMLCustomShapeContext( { } -////////////////////////////////////////////////////////////////////////////// - SdXMLCustomShapeContext::~SdXMLCustomShapeContext() { } -////////////////////////////////////////////////////////////////////////////// - // this is called from the parent group for each unparsed attribute in the attribute list void SdXMLCustomShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { @@ -3698,8 +3553,6 @@ void SdXMLCustomShapeContext::processAttribute( sal_uInt16 nPrefix, const OUStri SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue ); } -////////////////////////////////////////////////////////////////////////////// - void SdXMLCustomShapeContext::StartElement( const uno::Reference< xml::sax::XAttributeList >& xAttrList ) { // create rectangle shape @@ -3828,8 +3681,6 @@ void SdXMLCustomShapeContext::EndElement() SdXMLShapeContext::EndElement(); } -////////////////////////////////////////////////////////////////////////////// - SvXMLImportContext* SdXMLCustomShapeContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList ) @@ -3851,10 +3702,6 @@ SvXMLImportContext* SdXMLCustomShapeContext::CreateChildContext( return pContext; } -/////////////////////////////////////////////////////////////////////// - -////////////////////////////////////////////////////////////////////////////// - TYPEINIT1( SdXMLTableShapeContext, SdXMLShapeContext ); SdXMLTableShapeContext::SdXMLTableShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes ) diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx index ab0051573167..34786ec072a0 100644 --- a/xmloff/source/draw/ximpshap.hxx +++ b/xmloff/source/draw/ximpshap.hxx @@ -36,7 +36,6 @@ #include <xmloff/xmlmultiimagehelper.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -////////////////////////////////////////////////////////////////////////////// // common shape context class SdXMLShapeContext : public SvXMLShapeContext @@ -118,7 +117,6 @@ public: virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; -////////////////////////////////////////////////////////////////////////////// // draw:rect context class SdXMLRectShapeContext : public SdXMLShapeContext @@ -140,7 +138,6 @@ public: virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; -////////////////////////////////////////////////////////////////////////////// // draw:line context class SdXMLLineShapeContext : public SdXMLShapeContext @@ -165,7 +162,6 @@ public: virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; -////////////////////////////////////////////////////////////////////////////// // draw:ellipse and draw:circle context class SdXMLEllipseShapeContext : public SdXMLShapeContext @@ -193,7 +189,6 @@ public: virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; -////////////////////////////////////////////////////////////////////////////// // draw:polyline and draw:polygon context class SdXMLPolygonShapeContext : public SdXMLShapeContext @@ -216,7 +211,6 @@ public: virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; -////////////////////////////////////////////////////////////////////////////// // draw:path context class SdXMLPathShapeContext : public SdXMLShapeContext @@ -239,7 +233,6 @@ public: virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; -////////////////////////////////////////////////////////////////////////////// // draw:text-box context class SdXMLTextBoxShapeContext : public SdXMLShapeContext @@ -261,7 +254,6 @@ public: virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; -////////////////////////////////////////////////////////////////////////////// // draw:control context class SdXMLControlShapeContext : public SdXMLShapeContext @@ -284,7 +276,6 @@ public: virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; -////////////////////////////////////////////////////////////////////////////// // draw:connector context class SdXMLConnectorShapeContext : public SdXMLShapeContext @@ -321,7 +312,6 @@ public: virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; -////////////////////////////////////////////////////////////////////////////// // draw:measure context class SdXMLMeasureShapeContext : public SdXMLShapeContext @@ -346,7 +336,6 @@ public: virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; -////////////////////////////////////////////////////////////////////////////// // draw:page context class SdXMLPageShapeContext : public SdXMLShapeContext @@ -368,7 +357,6 @@ public: virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; -////////////////////////////////////////////////////////////////////////////// // draw:caption context class SdXMLCaptionShapeContext : public SdXMLShapeContext @@ -392,7 +380,6 @@ public: virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; -////////////////////////////////////////////////////////////////////////////// // office:image context class SdXMLGraphicObjectShapeContext : public SdXMLShapeContext @@ -420,7 +407,6 @@ public: virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; -////////////////////////////////////////////////////////////////////////////// // chart:chart context class SdXMLChartShapeContext : public SdXMLShapeContext @@ -444,7 +430,6 @@ public: const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); }; -////////////////////////////////////////////////////////////////////////////// // draw:object and draw:object_ole context class SdXMLObjectShapeContext : public SdXMLShapeContext @@ -477,7 +462,6 @@ public: virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; -////////////////////////////////////////////////////////////////////////////// // draw:applet class SdXMLAppletShapeContext : public SdXMLShapeContext @@ -510,7 +494,6 @@ public: virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; -////////////////////////////////////////////////////////////////////////////// // draw:plugin class SdXMLPluginShapeContext : public SdXMLShapeContext @@ -542,7 +525,6 @@ public: virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; -////////////////////////////////////////////////////////////////////////////// // draw:floating-frame class SdXMLFloatingFrameShapeContext : public SdXMLShapeContext @@ -568,7 +550,6 @@ public: virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; -////////////////////////////////////////////////////////////////////////////// // draw:-frame class SdXMLFrameShapeContext : public SdXMLShapeContext, public MultiImageImportHelper @@ -632,7 +613,6 @@ public: virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ); }; -////////////////////////////////////////////////////////////////////////////// // draw:table class SdXMLTableShapeContext : public SdXMLShapeContext diff --git a/xmloff/source/draw/ximpshow.cxx b/xmloff/source/draw/ximpshow.cxx index 17b0edf23755..d99e1e1f8dc6 100644 --- a/xmloff/source/draw/ximpshow.cxx +++ b/xmloff/source/draw/ximpshow.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/util/Duration.hpp> #include <com/sun/star/xml/sax/XAttributeList.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> @@ -34,7 +33,6 @@ #include <xmloff/xmluconv.hxx> #include "ximpshow.hxx" - using namespace ::std; using namespace ::cppu; using namespace ::com::sun::star; @@ -49,8 +47,6 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::presentation; using namespace ::xmloff::token; -/////////////////////////////////////////////////////////////////////// - class ShowsImpImpl { public: @@ -66,8 +62,6 @@ public: {} }; -/////////////////////////////////////////////////////////////////////// - TYPEINIT1( SdXMLShowsContext, SvXMLImportContext ); SdXMLShowsContext::SdXMLShowsContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList ) @@ -90,7 +84,6 @@ SdXMLShowsContext::SdXMLShowsContext( SdXMLImport& rImport, sal_uInt16 nPrfx, c if( xPresentationSupplier.is() ) mpImpl->mxPresProps = Reference< XPropertySet >::query( xPresentationSupplier->getPresentation() ); - if( mpImpl->mxPresProps.is() ) { sal_Bool bAll = sal_True; diff --git a/xmloff/source/draw/ximpshow.hxx b/xmloff/source/draw/ximpshow.hxx index a6190f0c6de8..50fcb9fd197e 100644 --- a/xmloff/source/draw/ximpshow.hxx +++ b/xmloff/source/draw/ximpshow.hxx @@ -25,7 +25,6 @@ class ShowsImpImpl; -////////////////////////////////////////////////////////////////////////////// // presentations:animations class SdXMLShowsContext : public SvXMLImportContext diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx index a9883cdfaf81..e092e37807be 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -45,14 +45,11 @@ #include "XMLNumberStylesImport.hxx" #include "xmloff/xmlerror.hxx" - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; using namespace ::xmloff::token; -////////////////////////////////////////////////////////////////////////////// - class SdXMLDrawingPagePropertySetContext : public SvXMLPropertySetContext { public: @@ -131,8 +128,6 @@ SvXMLImportContext *SdXMLDrawingPagePropertySetContext::CreateChildContext( return pContext; } -////////////////////////////////////////////////////////////////////////////// - class SdXMLDrawingPageStyleContext : public XMLPropStyleContext { public: @@ -303,8 +298,6 @@ void SdXMLDrawingPageStyleContext::FillPropertySet( } } -////////////////////////////////////////////////////////////////////////////// - TYPEINIT1( SdXMLPageMasterStyleContext, SvXMLStyleContext ); SdXMLPageMasterStyleContext::SdXMLPageMasterStyleContext( @@ -383,15 +376,10 @@ SdXMLPageMasterStyleContext::SdXMLPageMasterStyleContext( } } -////////////////////////////////////////////////////////////////////////////// - SdXMLPageMasterStyleContext::~SdXMLPageMasterStyleContext() { } -////////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// - TYPEINIT1( SdXMLPageMasterContext, SvXMLStyleContext ); SdXMLPageMasterContext::SdXMLPageMasterContext( @@ -425,8 +413,6 @@ SdXMLPageMasterContext::SdXMLPageMasterContext( } } -////////////////////////////////////////////////////////////////////////////// - SdXMLPageMasterContext::~SdXMLPageMasterContext() { // release remembered contexts, they are no longer needed @@ -437,8 +423,6 @@ SdXMLPageMasterContext::~SdXMLPageMasterContext() } } -////////////////////////////////////////////////////////////////////////////// - SvXMLImportContext *SdXMLPageMasterContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, @@ -466,9 +450,6 @@ SvXMLImportContext *SdXMLPageMasterContext::CreateChildContext( return pContext; } -////////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// - TYPEINIT1( SdXMLPresentationPageLayoutContext, SvXMLStyleContext ); SdXMLPresentationPageLayoutContext::SdXMLPresentationPageLayoutContext( @@ -740,9 +721,6 @@ void SdXMLPresentationPageLayoutContext::EndElement() } } -////////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// - SdXMLPresentationPlaceholderContext::SdXMLPresentationPlaceholderContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const @@ -798,15 +776,10 @@ SdXMLPresentationPlaceholderContext::SdXMLPresentationPlaceholderContext( } } -////////////////////////////////////////////////////////////////////////////// - SdXMLPresentationPlaceholderContext::~SdXMLPresentationPlaceholderContext() { } -////////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// - TYPEINIT1( SdXMLMasterPageContext, SdXMLGenericPageContext ); SdXMLMasterPageContext::SdXMLMasterPageContext( @@ -901,14 +874,10 @@ SdXMLMasterPageContext::SdXMLMasterPageContext( DeleteAllShapes(); } -////////////////////////////////////////////////////////////////////////////// - SdXMLMasterPageContext::~SdXMLMasterPageContext() { } -////////////////////////////////////////////////////////////////////////////// - void SdXMLMasterPageContext::EndElement() { // set styles on master-page @@ -923,8 +892,6 @@ void SdXMLMasterPageContext::EndElement() GetImport().GetShapeImport()->endPage(GetLocalShapesContext()); } -////////////////////////////////////////////////////////////////////////////// - SvXMLImportContext* SdXMLMasterPageContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, @@ -985,9 +952,6 @@ SvXMLImportContext* SdXMLMasterPageContext::CreateChildContext( return pContext; } -////////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// - TYPEINIT1( SdXMLStylesContext, SvXMLStyleContext ); SdXMLStylesContext::SdXMLStylesContext( @@ -1004,16 +968,12 @@ SdXMLStylesContext::SdXMLStylesContext( mpNumFmtHelper = new SvXMLNumFmtHelper( mpNumFormatter, xContext ); } -////////////////////////////////////////////////////////////////////////////// - SdXMLStylesContext::~SdXMLStylesContext() { delete mpNumFmtHelper; delete mpNumFormatter; } -////////////////////////////////////////////////////////////////////////////// - SvXMLStyleContext* SdXMLStylesContext::CreateStyleChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, @@ -1083,8 +1043,6 @@ SvXMLStyleContext* SdXMLStylesContext::CreateStyleChildContext( return pContext; } -////////////////////////////////////////////////////////////////////////////// - SvXMLStyleContext* SdXMLStylesContext::CreateStyleStyleChildContext( sal_uInt16 nFamily, sal_uInt16 nPrefix, @@ -1112,8 +1070,6 @@ SvXMLStyleContext* SdXMLStylesContext::CreateStyleStyleChildContext( return pContext; } -////////////////////////////////////////////////////////////////////////////// - SvXMLStyleContext* SdXMLStylesContext::CreateDefaultStyleStyleChildContext( sal_uInt16 nFamily, sal_uInt16 nPrefix, @@ -1136,16 +1092,12 @@ SvXMLStyleContext* SdXMLStylesContext::CreateDefaultStyleStyleChildContext( return pContext; } -////////////////////////////////////////////////////////////////////////////// - sal_uInt16 SdXMLStylesContext::GetFamily( const OUString& rFamily ) const { // call base class return SvXMLStylesContext::GetFamily(rFamily); } -////////////////////////////////////////////////////////////////////////////// - UniReference< SvXMLImportPropertyMapper > SdXMLStylesContext::GetImportPropertyMapper( sal_uInt16 nFamily) const { @@ -1187,7 +1139,6 @@ UniReference< SvXMLImportPropertyMapper > SdXMLStylesContext::GetImportPropertyM return xMapper; } -////////////////////////////////////////////////////////////////////////////// // Process all style and object info // void SdXMLStylesContext::EndElement() @@ -1250,7 +1201,6 @@ void SdXMLStylesContext::EndElement() } } -////////////////////////////////////////////////////////////////////////////// // set master-page styles (all with family="presentation" and a special // prefix) on given master-page. // @@ -1278,7 +1228,6 @@ void SdXMLStylesContext::SetMasterPageStyles(SdXMLMasterPageContext& rMaster) co } } -////////////////////////////////////////////////////////////////////////////// // Process styles list: // set graphic styles (all with family="graphics"). Remember xStyle at list element. // @@ -1312,7 +1261,6 @@ void SdXMLStylesContext::ImpSetCellStyles() const } } -////////////////////////////////////////////////////////////////////////////// // help function used by ImpSetGraphicStyles() and ImpSetMasterPageStyles() // void SdXMLStylesContext::ImpSetGraphicStyles( uno::Reference< container::XNameAccess >& xPageStyles, sal_uInt16 nFamily, const OUString& rPrefix) const @@ -1467,7 +1415,6 @@ void SdXMLStylesContext::ImpSetGraphicStyles( uno::Reference< container::XNameAc } } -//////////////////////////////////////////////////////////////////////////////// // helper function to create the uno component that hold the mappings from // xml auto layout name to internal autolayout id @@ -1488,8 +1435,6 @@ uno::Reference< container::XNameAccess > SdXMLStylesContext::getPageLayouts() co return uno::Reference< container::XNameAccess >::query( xLayouts ); } -//////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////// // TYPEINIT1( SdXMLMasterStylesContext, SvXMLImportContext ); @@ -1581,8 +1526,6 @@ SvXMLImportContext* SdXMLMasterStylesContext::CreateChildContext( return pContext; } -/////////////////////////////////////////////////////////////////////// - SdXMLHeaderFooterDeclContext::SdXMLHeaderFooterDeclContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) diff --git a/xmloff/source/draw/ximpstyl.hxx b/xmloff/source/draw/ximpstyl.hxx index 3b572bfc5223..e53ec1cec418 100644 --- a/xmloff/source/draw/ximpstyl.hxx +++ b/xmloff/source/draw/ximpstyl.hxx @@ -30,7 +30,6 @@ class SvNumberFormatter; class SvXMLNumFmtHelper; -////////////////////////////////////////////////////////////////////////////// // special style:style context inside style:page-master context class SdXMLPageMasterStyleContext: public SvXMLStyleContext @@ -65,7 +64,6 @@ public: com::sun::star::view::PaperOrientation GetOrientation() const { return meOrientation; } }; -////////////////////////////////////////////////////////////////////////////// // style:page-master context class SdXMLPageMasterContext: public SvXMLStyleContext @@ -94,7 +92,6 @@ public: const SdXMLPageMasterStyleContext* GetPageMasterStyle() const { return mpPageMasterStyle; } }; -////////////////////////////////////////////////////////////////////////////// // style:masterpage context class SdXMLMasterPageContext: public SdXMLGenericPageContext @@ -128,7 +125,6 @@ public: }; typedef ::std::vector< SdXMLMasterPageContext* > ImpMasterPageList; -////////////////////////////////////////////////////////////////////////////// // presentation:placeholder context class SdXMLPresentationPlaceholderContext: public SvXMLImportContext @@ -158,7 +154,6 @@ public: }; typedef ::std::vector< SdXMLPresentationPlaceholderContext* > ImpPlaceholderList; -////////////////////////////////////////////////////////////////////////////// // style:presentation-page-layout context class SdXMLPresentationPageLayoutContext: public SvXMLStyleContext @@ -188,7 +183,6 @@ public: sal_uInt16 GetTypeId() const { return mnTypeId; } }; -////////////////////////////////////////////////////////////////////////////// // office:styles context class SdXMLStylesContext : public SvXMLStylesContext @@ -243,7 +237,6 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > getPageLayouts() const; }; -////////////////////////////////////////////////////////////////////////////// // office:master-styles context // class SdXMLMasterStylesContext : public SvXMLImportContext @@ -270,7 +263,6 @@ public: const ImpMasterPageList& GetMasterPageList() const { return maMasterPageList; } }; -////////////////////////////////////////////////////////////////////////////// // <pres:header-decl>, <pres:footer-decl> and <pres:date-time-decl> class SdXMLHeaderFooterDeclContext : public SvXMLStyleContext @@ -291,7 +283,6 @@ private: sal_Bool mbFixed; }; - #endif // _XIMPSTYLE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |