sc/source/filter/inc/formulabase.hxx | 2 +- sc/source/filter/inc/numberformatsbuffer.hxx | 2 -- sc/source/filter/inc/stylesbuffer.hxx | 8 ++------ sc/source/filter/inc/workbookhelper.hxx | 6 ------ sc/source/filter/inc/worksheetbuffer.hxx | 3 --- sc/source/filter/inc/worksheethelper.hxx | 1 - sc/source/filter/oox/commentsbuffer.cxx | 5 +---- sc/source/filter/oox/condformatbuffer.cxx | 1 - sc/source/filter/oox/drawingbase.cxx | 1 - sc/source/filter/oox/drawingfragment.cxx | 1 - sc/source/filter/oox/excelchartconverter.cxx | 2 -- sc/source/filter/oox/excelfilter.cxx | 1 - sc/source/filter/oox/excelvbaproject.cxx | 3 --- sc/source/filter/oox/externallinkbuffer.cxx | 7 ------- sc/source/filter/oox/externallinkfragment.cxx | 1 - sc/source/filter/oox/formulabuffer.cxx | 6 ++---- sc/source/filter/oox/formulaparser.cxx | 3 --- sc/source/filter/oox/numberformatsbuffer.cxx | 3 --- sc/source/filter/oox/pivotcachebuffer.cxx | 1 - sc/source/filter/oox/pivottablebuffer.cxx | 1 - sc/source/filter/oox/scenariobuffer.cxx | 1 - sc/source/filter/oox/sharedstringsbuffer.cxx | 3 --- sc/source/filter/oox/sheetdatabuffer.cxx | 5 ----- sc/source/filter/oox/sheetdatacontext.cxx | 9 --------- sc/source/filter/oox/stylesbuffer.cxx | 22 +++++++++------------- sc/source/filter/oox/tablebuffer.cxx | 1 - sc/source/filter/oox/tablecolumnsbuffer.cxx | 5 ----- sc/source/filter/oox/viewsettings.cxx | 1 - sc/source/filter/oox/workbookfragment.cxx | 1 - sc/source/filter/oox/workbookhelper.cxx | 1 - sc/source/filter/oox/worksheetbuffer.cxx | 3 --- sc/source/filter/oox/worksheetfragment.cxx | 1 - sc/source/filter/oox/worksheethelper.cxx | 1 - sc/source/filter/oox/worksheetsettings.cxx | 3 --- 34 files changed, 15 insertions(+), 100 deletions(-)
New commits: commit a7ecbbec9eefdc90cd5ea086954ba6bf8f694433 Author: Jochen Nitschke <j.nitschke+loger...@ok.de> Date: Tue Jan 24 09:15:27 2017 +0100 cleanup css includes and using namespaces Change-Id: I29c3f89c50f858ff4592d0058f15d856de465d77 Reviewed-on: https://gerrit.libreoffice.org/33490 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/sc/source/filter/inc/formulabase.hxx b/sc/source/filter/inc/formulabase.hxx index e105905..e217165 100644 --- a/sc/source/filter/inc/formulabase.hxx +++ b/sc/source/filter/inc/formulabase.hxx @@ -30,7 +30,7 @@ #include "addressconverter.hxx" namespace com { namespace sun { namespace star { - namespace sheet { class XFormulaOpCodeMapper; } + namespace lang { class XMultiServiceFactory; } namespace sheet { class XFormulaParser; } } } } diff --git a/sc/source/filter/inc/numberformatsbuffer.hxx b/sc/source/filter/inc/numberformatsbuffer.hxx index 57861d4..4098095 100644 --- a/sc/source/filter/inc/numberformatsbuffer.hxx +++ b/sc/source/filter/inc/numberformatsbuffer.hxx @@ -28,8 +28,6 @@ namespace com { namespace sun { namespace star { namespace util { class XNumberFormats; } } } } -namespace oox { class PropertyMap; } - namespace oox { namespace xls { diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx index 8a5fdc8..64231e9 100644 --- a/sc/source/filter/inc/stylesbuffer.hxx +++ b/sc/source/filter/inc/stylesbuffer.hxx @@ -37,12 +37,8 @@ #include "attarray.hxx" #include <list> -class ScMarkData; -namespace com { namespace sun { namespace star { - namespace awt { struct FontDescrtiptor; } -} } } - -namespace oox { class PropertySet; } +namespace oox { class PropertySet; + class PropertyMap; } namespace oox { namespace xls { diff --git a/sc/source/filter/inc/workbookhelper.hxx b/sc/source/filter/inc/workbookhelper.hxx index 7b6a073..e5e12b6 100644 --- a/sc/source/filter/inc/workbookhelper.hxx +++ b/sc/source/filter/inc/workbookhelper.hxx @@ -28,22 +28,18 @@ #include "rangenam.hxx" namespace com { namespace sun { namespace star { - namespace container { class XNameAccess; } namespace container { class XNameContainer; } - namespace lang { class XMultiServiceFactory; } namespace sheet { class XDatabaseRange; } namespace sheet { class XSpreadsheet; } namespace sheet { class XSpreadsheetDocument; } namespace sheet { struct FormulaToken; } namespace style { class XStyle; } - namespace table { class XCell; } namespace table { class XCellRange; } } } } namespace oox { class AttributeList; class SegmentProgressBar; - class ISegmentProgressBar; } namespace oox { namespace core { @@ -54,7 +50,6 @@ namespace oox { namespace core { } } class ScDocument; -class ScDocShell; class ScDocumentImport; class ScEditEngineDefaulter; class ScDBData; @@ -73,7 +68,6 @@ struct IgnoreCaseCompare class AddressConverter; class ConnectionsBuffer; class DefinedNamesBuffer; -class ExcelChartConverter; class ExternalLinkBuffer; class FormulaParser; class PageSettingsConverter; diff --git a/sc/source/filter/inc/worksheetbuffer.hxx b/sc/source/filter/inc/worksheetbuffer.hxx index cc86559..dc9a184 100644 --- a/sc/source/filter/inc/worksheetbuffer.hxx +++ b/sc/source/filter/inc/worksheetbuffer.hxx @@ -26,9 +26,6 @@ #include "workbookhelper.hxx" #include "documentimport.hxx" -namespace com { namespace sun { namespace star { - namespace i18n { class XCharacterClassification; } -} } } namespace oox { namespace xls { diff --git a/sc/source/filter/inc/worksheethelper.hxx b/sc/source/filter/inc/worksheethelper.hxx index d996ee0..3c2276e 100644 --- a/sc/source/filter/inc/worksheethelper.hxx +++ b/sc/source/filter/inc/worksheethelper.hxx @@ -35,7 +35,6 @@ namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; } namespace sheet { class XSpreadsheet; } namespace table { class XCell; } - namespace table { class XCell2; } namespace table { class XCellRange; } } } } diff --git a/sc/source/filter/oox/commentsbuffer.cxx b/sc/source/filter/oox/commentsbuffer.cxx index 568d380..ae71986 100644 --- a/sc/source/filter/oox/commentsbuffer.cxx +++ b/sc/source/filter/oox/commentsbuffer.cxx @@ -27,6 +27,7 @@ #include <com/sun/star/sheet/XSheetAnnotationShapeSupplier.hpp> #include <com/sun/star/sheet/XSheetAnnotations.hpp> #include <com/sun/star/sheet/XSheetAnnotationsSupplier.hpp> +#include <com/sun/star/text/XText.hpp> #include <osl/diagnose.h> #include <oox/helper/attributelist.hxx> #include <oox/vml/vmlshape.hxx> @@ -35,10 +36,6 @@ #include <svx/sdtaitm.hxx> #include "unitconverter.hxx" -#include <com/sun/star/text/XText.hpp> - -using ::com::sun::star::text::XText; - namespace oox { namespace xls { diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx index ede0d46..3dcb0b2 100644 --- a/sc/source/filter/oox/condformatbuffer.cxx +++ b/sc/source/filter/oox/condformatbuffer.cxx @@ -46,7 +46,6 @@ namespace oox { namespace xls { using namespace ::com::sun::star::sheet; -using namespace ::com::sun::star::style; using namespace ::com::sun::star::uno; namespace { diff --git a/sc/source/filter/oox/drawingbase.cxx b/sc/source/filter/oox/drawingbase.cxx index eae05aa..7835942 100644 --- a/sc/source/filter/oox/drawingbase.cxx +++ b/sc/source/filter/oox/drawingbase.cxx @@ -32,7 +32,6 @@ namespace oox { namespace xls { -using namespace ::com::sun::star::table; using namespace ::oox::drawingml; namespace { diff --git a/sc/source/filter/oox/drawingfragment.cxx b/sc/source/filter/oox/drawingfragment.cxx index 67b2427..91a2e50 100644 --- a/sc/source/filter/oox/drawingfragment.cxx +++ b/sc/source/filter/oox/drawingfragment.cxx @@ -56,7 +56,6 @@ using namespace ::com::sun::star::document; using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::script; using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::xml::sax; using namespace ::oox::core; using namespace ::oox::drawingml; using namespace ::oox::ole; diff --git a/sc/source/filter/oox/excelchartconverter.cxx b/sc/source/filter/oox/excelchartconverter.cxx index 71a161e..3357ed9 100644 --- a/sc/source/filter/oox/excelchartconverter.cxx +++ b/sc/source/filter/oox/excelchartconverter.cxx @@ -35,8 +35,6 @@ namespace xls { using namespace ::com::sun::star::chart2; using namespace ::com::sun::star::chart2::data; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; using ::oox::drawingml::chart::DataSequenceModel; diff --git a/sc/source/filter/oox/excelfilter.cxx b/sc/source/filter/oox/excelfilter.cxx index 36c3757..8cda915 100644 --- a/sc/source/filter/oox/excelfilter.cxx +++ b/sc/source/filter/oox/excelfilter.cxx @@ -36,7 +36,6 @@ namespace xls { using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::xml::sax; using namespace ::oox::core; using ::oox::drawingml::table::TableStyleListPtr; diff --git a/sc/source/filter/oox/excelvbaproject.cxx b/sc/source/filter/oox/excelvbaproject.cxx index 4a0ba64..05dcb5b 100644 --- a/sc/source/filter/oox/excelvbaproject.cxx +++ b/sc/source/filter/oox/excelvbaproject.cxx @@ -24,7 +24,6 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XEnumeration.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> -#include <com/sun/star/document/XEventsSupplier.hpp> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/script/ModuleType.hpp> #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> @@ -37,9 +36,7 @@ namespace oox { namespace xls { using namespace ::com::sun::star::container; -using namespace ::com::sun::star::document; using namespace ::com::sun::star::frame; -using namespace ::com::sun::star::lang; using namespace ::com::sun::star::script; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::uno; diff --git a/sc/source/filter/oox/externallinkbuffer.cxx b/sc/source/filter/oox/externallinkbuffer.cxx index b16d58f..878d8d7 100644 --- a/sc/source/filter/oox/externallinkbuffer.cxx +++ b/sc/source/filter/oox/externallinkbuffer.cxx @@ -20,16 +20,10 @@ #include "externallinkbuffer.hxx" #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/sheet/ComplexReference.hpp> #include <com/sun/star/sheet/DDELinkInfo.hpp> #include <com/sun/star/sheet/ExternalLinkType.hpp> -#include <com/sun/star/sheet/ExternalReference.hpp> -#include <com/sun/star/sheet/ReferenceFlags.hpp> -#include <com/sun/star/sheet/SingleReference.hpp> #include <com/sun/star/sheet/XDDELinks.hpp> -#include <com/sun/star/sheet/XDDELink.hpp> #include <com/sun/star/sheet/XDDELinkResults.hpp> -#include <com/sun/star/sheet/XExternalDocLink.hpp> #include <com/sun/star/sheet/XExternalDocLinks.hpp> #include <osl/diagnose.h> #include <rtl/strbuf.hxx> @@ -47,7 +41,6 @@ namespace oox { namespace xls { using namespace ::com::sun::star::sheet; -using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; using ::oox::core::Relation; diff --git a/sc/source/filter/oox/externallinkfragment.cxx b/sc/source/filter/oox/externallinkfragment.cxx index d3f0bda..c91360a 100644 --- a/sc/source/filter/oox/externallinkfragment.cxx +++ b/sc/source/filter/oox/externallinkfragment.cxx @@ -31,7 +31,6 @@ namespace oox { namespace xls { using namespace ::com::sun::star::sheet; -using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; using namespace ::oox::core; diff --git a/sc/source/filter/oox/formulabuffer.cxx b/sc/source/filter/oox/formulabuffer.cxx index b8a319f..00f73ee 100644 --- a/sc/source/filter/oox/formulabuffer.cxx +++ b/sc/source/filter/oox/formulabuffer.cxx @@ -24,10 +24,8 @@ #include <oox/token/tokens.hxx> #include <svl/sharedstringpool.hxx> -using namespace com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sheet; -using namespace ::com::sun::star::container; #include <memory> @@ -170,7 +168,7 @@ void applySharedFormulas( void applyCellFormulas( ScDocumentImport& rDoc, CachedTokenArray& rCache, SvNumberFormatter& rFormatter, - const uno::Sequence<sheet::ExternalLinkInfo>& rExternalLinks, + const Sequence<ExternalLinkInfo>& rExternalLinks, const std::vector<FormulaBuffer::TokenAddressItem>& rCells ) { for (const FormulaBuffer::TokenAddressItem& rItem : rCells) @@ -289,7 +287,7 @@ void applyCellFormulaValues( void processSheetFormulaCells( ScDocumentImport& rDoc, FormulaBuffer::SheetItem& rItem, SvNumberFormatter& rFormatter, - const uno::Sequence<sheet::ExternalLinkInfo>& rExternalLinks, bool bGeneratorKnownGood ) + const Sequence<ExternalLinkInfo>& rExternalLinks, bool bGeneratorKnownGood ) { if (rItem.mpSharedFormulaEntries && rItem.mpSharedFormulaIDs) applySharedFormulas(rDoc, rFormatter, *rItem.mpSharedFormulaEntries, *rItem.mpSharedFormulaIDs); diff --git a/sc/source/filter/oox/formulaparser.cxx b/sc/source/filter/oox/formulaparser.cxx index ff0ce24..d7f7cc9 100644 --- a/sc/source/filter/oox/formulaparser.cxx +++ b/sc/source/filter/oox/formulaparser.cxx @@ -19,11 +19,8 @@ #include "formulaparser.hxx" -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/sheet/ComplexReference.hpp> #include <com/sun/star/sheet/ExternalReference.hpp> -#include <com/sun/star/sheet/FormulaToken.hpp> -#include <com/sun/star/sheet/NameToken.hpp> #include <com/sun/star/sheet/ReferenceFlags.hpp> #include <com/sun/star/sheet/SingleReference.hpp> #include <osl/diagnose.h> diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx index 31b2e24..3fb7178 100644 --- a/sc/source/filter/oox/numberformatsbuffer.cxx +++ b/sc/source/filter/oox/numberformatsbuffer.cxx @@ -19,9 +19,7 @@ #include "numberformatsbuffer.hxx" -#include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/i18n/NumberFormatIndex.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/util/XNumberFormatTypes.hpp> #include <com/sun/star/util/XNumberFormats.hpp> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> @@ -46,7 +44,6 @@ namespace oox { namespace xls { -using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx b/sc/source/filter/oox/pivotcachebuffer.cxx index 685d163..4c6b27f 100644 --- a/sc/source/filter/oox/pivotcachebuffer.cxx +++ b/sc/source/filter/oox/pivotcachebuffer.cxx @@ -50,7 +50,6 @@ namespace xls { using namespace ::com::sun::star::container; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::util; using ::oox::core::Relations; diff --git a/sc/source/filter/oox/pivottablebuffer.cxx b/sc/source/filter/oox/pivottablebuffer.cxx index 37a1c46..f9da29e 100644 --- a/sc/source/filter/oox/pivottablebuffer.cxx +++ b/sc/source/filter/oox/pivottablebuffer.cxx @@ -60,7 +60,6 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; -using namespace com::sun::star; namespace { diff --git a/sc/source/filter/oox/scenariobuffer.cxx b/sc/source/filter/oox/scenariobuffer.cxx index 5032159..dd2dc00 100644 --- a/sc/source/filter/oox/scenariobuffer.cxx +++ b/sc/source/filter/oox/scenariobuffer.cxx @@ -20,7 +20,6 @@ #include "scenariobuffer.hxx" #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/sheet/XScenario.hpp> #include <com/sun/star/sheet/XScenarios.hpp> #include <com/sun/star/sheet/XScenariosSupplier.hpp> diff --git a/sc/source/filter/oox/sharedstringsbuffer.cxx b/sc/source/filter/oox/sharedstringsbuffer.cxx index c01c257..839f2c0 100644 --- a/sc/source/filter/oox/sharedstringsbuffer.cxx +++ b/sc/source/filter/oox/sharedstringsbuffer.cxx @@ -22,9 +22,6 @@ namespace oox { namespace xls { -using namespace ::com::sun::star::text; -using namespace ::com::sun::star::uno; - SharedStringsBuffer::SharedStringsBuffer( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) { diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx b/sc/source/filter/oox/sheetdatabuffer.cxx index e40e47e..52f29ac 100644 --- a/sc/source/filter/oox/sheetdatabuffer.cxx +++ b/sc/source/filter/oox/sheetdatabuffer.cxx @@ -21,12 +21,8 @@ #include <algorithm> #include <com/sun/star/sheet/XArrayFormulaTokens.hpp> -#include <com/sun/star/sheet/XCellRangeData.hpp> -#include <com/sun/star/sheet/XMultipleOperation.hpp> -#include <com/sun/star/text/XText.hpp> #include <com/sun/star/util/DateTime.hpp> #include <com/sun/star/util/NumberFormat.hpp> -#include <com/sun/star/util/XMergeable.hpp> #include <com/sun/star/util/XNumberFormatTypes.hpp> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <rtl/ustrbuf.hxx> @@ -58,7 +54,6 @@ namespace xls { using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sheet; -using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; diff --git a/sc/source/filter/oox/sheetdatacontext.cxx b/sc/source/filter/oox/sheetdatacontext.cxx index 2db99b3..95f8be4 100644 --- a/sc/source/filter/oox/sheetdatacontext.cxx +++ b/sc/source/filter/oox/sheetdatacontext.cxx @@ -19,10 +19,6 @@ #include "sheetdatacontext.hxx" -#include <com/sun/star/table/CellContentType.hpp> -#include <com/sun/star/table/XCell.hpp> -#include <com/sun/star/table/XCellRange.hpp> -#include <com/sun/star/text/XText.hpp> #include <oox/helper/attributelist.hxx> #include <oox/helper/propertyset.hxx> #include <oox/token/namespaces.hxx> @@ -35,11 +31,6 @@ namespace oox { namespace xls { -using namespace ::com::sun::star::sheet; -using namespace ::com::sun::star::table; -using namespace ::com::sun::star::text; -using namespace ::com::sun::star::uno; - using ::oox::core::ContextHandlerRef; namespace { diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx index 0d097b0..68253bd 100644 --- a/sc/source/filter/oox/stylesbuffer.cxx +++ b/sc/source/filter/oox/stylesbuffer.cxx @@ -30,14 +30,11 @@ #include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/awt/XFont2.hpp> #include <com/sun/star/container/XIndexAccess.hpp> -#include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/style/XStyle.hpp> #include <com/sun/star/text/WritingMode2.hpp> -#include <com/sun/star/text/XText.hpp> #include <com/sun/star/table/BorderLineStyle.hpp> #include <com/sun/star/table/CellVertJustify2.hpp> #include <com/sun/star/table/CellJustifyMethod.hpp> -#include <com/sun/star/table/TableBorder.hpp> #include <editeng/justifyitem.hxx> #include <editeng/frmdiritem.hxx> #include <editeng/fontitem.hxx> @@ -85,7 +82,6 @@ namespace oox { namespace xls { -using namespace com::sun::star; using namespace ::com::sun::star::awt; using namespace ::com::sun::star::container; using namespace ::com::sun::star::style; @@ -1549,42 +1545,42 @@ bool Border::convertBorderLine( BorderLine2& rBorderLine, const BorderLineModel& { case XML_dashDot: lclSetBorderLineWidth( rBorderLine, API_LINE_THIN ); - rBorderLine.LineStyle = table::BorderLineStyle::DASH_DOT; + rBorderLine.LineStyle = BorderLineStyle::DASH_DOT; break; case XML_dashDotDot: lclSetBorderLineWidth( rBorderLine, API_LINE_THIN ); - rBorderLine.LineStyle = table::BorderLineStyle::DASH_DOT_DOT; + rBorderLine.LineStyle = BorderLineStyle::DASH_DOT_DOT; break; case XML_dashed: lclSetBorderLineWidth( rBorderLine, API_LINE_THIN ); - rBorderLine.LineStyle = table::BorderLineStyle::FINE_DASHED; + rBorderLine.LineStyle = BorderLineStyle::FINE_DASHED; break; case XML_dotted: lclSetBorderLineWidth( rBorderLine, API_LINE_THIN ); - rBorderLine.LineStyle = table::BorderLineStyle::DOTTED; + rBorderLine.LineStyle = BorderLineStyle::DOTTED; break; case XML_double: lclSetBorderLineWidth( rBorderLine, 10, 15, 10 ); - rBorderLine.LineStyle = table::BorderLineStyle::DOUBLE_THIN; + rBorderLine.LineStyle = BorderLineStyle::DOUBLE_THIN; break; case XML_hair: lclSetBorderLineWidth( rBorderLine, API_LINE_HAIR ); break; case XML_medium: lclSetBorderLineWidth( rBorderLine, API_LINE_MEDIUM ); break; case XML_mediumDashDot: lclSetBorderLineWidth( rBorderLine, API_LINE_MEDIUM ); - rBorderLine.LineStyle = table::BorderLineStyle::DASH_DOT; + rBorderLine.LineStyle = BorderLineStyle::DASH_DOT; break; case XML_mediumDashDotDot: lclSetBorderLineWidth( rBorderLine, API_LINE_MEDIUM ); - rBorderLine.LineStyle = table::BorderLineStyle::DASH_DOT_DOT; + rBorderLine.LineStyle = BorderLineStyle::DASH_DOT_DOT; break; case XML_mediumDashed: lclSetBorderLineWidth( rBorderLine, API_LINE_MEDIUM ); - rBorderLine.LineStyle = table::BorderLineStyle::DASHED; + rBorderLine.LineStyle = BorderLineStyle::DASHED; break; case XML_none: lclSetBorderLineWidth( rBorderLine, API_LINE_NONE ); break; case XML_slantDashDot: lclSetBorderLineWidth( rBorderLine, API_LINE_MEDIUM ); - rBorderLine.LineStyle = table::BorderLineStyle::FINE_DASHED; + rBorderLine.LineStyle = BorderLineStyle::FINE_DASHED; break; case XML_thick: lclSetBorderLineWidth( rBorderLine, API_LINE_THICK ); break; case XML_thin: lclSetBorderLineWidth( rBorderLine, API_LINE_THIN ); break; diff --git a/sc/source/filter/oox/tablebuffer.cxx b/sc/source/filter/oox/tablebuffer.cxx index e3fdbe3..10e5a19 100644 --- a/sc/source/filter/oox/tablebuffer.cxx +++ b/sc/source/filter/oox/tablebuffer.cxx @@ -33,7 +33,6 @@ namespace oox { namespace xls { -using namespace ::com::sun::star::container; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::uno; diff --git a/sc/source/filter/oox/tablecolumnsbuffer.cxx b/sc/source/filter/oox/tablecolumnsbuffer.cxx index 1ea875c..56b0f7e 100644 --- a/sc/source/filter/oox/tablecolumnsbuffer.cxx +++ b/sc/source/filter/oox/tablecolumnsbuffer.cxx @@ -19,7 +19,6 @@ #include "tablecolumnsbuffer.hxx" -#include <com/sun/star/sheet/XDatabaseRange.hpp> #include <rtl/ustrbuf.hxx> #include <osl/diagnose.h> #include <oox/helper/attributelist.hxx> @@ -34,10 +33,6 @@ namespace oox { namespace xls { -using namespace ::com::sun::star::sheet; -using namespace ::com::sun::star::table; -using namespace ::com::sun::star::uno; - TableColumn::TableColumn( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), mnId( -1 ), diff --git a/sc/source/filter/oox/viewsettings.cxx b/sc/source/filter/oox/viewsettings.cxx index 4048674..6ac2ace 100644 --- a/sc/source/filter/oox/viewsettings.cxx +++ b/sc/source/filter/oox/viewsettings.cxx @@ -21,7 +21,6 @@ #include <com/sun/star/awt/Point.hpp> #include <com/sun/star/awt/Size.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/container/XNameContainer.hpp> diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx index bf19e87..6799f1c 100644 --- a/sc/source/filter/oox/workbookfragment.cxx +++ b/sc/source/filter/oox/workbookfragment.cxx @@ -80,7 +80,6 @@ namespace xls { using namespace ::com::sun::star::io; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::sheet; using namespace ::oox::core; using ::oox::drawingml::ThemeFragmentHandler; diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index 5dd584a..0eb53c5 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -83,7 +83,6 @@ namespace oox { namespace xls { -using namespace ::com::sun::star::awt; using namespace ::com::sun::star::container; using namespace ::com::sun::star::document; using namespace ::com::sun::star::lang; diff --git a/sc/source/filter/oox/worksheetbuffer.cxx b/sc/source/filter/oox/worksheetbuffer.cxx index 608657d..df06376 100644 --- a/sc/source/filter/oox/worksheetbuffer.cxx +++ b/sc/source/filter/oox/worksheetbuffer.cxx @@ -20,10 +20,7 @@ #include "worksheetbuffer.hxx" #include <com/sun/star/container/XIndexAccess.hpp> -#include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XNamed.hpp> -#include <com/sun/star/sheet/XExternalSheetName.hpp> -#include <com/sun/star/sheet/XSheetLinkable.hpp> #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> #include <osl/diagnose.h> #include <rtl/ustrbuf.hxx> diff --git a/sc/source/filter/oox/worksheetfragment.cxx b/sc/source/filter/oox/worksheetfragment.cxx index c7649f1..8aaab09 100644 --- a/sc/source/filter/oox/worksheetfragment.cxx +++ b/sc/source/filter/oox/worksheetfragment.cxx @@ -47,7 +47,6 @@ namespace oox { namespace xls { -using namespace ::com::sun::star::uno; using namespace ::oox::core; namespace { diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx index 34e8606..c57947f 100644 --- a/sc/source/filter/oox/worksheethelper.cxx +++ b/sc/source/filter/oox/worksheethelper.cxx @@ -87,7 +87,6 @@ using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::util; namespace { diff --git a/sc/source/filter/oox/worksheetsettings.cxx b/sc/source/filter/oox/worksheetsettings.cxx index 12d047d..2f4041c 100644 --- a/sc/source/filter/oox/worksheetsettings.cxx +++ b/sc/source/filter/oox/worksheetsettings.cxx @@ -19,7 +19,6 @@ #include "worksheetsettings.hxx" -#include <com/sun/star/util/XProtectable.hpp> #include <oox/core/filterbase.hxx> #include <oox/helper/binaryinputstream.hxx> #include <oox/helper/attributelist.hxx> @@ -34,9 +33,7 @@ namespace oox { namespace xls { -using namespace ::com::sun::star::beans; using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::util; namespace { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits