diff options
Diffstat (limited to 'xmloff/source/style')
58 files changed, 3 insertions, 552 deletions
diff --git a/xmloff/source/style/AttributeContainerHandler.cxx b/xmloff/source/style/AttributeContainerHandler.cxx index 169e1cd22c80..d09f0ddb36e0 100644 --- a/xmloff/source/style/AttributeContainerHandler.cxx +++ b/xmloff/source/style/AttributeContainerHandler.cxx @@ -25,12 +25,10 @@ #include "AttributeContainerHandler.hxx" - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::container; -/////////////////////////////////////////////////////////////////////////////// // // class XMLAttributeContainerHandler // diff --git a/xmloff/source/style/DashStyle.cxx b/xmloff/source/style/DashStyle.cxx index 20ae5d287852..fc4137dc9a1c 100644 --- a/xmloff/source/style/DashStyle.cxx +++ b/xmloff/source/style/DashStyle.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/drawing/DashStyle.hpp> #include <com/sun/star/drawing/LineDash.hpp> @@ -75,9 +74,7 @@ SvXMLEnumMapEntry const pXML_DashStyle_Enum[] = { XML_TOKEN_INVALID, 0 } }; -//------------------------------------------------------------- // Import -//------------------------------------------------------------- XMLDashStyleImport::XMLDashStyleImport( SvXMLImport& rImp ) : rImport(rImp) @@ -210,10 +207,7 @@ sal_Bool XMLDashStyleImport::importXML( return sal_True; } - -//------------------------------------------------------------- // Export -//------------------------------------------------------------- XMLDashStyleExport::XMLDashStyleExport( SvXMLExport& rExp ) : rExport(rExp) @@ -257,7 +251,6 @@ sal_Bool XMLDashStyleExport::exportXML( aStrValue = aOut.makeStringAndClear(); rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_STYLE, aStrValue ); - // dots if( aLineDash.Dots ) { @@ -315,7 +308,6 @@ sal_Bool XMLDashStyleExport::exportXML( aStrValue = aOut.makeStringAndClear(); rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_DISTANCE, aStrValue ); - // do Write SvXMLElementExport rElem( rExport, XML_NAMESPACE_DRAW, XML_STROKE_DASH, diff --git a/xmloff/source/style/DrawAspectHdl.cxx b/xmloff/source/style/DrawAspectHdl.cxx index b39140babc76..14ff712f3508 100644 --- a/xmloff/source/style/DrawAspectHdl.cxx +++ b/xmloff/source/style/DrawAspectHdl.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "DrawAspectHdl.hxx" #include <com/sun/star/uno/Any.hxx> @@ -31,12 +30,9 @@ #include <xmloff/xmlement.hxx> #include <xmloff/xmltoken.hxx> - - using namespace ::com::sun::star; using namespace ::xmloff::token; -/////////////////////////////////////////////////////////////////////////////// // // class XMLMeasurePropHdl // diff --git a/xmloff/source/style/EnumPropertyHdl.cxx b/xmloff/source/style/EnumPropertyHdl.cxx index 789baa04e799..6ab210a6c1da 100644 --- a/xmloff/source/style/EnumPropertyHdl.cxx +++ b/xmloff/source/style/EnumPropertyHdl.cxx @@ -24,10 +24,8 @@ #include <rtl/ustrbuf.hxx> #include <com/sun/star/uno/Any.hxx> - using namespace ::com::sun::star::uno; -/////////////////////////////////////////////////////////////////////////////// // // class XMLEnumPropertyHdl // diff --git a/xmloff/source/style/FillStyleContext.cxx b/xmloff/source/style/FillStyleContext.cxx index 015629e628b8..3543145bbc6a 100644 --- a/xmloff/source/style/FillStyleContext.cxx +++ b/xmloff/source/style/FillStyleContext.cxx @@ -33,10 +33,6 @@ using namespace ::com::sun::star; - -////////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// - TYPEINIT1( XMLGradientStyleContext, SvXMLStyleContext ); XMLGradientStyleContext::XMLGradientStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, @@ -81,9 +77,6 @@ sal_Bool XMLGradientStyleContext::IsTransient() const return sal_True; } -////////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// - TYPEINIT1( XMLHatchStyleContext, SvXMLStyleContext ); XMLHatchStyleContext::XMLHatchStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, @@ -127,9 +120,6 @@ sal_Bool XMLHatchStyleContext::IsTransient() const return sal_True; } -////////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// - TYPEINIT1( XMLBitmapStyleContext, SvXMLStyleContext ); XMLBitmapStyleContext::XMLBitmapStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, @@ -207,10 +197,6 @@ sal_Bool XMLBitmapStyleContext::IsTransient() const return sal_True; } - -////////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// - TYPEINIT1( XMLTransGradientStyleContext, SvXMLStyleContext ); XMLTransGradientStyleContext::XMLTransGradientStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, @@ -254,9 +240,6 @@ sal_Bool XMLTransGradientStyleContext::IsTransient() const return sal_True; } -////////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// - TYPEINIT1( XMLMarkerStyleContext, SvXMLStyleContext ); XMLMarkerStyleContext::XMLMarkerStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, @@ -300,9 +283,6 @@ sal_Bool XMLMarkerStyleContext::IsTransient() const return sal_True; } -////////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// - TYPEINIT1( XMLDashStyleContext, SvXMLStyleContext ); XMLDashStyleContext::XMLDashStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/xmloff/source/style/FillStyleContext.hxx b/xmloff/source/style/FillStyleContext.hxx index 6bfae84fb858..336e55626d20 100644 --- a/xmloff/source/style/FillStyleContext.hxx +++ b/xmloff/source/style/FillStyleContext.hxx @@ -24,7 +24,6 @@ #include <xmloff/xmlstyle.hxx> #include<rtl/ustring.hxx> -////////////////////////////////////////////////////////////////////////////// // draw:gardient context class XMLGradientStyleContext: public SvXMLStyleContext @@ -45,7 +44,6 @@ public: virtual sal_Bool IsTransient() const; }; -////////////////////////////////////////////////////////////////////////////// // draw:hatch context class XMLHatchStyleContext: public SvXMLStyleContext @@ -66,7 +64,6 @@ public: virtual sal_Bool IsTransient() const; }; -////////////////////////////////////////////////////////////////////////////// // draw:fill-image context class XMLBitmapStyleContext: public SvXMLStyleContext @@ -93,7 +90,6 @@ public: virtual sal_Bool IsTransient() const; }; -////////////////////////////////////////////////////////////////////////////// // draw:transparency context class XMLTransGradientStyleContext: public SvXMLStyleContext @@ -114,7 +110,6 @@ public: virtual sal_Bool IsTransient() const; }; -////////////////////////////////////////////////////////////////////////////// // draw:marker context class XMLMarkerStyleContext: public SvXMLStyleContext @@ -135,7 +130,6 @@ public: virtual sal_Bool IsTransient() const; }; -////////////////////////////////////////////////////////////////////////////// // draw:marker context class XMLDashStyleContext: public SvXMLStyleContext diff --git a/xmloff/source/style/GradientStyle.cxx b/xmloff/source/style/GradientStyle.cxx index 435040f756ea..7683337569a4 100644 --- a/xmloff/source/style/GradientStyle.cxx +++ b/xmloff/source/style/GradientStyle.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "xmloff/GradientStyle.hxx" #include <com/sun/star/awt/Gradient.hpp> @@ -36,8 +35,6 @@ #include <xmloff/xmlexp.hxx> #include <xmloff/xmlimp.hxx> - - using namespace ::com::sun::star; using namespace ::xmloff::token; @@ -58,7 +55,6 @@ enum SvXMLTokenMapAttrs XML_TOK_TABSTOP_END=XML_TOK_UNKNOWN }; - SvXMLEnumMapEntry const pXML_GradientStyle_Enum[] = { { XML_GRADIENTSTYLE_LINEAR, awt::GradientStyle_LINEAR }, @@ -70,9 +66,7 @@ SvXMLEnumMapEntry const pXML_GradientStyle_Enum[] = { XML_TOKEN_INVALID, 0 } }; -//------------------------------------------------------------- // Import -//------------------------------------------------------------- XMLGradientStyleImport::XMLGradientStyleImport( SvXMLImport& rImp ) : rImport(rImp) @@ -218,10 +212,7 @@ sal_Bool XMLGradientStyleImport::importXML( return bRet; } - -//------------------------------------------------------------- // Export -//------------------------------------------------------------- XMLGradientStyleExport::XMLGradientStyleExport( SvXMLExport& rExp ) @@ -264,7 +255,6 @@ sal_Bool XMLGradientStyleExport::exportXML( rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_DISPLAY_NAME, aStrName ); - aStrValue = aOut.makeStringAndClear(); rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_STYLE, aStrValue ); diff --git a/xmloff/source/style/HatchStyle.cxx b/xmloff/source/style/HatchStyle.cxx index c42e6a3db026..e05a09b8ab2f 100644 --- a/xmloff/source/style/HatchStyle.cxx +++ b/xmloff/source/style/HatchStyle.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "xmloff/HatchStyle.hxx" #include <com/sun/star/drawing/Hatch.hpp> @@ -50,7 +49,6 @@ enum SvXMLTokenMapAttrs XML_TOK_TABSTOP_END=XML_TOK_UNKNOWN }; - SvXMLEnumMapEntry const pXML_HatchStyle_Enum[] = { { XML_HATCHSTYLE_SINGLE, drawing::HatchStyle_SINGLE }, @@ -59,10 +57,7 @@ SvXMLEnumMapEntry const pXML_HatchStyle_Enum[] = { XML_TOKEN_INVALID, 0 } }; - -//------------------------------------------------------------- // Import -//------------------------------------------------------------- XMLHatchStyleImport::XMLHatchStyleImport( SvXMLImport& rImp ) : rImport(rImp) @@ -175,10 +170,7 @@ sal_Bool XMLHatchStyleImport::importXML( return bRet; } - -//------------------------------------------------------------- // Export -//------------------------------------------------------------- XMLHatchStyleExport::XMLHatchStyleExport( SvXMLExport& rExp ) : rExport(rExp) diff --git a/xmloff/source/style/MarkerStyle.cxx b/xmloff/source/style/MarkerStyle.cxx index 53bf23eca1d6..125d411ab50c 100644 --- a/xmloff/source/style/MarkerStyle.cxx +++ b/xmloff/source/style/MarkerStyle.cxx @@ -34,10 +34,7 @@ using namespace ::com::sun::star; using namespace ::xmloff::token; - -//------------------------------------------------------------- // Import -//------------------------------------------------------------- XMLMarkerStyleImport::XMLMarkerStyleImport( SvXMLImport& rImp ) : rImport( rImp ) @@ -146,10 +143,7 @@ sal_Bool XMLMarkerStyleImport::importXML( return bHasViewBox && bHasPathData; } - -//------------------------------------------------------------- // Export -//------------------------------------------------------------- XMLMarkerStyleExport::XMLMarkerStyleExport( SvXMLExport& rExp ) : rExport( rExp ) @@ -172,7 +166,6 @@ sal_Bool XMLMarkerStyleExport::exportXML( if(rValue >>= aBezier) { - ///////////////// // Name sal_Bool bEncoded = sal_False; OUString aStrName( rStrName ); @@ -183,7 +176,6 @@ sal_Bool XMLMarkerStyleExport::exportXML( rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_DISPLAY_NAME, aStrName ); - ///////////////// // Viewbox (viewBox="0 0 1500 1000") sal_Int32 nMinX(0x7fffffff); sal_Int32 nMaxX(0x80000000); @@ -235,7 +227,6 @@ sal_Bool XMLMarkerStyleExport::exportXML( SdXMLImExViewBox aViewBox( 0, 0, nDifX, nDifY ); rExport.AddAttribute( XML_NAMESPACE_SVG, XML_VIEWBOX, aViewBox.GetExportString() ); - ///////////////// // Pathdata pOuterSequence = aBezier.Coordinates.getArray(); drawing::FlagSequence* pOuterFlags = aBezier.Flags.getArray(); @@ -255,7 +246,6 @@ sal_Bool XMLMarkerStyleExport::exportXML( // write point array rExport.AddAttribute(XML_NAMESPACE_SVG, XML_D, aSvgDElement.GetExportString()); - ///////////////// // Do Write SvXMLElementExport rElem( rExport, XML_NAMESPACE_DRAW, XML_MARKER, sal_True, sal_False ); diff --git a/xmloff/source/style/NamedBoolPropertyHdl.cxx b/xmloff/source/style/NamedBoolPropertyHdl.cxx index 7dacca646b3d..871e8003d698 100644 --- a/xmloff/source/style/NamedBoolPropertyHdl.cxx +++ b/xmloff/source/style/NamedBoolPropertyHdl.cxx @@ -24,10 +24,8 @@ #include <rtl/ustrbuf.hxx> #include <com/sun/star/uno/Any.hxx> - using namespace ::com::sun::star::uno; -/////////////////////////////////////////////////////////////////////////////// // // class XMLNamedBoolPropertyHdl // diff --git a/xmloff/source/style/PageHeaderFooterContext.cxx b/xmloff/source/style/PageHeaderFooterContext.cxx index b58301f48b1b..04f4e04b8d23 100644 --- a/xmloff/source/style/PageHeaderFooterContext.cxx +++ b/xmloff/source/style/PageHeaderFooterContext.cxx @@ -26,8 +26,6 @@ using namespace com::sun::star; using ::xmloff::token::IsXMLToken; using ::xmloff::token::XML_HEADER_FOOTER_PROPERTIES; -//------------------------------------------------------------------ - PageHeaderFooterContext::PageHeaderFooterContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -69,7 +67,6 @@ SvXMLImportContext *PageHeaderFooterContext::CreateChildContext( sal_uInt16 nPre rMap, nStartIndex, nEndIndex, aType); } - if( !pContext ) pContext = new SvXMLImportContext( GetImport(), nPrefix, rLName ); diff --git a/xmloff/source/style/PageMasterExportPropMapper.cxx b/xmloff/source/style/PageMasterExportPropMapper.cxx index db50eb6a5669..0bf9d9ea4a65 100644 --- a/xmloff/source/style/PageMasterExportPropMapper.cxx +++ b/xmloff/source/style/PageMasterExportPropMapper.cxx @@ -32,9 +32,6 @@ using namespace ::com::sun::star::beans; using namespace ::comphelper; using namespace ::xmloff::token; - -//______________________________________________________________________________ - static inline sal_Bool lcl_HasSameLineWidth( const table::BorderLine2& rLine1, const table::BorderLine2& rLine2 ) { return (rLine1.InnerLineWidth == rLine2.InnerLineWidth) && @@ -69,7 +66,6 @@ static void lcl_AddState(::std::vector< XMLPropertyState >& rPropState, sal_Int3 rPropState.push_back(XMLPropertyState (nIndex, cppu::bool2any(sal_True))); } -//______________________________________________________________________________ // helper struct to handle equal XMLPropertyState's for page, header and footer struct XMLPropertyStateBuffer @@ -214,8 +210,6 @@ void XMLPropertyStateBuffer::ContextFilter( ::std::vector< XMLPropertyState >& ) } } -//______________________________________________________________________________ - XMLPageMasterExportPropMapper::XMLPageMasterExportPropMapper( const UniReference< XMLPropertySetMapper >& rMapper, SvXMLExport& rExport ) : diff --git a/xmloff/source/style/PageMasterExportPropMapper.hxx b/xmloff/source/style/PageMasterExportPropMapper.hxx index 0d24df5f0885..2bd6dbbd022e 100644 --- a/xmloff/source/style/PageMasterExportPropMapper.hxx +++ b/xmloff/source/style/PageMasterExportPropMapper.hxx @@ -25,8 +25,6 @@ #include "XMLTextColumnsExport.hxx" #include "XMLFootnoteSeparatorExport.hxx" -//______________________________________________________________________________ - class XMLPageMasterExportPropMapper : public SvXMLExportPropertyMapper { protected: diff --git a/xmloff/source/style/PageMasterPropHdl.cxx b/xmloff/source/style/PageMasterPropHdl.cxx index d37db396b9b1..cd1212a6a984 100644 --- a/xmloff/source/style/PageMasterPropHdl.cxx +++ b/xmloff/source/style/PageMasterPropHdl.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "PageMasterPropHdl.hxx" #include <sax/tools/converter.hxx> @@ -32,20 +31,14 @@ #include <comphelper/types.hxx> #include <comphelper/extract.hxx> - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::style; using namespace ::comphelper; using namespace ::xmloff::token; - -//______________________________________________________________________________ - #define DEFAULT_PAPERTRAY (sal_Int32(-1)) - -//______________________________________________________________________________ // property handler for style:page-usage (style::PageStyleLayout) XMLPMPropHdl_PageStyleLayout::~XMLPMPropHdl_PageStyleLayout() @@ -112,8 +105,6 @@ sal_Bool XMLPMPropHdl_PageStyleLayout::exportXML( return bRet; } - -//______________________________________________________________________________ // property handler for style:num-format (style::NumberingType) XMLPMPropHdl_NumFormat::~XMLPMPropHdl_NumFormat() @@ -171,8 +162,6 @@ sal_Bool XMLPMPropHdl_NumFormat::exportXML( return bRet; } - -//______________________________________________________________________________ // property handler for style:num-letter-sync (style::NumberingType) XMLPMPropHdl_NumLetterSync::~XMLPMPropHdl_NumLetterSync() @@ -227,8 +216,6 @@ sal_Bool XMLPMPropHdl_NumLetterSync::exportXML( return bRet; } - -//______________________________________________________________________________ // property handler for style:paper-tray-number XMLPMPropHdl_PaperTrayNumber::~XMLPMPropHdl_PaperTrayNumber() @@ -283,8 +270,6 @@ sal_Bool XMLPMPropHdl_PaperTrayNumber::exportXML( return bRet; } - -//______________________________________________________________________________ // property handler for style:print XMLPMPropHdl_Print::XMLPMPropHdl_Print( enum XMLTokenEnum eValue ) : @@ -330,7 +315,6 @@ sal_Bool XMLPMPropHdl_Print::exportXML( return sal_True; } -//______________________________________________________________________________ // property handler for style:table-centering XMLPMPropHdl_CenterHorizontal::~XMLPMPropHdl_CenterHorizontal() @@ -352,7 +336,6 @@ sal_Bool XMLPMPropHdl_CenterHorizontal::importXML( bRet = sal_True; } - return bRet; } diff --git a/xmloff/source/style/PageMasterPropHdl.hxx b/xmloff/source/style/PageMasterPropHdl.hxx index 43b2ec371909..7bfdedbd017e 100644 --- a/xmloff/source/style/PageMasterPropHdl.hxx +++ b/xmloff/source/style/PageMasterPropHdl.hxx @@ -24,8 +24,6 @@ #include <rtl/ustring.hxx> #include <xmloff/xmltoken.hxx> - -//______________________________________________________________________________ // property handler for style:page-usage (style::PageStyleLayout) class XMLPMPropHdl_PageStyleLayout : public XMLPropertyHandler @@ -48,8 +46,6 @@ public: ) const; }; - -//______________________________________________________________________________ // property handler for style:num-format (style::NumberingType) class XMLPMPropHdl_NumFormat : public XMLPropertyHandler @@ -68,8 +64,6 @@ public: ) const; }; - -//______________________________________________________________________________ // property handler for style:num-letter-sync (style::NumberingType) class XMLPMPropHdl_NumLetterSync : public XMLPropertyHandler @@ -88,8 +82,6 @@ public: ) const; }; - -//______________________________________________________________________________ // property handler for style:paper-tray-number class XMLPMPropHdl_PaperTrayNumber : public XMLPropertyHandler @@ -108,8 +100,6 @@ public: ) const; }; - -//______________________________________________________________________________ // property handler for style:print class XMLPMPropHdl_Print : public XMLPropertyHandler @@ -133,7 +123,6 @@ public: ) const; }; -//______________________________________________________________________________ // property handler for style:table-centering class XMLPMPropHdl_CenterHorizontal : public XMLPropertyHandler diff --git a/xmloff/source/style/PageMasterPropHdlFactory.cxx b/xmloff/source/style/PageMasterPropHdlFactory.cxx index 0923cee3a5f8..ca96939581b0 100644 --- a/xmloff/source/style/PageMasterPropHdlFactory.cxx +++ b/xmloff/source/style/PageMasterPropHdlFactory.cxx @@ -28,12 +28,9 @@ #include <xmloff/PageMasterStyleMap.hxx> #include <com/sun/star/text/TextGridMode.hpp> - - using namespace ::xmloff::token; using namespace ::com::sun::star; - SvXMLEnumMapEntry aXML_TextGridMode_ConstantMap[] = { { XML_NONE, text::TextGridMode::NONE }, @@ -42,8 +39,6 @@ SvXMLEnumMapEntry aXML_TextGridMode_ConstantMap[] = { XML_TOKEN_INVALID, 0 } }; -//______________________________________________________________________________ - XMLPageMasterPropHdlFactory::XMLPageMasterPropHdlFactory() : XMLPropertyHandlerFactory() { @@ -131,5 +126,4 @@ const XMLPropertyHandler* XMLPageMasterPropHdlFactory::GetPropertyHandler( sal_I return pHdl; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/style/PageMasterPropHdlFactory.hxx b/xmloff/source/style/PageMasterPropHdlFactory.hxx index 8b65c4fc2e77..8da183618b7e 100644 --- a/xmloff/source/style/PageMasterPropHdlFactory.hxx +++ b/xmloff/source/style/PageMasterPropHdlFactory.hxx @@ -22,9 +22,6 @@ #include <xmloff/prhdlfac.hxx> - -//______________________________________________________________________________ - class XMLPageMasterPropHdlFactory : public XMLPropertyHandlerFactory { public: diff --git a/xmloff/source/style/PageMasterPropMapper.cxx b/xmloff/source/style/PageMasterPropMapper.cxx index 273e1c3eaf35..60588799e397 100644 --- a/xmloff/source/style/PageMasterPropMapper.cxx +++ b/xmloff/source/style/PageMasterPropMapper.cxx @@ -17,10 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "PageMasterPropMapper.hxx" - #include <xmloff/PageMasterStyleMap.hxx> #include "PageMasterPropHdlFactory.hxx" @@ -28,9 +26,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; - -//______________________________________________________________________________ - XMLPageMasterPropSetMapper::XMLPageMasterPropSetMapper(): XMLPropertySetMapper( aXMLPageMasterStyleMap, new XMLPageMasterPropHdlFactory()) { diff --git a/xmloff/source/style/PageMasterPropMapper.hxx b/xmloff/source/style/PageMasterPropMapper.hxx index 231a35911452..db2f237d382f 100644 --- a/xmloff/source/style/PageMasterPropMapper.hxx +++ b/xmloff/source/style/PageMasterPropMapper.hxx @@ -22,9 +22,6 @@ #include <xmloff/xmlprmap.hxx> - -//______________________________________________________________________________ - class XMLPageMasterPropSetMapper : public XMLPropertySetMapper { public: diff --git a/xmloff/source/style/PageMasterStyleMap.cxx b/xmloff/source/style/PageMasterStyleMap.cxx index 872672906272..f3c86b01e1f7 100644 --- a/xmloff/source/style/PageMasterStyleMap.cxx +++ b/xmloff/source/style/PageMasterStyleMap.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <xmloff/PageMasterStyleMap.hxx> #include <xmloff/xmlnmspe.hxx> #include <xmloff/xmltoken.hxx> @@ -34,8 +33,6 @@ using namespace ::xmloff::token; #define HFMAP(name,prefix,token,type,context) \ MAP(name,prefix,token,type|XML_TYPE_PROP_HEADER_FOOTER,context, SvtSaveOptions::ODFVER_010) -//______________________________________________________________________________ - const XMLPropertyMapEntry aXMLPageMasterStyleMap[] = { // page master diff --git a/xmloff/source/style/TransGradientStyle.cxx b/xmloff/source/style/TransGradientStyle.cxx index 93a66e8dd77d..82d8520a3074 100644 --- a/xmloff/source/style/TransGradientStyle.cxx +++ b/xmloff/source/style/TransGradientStyle.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "TransGradientStyle.hxx" #include <com/sun/star/awt/Gradient.hpp> @@ -36,7 +35,6 @@ #include <xmloff/xmlexp.hxx> #include <xmloff/xmlimp.hxx> - using namespace ::com::sun::star; using namespace ::xmloff::token; @@ -55,7 +53,6 @@ enum SvXMLTokenMapAttrs XML_TOK_TABSTOP_END=XML_TOK_UNKNOWN }; - SvXMLEnumMapEntry const pXML_GradientStyle_Enum[] = { { XML_GRADIENTSTYLE_LINEAR, awt::GradientStyle_LINEAR }, @@ -67,10 +64,7 @@ SvXMLEnumMapEntry const pXML_GradientStyle_Enum[] = { XML_TOKEN_INVALID, 0 } }; - -//------------------------------------------------------------- // Import -//------------------------------------------------------------- XMLTransGradientStyleImport::XMLTransGradientStyleImport( SvXMLImport& rImp ) : rImport(rImp) @@ -216,10 +210,7 @@ sal_Bool XMLTransGradientStyleImport::importXML( return bRet; } - -//------------------------------------------------------------- // Export -//------------------------------------------------------------- XMLTransGradientStyleExport::XMLTransGradientStyleExport( SvXMLExport& rExp ) : rExport(rExp) @@ -230,7 +221,6 @@ XMLTransGradientStyleExport::~XMLTransGradientStyleExport() { } - sal_Bool XMLTransGradientStyleExport::exportXML( const OUString& rStrName, const uno::Any& rValue ) @@ -277,7 +267,6 @@ sal_Bool XMLTransGradientStyleExport::exportXML( rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_CY, aStrValue ); } - Color aColor; // Transparency start diff --git a/xmloff/source/style/WordWrapPropertyHdl.cxx b/xmloff/source/style/WordWrapPropertyHdl.cxx index 04623adf6d0f..5c3f02f99ea6 100644 --- a/xmloff/source/style/WordWrapPropertyHdl.cxx +++ b/xmloff/source/style/WordWrapPropertyHdl.cxx @@ -26,10 +26,8 @@ #include <rtl/ustrbuf.hxx> #include <com/sun/star/uno/Any.hxx> - using namespace ::com::sun::star::uno; -/////////////////////////////////////////////////////////////////////////////// // // class XMLWordWrapPropertyHdl // diff --git a/xmloff/source/style/XMLClipPropertyHandler.cxx b/xmloff/source/style/XMLClipPropertyHandler.cxx index bdcc4fe0e8cc..ff3964e4dec7 100644 --- a/xmloff/source/style/XMLClipPropertyHandler.cxx +++ b/xmloff/source/style/XMLClipPropertyHandler.cxx @@ -24,13 +24,11 @@ #include <xmloff/xmluconv.hxx> #include <xmloff/xmltoken.hxx> - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::text; using namespace ::xmloff::token; -/////////////////////////////////////////////////////////////////////////////// // // class XMLMeasurePropHdl // diff --git a/xmloff/source/style/XMLPageExport.cxx b/xmloff/source/style/XMLPageExport.cxx index 48e429550dd7..821f0099897d 100644 --- a/xmloff/source/style/XMLPageExport.cxx +++ b/xmloff/source/style/XMLPageExport.cxx @@ -33,7 +33,6 @@ #include "PageMasterPropMapper.hxx" #include "PageMasterExportPropMapper.hxx" - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::style; @@ -41,9 +40,6 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::beans; using namespace ::xmloff::token; - -//______________________________________________________________________________ - sal_Bool XMLPageExport::findPageMasterName( const OUString& rStyleName, OUString& rPMName ) const { for( ::std::vector< XMLPageExportNameEntry >::const_iterator pEntry = aNameVector.begin(); diff --git a/xmloff/source/style/adjushdl.cxx b/xmloff/source/style/adjushdl.cxx index 1f10b2a8fb7e..b473ac6f338e 100644 --- a/xmloff/source/style/adjushdl.cxx +++ b/xmloff/source/style/adjushdl.cxx @@ -50,7 +50,6 @@ SvXMLEnumMapEntry const pXML_Para_Align_Last_Enum[] = { XML_TOKEN_INVALID, 0 } }; -/////////////////////////////////////////////////////////////////////////////// // // class XMLParaAdjustPropHdl // @@ -86,7 +85,6 @@ sal_Bool XMLParaAdjustPropHdl::exportXML( OUString& rStrExpValue, const uno::Any return bRet; } -/////////////////////////////////////////////////////////////////////////////// // // class XMLLastLineAdjustPropHdl // diff --git a/xmloff/source/style/backhdl.cxx b/xmloff/source/style/backhdl.cxx index 53cc76470408..b0ec3e7deb59 100644 --- a/xmloff/source/style/backhdl.cxx +++ b/xmloff/source/style/backhdl.cxx @@ -25,7 +25,6 @@ #include <com/sun/star/uno/Any.hxx> #include <rtl/ustrbuf.hxx> - using namespace ::com::sun::star; using namespace ::xmloff::token; @@ -43,7 +42,6 @@ SvXMLEnumMapEntry pXML_BrushVerticalPos[] = { XML_TOKEN_INVALID, 0 } }; -/////////////////////////////////////////////////////////////////////////////// // // class XMLBackGraphicPositionPropHdl // diff --git a/xmloff/source/style/bordrhdl.cxx b/xmloff/source/style/bordrhdl.cxx index 736551b9cb68..530441e720c4 100644 --- a/xmloff/source/style/bordrhdl.cxx +++ b/xmloff/source/style/bordrhdl.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <bordrhdl.hxx> #include <sax/tools/converter.hxx> #include <xmloff/xmltoken.hxx> @@ -26,7 +25,6 @@ #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/table/BorderLine2.hpp> - using namespace ::com::sun::star; using namespace ::xmloff::token; @@ -78,7 +76,6 @@ SvXMLEnumMapEntry pXML_NamedBorderWidths[] = }; // mapping tables to map external xml input to intarnal box line widths - static sal_uInt16 const aBorderWidths[] = { DEF_LINE_WIDTH_0, @@ -95,8 +92,6 @@ static void lcl_frmitems_setXMLBorderStyle( table::BorderLine2 & rBorderLine, sa rBorderLine.LineStyle = eStyle; } - -/////////////////////////////////////////////////////////////////////////////// // // class XMLEscapementPropHdl // @@ -180,7 +175,6 @@ sal_Bool XMLBorderWidthHdl::exportXML( OUString& rStrExpValue, const uno::Any& r return sal_True; } -/////////////////////////////////////////////////////////////////////////////// // // class XMLEscapementHeightPropHdl // diff --git a/xmloff/source/style/breakhdl.cxx b/xmloff/source/style/breakhdl.cxx index 3e9f15c8f79e..8b0b642f3d5d 100644 --- a/xmloff/source/style/breakhdl.cxx +++ b/xmloff/source/style/breakhdl.cxx @@ -24,7 +24,6 @@ #include <com/sun/star/style/BreakType.hpp> #include <com/sun/star/uno/Any.hxx> - using namespace ::com::sun::star; using namespace ::xmloff::token; @@ -38,7 +37,6 @@ SvXMLEnumMapEntry pXML_BreakTypes[] = { XML_TOKEN_INVALID, 0} }; -/////////////////////////////////////////////////////////////////////////////// // // class XMLFmtBreakBeforePropHdl // @@ -109,7 +107,6 @@ sal_Bool XMLFmtBreakBeforePropHdl::exportXML( OUString& rStrExpValue, const uno: return sal_True; } -/////////////////////////////////////////////////////////////////////////////// // // class XMLFmtBreakBeforePropHdl // diff --git a/xmloff/source/style/cdouthdl.cxx b/xmloff/source/style/cdouthdl.cxx index c92b30b04016..e248491d5452 100644 --- a/xmloff/source/style/cdouthdl.cxx +++ b/xmloff/source/style/cdouthdl.cxx @@ -25,7 +25,6 @@ #include <com/sun/star/awt/FontStrikeout.hpp> #include <com/sun/star/uno/Any.hxx> - using namespace ::com::sun::star; using namespace ::com::sun::star::awt; using namespace ::xmloff::token; @@ -72,10 +71,7 @@ SvXMLEnumMapEntry pXML_CrossedoutWidth_Enum[] = { XML_TOKEN_INVALID, 0 } }; -/////////////////////////////////////////////////////////////////////////////// -// // class XMLCrossedOutTypePropHdl -// XMLCrossedOutTypePropHdl::~XMLCrossedOutTypePropHdl() { @@ -150,10 +146,7 @@ sal_Bool XMLCrossedOutTypePropHdl::exportXML( OUString& rStrExpValue, const uno: return bRet; } -/////////////////////////////////////////////////////////////////////////////// -// // class XMLCrossedOutStylePropHdl -// XMLCrossedOutStylePropHdl::~XMLCrossedOutStylePropHdl() { @@ -201,10 +194,7 @@ sal_Bool XMLCrossedOutStylePropHdl::exportXML( OUString& rStrExpValue, const uno return bRet; } -/////////////////////////////////////////////////////////////////////////////// -// // class XMLCrossedOutWidthPropHdl -// XMLCrossedOutWidthPropHdl::~XMLCrossedOutWidthPropHdl() { @@ -273,10 +263,7 @@ sal_Bool XMLCrossedOutWidthPropHdl::exportXML( OUString& rStrExpValue, const uno return bRet; } -/////////////////////////////////////////////////////////////////////////////// -// // class XMLCrossedOutTextPropHdl -// XMLCrossedOutTextPropHdl::~XMLCrossedOutTextPropHdl() { diff --git a/xmloff/source/style/chrhghdl.cxx b/xmloff/source/style/chrhghdl.cxx index 3d2602aa22b0..7363cc024840 100644 --- a/xmloff/source/style/chrhghdl.cxx +++ b/xmloff/source/style/chrhghdl.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <chrhghdl.hxx> #include <rtl/ustrbuf.hxx> @@ -28,10 +27,8 @@ #include <xmloff/xmluconv.hxx> - using namespace ::com::sun::star; -/////////////////////////////////////////////////////////////////////////////// // // class XMLEscapementPropHdl // @@ -78,7 +75,6 @@ sal_Bool XMLCharHeightHdl::exportXML( OUString& rStrExpValue, const uno::Any& rV return !rStrExpValue.isEmpty(); } -/////////////////////////////////////////////////////////////////////////////// // // class XMLEscapementHeightPropHdl // @@ -117,7 +113,6 @@ sal_Bool XMLCharHeightPropHdl::exportXML( OUString& rStrExpValue, const uno::Any return !rStrExpValue.isEmpty(); } -/////////////////////////////////////////////////////////////////////////////// // // class XMLEscapementPropHdl // diff --git a/xmloff/source/style/chrlohdl.cxx b/xmloff/source/style/chrlohdl.cxx index d23159d06505..855266aa2fbd 100644 --- a/xmloff/source/style/chrlohdl.cxx +++ b/xmloff/source/style/chrlohdl.cxx @@ -25,24 +25,20 @@ #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/lang/Locale.hpp> - using namespace ::com::sun::star; using namespace ::xmloff::token; - /* TODO-BCP47: this fiddling with Locale is quite ugly and fragile, especially * for the fo:script temporarily stored in Variant, it would be better to use * LanguageTagODF but we have that nasty UNO API requirement here. * => make LanguageTagODF (unpublished) API? */ - // For runtime performance, instead of converting back and forth between // com::sun::star::Locale and LanguageTag to decide if script or tag are // needed, this code takes advantage of knowledge about the internal // representation of BCP 47 language tags in a Locale if present as done in a // LanguageTag. - XMLCharLanguageHdl::~XMLCharLanguageHdl() { // nothing to do @@ -130,8 +126,6 @@ sal_Bool XMLCharLanguageHdl::exportXML( OUString& rStrExpValue, const uno::Any& return sal_True; } -// =========================================================================== - XMLCharScriptHdl::~XMLCharScriptHdl() { // nothing to do @@ -246,8 +240,6 @@ sal_Bool XMLCharScriptHdl::exportXML( OUString& rStrExpValue, const uno::Any& rV return sal_True; } -// =========================================================================== - XMLCharCountryHdl::~XMLCharCountryHdl() { // nothing to do @@ -319,8 +311,6 @@ sal_Bool XMLCharCountryHdl::exportXML( OUString& rStrExpValue, const uno::Any& r return sal_True; } -// =========================================================================== - XMLCharRfcLanguageTagHdl::~XMLCharRfcLanguageTagHdl() { // nothing to do diff --git a/xmloff/source/style/csmaphdl.cxx b/xmloff/source/style/csmaphdl.cxx index 1df628f8d48d..ba16e857f0f4 100644 --- a/xmloff/source/style/csmaphdl.cxx +++ b/xmloff/source/style/csmaphdl.cxx @@ -24,7 +24,6 @@ #include <com/sun/star/style/CaseMap.hpp> #include <com/sun/star/uno/Any.hxx> - using namespace ::com::sun::star; using namespace ::xmloff::token; @@ -37,10 +36,7 @@ static SvXMLEnumMapEntry pXML_Casemap_Enum[] = { XML_TOKEN_INVALID, 0 } }; -/////////////////////////////////////////////////////////////////////////////// -// // class XMLPosturePropHdl -// XMLCaseMapPropHdl::~XMLCaseMapPropHdl() { @@ -75,10 +71,7 @@ sal_Bool XMLCaseMapPropHdl::exportXML( OUString& rStrExpValue, const uno::Any& r return bRet; } -/////////////////////////////////////////////////////////////////////////////// -// // class XMLCaseMapVariantHdl -// XMLCaseMapVariantHdl::~XMLCaseMapVariantHdl() { diff --git a/xmloff/source/style/durationhdl.cxx b/xmloff/source/style/durationhdl.cxx index 676f26050510..fcfd3bb5e3f4 100644 --- a/xmloff/source/style/durationhdl.cxx +++ b/xmloff/source/style/durationhdl.cxx @@ -23,13 +23,9 @@ #include <rtl/ustrbuf.hxx> #include <sax/tools/converter.hxx> - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; -// --------------------------------------------------------------------------- - - sal_Bool XMLDurationMS16PropHdl_Impl::importXML( const OUString& rStrImpValue, Any& rValue, diff --git a/xmloff/source/style/escphdl.cxx b/xmloff/source/style/escphdl.cxx index 0bfd631c84dd..8d395b325d20 100644 --- a/xmloff/source/style/escphdl.cxx +++ b/xmloff/source/style/escphdl.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <escphdl.hxx> #include <sax/tools/converter.hxx> @@ -26,7 +25,6 @@ #include <rtl/ustrbuf.hxx> #include <com/sun/star/uno/Any.hxx> - using namespace ::com::sun::star; using namespace ::xmloff::token; @@ -35,7 +33,6 @@ using namespace ::xmloff::token; #define DFLT_ESC_AUTO_SUPER 101 #define DFLT_ESC_AUTO_SUB -101 -/////////////////////////////////////////////////////////////////////////////// // // class XMLEscapementPropHdl // @@ -101,7 +98,6 @@ sal_Bool XMLEscapementPropHdl::exportXML( OUString& rStrExpValue, const uno::Any return sal_True; } -/////////////////////////////////////////////////////////////////////////////// // // class XMLEscapementHeightPropHdl // diff --git a/xmloff/source/style/fonthdl.cxx b/xmloff/source/style/fonthdl.cxx index 0e1e8365f3c9..50543844a9e1 100644 --- a/xmloff/source/style/fonthdl.cxx +++ b/xmloff/source/style/fonthdl.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <fonthdl.hxx> #include <sax/tools/converter.hxx> @@ -28,7 +27,6 @@ #include <com/sun/star/uno/Any.hxx> #include <tools/fontenum.hxx> - using namespace ::com::sun::star; using namespace ::xmloff::token; @@ -54,10 +52,8 @@ static SvXMLEnumMapEntry const aFontPitchMapping[] = { XML_VARIABLE, PITCH_VARIABLE }, { XML_TOKEN_INVALID, 0 } }; -/////////////////////////////////////////////////////////////////////////////// -// + // class XMLFontFamilyNamePropHdl -// XMLFontFamilyNamePropHdl::~XMLFontFamilyNamePropHdl() { @@ -188,10 +184,7 @@ sal_Bool XMLFontFamilyNamePropHdl::exportXML( OUString& rStrExpValue, const uno: return bRet; } -/////////////////////////////////////////////////////////////////////////////// -// // class XMLFontFamilyPropHdl -// XMLFontFamilyPropHdl::~XMLFontFamilyPropHdl() { @@ -226,10 +219,7 @@ sal_Bool XMLFontFamilyPropHdl::exportXML( OUString& rStrExpValue, const uno::Any return bRet; } -/////////////////////////////////////////////////////////////////////////////// -// // class XMLFontEncodingPropHdl -// XMLFontEncodingPropHdl::~XMLFontEncodingPropHdl() { @@ -265,10 +255,7 @@ sal_Bool XMLFontEncodingPropHdl::exportXML( OUString& rStrExpValue, const uno::A return bRet; } -/////////////////////////////////////////////////////////////////////////////// -// // class XMLFontPitchPropHdl -// XMLFontPitchPropHdl::~XMLFontPitchPropHdl() { diff --git a/xmloff/source/style/impastp1.cxx b/xmloff/source/style/impastp1.cxx index b71368e93650..49e8e018b885 100644 --- a/xmloff/source/style/impastp1.cxx +++ b/xmloff/source/style/impastp1.cxx @@ -20,16 +20,8 @@ #include <tools/debug.hxx> #include "impastpl.hxx" - -//############################################################################# -// // Class XMLFamilyData_Impl -// - -/////////////////////////////////////////////////////////////////////////////// -// // ctor/dtor class XMLFamilyData_Impl -// XMLFamilyData_Impl::XMLFamilyData_Impl( sal_Int32 nFamily, diff --git a/xmloff/source/style/impastp2.cxx b/xmloff/source/style/impastp2.cxx index 1cf90cd79ce5..86e2a4019946 100644 --- a/xmloff/source/style/impastp2.cxx +++ b/xmloff/source/style/impastp2.cxx @@ -22,16 +22,8 @@ using namespace std; - -//############################################################################# -// // Class SvXMLAutoStylePoolProperties_Impl -// - -/////////////////////////////////////////////////////////////////////////////// -// // ctor class SvXMLAutoStylePoolProperties_Impl -// SvXMLAutoStylePoolPropertiesP_Impl::SvXMLAutoStylePoolPropertiesP_Impl( XMLFamilyData_Impl& rFamilyData, const vector< XMLPropertyState >& rProperties ) : maProperties( rProperties ), diff --git a/xmloff/source/style/impastp3.cxx b/xmloff/source/style/impastp3.cxx index 41693a5d37d1..91fff88fad03 100644 --- a/xmloff/source/style/impastp3.cxx +++ b/xmloff/source/style/impastp3.cxx @@ -22,16 +22,8 @@ using namespace std; - -//############################################################################# -// // Class SvXMLAutoStylePoolParent_Impl -// - -/////////////////////////////////////////////////////////////////////////////// -// // dtor class SvXMLAutoStylePoolParent_Impl -// SvXMLAutoStylePoolParentP_Impl::~SvXMLAutoStylePoolParentP_Impl() { @@ -40,11 +32,8 @@ SvXMLAutoStylePoolParentP_Impl::~SvXMLAutoStylePoolParentP_Impl() maPropertiesList.clear(); } -/////////////////////////////////////////////////////////////////////////////// -// // Adds a array of XMLPropertyState ( vector< XMLPropertyState > ) to list // if not added, yet. -// sal_Bool SvXMLAutoStylePoolParentP_Impl::Add( XMLFamilyData_Impl& rFamilyData, const vector< XMLPropertyState >& rProperties, OUString& rName, bool bDontSeek ) { @@ -86,7 +75,6 @@ sal_Bool SvXMLAutoStylePoolParentP_Impl::Add( XMLFamilyData_Impl& rFamilyData, c return bAdded; } -/////////////////////////////////////////////////////////////////////////////// // // Adds a array of XMLPropertyState ( vector< XMLPropertyState > ) with a given name. // If the name exists already, nothing is done. If a style with a different name and @@ -128,7 +116,6 @@ sal_Bool SvXMLAutoStylePoolParentP_Impl::AddNamed( XMLFamilyData_Impl& rFamilyDa return bAdded; } -/////////////////////////////////////////////////////////////////////////////// // // Search for a array of XMLPropertyState ( vector< XMLPropertyState > ) in list // diff --git a/xmloff/source/style/impastp4.cxx b/xmloff/source/style/impastp4.cxx index 154d5b9dfa91..c211945b2937 100644 --- a/xmloff/source/style/impastp4.cxx +++ b/xmloff/source/style/impastp4.cxx @@ -34,15 +34,8 @@ using namespace ::std; using namespace ::com::sun::star; using namespace ::xmloff::token; -//############################################################################# -// // Class SvXMLAutoStylePool_Impl -// - -/////////////////////////////////////////////////////////////////////////////// -// // ctor/dtor class SvXMLAutoStylePool_Impl -// SvXMLAutoStylePoolP_Impl::SvXMLAutoStylePoolP_Impl( SvXMLExport& rExp) : rExport( rExp ) @@ -53,10 +46,7 @@ SvXMLAutoStylePoolP_Impl::~SvXMLAutoStylePoolP_Impl() { } -/////////////////////////////////////////////////////////////////////////////// -// // Adds stylefamily-information to sorted list -// void SvXMLAutoStylePoolP_Impl::AddFamily( sal_Int32 nFamily, @@ -105,11 +95,8 @@ void SvXMLAutoStylePoolP_Impl::SetFamilyPropSetMapper( if (aFind != maFamilyList.end()) aFind->mxMapper = rMapper; } -/////////////////////////////////////////////////////////////////////////////// -// -// Adds a name to list -// +// Adds a name to list void SvXMLAutoStylePoolP_Impl::RegisterName( sal_Int32 nFamily, const OUString& rName ) { XMLFamilyData_Impl aTmp( nFamily ); @@ -120,7 +107,6 @@ void SvXMLAutoStylePoolP_Impl::RegisterName( sal_Int32 nFamily, const OUString& aFind->mpNameList->insert(rName); } -/////////////////////////////////////////////////////////////////////////////// // // Retrieve the list of registered names // @@ -159,11 +145,8 @@ void SvXMLAutoStylePoolP_Impl::GetRegisteredNames( std::copy( aNames.begin(), aNames.end(), rNames.getArray() ); } -/////////////////////////////////////////////////////////////////////////////// -// // Adds a array of XMLPropertyState ( vector< XMLPropertyState > ) to list // if not added, yet. -// sal_Bool SvXMLAutoStylePoolP_Impl::Add(OUString& rName, sal_Int32 nFamily, const OUString& rParent, @@ -255,7 +238,6 @@ sal_Bool SvXMLAutoStylePoolP_Impl::AddNamed(const OUString& rName, sal_Int32 nFa return bRet; } -/////////////////////////////////////////////////////////////////////////////// // // Search for a array of XMLPropertyState ( vector< XMLPropertyState > ) in list // @@ -290,7 +272,6 @@ OUString SvXMLAutoStylePoolP_Impl::Find( sal_Int32 nFamily, return sName; } -/////////////////////////////////////////////////////////////////////////////// // // export // @@ -316,7 +297,6 @@ void SvXMLAutoStylePoolP_Impl::exportXML( if (!nCount) return; - ///////////////////////////////////////////////////////////////////////////////////// // create, initialize and fill helper-structure (SvXMLAutoStylePoolProperties_Impl) // which contains a parent-name and a SvXMLAutoStylePoolProperties_Impl // @@ -354,7 +334,6 @@ void SvXMLAutoStylePoolP_Impl::exportXML( } } - ///////////////////////////////////////////////////////////////////////////////////// // // create string to export for each XML-style. That means for each property-list // diff --git a/xmloff/source/style/impastpl.hxx b/xmloff/source/style/impastpl.hxx index c81f6d1d5e8c..1d8969f91bb5 100644 --- a/xmloff/source/style/impastpl.hxx +++ b/xmloff/source/style/impastpl.hxx @@ -40,10 +40,7 @@ class SvXMLExport; #define MAX_CACHE_SIZE 65536 -/////////////////////////////////////////////////////////////////////////////// -// // Implementationclass for stylefamily-information -// typedef OUString* OUStringPtr; typedef ::std::vector< OUStringPtr > SvXMLAutoStylePoolCache_Impl; @@ -82,13 +79,10 @@ public: void ClearEntries(); }; -/// A set that finds and sorts based only on mnFamily +// A set that finds and sorts based only on mnFamily typedef boost::ptr_set<XMLFamilyData_Impl> XMLFamilyDataList_Impl; -/////////////////////////////////////////////////////////////////////////////// -// // Properties of a pool -// class SvXMLAutoStylePoolPropertiesP_Impl { @@ -114,11 +108,7 @@ public: typedef SvXMLAutoStylePoolPropertiesP_Impl* SvXMLAutoStylePoolPropertiesPPtr; typedef ::std::vector< SvXMLAutoStylePoolPropertiesPPtr > SvXMLAutoStylePoolPropertiesPList_Impl; -/////////////////////////////////////////////////////////////////////////////// -// // Parents of AutoStylePool's -// - class SvXMLAutoStylePoolParentP_Impl { OUString msParent; @@ -160,10 +150,7 @@ public: ~SvXMLAutoStylePoolParentsP_Impl() { DeleteAndDestroyAll(); } }; -/////////////////////////////////////////////////////////////////////////////// -// // Implementationclass of SvXMLAutoStylePool -// class SvXMLAutoStylePoolP_Impl { diff --git a/xmloff/source/style/kernihdl.cxx b/xmloff/source/style/kernihdl.cxx index 74051eb33ff3..8f9734ec09aa 100644 --- a/xmloff/source/style/kernihdl.cxx +++ b/xmloff/source/style/kernihdl.cxx @@ -25,11 +25,9 @@ #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> - using namespace ::com::sun::star::uno; using namespace ::xmloff::token; -/////////////////////////////////////////////////////////////////////////////// // // class XMLKerningPropHdl // diff --git a/xmloff/source/style/lspachdl.cxx b/xmloff/source/style/lspachdl.cxx index a6fd84667e6e..7d6fdfb80534 100644 --- a/xmloff/source/style/lspachdl.cxx +++ b/xmloff/source/style/lspachdl.cxx @@ -26,12 +26,10 @@ #include <com/sun/star/style/LineSpacing.hpp> #include <com/sun/star/style/LineSpacingMode.hpp> - using namespace ::com::sun::star; using ::xmloff::token::IsXMLToken; using ::xmloff::token::XML_CASEMAP_NORMAL; -/////////////////////////////////////////////////////////////////////////////// // // class XMLEscapementPropHdl // @@ -95,7 +93,6 @@ sal_Bool XMLLineHeightHdl::exportXML( OUString& rStrExpValue, const uno::Any& rV return !rStrExpValue.isEmpty(); } -/////////////////////////////////////////////////////////////////////////////// // // class XMLLineHeightAtLeastHdl // @@ -136,7 +133,6 @@ sal_Bool XMLLineHeightAtLeastHdl::exportXML( OUString& rStrExpValue, const uno:: return !rStrExpValue.isEmpty(); } -/////////////////////////////////////////////////////////////////////////////// // // class XMLLineSpacingHdl // diff --git a/xmloff/source/style/opaquhdl.cxx b/xmloff/source/style/opaquhdl.cxx index d61e576f01bf..88f6ed5af465 100644 --- a/xmloff/source/style/opaquhdl.cxx +++ b/xmloff/source/style/opaquhdl.cxx @@ -21,19 +21,13 @@ #include <com/sun/star/uno/Any.hxx> #include <rtl/ustrbuf.hxx> -// -- #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> - using namespace ::com::sun::star::uno; using namespace ::xmloff::token; - -/////////////////////////////////////////////////////////////////////////////// -// // class XMLOpaquePropHdl -// XMLOpaquePropHdl::~XMLOpaquePropHdl() { diff --git a/xmloff/source/style/postuhdl.cxx b/xmloff/source/style/postuhdl.cxx index a05fa74a8aa0..ced4e82a818a 100644 --- a/xmloff/source/style/postuhdl.cxx +++ b/xmloff/source/style/postuhdl.cxx @@ -25,7 +25,6 @@ #include <com/sun/star/awt/FontSlant.hpp> #include <tools/fontenum.hxx> - using namespace ::com::sun::star; using namespace ::xmloff::token; @@ -37,7 +36,6 @@ SvXMLEnumMapEntry const aPostureGenericMapping[] = { XML_TOKEN_INVALID, 0 } }; -/////////////////////////////////////////////////////////////////////////////// // // class XMLPosturePropHdl // diff --git a/xmloff/source/style/prhdlfac.cxx b/xmloff/source/style/prhdlfac.cxx index 305a5daf1fa7..3e9fd918f2f3 100644 --- a/xmloff/source/style/prhdlfac.cxx +++ b/xmloff/source/style/prhdlfac.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/drawing/ColorMode.hpp> #include <com/sun/star/text/HorizontalAdjust.hpp> #include <com/sun/star/text/WritingMode2.hpp> @@ -95,21 +94,14 @@ SvXMLEnumMapEntry const aXML_WritingDirection_Enum[] = { XML_TOKEN_INVALID, 0 } }; - -/////////////////////////////////////////////////////////////////////////// -// // Dtor -// XMLPropertyHandlerFactory::~XMLPropertyHandlerFactory() { for( CacheMap::iterator pPos = maHandlerCache.begin(); pPos != maHandlerCache.end(); ++pPos ) delete pPos->second; } -/////////////////////////////////////////////////////////////////////////// -// // Interface -// const XMLPropertyHandler* XMLPropertyHandlerFactory::GetPropertyHandler( sal_Int32 nType ) const { DBG_ASSERT( (nType & ~((sal_uInt32)MID_FLAG_MASK)) == 0, @@ -117,10 +109,7 @@ const XMLPropertyHandler* XMLPropertyHandlerFactory::GetPropertyHandler( sal_Int return GetBasicHandler( nType ); } -/////////////////////////////////////////////////////////////////////////// -// // Helper-methods to create and cache PropertyHandler -// XMLPropertyHandler* XMLPropertyHandlerFactory::GetHdlCache( sal_Int32 nType ) const { XMLPropertyHandler* pRet = NULL; diff --git a/xmloff/source/style/shadwhdl.cxx b/xmloff/source/style/shadwhdl.cxx index 596694793860..b991baab9d49 100644 --- a/xmloff/source/style/shadwhdl.cxx +++ b/xmloff/source/style/shadwhdl.cxx @@ -28,11 +28,9 @@ #include <xmloff/xmluconv.hxx> #include <xmloff/xmltoken.hxx> - using namespace ::com::sun::star; using namespace ::xmloff::token; -/////////////////////////////////////////////////////////////////////////////// // // class XMLMeasurePropHdl // diff --git a/xmloff/source/style/shdwdhdl.cxx b/xmloff/source/style/shdwdhdl.cxx index 7fd14b598a2a..4fb594dbbd9c 100644 --- a/xmloff/source/style/shdwdhdl.cxx +++ b/xmloff/source/style/shdwdhdl.cxx @@ -24,11 +24,9 @@ // -- #include <xmloff/xmltoken.hxx> - using namespace ::com::sun::star::uno; using namespace ::xmloff::token; -/////////////////////////////////////////////////////////////////////////////// // // class XMLFmtSplitPropHdl // diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx index 318cc0d1c6f4..858d68a4c360 100644 --- a/xmloff/source/style/styleexp.cxx +++ b/xmloff/source/style/styleexp.cxx @@ -268,7 +268,6 @@ sal_Bool XMLStyleExport::exportStyle( bool bNoInheritedListStyle( true ); - ///////////////////////////////////////////////// Reference<XStyle> xStyle( xPropState, UNO_QUERY ); while ( xStyle.is() ) { @@ -295,7 +294,6 @@ sal_Bool XMLStyleExport::exportStyle( } } } - ///////////////////////////////////////////////// if ( bNoInheritedListStyle ) GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_LIST_STYLE_NAME, @@ -507,5 +505,4 @@ void XMLStyleExport::exportStyleFamily( } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/style/tabsthdl.cxx b/xmloff/source/style/tabsthdl.cxx index 4001950c3d0f..45e0c42d6253 100644 --- a/xmloff/source/style/tabsthdl.cxx +++ b/xmloff/source/style/tabsthdl.cxx @@ -23,7 +23,6 @@ using namespace ::com::sun::star; -/////////////////////////////////////////////////////////////////////////////// // // class XMLFontFamilyNamePropHdl // diff --git a/xmloff/source/style/undlihdl.cxx b/xmloff/source/style/undlihdl.cxx index b238491958de..61e9db4acaec 100644 --- a/xmloff/source/style/undlihdl.cxx +++ b/xmloff/source/style/undlihdl.cxx @@ -22,11 +22,9 @@ #include <xmloff/xmluconv.hxx> #include <rtl/ustrbuf.hxx> - #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/awt/FontUnderline.hpp> - using namespace ::com::sun::star; using namespace ::com::sun::star::awt; using namespace ::xmloff::token; @@ -102,9 +100,6 @@ SvXMLEnumMapEntry const pXML_UnderlineWidth_Enum[] = { XML_TOKEN_INVALID, 0 } }; - - -/////////////////////////////////////////////////////////////////////////////// // // class XMLUnderlineTypePropHdl // @@ -187,7 +182,6 @@ sal_Bool XMLUnderlineTypePropHdl::exportXML( OUString& rStrExpValue, const uno:: return bRet; } -/////////////////////////////////////////////////////////////////////////////// // // class XMLUnderlineStylePropHdl // @@ -275,7 +269,6 @@ sal_Bool XMLUnderlineStylePropHdl::exportXML( OUString& rStrExpValue, const uno: return bRet; } -/////////////////////////////////////////////////////////////////////////////// // // class XMLUnderlineWidthPropHdl // diff --git a/xmloff/source/style/weighhdl.cxx b/xmloff/source/style/weighhdl.cxx index 7c8d31b2af65..5fd5db811a95 100644 --- a/xmloff/source/style/weighhdl.cxx +++ b/xmloff/source/style/weighhdl.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <weighhdl.hxx> #include <sax/tools/converter.hxx> @@ -33,7 +32,6 @@ #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/awt/FontWeight.hpp> - using namespace ::com::sun::star::uno; using namespace ::xmloff::token; @@ -59,10 +57,7 @@ FontWeightMapper const aFontWeightMap[] = { ::com::sun::star::awt::FontWeight::DONTKNOW, 1000 } }; -/////////////////////////////////////////////////////////////////////////////// -// // class XMLFmtBreakBeforePropHdl -// XMLFontWeightPropHdl::~XMLFontWeightPropHdl() { diff --git a/xmloff/source/style/xmlbahdl.cxx b/xmloff/source/style/xmlbahdl.cxx index 9a7c0ed582bd..bad015ca3d0c 100644 --- a/xmloff/source/style/xmlbahdl.cxx +++ b/xmloff/source/style/xmlbahdl.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <xmlbahdl.hxx> #include <tools/debug.hxx> @@ -26,7 +25,6 @@ #include <com/sun/star/uno/Any.hxx> #include <xmloff/xmltoken.hxx> - using namespace ::com::sun::star::uno; using namespace ::xmloff::token; @@ -83,10 +81,7 @@ static sal_Bool lcl_xmloff_getAny( const Any& rValue, sal_Int32& nValue, return bRet; } -/////////////////////////////////////////////////////////////////////////////// -// // class XMLNumberPropHdl -// XMLNumberPropHdl::~XMLNumberPropHdl() { @@ -119,9 +114,7 @@ sal_Bool XMLNumberPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, return bRet; } -/////////////////////////////////////////////////////////////////////////////// // class XMLNumberNonePropHdl -// XMLNumberNonePropHdl::XMLNumberNonePropHdl( sal_Int8 nB ) : sZeroStr( GetXMLToken(XML_NO_LIMIT) ), @@ -184,10 +177,7 @@ sal_Bool XMLNumberNonePropHdl::exportXML( OUString& rStrExpValue, const Any& rVa return bRet; } -/////////////////////////////////////////////////////////////////////////////// -// // class XMLMeasurePropHdl -// XMLMeasurePropHdl::~XMLMeasurePropHdl() { @@ -222,10 +212,7 @@ sal_Bool XMLMeasurePropHdl::exportXML( OUString& rStrExpValue, const Any& rValue return bRet; } -/////////////////////////////////////////////////////////////////////////////// -// // class XMLBoolFalsePropHdl -// XMLBoolFalsePropHdl::~XMLBoolFalsePropHdl() { @@ -242,10 +229,7 @@ sal_Bool XMLBoolFalsePropHdl::exportXML( OUString& rStrExpValue, const Any& /*rV return XMLBoolPropHdl::exportXML( rStrExpValue, makeAny( sal_False ), rCnv ); } -/////////////////////////////////////////////////////////////////////////////// -// // class XMLBoolPropHdl -// XMLBoolPropHdl::~XMLBoolPropHdl() { @@ -278,10 +262,7 @@ sal_Bool XMLBoolPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, c return bRet; } -/////////////////////////////////////////////////////////////////////////////// -// // class XMLNBoolPropHdl -// XMLNBoolPropHdl::~XMLNBoolPropHdl() { @@ -314,10 +295,7 @@ sal_Bool XMLNBoolPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, return bRet; } -/////////////////////////////////////////////////////////////////////////////// -// // class XMLPercentPropHdl -// XMLPercentPropHdl::~XMLPercentPropHdl() { @@ -350,10 +328,7 @@ sal_Bool XMLPercentPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue return bRet; } -/////////////////////////////////////////////////////////////////////////////// -// // class XMLDoublePercentPropHdl -// sal_Bool XMLDoublePercentPropHdl::importXML( const OUString& rStrImpValue, Any& rValue, const SvXMLUnitConverter& ) const { @@ -398,11 +373,7 @@ sal_Bool XMLDoublePercentPropHdl::exportXML( OUString& rStrExpValue, const Any& return bRet; } - -/////////////////////////////////////////////////////////////////////////////// -// // class XMLNegPercentPropHdl -// XMLNegPercentPropHdl::~XMLNegPercentPropHdl() { @@ -435,11 +406,7 @@ sal_Bool XMLNegPercentPropHdl::exportXML( OUString& rStrExpValue, const Any& rVa return bRet; } - -/////////////////////////////////////////////////////////////////////////////// -// // class XMLMeasurePxPropHdl -// XMLMeasurePxPropHdl::~XMLMeasurePxPropHdl() { @@ -474,10 +441,7 @@ sal_Bool XMLMeasurePxPropHdl::exportXML( OUString& rStrExpValue, const Any& rVal return bRet; } -/////////////////////////////////////////////////////////////////////////////// -// // class XMLColorPropHdl -// XMLColorPropHdl::~XMLColorPropHdl() { @@ -552,10 +516,7 @@ sal_Bool XMLColorPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, return bRet; } -/////////////////////////////////////////////////////////////////////////////// -// // class XMLHexPropHdl -// XMLHexPropHdl::~XMLHexPropHdl() { @@ -594,10 +555,7 @@ sal_Bool XMLHexPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, co return bRet; } -/////////////////////////////////////////////////////////////////////////////// -// // class XMLStringPropHdl -// XMLStringPropHdl::~XMLStringPropHdl() { @@ -624,10 +582,7 @@ sal_Bool XMLStringPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, return bRet; } -/////////////////////////////////////////////////////////////////////////////// -// // class XMLStyleNamePropHdl -// XMLStyleNamePropHdl::~XMLStyleNamePropHdl() { @@ -647,11 +602,7 @@ sal_Bool XMLStyleNamePropHdl::exportXML( OUString& rStrExpValue, const Any& rVal return bRet; } - -/////////////////////////////////////////////////////////////////////////////// -// // class XMLDoublePropHdl -// XMLDoublePropHdl::~XMLDoublePropHdl() { @@ -683,10 +634,7 @@ sal_Bool XMLDoublePropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, return bRet; } -/////////////////////////////////////////////////////////////////////////////// -// // class XMLColorTransparentPropHdl -// XMLColorTransparentPropHdl::XMLColorTransparentPropHdl( enum XMLTokenEnum eTransparent ) : @@ -734,11 +682,7 @@ sal_Bool XMLColorTransparentPropHdl::exportXML( OUString& rStrExpValue, const An return bRet; } - -/////////////////////////////////////////////////////////////////////////////// -// // class XMLIsTransparentPropHdl -// XMLIsTransparentPropHdl::XMLIsTransparentPropHdl( enum XMLTokenEnum eTransparent, sal_Bool bTransPropVal ) : @@ -780,10 +724,7 @@ sal_Bool XMLIsTransparentPropHdl::exportXML( OUString& rStrExpValue, const Any& return bRet; } -/////////////////////////////////////////////////////////////////////////////// -// // class XMLColorAutoPropHdl -// XMLColorAutoPropHdl::XMLColorAutoPropHdl() { @@ -829,10 +770,7 @@ sal_Bool XMLColorAutoPropHdl::exportXML( OUString& rStrExpValue, const Any& rVal return bRet; } -/////////////////////////////////////////////////////////////////////////////// -// // class XMLIsAutoColorPropHdl -// XMLIsAutoColorPropHdl::XMLIsAutoColorPropHdl() { @@ -871,10 +809,7 @@ sal_Bool XMLIsAutoColorPropHdl::exportXML( OUString& rStrExpValue, const Any& rV return bRet; } -/////////////////////////////////////////////////////////////////////////////// -// // class XMLCompareOnlyPropHdl -// XMLCompareOnlyPropHdl::~XMLCompareOnlyPropHdl() { @@ -893,9 +828,7 @@ sal_Bool XMLCompareOnlyPropHdl::exportXML( OUString&, const Any&, const SvXMLUni return sal_False; } -/////////////////////////////////////////////////////////////////////////////// // class XMLNumberWithoutZeroPropHdl -// XMLNumberWithoutZeroPropHdl::XMLNumberWithoutZeroPropHdl( sal_Int8 nB ) : nBytes( nB ) @@ -935,9 +868,7 @@ sal_Bool XMLNumberWithoutZeroPropHdl::exportXML( OUString& rStrExpValue, const A return bRet; } -/////////////////////////////////////////////////////////////////////////////// // class XMLNumberWithAutoInsteadZeroPropHdl -// XMLNumberWithAutoInsteadZeroPropHdl::~XMLNumberWithAutoInsteadZeroPropHdl() { diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx index c2c414b100d7..0637cd220e81 100644 --- a/xmloff/source/style/xmlexppr.cxx +++ b/xmloff/source/style/xmlexppr.cxx @@ -39,7 +39,6 @@ #include <xmloff/PropertySetInfoHash.hxx> #include <comphelper/stl_types.hxx> - using namespace ::std; using namespace ::com::sun::star; using namespace ::com::sun::star::beans; @@ -78,19 +77,12 @@ static XMLPropTokens_Impl aPropTokens[MAX_PROP_TYPES] = ENTRY(SECTION) }; -/////////////////////////////////////////////////////////////////////////////// -// // public methods -// -/////////////////////////////////////////////////////////////////////////// -// // Take all properties of the XPropertySet which are also found in the // XMLPropertyMapEntry-array and which are not set to their default-value, // if a state is available. -// // After that I call the method 'ContextFilter'. -// typedef std::list<XMLPropertyState> XMLPropertyStateList_Impl; @@ -190,8 +182,6 @@ FilterPropertyInfo_Impl::FilterPropertyInfo_Impl( typedef std::list<FilterPropertyInfo_Impl> FilterPropertyInfoList_Impl; -// ---------------------------------------------------------------------------- - class FilterPropertiesInfo_Impl { sal_uInt32 nCount; @@ -214,8 +204,6 @@ public: sal_uInt32 GetPropertyCount() const { return nCount; } }; -// ---------------------------------------------------------------------------- - typedef boost::unordered_map < PropertySetInfoKey, @@ -243,8 +231,6 @@ FilterPropertiesInfos_Impl::~FilterPropertiesInfos_Impl () } } -// ---------------------------------------------------------------------------- - FilterPropertiesInfo_Impl::FilterPropertiesInfo_Impl() : nCount(0), aPropInfos(), @@ -554,10 +540,7 @@ void FilterPropertiesInfo_Impl::FillPropertyStateArray( aPropStates.FillPropertyStateVector(rPropStates); } -/////////////////////////////////////////////////////////////////////////////// -// // ctor/dtor , class SvXMLExportPropertyMapper -// SvXMLExportPropertyMapper::SvXMLExportPropertyMapper( const UniReference< XMLPropertySetMapper >& rMapper ) : @@ -602,7 +585,6 @@ void SvXMLExportPropertyMapper::ChainExportMapper( } } - vector< XMLPropertyState > SvXMLExportPropertyMapper::_Filter( const Reference< XPropertySet > xPropSet, const sal_Bool bDefault ) const @@ -725,13 +707,10 @@ void SvXMLExportPropertyMapper::ContextFilter( mxNextMapper->ContextFilter( rProperties, rPropSet ); } -/////////////////////////////////////////////////////////////////////////// -// // Compares two Sequences of XMLPropertyState: // 1.Number of elements equal ? // 2.Index of each element equal ? (So I know whether the propertynames are the same) // 3.Value of each element equal ? -// sal_Bool SvXMLExportPropertyMapper::Equals( const vector< XMLPropertyState >& aProperties1, const vector< XMLPropertyState >& aProperties2 ) const @@ -776,7 +755,6 @@ sal_Bool SvXMLExportPropertyMapper::Equals( return bRet; } - /** fills the given attribute list with the items in the given set void SvXMLExportPropertyMapper::exportXML( SvXMLAttributeList& rAttrList, const ::std::vector< XMLPropertyState >& rProperties, @@ -788,7 +766,6 @@ void SvXMLExportPropertyMapper::exportXML( SvXMLAttributeList& rAttrList, nFlags, 0, -1, -1 ); } - void SvXMLExportPropertyMapper::exportXML( SvXMLAttributeList& rAttrList, const ::std::vector< XMLPropertyState >& rProperties, const SvXMLUnitConverter& rUnitConverter, @@ -876,10 +853,7 @@ void SvXMLExportPropertyMapper::handleElementItem( pProperties, nIdx ); } -/////////////////////////////////////////////////////////////////////////////// -// // protected methods -// /** fills the given attribute list with the items in the given set */ void SvXMLExportPropertyMapper::_exportXML( diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx index e3ca3a76430b..61d36b1b9040 100644 --- a/xmloff/source/style/xmlnumfe.cxx +++ b/xmloff/source/style/xmlnumfe.cxx @@ -48,17 +48,12 @@ #include <set> #include <boost/ptr_container/ptr_vector.hpp> - using namespace ::com::sun::star; using namespace ::xmloff::token; using namespace ::svt; -//------------------------------------------------------------------------- - #define XMLNUM_MAX_PARTS 3 -//------------------------------------------------------------------------- - struct LessuInt32 { sal_Bool operator() (const sal_uInt32 rValue1, const sal_uInt32 rValue2) const @@ -93,8 +88,6 @@ public: void SetWasUsed(const uno::Sequence<sal_Int32>& rWasUsed); }; -//------------------------------------------------------------------------- - struct SvXMLEmbeddedTextEntry { sal_uInt16 nSourcePos; // position in NumberFormat (to skip later) @@ -107,11 +100,7 @@ struct SvXMLEmbeddedTextEntry class SvXMLEmbeddedTextEntryArr : public boost::ptr_vector<SvXMLEmbeddedTextEntry> {}; -//------------------------------------------------------------------------- - -// //! SvXMLNumUsedList_Impl should be optimized! -// SvXMLNumUsedList_Impl::SvXMLNumUsedList_Impl() : nUsedCount(0), @@ -216,8 +205,6 @@ void SvXMLNumUsedList_Impl::SetWasUsed(const uno::Sequence<sal_Int32>& rWasUsed) } } -//------------------------------------------------------------------------- - SvXMLNumFmtExport::SvXMLNumFmtExport( SvXMLExport& rExp, const uno::Reference< util::XNumberFormatsSupplier >& rSupp ) : @@ -293,11 +280,7 @@ SvXMLNumFmtExport::~SvXMLNumFmtExport() delete pCharClass; } -//------------------------------------------------------------------------- - -// // helper methods -// static OUString lcl_CreateStyleName( sal_Int32 nKey, sal_Int32 nPart, sal_Bool bDefPart, const OUString& rPrefix ) { @@ -345,11 +328,7 @@ void SvXMLNumFmtExport::AddLanguageAttr_Impl( sal_Int32 nLang ) } } -//------------------------------------------------------------------------- - -// // methods to write individual elements within a format -// void SvXMLNumFmtExport::AddToTextElement_Impl( const OUString& rString ) { @@ -752,7 +731,6 @@ void SvXMLNumFmtExport::WriteMapElement_Impl( sal_Int32 nOp, double fLimit, } } -//------------------------------------------------------------------------- // for old (automatic) currency formats: parse currency symbol from text sal_Int32 lcl_FindSymbol( const OUString& sUpperStr, const OUString& sCurString ) @@ -837,8 +815,6 @@ sal_Bool SvXMLNumFmtExport::WriteTextWithCurrency_Impl( const OUString& rString, return bRet; // sal_True: currency element written } -//------------------------------------------------------------------------- - static OUString lcl_GetDefaultCalendar( SvNumberFormatter* pFormatter, LanguageType nLang ) { // get name of first non-gregorian calendar for the language @@ -864,8 +840,6 @@ static OUString lcl_GetDefaultCalendar( SvNumberFormatter* pFormatter, LanguageT return aCalendar; } -//------------------------------------------------------------------------- - static sal_Bool lcl_IsInEmbedded( const SvXMLEmbeddedTextEntryArr& rEmbeddedEntries, sal_uInt16 nPos ) { sal_uInt16 nCount = rEmbeddedEntries.size(); @@ -947,18 +921,14 @@ static sal_Bool lcl_IsDefaultDateFormat( const SvNumberformat& rFormat, sal_Bool } } -// // export one part (condition) -// void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt32 nKey, sal_uInt16 nPart, sal_Bool bDefPart ) { //! for the default part, pass the coditions from the other parts! - // // element name - // NfIndexTableOffset eBuiltIn = pFormatter->GetIndexTableOffset( nKey ); @@ -1020,9 +990,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt OUString sAttrValue; sal_Bool bUserDef = ( ( rFormat.GetType() & NUMBERFORMAT_DEFINED ) != 0 ); - // // common attributes for format - // // format name (generated from key) - style namespace rExport.AddAttribute( XML_NAMESPACE_STYLE, XML_NAME, @@ -1100,9 +1068,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt XML_FALSE ); } - // // Native number transliteration - // ::com::sun::star::i18n::NativeNumberXmlAttributes aAttr; rFormat.GetNatNumXml( aAttr, nPart ); if ( !aAttr.Format.isEmpty() ) @@ -1122,28 +1088,21 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt aAttr.Style ); } - // // The element - // SvXMLElementExport aElem( rExport, XML_NAMESPACE_NUMBER, eType, sal_True, sal_True ); - // // color (properties element) - // const Color* pCol = rFormat.GetColor( nPart ); if (pCol) WriteColorElement_Impl(*pCol); - // detect if there is "real" content, excluding color and maps //! move to implementation of Write... methods? sal_Bool bAnyContent = sal_False; - // // format elements - // SvXMLEmbeddedTextEntryArr aEmbeddedEntries; if ( eBuiltIn == NF_NUMBER_STANDARD ) @@ -1609,9 +1568,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt sal_True, sal_False ); } - // // mapping (conditions) must be last elements - // if (bDefPart) { @@ -1656,11 +1613,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt } } -//------------------------------------------------------------------------- - -// // export one format -// void SvXMLNumFmtExport::ExportFormat_Impl( const SvNumberformat& rFormat, sal_uInt32 nKey ) { @@ -1690,11 +1643,7 @@ void SvXMLNumFmtExport::ExportFormat_Impl( const SvNumberformat& rFormat, sal_uI } } -//------------------------------------------------------------------------- - -// // export method called by application -// void SvXMLNumFmtExport::Export( sal_Bool bIsAutoStyle ) { @@ -1779,8 +1728,6 @@ void SvXMLNumFmtExport::SetWasUsed(const uno::Sequence<sal_Int32>& rWasUsed) pUsedList->SetWasUsed(rWasUsed); } - - static const SvNumberformat* lcl_GetFormat( SvNumberFormatter* pFormatter, sal_uInt32 nKey ) { diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx index 32ca705884f9..bf2b24500b02 100644 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <comphelper/string.hxx> #include <unotools/syslocale.hxx> @@ -47,12 +46,9 @@ #include <boost/ptr_container/ptr_vector.hpp> #include <boost/ptr_container/ptr_set.hpp> - using namespace ::com::sun::star; using namespace ::xmloff::token; -//------------------------------------------------------------------------- - struct SvXMLNumFmtEntry { OUString aName; @@ -80,8 +76,6 @@ struct SvXMLEmbeddedElement typedef boost::ptr_set<SvXMLEmbeddedElement> SvXMLEmbeddedElementArr; -//------------------------------------------------------------------------- - class SvXMLNumImpData { SvNumberFormatter* pFormatter; @@ -112,7 +106,6 @@ public: void RemoveVolatileFormats(); }; - struct SvXMLNumberInfo { sal_Int32 nDecimals; @@ -164,7 +157,6 @@ public: void AddEmbeddedElement( sal_Int32 nFormatPos, const OUString& rContent ); }; - class SvXMLNumFmtEmbeddedTextContext : public SvXMLImportContext { SvXMLNumFmtElementContext& rParent; @@ -187,7 +179,6 @@ public: virtual void EndElement(); }; - class SvXMLNumFmtMapContext : public SvXMLImportContext { SvXMLNumFormatContext& rParent; @@ -210,7 +201,6 @@ public: virtual void EndElement(); }; - class SvXMLNumFmtPropContext : public SvXMLImportContext { SvXMLNumFormatContext& rParent; @@ -233,9 +223,6 @@ public: virtual void EndElement(); }; - -//------------------------------------------------------------------------- - enum SvXMLStyleTokens { XML_TOK_STYLE_TEXT, @@ -301,8 +288,6 @@ enum SvXMLStyleElemAttrTokens XML_TOK_ELEM_ATTR_CALENDAR }; -//------------------------------------------------------------------------- - // // standard colors // @@ -343,8 +328,6 @@ static const SvXMLEnumMapEntry aFormatSourceMap[] = { XML_TOKEN_INVALID, 0 } }; -//------------------------------------------------------------------------- - struct SvXMLDefaultDateFormat { NfIndexTableOffset eFormat; @@ -378,8 +361,6 @@ static const SvXMLDefaultDateFormat aDefaultDateFormats[] = { NF_DATETIME_SYS_DDMMYYYY_HHMMSS, XML_DEA_NONE, XML_DEA_ANY, XML_DEA_ANY, XML_DEA_ANY, XML_DEA_ANY, XML_DEA_ANY, XML_DEA_ANY, sal_False } }; -//------------------------------------------------------------------------- - // // SvXMLNumImpData // @@ -617,8 +598,6 @@ const LocaleDataWrapper& SvXMLNumImpData::GetLocaleData( LanguageType nLang ) return *pLocaleData; } -//------------------------------------------------------------------------- - // // SvXMLNumFmtMapContext // @@ -668,8 +647,6 @@ void SvXMLNumFmtMapContext::EndElement() rParent.AddCondition( sCondition, sName ); } -//------------------------------------------------------------------------- - // // SvXMLNumFmtPropContext // @@ -718,8 +695,6 @@ void SvXMLNumFmtPropContext::EndElement() rParent.AddColor( m_nColor ); } -//------------------------------------------------------------------------- - // // SvXMLNumFmtEmbeddedTextContext // @@ -771,8 +746,6 @@ void SvXMLNumFmtEmbeddedTextContext::EndElement() rParent.AddEmbeddedElement( nTextPosition, aContent.makeStringAndClear() ); } -//------------------------------------------------------------------------- - static sal_Bool lcl_ValidChar( sal_Unicode cChar, const SvXMLNumFormatContext& rParent ) { sal_uInt16 nFormatType = rParent.GetType(); @@ -1259,8 +1232,6 @@ void SvXMLNumFmtElementContext::EndElement() } } -//------------------------------------------------------------------------- - sal_uInt16 SvXMLNumFmtDefaults::GetDefaultDateFormat( SvXMLDateElementAttributes eDOW, SvXMLDateElementAttributes eDay, SvXMLDateElementAttributes eMonth, SvXMLDateElementAttributes eYear, SvXMLDateElementAttributes eHours, @@ -1287,8 +1258,6 @@ sal_uInt16 SvXMLNumFmtDefaults::GetDefaultDateFormat( SvXMLDateElementAttributes return NF_INDEX_TABLE_ENTRIES; // invalid } -//------------------------------------------------------------------------- - // // SvXMLNumFormatContext // @@ -2173,8 +2142,6 @@ sal_Bool SvXMLNumFormatContext::IsSystemLanguage() return nFormatLang == LANGUAGE_SYSTEM; } -//------------------------------------------------------------------------- - // // SvXMLNumFmtHelper // diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx index 3047c9047dc7..4ac569edae5a 100644 --- a/xmloff/source/style/xmlnumi.cxx +++ b/xmloff/source/style/xmlnumi.cxx @@ -53,7 +53,6 @@ #include <xmloff/xmlnumi.hxx> - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::style; @@ -65,8 +64,6 @@ using namespace ::com::sun::star::frame; using namespace ::xmloff::token; using namespace ::com::sun::star::io; -// --------------------------------------------------------------------- - class SvxXMLListLevelStyleContext_Impl; class SvxXMLListLevelStyleAttrContext_Impl : public SvXMLImportContext @@ -87,8 +84,6 @@ public: const Reference< xml::sax::XAttributeList > & xAttrList ); }; -// --------------------------------------------------------------------- - class SvxXMLListLevelStyleLabelAlignmentAttrContext_Impl : public SvXMLImportContext { SvxXMLListLevelStyleContext_Impl& rListLevel; @@ -103,8 +98,6 @@ public: virtual ~SvxXMLListLevelStyleLabelAlignmentAttrContext_Impl(); }; -// --------------------------------------------------------------------- - enum SvxXMLTextListLevelStyleAttrTokens { XML_TOK_TEXT_LEVEL_ATTR_LEVEL, @@ -599,8 +592,6 @@ Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties( return aPropSeq; } -// --------------------------------------------------------------------- - enum SvxXMLStyleAttributesAttrTokens { XML_TOK_STYLE_ATTRIBUTES_ATTR_SPACE_BEFORE, @@ -935,8 +926,6 @@ SvXMLImportContext* SvxXMLListLevelStyleAttrContext_Impl::CreateChildContext( return pContext; } -// --------------------------------------------------------------------- - enum SvxXMLStyleAttributesLabelAlignmentAttrTokens { XML_TOK_STYLE_ATTRIBUTES_ATTR_LABEL_FOLLOWED_BY, @@ -1017,8 +1006,6 @@ SvxXMLListLevelStyleLabelAlignmentAttrContext_Impl::~SvxXMLListLevelStyleLabelAl { } -// --------------------------------------------------------------------- - class SvxXMLListStyle_Impl : public std::vector<SvxXMLListLevelStyleContext_Impl *> {}; void SvxXMLListStyleContext::SetAttribute( sal_uInt16 nPrefixKey, @@ -1036,7 +1023,6 @@ void SvxXMLListStyleContext::SetAttribute( sal_uInt16 nPrefixKey, } } - SvxXMLListStyleContext::SvxXMLListStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/xmloff/source/style/xmlprmap.cxx b/xmloff/source/style/xmlprmap.cxx index 351c9127cb6c..7ad12d57d1ab 100644 --- a/xmloff/source/style/xmlprmap.cxx +++ b/xmloff/source/style/xmlprmap.cxx @@ -27,7 +27,6 @@ #include <com/sun/star/uno/Any.hxx> #include <xmloff/xmltoken.hxx> - using namespace ::std; using namespace ::com::sun::star::uno; @@ -61,10 +60,7 @@ XMLPropertySetMapperEntry_Impl::XMLPropertySetMapperEntry_Impl( DBG_ASSERT( pHdl, "Unknown XML property type handler!" ); } -/////////////////////////////////////////////////////////////////////////// -// // Ctor -// XMLPropertySetMapper::XMLPropertySetMapper( const XMLPropertyMapEntry* pEntries, const UniReference< XMLPropertyHandlerFactory >& rFactory ) @@ -108,10 +104,7 @@ void XMLPropertySetMapper::AddMapperEntry( } } -/////////////////////////////////////////////////////////////////////////// -// // Export a Property -// sal_Bool XMLPropertySetMapper::exportXML( OUString& rStrExpValue, const XMLPropertyState& rProperty, @@ -129,10 +122,7 @@ sal_Bool XMLPropertySetMapper::exportXML( return bRet; } -/////////////////////////////////////////////////////////////////////////// -// // Import a Property -// sal_Bool XMLPropertySetMapper::importXML( const OUString& rStrImpValue, XMLPropertyState& rProperty, @@ -149,12 +139,9 @@ sal_Bool XMLPropertySetMapper::importXML( return bRet; } -/////////////////////////////////////////////////////////////////////////// -// // Search for the given name and the namespace in the list and return // the index of the entry // If there is no matching entry the method returns -1 -// sal_Int32 XMLPropertySetMapper::GetEntryIndex( sal_uInt16 nNamespace, const OUString& rStrName, @@ -182,7 +169,6 @@ sal_Int32 XMLPropertySetMapper::GetEntryIndex( return -1; } - /** searches for an entry that matches the given api name, namespace and local name or -1 if nothing found */ sal_Int32 XMLPropertySetMapper::FindEntryIndex( const sal_Char* sApiName, diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx index c54d7ffbe5f5..d9d18f6ef95f 100644 --- a/xmloff/source/style/xmlstyle.cxx +++ b/xmloff/source/style/xmlstyle.cxx @@ -62,8 +62,6 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::style; using namespace ::xmloff::token; -// --------------------------------------------------------------------- - static SvXMLTokenMapEntry aStyleStylesElemTokenMap[] = { { XML_NAMESPACE_STYLE, XML_STYLE, XML_TOK_STYLE_STYLE }, @@ -93,8 +91,6 @@ const SvXMLTokenMap& SvXMLStylesContext::GetStyleStylesElemTokenMap() return *mpStyleStylesElemTokenMap; } -// --------------------------------------------------------------------- - void SvXMLStyleContext::SetAttribute( sal_uInt16 nPrefixKey, const OUString& rLocalName, const OUString& rValue ) @@ -206,8 +202,6 @@ sal_Bool SvXMLStyleContext::IsTransient() const return sal_False; } -// --------------------------------------------------------------------- - class SvXMLStyleIndex_Impl { OUString sName; @@ -252,7 +246,6 @@ struct SvXMLStyleIndexCmp_Impl } }; - class SvXMLStylesContext_Impl { typedef std::vector<SvXMLStyleContext*> StylesType; @@ -372,8 +365,6 @@ const SvXMLStyleContext *SvXMLStylesContext_Impl::FindStyleChildContext( sal_uIn return pStyle; } -// --------------------------------------------------------------------- - TYPEINIT1( SvXMLStylesContext, SvXMLImportContext ); sal_uInt32 SvXMLStylesContext::GetStyleCount() const @@ -556,7 +547,6 @@ SvXMLStyleContext *SvXMLStylesContext::CreateDefaultStyleStyleChildContext( return 0; } - sal_Bool SvXMLStylesContext::InsertStyleFamily( sal_uInt16 ) const { return sal_True; @@ -793,7 +783,6 @@ OUString SvXMLStylesContext::GetServiceName( sal_uInt16 nFamily ) const return sServiceName; } - SvXMLStylesContext::SvXMLStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< xml::sax::XAttributeList > &, sal_Bool bAuto ) : @@ -805,7 +794,6 @@ SvXMLStylesContext::SvXMLStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx, { } - SvXMLStylesContext::~SvXMLStylesContext() { delete mpStyleStylesElemTokenMap; @@ -913,7 +901,6 @@ void SvXMLStylesContext::FinishStyles( sal_Bool bOverwrite ) } } - const SvXMLStyleContext *SvXMLStylesContext::FindStyleChildContext( sal_uInt16 nFamily, const OUString& rName, |