diff options
| author | Daniel Rentz <dr@openoffice.org> | 2010-08-05 16:01:52 +0200 |
|---|---|---|
| committer | Daniel Rentz <dr@openoffice.org> | 2010-08-05 16:01:52 +0200 |
| commit | 64f870b426c96776b0367b7a97dd9b3d70aead06 (patch) | |
| tree | b9103c629d7c62714cbd5572bac10b5c68f898da /oox/source | |
| parent | 107fa1e40f1db8fb9333b987376bc14c0987fa4b (diff) | |
dr77: code cleanup
Diffstat (limited to 'oox/source')
60 files changed, 491 insertions, 605 deletions
diff --git a/oox/source/drawingml/chart/axiscontext.cxx b/oox/source/drawingml/chart/axiscontext.cxx index 1066f91c0e19..cfcdd3ff0754 100644 --- a/oox/source/drawingml/chart/axiscontext.cxx +++ b/oox/source/drawingml/chart/axiscontext.cxx @@ -26,21 +26,24 @@ ************************************************************************/ #include "oox/drawingml/chart/axiscontext.hxx" + #include "oox/drawingml/shapepropertiescontext.hxx" #include "oox/drawingml/textbodycontext.hxx" #include "oox/drawingml/chart/axismodel.hxx" #include "oox/drawingml/chart/titlecontext.hxx" -using ::rtl::OUString; -using ::oox::core::ContextHandlerRef; -using ::oox::core::ContextHandler2Helper; - namespace oox { namespace drawingml { namespace chart { // ============================================================================ +using ::oox::core::ContextHandlerRef; +using ::oox::core::ContextHandler2Helper; +using ::rtl::OUString; + +// ============================================================================ + AxisDispUnitsContext::AxisDispUnitsContext( ContextHandler2Helper& rParent, AxisDispUnitsModel& rModel ) : ContextBase< AxisDispUnitsModel >( rParent, rModel ) { @@ -315,4 +318,3 @@ ContextHandlerRef ValAxisContext::onCreateContext( sal_Int32 nElement, const Att } // namespace chart } // namespace drawingml } // namespace oox - diff --git a/oox/source/drawingml/chart/axisconverter.cxx b/oox/source/drawingml/chart/axisconverter.cxx index da4fc3e5b83f..4c214aed857b 100644 --- a/oox/source/drawingml/chart/axisconverter.cxx +++ b/oox/source/drawingml/chart/axisconverter.cxx @@ -26,43 +26,36 @@ ************************************************************************/ #include "oox/drawingml/chart/axisconverter.hxx" + #include <com/sun/star/chart/ChartAxisArrangeOrderType.hpp> #include <com/sun/star/chart/ChartAxisLabelPosition.hpp> #include <com/sun/star/chart/ChartAxisMarkPosition.hpp> #include <com/sun/star/chart/ChartAxisPosition.hpp> -#include <com/sun/star/chart2/TickmarkStyle.hpp> #include <com/sun/star/chart2/AxisType.hpp> +#include <com/sun/star/chart2/TickmarkStyle.hpp> #include <com/sun/star/chart2/XAxis.hpp> #include <com/sun/star/chart2/XCoordinateSystem.hpp> #include <com/sun/star/chart2/XTitled.hpp> -#include "oox/drawingml/lineproperties.hxx" #include "oox/drawingml/chart/axismodel.hxx" #include "oox/drawingml/chart/titleconverter.hxx" #include "oox/drawingml/chart/typegroupconverter.hxx" +#include "oox/drawingml/lineproperties.hxx" #include "properties.hxx" -using ::rtl::OUString; -using ::com::sun::star::uno::Any; -using ::com::sun::star::uno::Reference; -using ::com::sun::star::uno::Sequence; -using ::com::sun::star::uno::Exception; -using ::com::sun::star::uno::UNO_QUERY; -using ::com::sun::star::uno::UNO_QUERY_THROW; -using ::com::sun::star::beans::XPropertySet; -using ::com::sun::star::chart2::IncrementData; -using ::com::sun::star::chart2::ScaleData; -using ::com::sun::star::chart2::SubIncrement; -using ::com::sun::star::chart2::XAxis; -using ::com::sun::star::chart2::XCoordinateSystem; -using ::com::sun::star::chart2::XScaling; -using ::com::sun::star::chart2::XTitled; - namespace oox { namespace drawingml { namespace chart { // ============================================================================ +using namespace ::com::sun::star::beans; +using namespace ::com::sun::star::chart2; +using namespace ::com::sun::star::uno; + +using ::rtl::OUString; + +// ============================================================================ + namespace { template< typename Type > @@ -330,4 +323,3 @@ void AxisConverter::convertFromModel( const Reference< XCoordinateSystem >& rxCo } // namespace chart } // namespace drawingml } // namespace oox - diff --git a/oox/source/drawingml/chart/axismodel.cxx b/oox/source/drawingml/chart/axismodel.cxx index 9f1d52adc0d2..8736e8f6dcd5 100644 --- a/oox/source/drawingml/chart/axismodel.cxx +++ b/oox/source/drawingml/chart/axismodel.cxx @@ -78,4 +78,3 @@ AxisModel::~AxisModel() } // namespace chart } // namespace drawingml } // namespace oox - diff --git a/oox/source/drawingml/chart/chartcontextbase.cxx b/oox/source/drawingml/chart/chartcontextbase.cxx index d3746f07ba6c..69c1f2622b46 100644 --- a/oox/source/drawingml/chart/chartcontextbase.cxx +++ b/oox/source/drawingml/chart/chartcontextbase.cxx @@ -26,11 +26,9 @@ ************************************************************************/ #include "oox/drawingml/chart/chartcontextbase.hxx" -#include "oox/drawingml/shapepropertiescontext.hxx" -#include "oox/drawingml/chart/modelbase.hxx" -using ::oox::core::ContextHandler2Helper; -using ::oox::core::ContextHandlerRef; +#include "oox/drawingml/chart/modelbase.hxx" +#include "oox/drawingml/shapepropertiescontext.hxx" namespace oox { namespace drawingml { @@ -38,6 +36,11 @@ namespace chart { // ============================================================================ +using ::oox::core::ContextHandler2Helper; +using ::oox::core::ContextHandlerRef; + +// ============================================================================ + ShapePrWrapperContext::ShapePrWrapperContext( ContextHandler2Helper& rParent, Shape& rModel ) : ContextBase< Shape >( rParent, rModel ) { @@ -117,4 +120,3 @@ ContextHandlerRef LayoutContext::onCreateContext( sal_Int32 nElement, const Attr } // namespace chart } // namespace drawingml } // namespace oox - diff --git a/oox/source/drawingml/chart/chartconverter.cxx b/oox/source/drawingml/chart/chartconverter.cxx index efd8e6d021e1..02672088c763 100644 --- a/oox/source/drawingml/chart/chartconverter.cxx +++ b/oox/source/drawingml/chart/chartconverter.cxx @@ -26,27 +26,28 @@ ************************************************************************/ #include "oox/drawingml/chart/chartconverter.hxx" + #include <com/sun/star/chart2/XChartDocument.hpp> #include "oox/drawingml/chart/chartspaceconverter.hxx" #include "oox/drawingml/chart/chartspacemodel.hxx" -using ::rtl::OUString; -using ::com::sun::star::uno::Reference; -using ::com::sun::star::uno::Exception; -using ::com::sun::star::awt::Point; -using ::com::sun::star::awt::Size; -using ::com::sun::star::drawing::XShapes; -using ::com::sun::star::chart2::XChartDocument; -using ::com::sun::star::chart2::data::XDataProvider; -using ::com::sun::star::chart2::data::XDataSequence; -using ::oox::core::XmlFilterBase; - namespace oox { namespace drawingml { namespace chart { // ============================================================================ +using namespace ::com::sun::star::awt; +using namespace ::com::sun::star::chart2; +using namespace ::com::sun::star::chart2::data; +using namespace ::com::sun::star::drawing; +using namespace ::com::sun::star::uno; + +using ::oox::core::XmlFilterBase; +using ::rtl::OUString; + +// ============================================================================ + ChartConverter::ChartConverter() { } @@ -90,4 +91,3 @@ Reference< XDataSequence > ChartConverter::createDataSequence( const Reference< } // namespace chart } // namespace drawingml } // namespace oox - diff --git a/oox/source/drawingml/chart/chartdrawingfragment.cxx b/oox/source/drawingml/chart/chartdrawingfragment.cxx index fcc350b583c3..dce6535c2f49 100644 --- a/oox/source/drawingml/chart/chartdrawingfragment.cxx +++ b/oox/source/drawingml/chart/chartdrawingfragment.cxx @@ -26,28 +26,30 @@ ************************************************************************/ #include "oox/drawingml/chart/chartdrawingfragment.hxx" + #include "oox/core/xmlfilterbase.hxx" #include "oox/drawingml/connectorshapecontext.hxx" #include "oox/drawingml/graphicshapecontext.hxx" #include "oox/drawingml/shapecontext.hxx" #include "oox/drawingml/shapegroupcontext.hxx" -using ::rtl::OUString; -using ::com::sun::star::uno::Reference; -using ::com::sun::star::awt::Point; -using ::com::sun::star::awt::Rectangle; -using ::com::sun::star::awt::Size; -using ::com::sun::star::drawing::XShapes; -using ::oox::core::ContextHandlerRef; -using ::oox::core::FragmentHandler2; -using ::oox::core::XmlFilterBase; - namespace oox { namespace drawingml { namespace chart { // ============================================================================ +using namespace ::com::sun::star::awt; +using namespace ::com::sun::star::drawing; +using namespace ::com::sun::star::uno; + +using ::oox::core::ContextHandlerRef; +using ::oox::core::FragmentHandler2; +using ::oox::core::XmlFilterBase; +using ::rtl::OUString; + +// ============================================================================ + ShapeAnchor::ShapeAnchor( bool bRelSize ) : mbRelSize( bRelSize ) { @@ -232,4 +234,3 @@ void ChartDrawingFragment::onEndElement( const OUString& rChars ) } // namespace chart } // namespace drawingml } // namespace oox - diff --git a/oox/source/drawingml/chart/chartspaceconverter.cxx b/oox/source/drawingml/chart/chartspaceconverter.cxx index 54212f1bdbda..8c05b0c8a53f 100644 --- a/oox/source/drawingml/chart/chartspaceconverter.cxx +++ b/oox/source/drawingml/chart/chartspaceconverter.cxx @@ -26,6 +26,7 @@ ************************************************************************/ #include "oox/drawingml/chart/chartspaceconverter.hxx" + #include <com/sun/star/chart/MissingValueTreatment.hpp> #include <com/sun/star/chart/XChartDocument.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> @@ -40,25 +41,23 @@ #include "oox/drawingml/chart/titleconverter.hxx" #include "properties.hxx" -using ::rtl::OUString; -using ::com::sun::star::awt::Point; -using ::com::sun::star::uno::Reference; -using ::com::sun::star::uno::Exception; -using ::com::sun::star::uno::UNO_QUERY; -using ::com::sun::star::uno::UNO_QUERY_THROW; -using ::com::sun::star::util::XNumberFormatsSupplier; -using ::com::sun::star::drawing::XDrawPageSupplier; -using ::com::sun::star::drawing::XShapes; -using ::com::sun::star::chart2::XDiagram; -using ::com::sun::star::chart2::XTitled; -using ::com::sun::star::chart2::data::XDataReceiver; - namespace oox { namespace drawingml { namespace chart { // ============================================================================ +using namespace ::com::sun::star::awt; +using namespace ::com::sun::star::chart2; +using namespace ::com::sun::star::chart2::data; +using namespace ::com::sun::star::drawing; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::util; + +using ::rtl::OUString; + +// ============================================================================ + ChartSpaceConverter::ChartSpaceConverter( const ConverterRoot& rParent, ChartSpaceModel& rModel ) : ConverterBase< ChartSpaceModel >( rParent, rModel ) { @@ -206,4 +205,3 @@ void ChartSpaceConverter::convertFromModel( const Reference< XShapes >& rxExtern } // namespace chart } // namespace drawingml } // namespace oox - diff --git a/oox/source/drawingml/chart/chartspacefragment.cxx b/oox/source/drawingml/chart/chartspacefragment.cxx index 75df94e95de7..f7aca001df5e 100644 --- a/oox/source/drawingml/chart/chartspacefragment.cxx +++ b/oox/source/drawingml/chart/chartspacefragment.cxx @@ -26,22 +26,25 @@ ************************************************************************/ #include "oox/drawingml/chart/chartspacefragment.hxx" + #include "oox/drawingml/shapepropertiescontext.hxx" #include "oox/drawingml/textbodycontext.hxx" #include "oox/drawingml/chart/chartspacemodel.hxx" #include "oox/drawingml/chart/plotareacontext.hxx" #include "oox/drawingml/chart/titlecontext.hxx" -using ::rtl::OUString; -using ::oox::core::ContextHandlerRef; -using ::oox::core::XmlFilterBase; - namespace oox { namespace drawingml { namespace chart { // ============================================================================ +using ::oox::core::ContextHandlerRef; +using ::oox::core::XmlFilterBase; +using ::rtl::OUString; + +// ============================================================================ + ChartSpaceFragment::ChartSpaceFragment( XmlFilterBase& rFilter, const OUString& rFragmentPath, ChartSpaceModel& rModel ) : FragmentBase< ChartSpaceModel >( rFilter, rFragmentPath, rModel ) { @@ -124,4 +127,3 @@ ContextHandlerRef ChartSpaceFragment::onCreateContext( sal_Int32 nElement, const } // namespace chart } // namespace drawingml } // namespace oox - diff --git a/oox/source/drawingml/chart/chartspacemodel.cxx b/oox/source/drawingml/chart/chartspacemodel.cxx index e386334160a8..3e2253a2ffc1 100644 --- a/oox/source/drawingml/chart/chartspacemodel.cxx +++ b/oox/source/drawingml/chart/chartspacemodel.cxx @@ -51,4 +51,3 @@ ChartSpaceModel::~ChartSpaceModel() } // namespace chart } // namespace drawingml } // namespace oox - diff --git a/oox/source/drawingml/chart/converterbase.cxx b/oox/source/drawingml/chart/converterbase.cxx index b5a0511bf1b8..136025fa862e 100644 --- a/oox/source/drawingml/chart/converterbase.cxx +++ b/oox/source/drawingml/chart/converterbase.cxx @@ -26,41 +26,21 @@ ************************************************************************/ #include "oox/drawingml/chart/converterbase.hxx" -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/frame/XModel.hpp> -#include <com/sun/star/drawing/FillStyle.hpp> -#include <com/sun/star/drawing/LineStyle.hpp> + #include <com/sun/star/chart/XAxisXSupplier.hpp> #include <com/sun/star/chart/XAxisYSupplier.hpp> #include <com/sun/star/chart/XAxisZSupplier.hpp> #include <com/sun/star/chart/XChartDocument.hpp> #include <com/sun/star/chart/XSecondAxisTitleSupplier.hpp> #include <com/sun/star/chart2/RelativePosition.hpp> +#include <com/sun/star/drawing/FillStyle.hpp> +#include <com/sun/star/drawing/LineStyle.hpp> +#include <com/sun/star/frame/XModel.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <tools/solar.h> // for F_PI180 -#include "properties.hxx" #include "oox/core/xmlfilterbase.hxx" #include "oox/drawingml/theme.hxx" - -using ::rtl::OUString; -using ::com::sun::star::uno::Reference; -using ::com::sun::star::uno::XInterface; -using ::com::sun::star::uno::Exception; -using ::com::sun::star::uno::RuntimeException; -using ::com::sun::star::uno::UNO_QUERY; -using ::com::sun::star::uno::UNO_QUERY_THROW; -using ::com::sun::star::uno::UNO_SET_THROW; -using ::com::sun::star::lang::XMultiServiceFactory; -using ::com::sun::star::frame::XModel; -using ::com::sun::star::awt::Point; -using ::com::sun::star::awt::Rectangle; -using ::com::sun::star::awt::Size; -using ::com::sun::star::chart2::RelativePosition; -using ::com::sun::star::chart2::XChartDocument; -using ::com::sun::star::chart2::XTitle; -using ::com::sun::star::drawing::XShape; -using ::oox::core::XmlFilterBase; - -namespace cssc = ::com::sun::star::chart; +#include "properties.hxx" namespace oox { namespace drawingml { @@ -68,6 +48,20 @@ namespace chart { // ============================================================================ +namespace cssc = ::com::sun::star::chart; + +using namespace ::com::sun::star::awt; +using namespace ::com::sun::star::chart2; +using namespace ::com::sun::star::drawing; +using namespace ::com::sun::star::frame; +using namespace ::com::sun::star::lang; +using namespace ::com::sun::star::uno; + +using ::oox::core::XmlFilterBase; +using ::rtl::OUString; + +// ============================================================================ + namespace { struct TitleKey : public ::std::pair< ObjectType, ::std::pair< sal_Int32, sal_Int32 > > @@ -419,4 +413,3 @@ bool LayoutConverter::convertFromModel( const Reference< XShape >& rxShape, doub } // namespace chart } // namespace drawingml } // namespace oox - diff --git a/oox/source/drawingml/chart/datasourcecontext.cxx b/oox/source/drawingml/chart/datasourcecontext.cxx index d55b955d6e0d..6fd12c415a50 100644 --- a/oox/source/drawingml/chart/datasourcecontext.cxx +++ b/oox/source/drawingml/chart/datasourcecontext.cxx @@ -26,11 +26,8 @@ ************************************************************************/ #include "oox/drawingml/chart/datasourcecontext.hxx" -#include "oox/drawingml/chart/datasourcemodel.hxx" -using ::rtl::OUString; -using ::oox::core::ContextHandler2Helper; -using ::oox::core::ContextHandlerRef; +#include "oox/drawingml/chart/datasourcemodel.hxx" namespace oox { namespace drawingml { @@ -38,6 +35,12 @@ namespace chart { // ============================================================================ +using ::oox::core::ContextHandler2Helper; +using ::oox::core::ContextHandlerRef; +using ::rtl::OUString; + +// ============================================================================ + DoubleSequenceContext::DoubleSequenceContext( ContextHandler2Helper& rParent, DataSequenceModel& rModel ) : DataSequenceContextBase( rParent, rModel ), mnPtIndex( -1 ) diff --git a/oox/source/drawingml/chart/datasourceconverter.cxx b/oox/source/drawingml/chart/datasourceconverter.cxx index 2409f8e89962..abb9ad111a8a 100644 --- a/oox/source/drawingml/chart/datasourceconverter.cxx +++ b/oox/source/drawingml/chart/datasourceconverter.cxx @@ -26,21 +26,25 @@ ************************************************************************/ #include "oox/drawingml/chart/datasourceconverter.hxx" + #include <com/sun/star/chart2/XChartDocument.hpp> #include "oox/drawingml/chart/chartconverter.hxx" #include "oox/drawingml/chart/datasourcemodel.hxx" #include "properties.hxx" -using ::rtl::OUString; -using ::com::sun::star::uno::Reference; -using ::com::sun::star::chart2::data::XDataSequence; - namespace oox { namespace drawingml { namespace chart { // ============================================================================ +using namespace ::com::sun::star::chart2::data; +using namespace ::com::sun::star::uno; + +using ::rtl::OUString; + +// ============================================================================ + DataSequenceConverter::DataSequenceConverter( const ConverterRoot& rParent, DataSequenceModel& rModel ) : ConverterBase< DataSequenceModel >( rParent, rModel ) { @@ -89,4 +93,3 @@ Reference< XDataSequence > DataSourceConverter::createDataSequence( const OUStri } // namespace chart } // namespace drawingml } // namespace oox - diff --git a/oox/source/drawingml/chart/datasourcemodel.cxx b/oox/source/drawingml/chart/datasourcemodel.cxx index 1f5b15f3e809..aad5a1bff959 100644 --- a/oox/source/drawingml/chart/datasourcemodel.cxx +++ b/oox/source/drawingml/chart/datasourcemodel.cxx @@ -57,4 +57,3 @@ DataSourceModel::~DataSourceModel() } // namespace chart } // namespace drawingml } // namespace oox - diff --git a/oox/source/drawingml/chart/modelbase.cxx b/oox/source/drawingml/chart/modelbase.cxx index c182d8e3e410..f32a118c5589 100644 --- a/oox/source/drawingml/chart/modelbase.cxx +++ b/oox/source/drawingml/chart/modelbase.cxx @@ -26,9 +26,8 @@ ************************************************************************/ #include "oox/drawingml/chart/modelbase.hxx" -#include "oox/helper/attributelist.hxx" -using ::rtl::OUString; +#include "oox/helper/attributelist.hxx" namespace oox { namespace drawingml { @@ -36,6 +35,10 @@ namespace chart { // ============================================================================ +using ::rtl::OUString; + +// ============================================================================ + NumberFormat::NumberFormat() : mbSourceLinked( true ) { @@ -73,4 +76,3 @@ LayoutModel::~LayoutModel() } // namespace chart } // namespace drawingml } // namespace oox - diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx index d96e2d43dd6f..c66b9a14c924 100644 --- a/oox/source/drawingml/chart/objectformatter.cxx +++ b/oox/source/drawingml/chart/objectformatter.cxx @@ -26,13 +26,11 @@ ************************************************************************/ #include "oox/drawingml/chart/objectformatter.hxx" -#include <rtl/strbuf.hxx> -#include <osl/thread.h> + #include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <com/sun/star/util/XNumberFormatTypes.hpp> -#include "properties.hxx" -#include "tokens.hxx" -#include "oox/helper/modelobjecthelper.hxx" +#include <osl/thread.h> +#include <rtl/strbuf.hxx> #include "oox/core/xmlfilterbase.hxx" #include "oox/drawingml/fillproperties.hxx" #include "oox/drawingml/lineproperties.hxx" @@ -40,24 +38,9 @@ #include "oox/drawingml/textparagraph.hxx" #include "oox/drawingml/theme.hxx" #include "oox/drawingml/chart/chartspacemodel.hxx" - -using ::rtl::OStringBuffer; -using ::rtl::OUString; -using ::rtl::OUStringToOString; -using ::com::sun::star::uno::Any; -using ::com::sun::star::uno::Reference; -using ::com::sun::star::uno::Exception; -using ::com::sun::star::uno::UNO_QUERY; -using ::com::sun::star::uno::UNO_QUERY_THROW; -using ::com::sun::star::lang::Locale; -using ::com::sun::star::lang::XMultiServiceFactory; -using ::com::sun::star::frame::XModel; -using ::com::sun::star::chart2::XChartDocument; -using ::com::sun::star::graphic::XGraphic; -using ::com::sun::star::util::XNumberFormats; -using ::com::sun::star::util::XNumberFormatsSupplier; -using ::com::sun::star::util::XNumberFormatTypes; -using ::oox::core::XmlFilterBase; +#include "oox/helper/modelobjecthelper.hxx" +#include "properties.hxx" +#include "tokens.hxx" namespace oox { namespace drawingml { @@ -65,6 +48,20 @@ namespace chart { // ============================================================================ +using namespace ::com::sun::star::chart2; +using namespace ::com::sun::star::frame; +using namespace ::com::sun::star::graphic; +using namespace ::com::sun::star::lang; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::util; + +using ::oox::core::XmlFilterBase; +using ::rtl::OStringBuffer; +using ::rtl::OUString; +using ::rtl::OUStringToOString; + +// ============================================================================ + namespace { struct AutoFormatPatternEntry @@ -1211,4 +1208,3 @@ void ObjectFormatter::convertAutomaticFill( PropertySet& rPropSet, ObjectType eO } // namespace chart } // namespace drawingml } // namespace oox - diff --git a/oox/source/drawingml/chart/plotareacontext.cxx b/oox/source/drawingml/chart/plotareacontext.cxx index 4f8268f06d66..17c6487b59b4 100644 --- a/oox/source/drawingml/chart/plotareacontext.cxx +++ b/oox/source/drawingml/chart/plotareacontext.cxx @@ -26,6 +26,7 @@ ************************************************************************/ #include "oox/drawingml/chart/plotareacontext.hxx" + #include "oox/drawingml/shapepropertiescontext.hxx" #include "oox/drawingml/chart/axiscontext.hxx" #include "oox/drawingml/chart/plotareamodel.hxx" @@ -33,15 +34,17 @@ #include "oox/drawingml/chart/titlecontext.hxx" #include "oox/drawingml/chart/typegroupcontext.hxx" -using ::oox::core::ContextHandler2Helper; -using ::oox::core::ContextHandlerRef; - namespace oox { namespace drawingml { namespace chart { // ============================================================================ +using ::oox::core::ContextHandler2Helper; +using ::oox::core::ContextHandlerRef; + +// ============================================================================ + View3DContext::View3DContext( ContextHandler2Helper& rParent, View3DModel& rModel ) : ContextBase< View3DModel >( rParent, rModel ) { @@ -182,4 +185,3 @@ ContextHandlerRef PlotAreaContext::onCreateContext( sal_Int32 nElement, const At } // namespace chart } // namespace drawingml } // namespace oox - diff --git a/oox/source/drawingml/chart/plotareaconverter.cxx b/oox/source/drawingml/chart/plotareaconverter.cxx index c3f74899ed97..19556d16dbf5 100644 --- a/oox/source/drawingml/chart/plotareaconverter.cxx +++ b/oox/source/drawingml/chart/plotareaconverter.cxx @@ -26,35 +26,34 @@ ************************************************************************/ #include "oox/drawingml/chart/plotareaconverter.hxx" -#include <com/sun/star/drawing/Direction3D.hpp> -#include <com/sun/star/drawing/ProjectionMode.hpp> -#include <com/sun/star/drawing/ShadeMode.hpp> + #include <com/sun/star/chart/XChartDocument.hpp> #include <com/sun/star/chart/XDiagramPositioning.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp> #include <com/sun/star/chart2/XDiagram.hpp> +#include <com/sun/star/drawing/Direction3D.hpp> +#include <com/sun/star/drawing/ProjectionMode.hpp> +#include <com/sun/star/drawing/ShadeMode.hpp> #include "oox/drawingml/chart/axisconverter.hxx" #include "oox/drawingml/chart/plotareamodel.hxx" #include "oox/drawingml/chart/typegroupconverter.hxx" #include "properties.hxx" -using ::rtl::OUString; -using ::com::sun::star::uno::Reference; -using ::com::sun::star::uno::Sequence; -using ::com::sun::star::uno::Exception; -using ::com::sun::star::uno::UNO_QUERY_THROW; -using ::com::sun::star::awt::Rectangle; -using ::com::sun::star::chart2::XCoordinateSystem; -using ::com::sun::star::chart2::XCoordinateSystemContainer; -using ::com::sun::star::chart2::XDiagram; - namespace oox { namespace drawingml { namespace chart { // ============================================================================ +using namespace ::com::sun::star::awt; +using namespace ::com::sun::star::chart2; +using namespace ::com::sun::star::uno; + +using ::rtl::OUString; + +// ============================================================================ + namespace { /** Axes set model. This is a helper for the plot area converter collecting all @@ -452,4 +451,3 @@ void PlotAreaConverter::convertPositionFromModel() } // namespace chart } // namespace drawingml } // namespace oox - diff --git a/oox/source/drawingml/chart/seriescontext.cxx b/oox/source/drawingml/chart/seriescontext.cxx index d06ca9716944..5412c97f0c91 100644 --- a/oox/source/drawingml/chart/seriescontext.cxx +++ b/oox/source/drawingml/chart/seriescontext.cxx @@ -26,23 +26,26 @@ ************************************************************************/ #include "oox/drawingml/chart/seriescontext.hxx" + #include "oox/drawingml/shapepropertiescontext.hxx" #include "oox/drawingml/textbodycontext.hxx" #include "oox/drawingml/chart/datasourcecontext.hxx" #include "oox/drawingml/chart/seriesmodel.hxx" #include "oox/drawingml/chart/titlecontext.hxx" -using ::rtl::OUString; -using ::oox::core::ContextHandler2; -using ::oox::core::ContextHandler2Helper; -using ::oox::core::ContextHandlerRef; - namespace oox { namespace drawingml { namespace chart { // ============================================================================ +using ::oox::core::ContextHandler2; +using ::oox::core::ContextHandler2Helper; +using ::oox::core::ContextHandlerRef; +using ::rtl::OUString; + +// ============================================================================ + namespace { ContextHandlerRef lclDataLabelSharedCreateContext( @@ -757,4 +760,3 @@ ContextHandlerRef SurfaceSeriesContext::onCreateContext( sal_Int32 nElement, con } // namespace chart } // namespace drawingml } // namespace oox - diff --git a/oox/source/drawingml/chart/seriesconverter.cxx b/oox/source/drawingml/chart/seriesconverter.cxx index 717a3972550e..0ff1aa2eaa12 100644 --- a/oox/source/drawingml/chart/seriesconverter.cxx +++ b/oox/source/drawingml/chart/seriesconverter.cxx @@ -26,6 +26,7 @@ ************************************************************************/ #include "oox/drawingml/chart/seriesconverter.hxx" + #include <com/sun/star/chart/DataLabelPlacement.hpp> #include <com/sun/star/chart/ErrorBarStyle.hpp> #include <com/sun/star/chart2/DataPointLabel.hpp> @@ -40,26 +41,21 @@ #include "oox/drawingml/chart/typegroupmodel.hxx" #include "properties.hxx" -using ::rtl::OUString; -using ::com::sun::star::uno::Reference; -using ::com::sun::star::uno::Exception; -using ::com::sun::star::uno::UNO_QUERY; -using ::com::sun::star::uno::UNO_QUERY_THROW; -using ::com::sun::star::beans::XPropertySet; -using ::com::sun::star::chart2::DataPointLabel; -using ::com::sun::star::chart2::XDataSeries; -using ::com::sun::star::chart2::XRegressionCurve; -using ::com::sun::star::chart2::XRegressionCurveContainer; -using ::com::sun::star::chart2::data::XDataSequence; -using ::com::sun::star::chart2::data::XDataSink; -using ::com::sun::star::chart2::data::XLabeledDataSequence; - namespace oox { namespace drawingml { namespace chart { // ============================================================================ +using namespace ::com::sun::star::beans; +using namespace ::com::sun::star::chart2; +using namespace ::com::sun::star::chart2::data; +using namespace ::com::sun::star::uno; + +using ::rtl::OUString; + +// ============================================================================ + namespace { Reference< XLabeledDataSequence > lclCreateLabeledDataSequence( @@ -621,4 +617,3 @@ Reference< XLabeledDataSequence > SeriesConverter::createLabeledDataSequence( } // namespace chart } // namespace drawingml } // namespace oox - diff --git a/oox/source/drawingml/chart/seriesmodel.cxx b/oox/source/drawingml/chart/seriesmodel.cxx index 01fff8e8d385..417d250caf77 100644 --- a/oox/source/drawingml/chart/seriesmodel.cxx +++ b/oox/source/drawingml/chart/seriesmodel.cxx @@ -154,4 +154,3 @@ SeriesModel::~SeriesModel() } // namespace chart } // namespace drawingml } // namespace oox - diff --git a/oox/source/drawingml/chart/titlecontext.cxx b/oox/source/drawingml/chart/titlecontext.cxx index 963ccdad595a..3954a9d5b08b 100644 --- a/oox/source/drawingml/chart/titlecontext.cxx +++ b/oox/source/drawingml/chart/titlecontext.cxx @@ -26,21 +26,24 @@ ************************************************************************/ #include "oox/drawingml/chart/titlecontext.hxx" + #include "oox/drawingml/shapepropertiescontext.hxx" #include "oox/drawingml/textbodycontext.hxx" #include "oox/drawingml/chart/datasourcecontext.hxx" #include "oox/drawingml/chart/titlemodel.hxx" -using ::rtl::OUString; -using ::oox::core::ContextHandler2Helper; -using ::oox::core::ContextHandlerRef; - namespace oox { namespace drawingml { namespace chart { // ============================================================================ +using ::oox::core::ContextHandler2Helper; +using ::oox::core::ContextHandlerRef; +using ::rtl::OUString; + +// ============================================================================ + TextContext::TextContext( ContextHandler2Helper& rParent, TextModel& rModel ) : ContextBase< TextModel >( rParent, rModel ) { @@ -160,4 +163,3 @@ ContextHandlerRef LegendContext::onCreateContext( sal_Int32 nElement, const Attr } // namespace chart } // namespace drawingml } // namespace oox - diff --git a/oox/source/drawingml/chart/titleconverter.cxx b/oox/source/drawingml/chart/titleconverter.cxx index bca53f1a2c01..c1cd02e17378 100644 --- a/oox/source/drawingml/chart/titleconverter.cxx +++ b/oox/source/drawingml/chart/titleconverter.cxx @@ -26,6 +26,7 @@ ************************************************************************/ #include "oox/drawingml/chart/titleconverter.hxx" + #include <com/sun/star/chart2/LegendExpansion.hpp> #include <com/sun/star/chart2/LegendPosition.hpp> #include <com/sun/star/chart2/XDiagram.hpp> @@ -33,25 +34,11 @@ #include <com/sun/star/chart2/XLegend.hpp> #include <com/sun/star/chart2/XTitle.hpp> #include <com/sun/star/chart2/XTitled.hpp> -#include "properties.hxx" #include "oox/drawingml/textbody.hxx" #include "oox/drawingml/textparagraph.hxx" #include "oox/drawingml/chart/datasourceconverter.hxx" #include "oox/drawingml/chart/titlemodel.hxx" - -using ::rtl::OUString; -using ::com::sun::star::uno::Reference; -using ::com::sun::star::uno::Sequence; -using ::com::sun::star::uno::Exception; -using ::com::sun::star::uno::UNO_QUERY_THROW; -using ::com::sun::star::awt::Rectangle; -using ::com::sun::star::chart2::XDiagram; -using ::com::sun::star::chart2::XFormattedString; -using ::com::sun::star::chart2::XLegend; -using ::com::sun::star::chart2::XTitle; -using ::com::sun::star::chart2::XTitled; -using ::com::sun::star::chart2::data::XDataSequence; -using ::oox::core::XmlFilterBase; +#include "properties.hxx" namespace oox { namespace drawingml { @@ -59,6 +46,16 @@ namespace chart { // ============================================================================ +using namespace ::com::sun::star::awt; +using namespace ::com::sun::star::chart2; +using namespace ::com::sun::star::chart2::data; +using namespace ::com::sun::star::uno; + +using ::oox::core::XmlFilterBase; +using ::rtl::OUString; + +// ============================================================================ + TextConverter::TextConverter( const ConverterRoot& rParent, TextModel& rModel ) : ConverterBase< TextModel >( rParent, rModel ) { @@ -270,4 +267,3 @@ void LegendConverter::convertFromModel( const Reference< XDiagram >& rxDiagram ) } // namespace chart } // namespace drawingml } // namespace oox - diff --git a/oox/source/drawingml/chart/titlemodel.cxx b/oox/source/drawingml/chart/titlemodel.cxx index bb5501e05f32..d1dc2c664e8f 100644 --- a/oox/source/drawingml/chart/titlemodel.cxx +++ b/oox/source/drawingml/chart/titlemodel.cxx @@ -69,4 +69,3 @@ LegendModel::~LegendModel() } // namespace chart } // namespace drawingml } // namespace oox - diff --git a/oox/source/drawingml/chart/typegroupcontext.cxx b/oox/source/drawingml/chart/typegroupcontext.cxx index 972295304593..781b2665d6f1 100644 --- a/oox/source/drawingml/chart/typegroupcontext.cxx +++ b/oox/source/drawingml/chart/typegroupcontext.cxx @@ -26,18 +26,21 @@ ************************************************************************/ #include "oox/drawingml/chart/typegroupcontext.hxx" + #include "oox/drawingml/chart/seriescontext.hxx" #include "oox/drawingml/chart/typegroupmodel.hxx" -using ::oox::core::ContextHandler2Helper; -using ::oox::core::ContextHandlerRef; - namespace oox { namespace drawingml { namespace chart { // ============================================================================ +using ::oox::core::ContextHandler2Helper; +using ::oox::core::ContextHandlerRef; + +// ============================================================================ + UpDownBarsContext::UpDownBarsContext( ContextHandler2Helper& rParent, UpDownBarsModel& rModel ) : ContextBase< UpDownBarsModel >( rParent, rModel ) { @@ -399,4 +402,3 @@ ContextHandlerRef SurfaceTypeGroupContext::onCreateContext( sal_Int32 nElement, } // namespace chart } // namespace drawingml } // namespace oox - diff --git a/oox/source/drawingml/chart/typegroupconverter.cxx b/oox/source/drawingml/chart/typegroupconverter.cxx index 3746048074e9..7c1f1a56fe25 100644 --- a/oox/source/drawingml/chart/typegroupconverter.cxx +++ b/oox/source/drawingml/chart/typegroupconverter.cxx @@ -26,6 +26,7 @@ ************************************************************************/ #include "oox/drawingml/chart/typegroupconverter.hxx" + #include <com/sun/star/chart/DataLabelPlacement.hpp> #include <com/sun/star/chart2/CurveStyle.hpp> #include <com/sun/star/chart2/DataPointGeometry3D.hpp> @@ -41,28 +42,21 @@ #include "oox/drawingml/chart/typegroupmodel.hxx" #include "properties.hxx" -using ::rtl::OUString; -using ::com::sun::star::uno::Reference; -using ::com::sun::star::uno::Sequence; -using ::com::sun::star::uno::Exception; -using ::com::sun::star::uno::UNO_QUERY; -using ::com::sun::star::uno::UNO_QUERY_THROW; -using ::com::sun::star::beans::XPropertySet; -using ::com::sun::star::chart2::XChartType; -using ::com::sun::star::chart2::XChartTypeContainer; -using ::com::sun::star::chart2::XCoordinateSystem; -using ::com::sun::star::chart2::XDataSeries; -using ::com::sun::star::chart2::XDataSeriesContainer; -using ::com::sun::star::chart2::XDiagram; -using ::com::sun::star::chart2::data::XDataSink; -using ::com::sun::star::chart2::data::XLabeledDataSequence; - namespace oox { namespace drawingml { namespace chart { // ============================================================================ +using namespace ::com::sun::star::beans; +using namespace ::com::sun::star::chart2; +using namespace ::com::sun::star::chart2::data; +using namespace ::com::sun::star::uno; + +using ::rtl::OUString; + +// ============================================================================ + namespace { // chart type service names @@ -570,4 +564,3 @@ void TypeGroupConverter::insertDataSeries( const Reference< XChartType >& rxChar } // namespace chart } // namespace drawingml } // namespace oox - diff --git a/oox/source/drawingml/chart/typegroupmodel.cxx b/oox/source/drawingml/chart/typegroupmodel.cxx index 24f5420644e4..ee5eefc4d163 100644 --- a/oox/source/drawingml/chart/typegroupmodel.cxx +++ b/oox/source/drawingml/chart/typegroupmodel.cxx @@ -80,4 +80,3 @@ TypeGroupModel::~TypeGroupModel() } // namespace chart } // namespace drawingml } // namespace oox - diff --git a/oox/source/drawingml/textliststyle.cxx b/oox/source/drawingml/textliststyle.cxx index 901db49802d9..8a491076909f 100644 --- a/oox/source/drawingml/textliststyle.cxx +++ b/oox/source/drawingml/textliststyle.cxx @@ -65,15 +65,4 @@ void TextListStyle::apply( const TextListStyle& rTextListStyle ) applyStyleList( rTextListStyle.getListStyle(), getListStyle() ); } -#if OSL_DEBUG_LEVEL > 0 -void TextListStyle::dump( int nLevels ) -{ - for ( int i = 0; i < nLevels; i++ ) - { - OSL_TRACE("level: %d", i); - maListStyle[ i ]->dump(); - } -} -#endif - } } diff --git a/oox/source/dump/biffdumper.cxx b/oox/source/dump/biffdumper.cxx index 30938f9ebbe6..7932ff2e6f4e 100644 --- a/oox/source/dump/biffdumper.cxx +++ b/oox/source/dump/biffdumper.cxx @@ -29,8 +29,8 @@ #include <osl/thread.h> #include <rtl/tencinfo.h> -#include "oox/dump/oledumper.hxx" #include "oox/core/filterbase.hxx" +#include "oox/dump/oledumper.hxx" #include "oox/ole/olestorage.hxx" #include "oox/xls/biffdetector.hxx" #include "oox/xls/biffinputstream.hxx" @@ -38,23 +38,27 @@ #if OOX_INCLUDE_DUMPER -using ::rtl::OUString; -using ::rtl::OUStringBuffer; +namespace oox { +namespace dump { +namespace biff { + +// ============================================================================ + +using namespace ::com::sun::star::io; +using namespace ::com::sun::star::lang; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::util; +using namespace ::oox::xls; + +using ::comphelper::MediaDescriptor; +using ::oox::core::FilterBase; using ::rtl::OString; using ::rtl::OStringBuffer; using ::rtl::OStringToOUString; -using ::com::sun::star::uno::Reference; -using ::com::sun::star::util::DateTime; -using ::com::sun::star::lang::XMultiServiceFactory; -using ::com::sun::star::io::XInputStream; -using ::comphelper::MediaDescriptor; -using ::oox::core::FilterBase; - -using namespace ::oox::xls; +using ::rtl::OUString; +using ::rtl::OUStringBuffer; -namespace oox { -namespace dump { -namespace biff { +// ============================================================================ namespace { @@ -93,12 +97,7 @@ const sal_uInt16 BIFF_STYLE_BUILTIN = 0x8000; const sal_uInt16 BIFF_PT_NOSTRING = 0xFFFF; -} // namespace - -// ============================================================================ -// ============================================================================ - -namespace { +// ---------------------------------------------------------------------------- void lclDumpDffClientPos( const OutputRef& rxOut, const BinaryInputStreamRef& rxStrm, const String& rName, sal_uInt16 nSubScale ) { @@ -128,7 +127,8 @@ void lclDumpDffClientRect( const OutputRef& rxOut, const BinaryInputStreamRef& r } // namespace -// ---------------------------------------------------------------------------- +// ============================================================================ +// ============================================================================ BiffDffStreamObject::BiffDffStreamObject( const OutputObjectBase& rParent, const BinaryInputStreamRef& rxStrm ) { @@ -4362,10 +4362,10 @@ void Dumper::implDump() } // ============================================================================ +// ============================================================================ } // namespace biff } // namespace dump } // namespace oox #endif - diff --git a/oox/source/dump/biffdumper.ini b/oox/source/dump/biffdumper.ini index d4b862825b3c..881001cb05c9 100644 --- a/oox/source/dump/biffdumper.ini +++ b/oox/source/dump/biffdumper.ini @@ -2235,4 +2235,3 @@ multilist=XFEXT-SUBREC end # ============================================================================ - diff --git a/oox/source/dump/dffdumper.cxx b/oox/source/dump/dffdumper.cxx index 8730698561ce..01994865c69d 100644 --- a/oox/source/dump/dffdumper.cxx +++ b/oox/source/dump/dffdumper.cxx @@ -29,13 +29,15 @@ #if OOX_INCLUDE_DUMPER -using ::rtl::OUString; - namespace oox { namespace dump { // ============================================================================ +using ::rtl::OUString; + +// ============================================================================ + namespace { const sal_uInt16 DFF_ID_BSE = 0xF007; /// BLIP store entry. @@ -320,4 +322,3 @@ sal_uInt16 DffStreamObject::dumpDffOptPropHeader() } // namespace oox #endif - diff --git a/oox/source/dump/dffdumper.ini b/oox/source/dump/dffdumper.ini index c33d733c6bd8..5526663e0e15 100644 --- a/oox/source/dump/dffdumper.ini +++ b/oox/source/dump/dffdumper.ini @@ -648,4 +648,3 @@ combilist=DFFSPLITMENUC-RECORD-INST end # ============================================================================ - diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx index 807a5ec74715..2a6cf61542f9 100644 --- a/oox/source/dump/dumperbase.cxx +++ b/oox/source/dump/dumperbase.cxx @@ -29,44 +29,44 @@ #include <algorithm> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/ucb/XSimpleFileAccess.hpp> #include <com/sun/star/io/XActiveDataSink.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> #include <com/sun/star/io/XTextInputStream.hpp> #include <com/sun/star/io/XTextOutputStream.hpp> -#include <rtl/math.hxx> -#include <osl/file.hxx> +#include <com/sun/star/ucb/XSimpleFileAccess.hpp> #include <comphelper/docpasswordhelper.hxx> +#include <osl/file.hxx> +#include <rtl/math.hxx> +#include "oox/core/filterbase.hxx" #include "oox/helper/binaryoutputstream.hxx" #include "oox/helper/textinputstream.hxx" -#include "oox/core/filterbase.hxx" #include "oox/xls/biffhelper.hxx" #if OOX_INCLUDE_DUMPER +namespace oox { +namespace dump { + +// ============================================================================ + +using namespace ::com::sun::star::io; +using namespace ::com::sun::star::lang; +using namespace ::com::sun::star::ucb; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::util; + +using ::comphelper::MediaDescriptor; +using ::oox::core::FilterBase; using ::rtl::OString; using ::rtl::OStringBuffer; using ::rtl::OStringToOUString; using ::rtl::OUString; using ::rtl::OUStringBuffer; using ::rtl::OUStringToOString; -using ::com::sun::star::uno::Exception; -using ::com::sun::star::uno::Reference; -using ::com::sun::star::uno::UNO_QUERY_THROW; -using ::com::sun::star::util::DateTime; -using ::com::sun::star::lang::XMultiServiceFactory; -using ::com::sun::star::ucb::XSimpleFileAccess; -using ::com::sun::star::io::XActiveDataSink; -using ::com::sun::star::io::XActiveDataSource; -using ::com::sun::star::io::XInputStream; -using ::com::sun::star::io::XOutputStream; -using ::com::sun::star::io::XTextInputStream; -using ::com::sun::star::io::XTextOutputStream; -using ::comphelper::MediaDescriptor; -using ::oox::core::FilterBase; -namespace oox { -namespace dump { +// ============================================================================ + +namespace { const sal_Unicode OOX_DUMP_BOM = 0xFEFF; const sal_Int32 OOX_DUMP_MAXSTRLEN = 80; @@ -79,6 +79,8 @@ const sal_Unicode OOX_DUMP_ITEMSEP = '='; const sal_Int32 OOX_DUMP_BYTESPERLINE = 16; const sal_Int64 OOX_DUMP_MAXARRAY = 16; +} // namespace + // ============================================================================ // ============================================================================ @@ -3212,4 +3214,3 @@ void DumperBase::construct( const ConfigRef& rxConfig ) } // namespace oox #endif - diff --git a/oox/source/dump/dumperbase.ini b/oox/source/dump/dumperbase.ini index 34ef302c784c..28aa59a03b81 100644 --- a/oox/source/dump/dumperbase.ini +++ b/oox/source/dump/dumperbase.ini @@ -393,4 +393,3 @@ multilist=SYSTEMCOLOR end # ============================================================================ - diff --git a/oox/source/dump/oledumper.cxx b/oox/source/dump/oledumper.cxx index cc49ee050ea6..eb7abef6c29d 100644 --- a/oox/source/dump/oledumper.cxx +++ b/oox/source/dump/oledumper.cxx @@ -26,30 +26,33 @@ ************************************************************************/ #include "oox/dump/oledumper.hxx" + #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XOutputStream.hpp> -#include <osl/thread.h> #include <osl/file.hxx> +#include <osl/thread.h> #include <rtl/tencinfo.h> -#include "oox/helper/binaryoutputstream.hxx" #include "oox/core/filterbase.hxx" +#include "oox/helper/binaryoutputstream.hxx" #include "oox/ole/olestorage.hxx" #include "oox/ole/vbainputstream.hxx" #if OOX_INCLUDE_DUMPER -using ::rtl::OUString; -using ::rtl::OUStringBuffer; -using ::rtl::OString; -using ::rtl::OStringToOUString; -using ::com::sun::star::uno::Reference; -using ::com::sun::star::io::XInputStream; -using ::com::sun::star::io::XOutputStream; - namespace oox { namespace dump { // ============================================================================ + +using namespace ::com::sun::star::io; +using namespace ::com::sun::star::uno; + +using ::rtl::OString; +using ::rtl::OStringToOUString; +using ::rtl::OUString; +using ::rtl::OUStringBuffer; + +// ============================================================================ // ============================================================================ OUString OleInputObjectBase::dumpAnsiString32( const String& rName ) @@ -2312,4 +2315,3 @@ void ActiveXStorageObject::implDumpBaseStream( const BinaryInputStreamRef& rxStr } // namespace oox #endif - diff --git a/oox/source/dump/oledumper.ini b/oox/source/dump/oledumper.ini index 13478464e6b3..c8461d4b28a7 100644 --- a/oox/source/dump/oledumper.ini +++ b/oox/source/dump/oledumper.ini @@ -885,4 +885,3 @@ end shortlist=VBA-DIR-PROJECTSYSKIND-PLATFORM,0,16-bit-windows,32-bit-windows,macintosh # ============================================================================ - diff --git a/oox/source/dump/pptxdumper.cxx b/oox/source/dump/pptxdumper.cxx index e01d7d349855..39e0ccc2be55 100644 --- a/oox/source/dump/pptxdumper.cxx +++ b/oox/source/dump/pptxdumper.cxx @@ -26,27 +26,31 @@ ************************************************************************/ #include "oox/dump/pptxdumper.hxx" -#include "oox/helper/zipstorage.hxx" -#include "oox/ole/olestorage.hxx" + #include "oox/dump/biffdumper.hxx" #include "oox/dump/oledumper.hxx" #include "oox/dump/xlsbdumper.hxx" +#include "oox/helper/zipstorage.hxx" +#include "oox/ole/olestorage.hxx" #if OOX_INCLUDE_DUMPER -using ::rtl::OUString; -using ::com::sun::star::uno::Reference; -using ::com::sun::star::lang::XMultiServiceFactory; -using ::com::sun::star::io::XInputStream; -using ::comphelper::MediaDescriptor; -using ::oox::core::FilterBase; - namespace oox { namespace dump { namespace pptx { // ============================================================================ +using namespace ::com::sun::star::io; +using namespace ::com::sun::star::lang; +using namespace ::com::sun::star::uno; + +using ::comphelper::MediaDescriptor; +using ::oox::core::FilterBase; +using ::rtl::OUString; + +// ============================================================================ + RootStorageObject::RootStorageObject( const DumperBase& rParent ) { StorageObjectBase::construct( rParent ); @@ -144,4 +148,3 @@ void Dumper::implDump() } // namespace oox #endif - diff --git a/oox/source/dump/pptxdumper.ini b/oox/source/dump/pptxdumper.ini index fa03953b7113..f3c058ecfbf5 100644 --- a/oox/source/dump/pptxdumper.ini +++ b/oox/source/dump/pptxdumper.ini @@ -16,4 +16,3 @@ include-config-file=dumperbase.ini # enable-import=1 # ============================================================================ - diff --git a/oox/source/dump/xlsbdumper.cxx b/oox/source/dump/xlsbdumper.cxx index dd78ac3c4e2e..8f249a909000 100644 --- a/oox/source/dump/xlsbdumper.cxx +++ b/oox/source/dump/xlsbdumper.cxx @@ -26,12 +26,13 @@ ************************************************************************/ #include "oox/dump/xlsbdumper.hxx" + #include <com/sun/star/io/XTextInputStream.hpp> +#include "oox/core/filterbase.hxx" #include "oox/dump/biffdumper.hxx" #include "oox/dump/oledumper.hxx" #include "oox/dump/pptxdumper.hxx" #include "oox/helper/zipstorage.hxx" -#include "oox/core/filterbase.hxx" #include "oox/ole/olestorage.hxx" #include "oox/xls/biffhelper.hxx" #include "oox/xls/formulabase.hxx" @@ -39,23 +40,25 @@ #if OOX_INCLUDE_DUMPER -using ::rtl::OUString; -using ::rtl::OUStringBuffer; -using ::com::sun::star::uno::Reference; -using ::com::sun::star::util::DateTime; -using ::com::sun::star::lang::XMultiServiceFactory; -using ::com::sun::star::io::XInputStream; -using ::comphelper::MediaDescriptor; -using ::oox::core::FilterBase; - -using namespace ::oox::xls; - namespace oox { namespace dump { namespace xlsb { // ============================================================================ +using namespace ::com::sun::star::io; +using namespace ::com::sun::star::lang; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::util; +using namespace ::oox::xls; + +using ::comphelper::MediaDescriptor; +using ::oox::core::FilterBase; +using ::rtl::OUString; +using ::rtl::OUStringBuffer; + +// ============================================================================ + namespace { const sal_uInt8 OOBIN_STRINGFLAG_FONTS = 0x01; @@ -2269,4 +2272,3 @@ void Dumper::implDump() } // namespace oox #endif - diff --git a/oox/source/dump/xlsbdumper.ini b/oox/source/dump/xlsbdumper.ini index f2ac3b49b4d6..b53870f09a15 100644 --- a/oox/source/dump/xlsbdumper.ini +++ b/oox/source/dump/xlsbdumper.ini @@ -1076,4 +1076,3 @@ flagslist=XF-USEDFLAGS end # ============================================================================ - diff --git a/oox/source/helper/attributelist.cxx b/oox/source/helper/attributelist.cxx index 5479fae46f82..1f365a1fdacd 100644 --- a/oox/source/helper/attributelist.cxx +++ b/oox/source/helper/attributelist.cxx @@ -26,17 +26,20 @@ ************************************************************************/ #include "oox/helper/attributelist.hxx" + #include <osl/diagnose.h> #include <rtl/ustrbuf.hxx> +namespace oox { + +// ============================================================================ + +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::util; +using namespace ::com::sun::star::xml::sax; + using ::rtl::OUString; using ::rtl::OUStringBuffer; -using ::com::sun::star::uno::Reference; -using ::com::sun::star::uno::Exception; -using ::com::sun::star::util::DateTime; -using ::com::sun::star::xml::sax::XFastAttributeList; - -namespace oox { // ============================================================================ @@ -314,4 +317,3 @@ DateTime AttributeList::getDateTime( sal_Int32 nAttrToken, const DateTime& rDefa // ============================================================================ } // namespace oox - diff --git a/oox/source/helper/binaryinputstream.cxx b/oox/source/helper/binaryinputstream.cxx index a5a3cf9a2c30..2d547cdbf724 100644 --- a/oox/source/helper/binaryinputstream.cxx +++ b/oox/source/helper/binaryinputstream.cxx @@ -26,27 +26,32 @@ ************************************************************************/ #include "oox/helper/binaryinputstream.hxx" + #include <string.h> #include <vector> #include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx> #include "oox/helper/binaryoutputstream.hxx" +namespace oox { + +// ============================================================================ + +using namespace ::com::sun::star::io; +using namespace ::com::sun::star::uno; + using ::rtl::OString; using ::rtl::OStringBuffer; using ::rtl::OStringToOUString; using ::rtl::OUString; using ::rtl::OUStringBuffer; -using ::com::sun::star::uno::UNO_QUERY; -using ::com::sun::star::uno::Reference; -using ::com::sun::star::uno::Exception; -using ::com::sun::star::io::XInputStream; -using ::com::sun::star::io::XSeekable; -namespace oox { +namespace { const sal_Int32 INPUTSTREAM_BUFFERSIZE = 0x8000; +} // namespace + // ============================================================================ OString BinaryInputStream::readNulCharArray() @@ -330,4 +335,3 @@ void RelativeInputStream::skip( sal_Int32 nBytes ) // ============================================================================ } // namespace oox - diff --git a/oox/source/helper/binaryoutputstream.cxx b/oox/source/helper/binaryoutputstream.cxx index f39ac9d8f1b2..f4ea9378aa90 100644 --- a/oox/source/helper/binaryoutputstream.cxx +++ b/oox/source/helper/binaryoutputstream.cxx @@ -26,19 +26,23 @@ ************************************************************************/ #include "oox/helper/binaryoutputstream.hxx" + #include <osl/diagnose.h> #include <string.h> -using ::com::sun::star::uno::UNO_QUERY; -using ::com::sun::star::uno::Reference; -using ::com::sun::star::uno::Exception; -using ::com::sun::star::io::XOutputStream; -using ::com::sun::star::io::XSeekable; - namespace oox { +// ============================================================================ + +using namespace ::com::sun::star::io; +using namespace ::com::sun::star::uno; + +namespace { + const sal_Int32 OUTPUTSTREAM_BUFFERSIZE = 0x8000; +} // namespace + // ============================================================================ void BinaryOutputStream::writeAtom( const void* pMem, sal_uInt8 nSize ) diff --git a/oox/source/helper/binarystreambase.cxx b/oox/source/helper/binarystreambase.cxx index a8f9320ffc94..d1e11850a68c 100644 --- a/oox/source/helper/binarystreambase.cxx +++ b/oox/source/helper/binarystreambase.cxx @@ -26,16 +26,18 @@ ************************************************************************/ #include "oox/helper/binarystreambase.hxx" -#include <osl/diagnose.h> -using ::com::sun::star::uno::Reference; -using ::com::sun::star::uno::Exception; -using ::com::sun::star::io::XSeekable; +#include <osl/diagnose.h> namespace oox { // ============================================================================ +using namespace ::com::sun::star::io; +using namespace ::com::sun::star::uno; + +// ============================================================================ + BinaryStreamBase::~BinaryStreamBase() { } @@ -158,4 +160,3 @@ void SequenceSeekableStream::seek( sal_Int64 nPos ) // ============================================================================ } // namespace oox - diff --git a/oox/source/helper/containerhelper.cxx b/oox/source/helper/containerhelper.cxx index 359bc87e09e9..4d41d9924326 100644 --- a/oox/source/helper/containerhelper.cxx +++ b/oox/source/helper/containerhelper.cxx @@ -26,25 +26,23 @@ ************************************************************************/ #include "oox/helper/containerhelper.hxx" -#include <rtl/ustrbuf.hxx> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> + #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/container/XNameContainer.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <rtl/ustrbuf.hxx> #include "oox/helper/helper.hxx" +namespace oox { + +// ============================================================================ + +using namespace ::com::sun::star::container; +using namespace ::com::sun::star::lang; +using namespace ::com::sun::star::uno; + using ::rtl::OUString; using ::rtl::OUStringBuffer; -using ::com::sun::star::uno::Any; -using ::com::sun::star::uno::Reference; -using ::com::sun::star::uno::Exception; -using ::com::sun::star::uno::UNO_QUERY; -using ::com::sun::star::uno::UNO_QUERY_THROW; -using ::com::sun::star::lang::XMultiServiceFactory; -using ::com::sun::star::container::XIndexContainer; -using ::com::sun::star::container::XNameAccess; -using ::com::sun::star::container::XNameContainer; - -namespace oox { // ============================================================================ @@ -221,4 +219,3 @@ void ObjectContainer::createContainer() const // ============================================================================ } // namespace oox - diff --git a/oox/source/helper/graphichelper.cxx b/oox/source/helper/graphichelper.cxx index 455778f939f7..a33f91359f2b 100644 --- a/oox/source/helper/graphichelper.cxx +++ b/oox/source/helper/graphichelper.cxx @@ -26,6 +26,7 @@ ************************************************************************/ #include "oox/helper/graphichelper.hxx" + #include <com/sun/star/awt/Point.hpp> #include <com/sun/star/awt/Size.hpp> #include <com/sun/star/awt/XDevice.hpp> @@ -39,32 +40,22 @@ #include "tokens.hxx" #include "oox/helper/containerhelper.hxx" -using ::rtl::OUString; -using ::com::sun::star::awt::DeviceInfo; -using ::com::sun::star::awt::Point; -using ::com::sun::star::awt::Size; -using ::com::sun::star::awt::XDevice; -using ::com::sun::star::awt::XUnitConversion; -using ::com::sun::star::beans::PropertyValue; -using ::com::sun::star::frame::XFrame; -using ::com::sun::star::frame::XFramesSupplier; -using ::com::sun::star::graphic::GraphicObject; -using ::com::sun::star::graphic::XGraphic; -using ::com::sun::star::graphic::XGraphicObject; -using ::com::sun::star::graphic::XGraphicProvider; -using ::com::sun::star::io::XInputStream; -using ::com::sun::star::lang::XMultiServiceFactory; -using ::com::sun::star::uno::Exception; -using ::com::sun::star::uno::Reference; -using ::com::sun::star::uno::Sequence; -using ::com::sun::star::uno::UNO_QUERY; -using ::com::sun::star::uno::UNO_QUERY_THROW; -using ::com::sun::star::uno::UNO_SET_THROW; - namespace oox { // ============================================================================ +using namespace ::com::sun::star::awt; +using namespace ::com::sun::star::beans; +using namespace ::com::sun::star::frame; +using namespace ::com::sun::star::graphic; +using namespace ::com::sun::star::io; +using namespace ::com::sun::star::lang; +using namespace ::com::sun::star::uno; + +using ::rtl::OUString; + +// ============================================================================ + namespace { inline sal_Int32 lclConvertScreenPixelToHmm( double fPixel, double fPixelPerHmm ) @@ -355,4 +346,3 @@ OUString GraphicHelper::importEmbeddedGraphicObject( const OUString& rStreamName // ============================================================================ } // namespace oox - diff --git a/oox/source/helper/modelobjecthelper.cxx b/oox/source/helper/modelobjecthelper.cxx index 6528fea5634d..f9b6b066230a 100644 --- a/oox/source/helper/modelobjecthelper.cxx +++ b/oox/source/helper/modelobjecthelper.cxx @@ -26,24 +26,26 @@ ************************************************************************/ #include "oox/helper/modelobjecthelper.hxx" -#include <com/sun/star/lang/XMultiServiceFactory.hpp> + #include <com/sun/star/awt/Gradient.hpp> #include <com/sun/star/drawing/LineDash.hpp> #include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include "oox/helper/helper.hxx" -using ::rtl::OUString; -using ::com::sun::star::uno::Any; -using ::com::sun::star::uno::Reference; -using ::com::sun::star::lang::XMultiServiceFactory; -using ::com::sun::star::awt::Gradient; -using ::com::sun::star::drawing::LineDash; -using ::com::sun::star::drawing::PolyPolygonBezierCoords; - namespace oox { // ============================================================================ +using namespace ::com::sun::star::awt; +using namespace ::com::sun::star::drawing; +using namespace ::com::sun::star::lang; +using namespace ::com::sun::star::uno; + +using ::rtl::OUString; + +// ============================================================================ + ModelObjectHelper::ModelObjectHelper( const Reference< XMultiServiceFactory >& rxModelFactory ) : maMarkerContainer( rxModelFactory, CREATE_OUSTRING( "com.sun.star.drawing.MarkerTable" ) ), maDashContainer( rxModelFactory, CREATE_OUSTRING( "com.sun.star.drawing.DashTable" ) ), @@ -88,4 +90,3 @@ OUString ModelObjectHelper::insertFillBitmap( const OUString& rGraphicUrl ) // ============================================================================ } // namespace oox - diff --git a/oox/source/helper/progressbar.cxx b/oox/source/helper/progressbar.cxx index 6934f2dcf8d3..1ef6531d3fb0 100644 --- a/oox/source/helper/progressbar.cxx +++ b/oox/source/helper/progressbar.cxx @@ -26,17 +26,19 @@ ************************************************************************/ #include "oox/helper/progressbar.hxx" + #include <com/sun/star/task/XStatusIndicator.hpp> #include "oox/helper/helper.hxx" -using ::rtl::OUString; -using ::com::sun::star::uno::Reference; -using ::com::sun::star::task::XStatusIndicator; - namespace oox { // ============================================================================ +using namespace ::com::sun::star::task; +using namespace ::com::sun::star::uno; + +using ::rtl::OUString; + namespace { const sal_Int32 PROGRESS_RANGE = 1000000; @@ -182,4 +184,3 @@ ISegmentProgressBarRef SegmentProgressBar::createSegment( double fLength ) // ============================================================================ } // namespace oox - diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx index 31072fe449e5..49a3547682b4 100644 --- a/oox/source/helper/propertymap.cxx +++ b/oox/source/helper/propertymap.cxx @@ -26,44 +26,25 @@ ************************************************************************/ #include "oox/helper/propertymap.hxx" -#include <osl/mutex.hxx> -#include <cppuhelper/implbase2.hxx> + #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertySetInfo.hpp> +#include <cppuhelper/implbase2.hxx> +#include <osl/mutex.hxx> #include "properties.hxx" #include "oox/token/propertylist.hxx" -using ::rtl::OUString; -using ::com::sun::star::uno::Any; -using ::com::sun::star::uno::Reference; -using ::com::sun::star::uno::RuntimeException; -using ::com::sun::star::uno::Sequence; -using ::com::sun::star::lang::IllegalArgumentException; -using ::com::sun::star::lang::WrappedTargetException; -using ::com::sun::star::beans::Property; -using ::com::sun::star::beans::PropertyValue; -using ::com::sun::star::beans::PropertyVetoException; -using ::com::sun::star::beans::UnknownPropertyException; -using ::com::sun::star::beans::XPropertyChangeListener; -using ::com::sun::star::beans::XPropertySet; -using ::com::sun::star::beans::XPropertySetInfo; -using ::com::sun::star::beans::XVetoableChangeListener; - -#if OSL_DEBUG_LEVEL > 0 -#include <cstdio> -#include <com/sun/star/style/LineSpacing.hpp> -#include <com/sun/star/style/LineSpacingMode.hpp> -#include <com/sun/star/text/WritingMode.hpp> -#define USS(x) OUStringToOString( x, RTL_TEXTENCODING_UTF8 ).getStr() -using namespace ::com::sun::star; +namespace oox { + +// ============================================================================ + +using namespace ::com::sun::star::beans; +using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; -using ::rtl::OString; -using ::com::sun::star::style::LineSpacing; -using ::com::sun::star::text::WritingMode; -#endif -namespace oox { +using ::rtl::OString; +using ::rtl::OUString; // ============================================================================ @@ -241,67 +222,6 @@ Reference< XPropertySet > PropertyMap::makePropertySet() const return new GenericPropertySet( *this ); } -#if OSL_DEBUG_LEVEL > 0 -void PropertyMap::dump( Reference< XPropertySet > rXPropSet ) -{ - Reference< XPropertySetInfo > info = rXPropSet->getPropertySetInfo (); - Sequence< beans::Property > props = info->getProperties (); - - OSL_TRACE("dump props, len: %d", props.getLength ()); - - for (int i=0; i < props.getLength (); i++) { - OString name = OUStringToOString( props [i].Name, RTL_TEXTENCODING_UTF8); - fprintf (stderr,"%30s = ", name.getStr() ); - - try { - Any value = rXPropSet->getPropertyValue( props [i].Name ); - - OUString strValue; - sal_Int32 intValue = 0; - sal_uInt32 uintValue = 0; - sal_Int16 int16Value = 0; - sal_uInt16 uint16Value = 0; - bool boolValue = false; - LineSpacing spacing; -// RectanglePoint pointValue; - WritingMode aWritingMode; - - if( value >>= strValue ) - fprintf (stderr,"\"%s\"\n", USS( strValue ) ); - else if( value >>= intValue ) - fprintf (stderr,"%"SAL_PRIdINT32" (hex: %"SAL_PRIxUINT32")\n", intValue, intValue); - else if( value >>= uintValue ) - fprintf (stderr,"%"SAL_PRIdINT32" (hex: %"SAL_PRIxUINT32")\n", uintValue, uintValue); - else if( value >>= int16Value ) - fprintf (stderr,"%d (hex: %x)\n", int16Value, int16Value); - else if( value >>= uint16Value ) - fprintf (stderr,"%d (hex: %x)\n", uint16Value, uint16Value); - else if( value >>= boolValue ) - fprintf (stderr,"%d (bool)\n", boolValue); - else if( value >>= aWritingMode ) - fprintf (stderr, "%d writing mode\n", aWritingMode); - else if( value >>= spacing ) { - fprintf (stderr, "mode: %d value: %d\n", spacing.Mode, spacing.Height); - } else if( value.isExtractableTo(::getCppuType((const sal_Int32*)0))) { - fprintf (stderr,"is extractable to int32\n"); - } -// else if( value >>= pointValue ) -// fprintf (stderr,"%d (RectanglePoint)\n", pointValue); - else - fprintf (stderr,"??? <unhandled type %s>\n", USS(value.getValueTypeName())); - } catch(Exception e) { - fprintf (stderr,"unable to get '%s' value\n", USS(props [i].Name)); - } - } -} - -void PropertyMap::dump() -{ - dump( Reference< XPropertySet >( makePropertySet(), UNO_QUERY ) ); -} -#endif - // ============================================================================ } // namespace oox - diff --git a/oox/source/helper/propertyset.cxx b/oox/source/helper/propertyset.cxx index e7071ba402a2..4812fdf35aa5 100644 --- a/oox/source/helper/propertyset.cxx +++ b/oox/source/helper/propertyset.cxx @@ -26,21 +26,21 @@ ************************************************************************/ #include "oox/helper/propertyset.hxx" -#include <rtl/strbuf.hxx> + #include <osl/diagnose.h> +#include <rtl/strbuf.hxx> #include "oox/helper/propertymap.hxx" -using ::rtl::OUString; +namespace oox { + +// ============================================================================ + +using namespace ::com::sun::star::beans; +using namespace ::com::sun::star::uno; + using ::rtl::OStringBuffer; +using ::rtl::OUString; using ::rtl::OUStringToOString; -using ::com::sun::star::uno::Any; -using ::com::sun::star::uno::Reference; -using ::com::sun::star::uno::Sequence; -using ::com::sun::star::uno::Exception; -using ::com::sun::star::uno::UNO_QUERY; -using ::com::sun::star::beans::XPropertySet; - -namespace oox { // ============================================================================ @@ -172,14 +172,6 @@ void PropertySet::setAnyProperty( const OUString& rPropName, const Any& rValue ) } } -#if OSL_DEBUG_LEVEL > 0 -void PropertySet::dump() -{ - PropertyMap::dump( Reference< XPropertySet >( getXPropertySet(), UNO_QUERY ) ); -} -#endif - // ============================================================================ } // namespace oox - diff --git a/oox/source/helper/recordinputstream.cxx b/oox/source/helper/recordinputstream.cxx index 617e7f95876e..a746eef47d73 100644 --- a/oox/source/helper/recordinputstream.cxx +++ b/oox/source/helper/recordinputstream.cxx @@ -26,15 +26,17 @@ ************************************************************************/ #include "oox/helper/recordinputstream.hxx" -#include <vector> -#include <string.h> -using ::rtl::OUString; +#include <vector> namespace oox { // ============================================================================ +using ::rtl::OUString; + +// ============================================================================ + RecordInputStream::RecordInputStream( const StreamDataSequence& rData ) : SequenceInputStream( rData ) { @@ -68,4 +70,3 @@ OUString RecordInputStream::readString( bool b32BitLen ) // ============================================================================ } // namespace oox - diff --git a/oox/source/helper/storagebase.cxx b/oox/source/helper/storagebase.cxx index 4a05f66db81b..eee2b5c5d9b2 100644 --- a/oox/source/helper/storagebase.cxx +++ b/oox/source/helper/storagebase.cxx @@ -26,24 +26,23 @@ ************************************************************************/ #include "oox/helper/storagebase.hxx" -#include <com/sun/star/io/XStream.hpp> + #include <com/sun/star/embed/XTransactedObject.hpp> +#include <com/sun/star/io/XStream.hpp> #include <rtl/ustrbuf.hxx> #include "oox/helper/binaryinputstream.hxx" #include "oox/helper/binaryoutputstream.hxx" +namespace oox { + +// ============================================================================ + +using namespace ::com::sun::star::embed; +using namespace ::com::sun::star::io; +using namespace ::com::sun::star::uno; + using ::rtl::OUString; using ::rtl::OUStringBuffer; -using ::com::sun::star::uno::Exception; -using ::com::sun::star::uno::Reference; -using ::com::sun::star::uno::UNO_SET_THROW; -using ::com::sun::star::embed::XStorage; -using ::com::sun::star::embed::XTransactedObject; -using ::com::sun::star::io::XInputStream; -using ::com::sun::star::io::XOutputStream; -using ::com::sun::star::io::XStream; - -namespace oox { // ============================================================================ diff --git a/oox/source/helper/textinputstream.cxx b/oox/source/helper/textinputstream.cxx index d6d4736f3ca2..d590781c6fd3 100755 --- a/oox/source/helper/textinputstream.cxx +++ b/oox/source/helper/textinputstream.cxx @@ -26,17 +26,20 @@ ************************************************************************/ #include "oox/helper/textinputstream.hxx" + #include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx> #include "oox/helper/binaryinputstream.hxx" +namespace oox { + +// ============================================================================ + using ::rtl::OStringBuffer; using ::rtl::OStringToOUString; using ::rtl::OUString; using ::rtl::OUStringBuffer; -namespace oox { - // ============================================================================ namespace { @@ -125,4 +128,3 @@ OUString TextInputStream::readLine() // ============================================================================ } // namespace oox - diff --git a/oox/source/helper/zipstorage.cxx b/oox/source/helper/zipstorage.cxx index 384870430c39..8145e7c4e5ce 100644 --- a/oox/source/helper/zipstorage.cxx +++ b/oox/source/helper/zipstorage.cxx @@ -26,6 +26,7 @@ ************************************************************************/ #include "oox/helper/zipstorage.hxx" + #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/embed/XTransactedObject.hpp> @@ -35,25 +36,20 @@ #include <comphelper/storagehelper.hxx> #include "oox/helper/helper.hxx" -using ::rtl::OUString; -using ::com::sun::star::container::NoSuchElementException; -using ::com::sun::star::embed::XStorage; -using ::com::sun::star::embed::XTransactedObject; -using ::com::sun::star::io::XInputStream; -using ::com::sun::star::io::XOutputStream; -using ::com::sun::star::io::XStream; -using ::com::sun::star::lang::XMultiServiceFactory; -using ::com::sun::star::uno::Any; -using ::com::sun::star::uno::Exception; -using ::com::sun::star::uno::Reference; -using ::com::sun::star::uno::Sequence; -using ::com::sun::star::uno::UNO_QUERY; -using ::com::sun::star::uno::UNO_QUERY_THROW; - namespace oox { // ============================================================================ +using namespace ::com::sun::star::container; +using namespace ::com::sun::star::embed; +using namespace ::com::sun::star::io; +using namespace ::com::sun::star::lang; +using namespace ::com::sun::star::uno; + +using ::rtl::OUString; + +// ============================================================================ + ZipStorage::ZipStorage( const Reference< XMultiServiceFactory >& rxFactory, const Reference< XInputStream >& rxInStream ) : diff --git a/oox/source/vml/vmldrawing.cxx b/oox/source/vml/vmldrawing.cxx index 1cc74c32aa2d..358803b63a13 100644 --- a/oox/source/vml/vmldrawing.cxx +++ b/oox/source/vml/vmldrawing.cxx @@ -26,6 +26,7 @@ ************************************************************************/ #include "oox/vml/vmldrawing.hxx" + #include <com/sun/star/drawing/XShapes.hpp> #include "tokens.hxx" #include "oox/core/xmlfilterbase.hxx" @@ -33,21 +34,20 @@ #include "oox/vml/vmlshape.hxx" #include "oox/vml/vmlshapecontainer.hxx" -using ::rtl::OUString; -using ::com::sun::star::uno::Reference; -using ::com::sun::star::uno::UNO_QUERY; -using ::com::sun::star::awt::Rectangle; -using ::com::sun::star::awt::XControlModel; -using ::com::sun::star::drawing::XDrawPage; -using ::com::sun::star::drawing::XShape; -using ::com::sun::star::drawing::XShapes; -using ::oox::core::XmlFilterBase; - namespace oox { namespace vml { // ============================================================================ +using namespace ::com::sun::star::awt; +using namespace ::com::sun::star::drawing; +using namespace ::com::sun::star::uno; + +using ::oox::core::XmlFilterBase; +using ::rtl::OUString; + +// ============================================================================ + namespace { /** Returns the textual representation of a numeric VML shape identifier. */ @@ -164,4 +164,3 @@ void Drawing::notifyShapeInserted( const Reference< XShape >& /*rxShape*/, const } // namespace vml } // namespave oox - diff --git a/oox/source/vml/vmldrawingfragment.cxx b/oox/source/vml/vmldrawingfragment.cxx index 333df72bbaf7..60ed554c2cb6 100644 --- a/oox/source/vml/vmldrawingfragment.cxx +++ b/oox/source/vml/vmldrawingfragment.cxx @@ -26,19 +26,23 @@ ************************************************************************/ #include "oox/vml/vmldrawingfragment.hxx" + #include "oox/vml/vmldrawing.hxx" #include "oox/vml/vmlinputstream.hxx" #include "oox/vml/vmlshapecontext.hxx" -using ::rtl::OUString; -using ::com::sun::star::uno::Reference; -using ::com::sun::star::io::XInputStream; +namespace oox { +namespace vml { + +// ============================================================================ + +using namespace ::com::sun::star::io; +using namespace ::com::sun::star::uno; + using ::oox::core::ContextHandlerRef; using ::oox::core::FragmentHandler2; using ::oox::core::XmlFilterBase; - -namespace oox { -namespace vml { +using ::rtl::OUString; // ============================================================================ @@ -90,4 +94,3 @@ void DrawingFragment::finalizeImport() } // namespace vml } // namespace oox - diff --git a/oox/source/vml/vmlformatting.cxx b/oox/source/vml/vmlformatting.cxx index 827930c22496..e82f78cf7210 100644 --- a/oox/source/vml/vmlformatting.cxx +++ b/oox/source/vml/vmlformatting.cxx @@ -26,26 +26,30 @@ ************************************************************************/ #include "oox/vml/vmlformatting.hxx" + #include <rtl/strbuf.hxx> #include "tokens.hxx" -#include "oox/token/tokenmap.hxx" -#include "oox/helper/graphichelper.hxx" -#include "oox/helper/propertymap.hxx" #include "oox/drawingml/color.hxx" #include "oox/drawingml/drawingmltypes.hxx" #include "oox/drawingml/fillproperties.hxx" #include "oox/drawingml/lineproperties.hxx" +#include "oox/helper/graphichelper.hxx" +#include "oox/helper/propertymap.hxx" +#include "oox/token/tokenmap.hxx" + +namespace oox { +namespace vml { + +// ============================================================================ + +using namespace ::com::sun::star::geometry; -using ::rtl::OStringBuffer; -using ::rtl::OUString; -using ::com::sun::star::geometry::IntegerRectangle2D; using ::oox::drawingml::Color; using ::oox::drawingml::FillProperties; using ::oox::drawingml::LineArrowProperties; using ::oox::drawingml::LineProperties; - -namespace oox { -namespace vml { +using ::rtl::OStringBuffer; +using ::rtl::OUString; // ============================================================================ @@ -600,4 +604,3 @@ void FillModel::pushToPropMap( PropertyMap& rPropMap, } // namespace vml } // namespace oox - diff --git a/oox/source/vml/vmlinputstream.cxx b/oox/source/vml/vmlinputstream.cxx index a6d50e193bc4..27776c66ca0b 100644 --- a/oox/source/vml/vmlinputstream.cxx +++ b/oox/source/vml/vmlinputstream.cxx @@ -26,22 +26,25 @@ ************************************************************************/ #include "oox/vml/vmlinputstream.hxx" + #include <map> #include <rtl/strbuf.hxx> #include <rtl/strbuf.hxx> #include "oox/helper/helper.hxx" -using ::rtl::OString; -using ::rtl::OStringBuffer; -using ::com::sun::star::uno::Exception; -using ::com::sun::star::uno::Reference; -using ::com::sun::star::io::XInputStream; - namespace oox { namespace vml { // ============================================================================ +using namespace ::com::sun::star::io; +using namespace ::com::sun::star::uno; + +using ::rtl::OString; +using ::rtl::OStringBuffer; + +// ============================================================================ + namespace { inline const sal_Char* lclFindCharacter( const sal_Char* pcBeg, const sal_Char* pcEnd, sal_Char cChar ) @@ -277,4 +280,3 @@ InputStream::~InputStream() } // namespace vml } // namespave oox - diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx index d557a7f50354..290e624698f4 100644 --- a/oox/source/vml/vmlshape.cxx +++ b/oox/source/vml/vmlshape.cxx @@ -26,7 +26,7 @@ ************************************************************************/ #include "oox/vml/vmlshape.hxx" -#include <rtl/math.hxx> + #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/beans/PropertyValues.hpp> #include <com/sun/star/awt/XControlModel.hpp> @@ -35,41 +35,34 @@ #include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp> #include <com/sun/star/drawing/XShapes.hpp> #include <com/sun/star/graphic/XGraphic.hpp> +#include <rtl/math.hxx> #include "properties.hxx" +#include "oox/core/xmlfilterbase.hxx" #include "oox/helper/graphichelper.hxx" #include "oox/helper/propertymap.hxx" #include "oox/helper/propertyset.hxx" -#include "oox/core/xmlfilterbase.hxx" #include "oox/ole/axcontrol.hxx" #include "oox/ole/axcontrolfragment.hxx" #include "oox/ole/oleobjecthelper.hxx" #include "oox/vml/vmldrawing.hxx" #include "oox/vml/vmlshapecontainer.hxx" -using ::rtl::OUString; -using ::com::sun::star::uno::Exception; -using ::com::sun::star::uno::Reference; -using ::com::sun::star::uno::UNO_QUERY; -using ::com::sun::star::uno::UNO_QUERY_THROW; -using ::com::sun::star::uno::UNO_SET_THROW; -using ::com::sun::star::lang::XMultiServiceFactory; -using ::com::sun::star::awt::Point; -using ::com::sun::star::awt::Rectangle; -using ::com::sun::star::awt::Size; -using ::com::sun::star::awt::XControlModel; -using ::com::sun::star::graphic::XGraphic; -using ::com::sun::star::drawing::PointSequenceSequence; -using ::com::sun::star::drawing::XControlShape; -using ::com::sun::star::drawing::XEnhancedCustomShapeDefaulter; -using ::com::sun::star::drawing::XShape; -using ::com::sun::star::drawing::XShapes; -using ::oox::core::XmlFilterBase; - namespace oox { namespace vml { // ============================================================================ +using namespace ::com::sun::star::awt; +using namespace ::com::sun::star::drawing; +using namespace ::com::sun::star::graphic; +using namespace ::com::sun::star::lang; +using namespace ::com::sun::star::uno; + +using ::oox::core::XmlFilterBase; +using ::rtl::OUString; + +// ============================================================================ + namespace { Point lclGetAbsPoint( const Point& rRelPoint, const Rectangle& rShapeRect, const Rectangle& rCoordSys ) @@ -552,4 +545,3 @@ Reference< XShape > GroupShape::implConvertAndInsert( const Reference< XShapes > } // namespace vml } // namespace oox - diff --git a/oox/source/vml/vmlshapecontainer.cxx b/oox/source/vml/vmlshapecontainer.cxx index a3bdfdb217d7..9589549be0d9 100644 --- a/oox/source/vml/vmlshapecontainer.cxx +++ b/oox/source/vml/vmlshapecontainer.cxx @@ -26,19 +26,23 @@ ************************************************************************/ #include "oox/vml/vmlshapecontainer.hxx" + #include "oox/vml/vmldrawing.hxx" #include "oox/vml/vmlshape.hxx" -using ::rtl::OUString; -using ::com::sun::star::uno::Reference; -using ::com::sun::star::awt::Rectangle; -using ::com::sun::star::drawing::XShapes; - namespace oox { namespace vml { // ============================================================================ +using namespace ::com::sun::star::awt; +using namespace ::com::sun::star::drawing; +using namespace ::com::sun::star::uno; + +using ::rtl::OUString; + +// ============================================================================ + namespace { template< typename ShapeType > @@ -130,4 +134,3 @@ void ShapeContainer::convertAndInsert( const Reference< XShapes >& rxShapes, con } // namespace vml } // namespace oox - diff --git a/oox/source/vml/vmlshapecontext.cxx b/oox/source/vml/vmlshapecontext.cxx index ec7da1d4d900..ac08c1836c2d 100644 --- a/oox/source/vml/vmlshapecontext.cxx +++ b/oox/source/vml/vmlshapecontext.cxx @@ -26,17 +26,21 @@ ************************************************************************/ #include "oox/vml/vmlshapecontext.hxx" + #include "oox/vml/vmlshape.hxx" #include "oox/vml/vmlshapecontainer.hxx" -using ::rtl::OUString; -using ::com::sun::star::awt::Point; +namespace oox { +namespace vml { + +// ============================================================================ + +using namespace ::com::sun::star::awt; + using ::oox::core::ContextHandler2; using ::oox::core::ContextHandler2Helper; using ::oox::core::ContextHandlerRef; - -namespace oox { -namespace vml { +using ::rtl::OUString; // ============================================================================ |