[Libreoffice-commits] core.git: sc/inc sc/source
Stephan Bergmann
sbergman at redhat.com
Mon Apr 14 06:42:00 PDT 2014
sc/inc/appluno.hxx | 81 ++++++++++
sc/inc/datastreamgettime.hxx | 33 ++++
sc/inc/filter.hxx | 2
sc/inc/scmod.hxx | 2
sc/source/core/data/column2.cxx | 5
sc/source/core/data/dpgroup.cxx | 2
sc/source/core/data/global.cxx | 5
sc/source/core/tool/callform.cxx | 15 --
sc/source/core/tool/compiler.cxx | 10 -
sc/source/core/tool/interpr7.cxx | 7
sc/source/core/tool/random.cxx | 2
sc/source/core/tool/scmatrix.cxx | 5
sc/source/filter/excel/xelink.cxx | 14 +
sc/source/filter/excel/xename.cxx | 5
sc/source/filter/excel/xestyle.cxx | 4
sc/source/filter/html/htmlpars.cxx | 4
sc/source/filter/inc/scmem.h | 4
sc/source/filter/lotus/lotus.cxx | 3
sc/source/filter/lotus/memory.cxx | 1
sc/source/filter/oox/drawingmanager.cxx | 21 --
sc/source/filter/oox/formulabuffer.cxx | 5
sc/source/filter/oox/formulaparser.cxx | 2
sc/source/filter/oox/workbookhelper.cxx | 1
sc/source/filter/oox/worksheethelper.cxx | 2
sc/source/filter/xml/XMLTrackedChangesContext.cxx | 18 --
sc/source/filter/xml/xmlcvali.cxx | 3
sc/source/filter/xml/xmlexprt.cxx | 3
sc/source/filter/xml/xmlimprt.cxx | 4
sc/source/filter/xml/xmlstyli.cxx | 1
sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx | 11 -
sc/source/ui/dbgui/PivotLayoutTreeList.cxx | 21 --
sc/source/ui/docshell/datastream.cxx | 3
sc/source/ui/undo/undoolk.cxx | 1
sc/source/ui/unoobj/appluno.cxx | 82 -----------
sc/source/ui/unoobj/cellsuno.cxx | 6
sc/source/ui/unoobj/unodoc.cxx | 1
sc/source/ui/vba/vbaborders.cxx | 2
sc/source/ui/vba/vbarange.cxx | 3
sc/source/ui/vba/vbawindows.cxx | 1
sc/source/ui/vba/vbaworkbooks.cxx | 68 ---------
sc/source/ui/view/drawvie3.cxx | 7
sc/source/ui/view/gridwin.cxx | 1
sc/source/ui/view/imapwrap.cxx | 1
sc/source/ui/view/imapwrap.hxx | 46 ++++++
sc/source/ui/view/olkact.cxx | 1
sc/source/ui/view/olkact.hxx | 33 ++++
sc/source/ui/view/output2.cxx | 2
sc/source/ui/view/tabvwsh4.cxx | 6
sc/source/ui/view/tabvwsh9.cxx | 6
49 files changed, 236 insertions(+), 330 deletions(-)
New commits:
commit 141a87dd3caeefc7d098dbf4d1a6df2f0cb259c5
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 14 15:41:13 2014 +0200
Clean up function declarations and some unused functions
Change-Id: If2c233a8ced8815b065a72caff907f10ef6166ff
diff --git a/sc/inc/appluno.hxx b/sc/inc/appluno.hxx
index 3b23866..1ed690a 100644
--- a/sc/inc/appluno.hxx
+++ b/sc/inc/appluno.hxx
@@ -46,6 +46,87 @@ com::sun::star::uno::Reference<com::sun::star::uno::XInterface> SAL_CALL
const com::sun::star::uno::Reference<
com::sun::star::lang::XMultiServiceFactory>& rSMgr );
+// Calc document
+css::uno::Sequence< OUString > SAL_CALL ScDocument_getSupportedServiceNames() throw();
+OUString SAL_CALL ScDocument_getImplementationName() throw();
+css::uno::Reference< css::uno::XInterface > SAL_CALL ScDocument_createInstance(
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr, const sal_uInt64 _nCreationFlags ) throw( css::uno::Exception );
+
+// Calc XML import
+css::uno::Sequence< OUString > SAL_CALL ScXMLImport_getSupportedServiceNames() throw();
+OUString SAL_CALL ScXMLImport_getImplementationName() throw();
+css::uno::Reference< css::uno::XInterface > SAL_CALL ScXMLImport_createInstance(
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+css::uno::Sequence< OUString > SAL_CALL ScXMLImport_Meta_getSupportedServiceNames() throw();
+OUString SAL_CALL ScXMLImport_Meta_getImplementationName() throw();
+css::uno::Reference< css::uno::XInterface > SAL_CALL ScXMLImport_Meta_createInstance(
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+css::uno::Sequence< OUString > SAL_CALL ScXMLImport_Styles_getSupportedServiceNames() throw();
+OUString SAL_CALL ScXMLImport_Styles_getImplementationName() throw();
+css::uno::Reference< css::uno::XInterface > SAL_CALL ScXMLImport_Styles_createInstance(
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+css::uno::Sequence< OUString > SAL_CALL ScXMLImport_Content_getSupportedServiceNames() throw();
+OUString SAL_CALL ScXMLImport_Content_getImplementationName() throw();
+css::uno::Reference< css::uno::XInterface > SAL_CALL ScXMLImport_Content_createInstance(
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+css::uno::Sequence< OUString > SAL_CALL ScXMLImport_Settings_getSupportedServiceNames() throw();
+OUString SAL_CALL ScXMLImport_Settings_getImplementationName() throw();
+css::uno::Reference< css::uno::XInterface > SAL_CALL ScXMLImport_Settings_createInstance(
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+
+// Calc XML export
+css::uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_getSupportedServiceNames() throw();
+OUString SAL_CALL ScXMLOOoExport_getImplementationName() throw();
+css::uno::Reference< css::uno::XInterface > SAL_CALL ScXMLOOoExport_createInstance(
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr )
+ throw (css::uno::Exception, std::exception);
+css::uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_Meta_getSupportedServiceNames() throw();
+OUString SAL_CALL ScXMLOOoExport_Meta_getImplementationName() throw();
+css::uno::Reference< css::uno::XInterface > SAL_CALL ScXMLOOoExport_Meta_createInstance(
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr )
+ throw (css::uno::Exception, std::exception);
+css::uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_Styles_getSupportedServiceNames() throw();
+OUString SAL_CALL ScXMLOOoExport_Styles_getImplementationName() throw();
+css::uno::Reference< css::uno::XInterface > SAL_CALL ScXMLOOoExport_Styles_createInstance(
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr )
+ throw (css::uno::Exception, std::exception);
+css::uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_Content_getSupportedServiceNames() throw();
+OUString SAL_CALL ScXMLOOoExport_Content_getImplementationName() throw();
+css::uno::Reference< css::uno::XInterface > SAL_CALL ScXMLOOoExport_Content_createInstance(
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr )
+ throw (css::uno::Exception, std::exception);
+css::uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_Settings_getSupportedServiceNames() throw();
+OUString SAL_CALL ScXMLOOoExport_Settings_getImplementationName() throw();
+css::uno::Reference< css::uno::XInterface > SAL_CALL ScXMLOOoExport_Settings_createInstance(
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr )
+ throw( css::uno::Exception, std::exception );
+
+// Calc XML Oasis export
+css::uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_getSupportedServiceNames() throw();
+OUString SAL_CALL ScXMLOasisExport_getImplementationName() throw();
+css::uno::Reference< css::uno::XInterface > SAL_CALL ScXMLOasisExport_createInstance(
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr )
+ throw (css::uno::Exception, std::exception);
+css::uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_Meta_getSupportedServiceNames() throw();
+OUString SAL_CALL ScXMLOasisExport_Meta_getImplementationName() throw();
+css::uno::Reference< css::uno::XInterface > SAL_CALL ScXMLOasisExport_Meta_createInstance(
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr )
+ throw (css::uno::Exception, std::exception);
+css::uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_Styles_getSupportedServiceNames() throw();
+OUString SAL_CALL ScXMLOasisExport_Styles_getImplementationName() throw();
+css::uno::Reference< css::uno::XInterface > SAL_CALL ScXMLOasisExport_Styles_createInstance(
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr )
+ throw( css::uno::Exception, std::exception );
+css::uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_Content_getSupportedServiceNames() throw();
+OUString SAL_CALL ScXMLOasisExport_Content_getImplementationName() throw();
+css::uno::Reference< css::uno::XInterface > SAL_CALL ScXMLOasisExport_Content_createInstance(
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr )
+ throw (css::uno::Exception, std::exception);
+css::uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_Settings_getSupportedServiceNames() throw();
+OUString SAL_CALL ScXMLOasisExport_Settings_getImplementationName() throw();
+css::uno::Reference< css::uno::XInterface > SAL_CALL ScXMLOasisExport_Settings_createInstance(
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr )
+ throw (css::uno::Exception, std::exception);
class ScSpreadsheetSettings : public cppu::WeakImplHelper3<
com::sun::star::sheet::XGlobalSheetSettings,
diff --git a/sc/inc/datastreamgettime.hxx b/sc/inc/datastreamgettime.hxx
new file mode 100644
index 0000000..6c39727
--- /dev/null
+++ b/sc/inc/datastreamgettime.hxx
@@ -0,0 +1,33 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_SC_INC_DATASTREAMGETTIME_HXX
+#define INCLUDED_SC_INC_DATASTREAMGETTIME_HXX
+
+#include <sal/config.h>
+
+namespace sc {
+
+double datastream_get_time(int nIdx);
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/filter.hxx b/sc/inc/filter.hxx
index e10dc63..e2fa299 100644
--- a/sc/inc/filter.hxx
+++ b/sc/inc/filter.hxx
@@ -130,6 +130,8 @@ class ScFormatFilter {
SC_DLLPUBLIC static ScFormatFilterPlugin &Get();
};
+FltError ScImportLotus123old( SvStream&, ScDocument*, rtl_TextEncoding eSrc );
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx
index 04098a1..dde69452 100644
--- a/sc/inc/scmod.hxx
+++ b/sc/inc/scmod.hxx
@@ -260,6 +260,8 @@ SC_DLLPUBLIC void SetAppOptions ( const ScAppOptions& rO
#define SC_MOD() ( *(ScModule**) GetAppData(SHL_CALC) )
+void global_InitAppOptions();
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index aea1277..a899ea9 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -2500,11 +2500,6 @@ copyFirstFormulaBlock(
return rCxt.setCachedColArray(nTab, nCol, pNumArray, pStrArray);
}
-struct FiniteValueFinder : std::unary_function<double, bool>
-{
- bool operator() (double f) const { return !rtl::math::isNan(f); }
-};
-
struct NonNullStringFinder : std::unary_function<const rtl_uString*, bool>
{
bool operator() (const rtl_uString* p) const { return p != NULL; }
diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx
index f39b425..6459b72 100644
--- a/sc/source/core/data/dpgroup.cxx
+++ b/sc/source/core/data/dpgroup.cxx
@@ -119,8 +119,6 @@ public:
virtual std::vector<ScDPItemData> getMatchValues() const SAL_OVERRIDE;
private:
- ScDPGroupDateFilter(); // disabled
-
std::vector<ScDPItemData> maValues;
Date maNullDate;
ScDPNumGroupInfo maNumInfo;
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index b1f833a..d3b2bd1 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -135,11 +135,6 @@ SfxViewShell* pScActiveViewShell = NULL; //! als Member !!!!!
sal_uInt16 nScClickMouseModifier = 0; //! dito
sal_uInt16 nScFillModeMouseModifier = 0; //! dito
-// Hack: ScGlobal::GetUserList() muss InitAppOptions in der UI aufrufen,
-// damit UserList aus Cfg geladen wird
-
-void global_InitAppOptions();
-
// statische Funktionen
bool ScGlobal::HasAttrChanged( const SfxItemSet& rNewAttrs,
diff --git a/sc/source/core/tool/callform.cxx b/sc/source/core/tool/callform.cxx
index e9e7e6c..a4e6076 100644
--- a/sc/source/core/tool/callform.cxx
+++ b/sc/source/core/tool/callform.cxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <boost/noncopyable.hpp>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <osl/module.hxx>
@@ -74,26 +77,17 @@ typedef void (CALLTYPE* FARPROC) ( void );
#define UNADVICE "Unadvice"
#endif
-class ModuleData
+class ModuleData: private boost::noncopyable
{
friend class ModuleCollection;
OUString aName;
osl::Module* pInstance;
public:
ModuleData(const OUString& rStr, osl::Module* pInst) : aName(rStr), pInstance(pInst) {}
- ModuleData(const ModuleData& rData) : aName(rData.aName)
- {
-#ifndef DISABLE_DYNLOADING
- pInstance = new osl::Module(aName);
-#else
- pInstance = NULL;
-#endif
- }
~ModuleData() { delete pInstance; }
const OUString& GetName() const { return aName; }
osl::Module* GetInstance() const { return pInstance; }
- void FreeInstance() { delete pInstance; pInstance = 0; }
};
FuncData::FuncData(const ModuleData*pModule,
@@ -134,7 +128,6 @@ class ModuleCollection
MapType maData;
public:
ModuleCollection() {}
- ModuleCollection(const ModuleCollection& r) : maData(r.maData) {}
const ModuleData* findByName(const OUString& rName) const;
void insert(ModuleData* pNew);
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 5d13c49..aee961e 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -94,16 +94,6 @@ static const sal_Char* pInternal[2] = { "TTT", "__DEBUG_VAR" };
using namespace ::com::sun::star::i18n;
-class ScCompilerRecursionGuard
-{
-private:
- short& rRecursion;
-public:
- ScCompilerRecursionGuard( short& rRec )
- : rRecursion( rRec ) { ++rRecursion; }
- ~ScCompilerRecursionGuard() { --rRecursion; }
-};
-
void ScCompiler::fillFromAddInMap( NonConstOpCodeMapPtr xMap,FormulaGrammar::Grammar _eGrammar ) const
{
size_t nSymbolOffset;
diff --git a/sc/source/core/tool/interpr7.cxx b/sc/source/core/tool/interpr7.cxx
index 5a266f2..c249a55 100644
--- a/sc/source/core/tool/interpr7.cxx
+++ b/sc/source/core/tool/interpr7.cxx
@@ -17,6 +17,7 @@
#include <com/sun/star/io/XInputStream.hpp>
#include "libxml/xpath.h"
+#include <datastreamgettime.hxx>
#include <dpobject.hxx>
#include <document.hxx>
@@ -25,12 +26,6 @@
using namespace com::sun::star;
-namespace sc
-{
- // punch through into the datastream impl.
- extern double datastream_get_time( int nIdx );
-}
-
// TODO: Add new methods for ScInterpreter here.
void ScInterpreter::ScFilterXML()
diff --git a/sc/source/core/tool/random.cxx b/sc/source/core/tool/random.cxx
index 5033582..5affe37 100644
--- a/sc/source/core/tool/random.cxx
+++ b/sc/source/core/tool/random.cxx
@@ -12,6 +12,8 @@
#include <boost/random.hpp>
+#include <random.hxx>
+
// this is nothing but a simple wrapper around
// the boost random generators
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index a59bb9d..e926e4b 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -25,6 +25,7 @@
#include "mtvelements.hxx"
#include "compare.hxx"
+#include <boost/noncopyable.hpp>
#include <svl/zforlist.hxx>
#include "svl/sharedstring.hxx"
#include <tools/stream.hxx>
@@ -188,15 +189,13 @@ _Comp CompareMatrixElemFunc<_Comp>::maComp;
}
-class ScMatrixImpl
+class ScMatrixImpl: private boost::noncopyable
{
MatrixImplType maMat;
MatrixImplType maMatFlag;
ScInterpreter* pErrorInterpreter;
bool mbCloneIfConst; // Whether the matrix is cloned with a CloneIfConst() call.
- ScMatrixImpl();
- ScMatrixImpl(const ScMatrixImpl&);
public:
ScMatrixImpl(SCSIZE nC, SCSIZE nR);
ScMatrixImpl(SCSIZE nC, SCSIZE nR, double fInitVal);
diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx
index 1e431a4..944a072 100644
--- a/sc/source/filter/excel/xelink.cxx
+++ b/sc/source/filter/excel/xelink.cxx
@@ -820,11 +820,13 @@ void XclExpTabInfo::CalcXclIndexes()
typedef ::std::pair< OUString, SCTAB > XclExpTabName;
typedef ::std::vector< XclExpTabName > XclExpTabNameVec;
-inline bool operator<( const XclExpTabName& rArg1, const XclExpTabName& rArg2 )
-{
- // compare the sheet names only
- return ScGlobal::GetCollator()->compareString( rArg1.first, rArg2.first ) < 0;
-}
+struct XclExpTabNameSort {
+ bool operator ()( const XclExpTabName& rArg1, const XclExpTabName& rArg2 )
+ {
+ // compare the sheet names only
+ return ScGlobal::GetCollator()->compareString( rArg1.first, rArg2.first ) < 0;
+ }
+};
void XclExpTabInfo::CalcSortedIndexes()
{
@@ -838,7 +840,7 @@ void XclExpTabInfo::CalcSortedIndexes()
rDoc.GetName( nScTab, aVec[ nScTab ].first );
aVec[ nScTab ].second = nScTab;
}
- ::std::sort( aVec.begin(), aVec.end() );
+ ::std::sort( aVec.begin(), aVec.end(), XclExpTabNameSort() );
// fill index vectors from sorted sheet name vector
maFromSortedVec.resize( mnScCnt );
diff --git a/sc/source/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxx
index f62ee68..ec3916d 100644
--- a/sc/source/filter/excel/xename.cxx
+++ b/sc/source/filter/excel/xename.cxx
@@ -63,8 +63,6 @@ public:
/** Sets the name's symbol value
@param sValue the name's symbolic value */
void SetSymbol( const OUString& rValue );
- /** Returns the name's symbol value */
- inline const OUString& GetSymbol() const { return msSymbol; }
/** Returns the original name (title) of this defined name. */
inline const OUString& GetOrigName() const { return maOrigName; }
@@ -172,9 +170,6 @@ private:
/** Creates a new NAME record for the passed user-defined name.
@return The 1-based NAME record index used elsewhere in the Excel file. */
sal_uInt16 CreateName( SCTAB nTab, const ScRangeData& rRangeData );
- /** Creates a new NAME record for the passed database range.
- @return The 1-based NAME record index used elsewhere in the Excel file. */
- sal_uInt16 CreateName( const ScDBData& rDBData );
/** Creates NAME records for all built-in names in the document. */
void CreateBuiltInNames();
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index 7365540..848d2c2 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -251,10 +251,6 @@ public:
/** Returns the RGB color data for a (non-zero-based) Excel palette entry.
@return The color from current or default palette or COL_AUTO, if nothing else found. */
ColorData GetColorData( sal_uInt16 nXclIndex ) const;
- /** Returns the color for a (non-zero-based) Excel palette entry.
- @return The color from current or default palette or COL_AUTO, if nothing else found. */
- inline Color GetColor( sal_uInt16 nXclIndex ) const
- { return Color( GetColorData( nXclIndex ) ); }
/** Returns true, if all colors of the palette are equal to default palette colors. */
bool IsDefaultPalette() const;
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index 0789782..e4b733f 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -1845,11 +1845,8 @@ public:
explicit ScHTMLTableMap( ScHTMLTable& rParentTable );
virtual ~ScHTMLTableMap();
- inline iterator begin() { return maTables.begin(); }
inline const_iterator begin() const { return maTables.begin(); }
- inline iterator end() { return maTables.end(); }
inline const_iterator end() const { return maTables.end(); }
- inline bool empty() const { return maTables.empty(); }
/** Returns the specified table.
@param nTableId Unique identifier of the table.
@@ -1920,7 +1917,6 @@ public:
inline bool is() const { return mpTableMap && maIter != maEnd; }
inline ScHTMLTable* operator->() { return maIter->second.get(); }
- inline ScHTMLTable& operator*() { return *maIter->second; }
inline ScHTMLTableIterator& operator++() { ++maIter; return *this; }
private:
diff --git a/sc/source/filter/inc/scmem.h b/sc/source/filter/inc/scmem.h
index 1fd91fe..805add4 100644
--- a/sc/source/filter/inc/scmem.h
+++ b/sc/source/filter/inc/scmem.h
@@ -20,6 +20,10 @@
#ifndef SC_SCMEM_H
#define SC_SCMEM_H
+#include <sal/config.h>
+
+#include <sal/types.h>
+
sal_Bool MemNew( void );
void MemDelete( void );
diff --git a/sc/source/filter/lotus/lotus.cxx b/sc/source/filter/lotus/lotus.cxx
index 5316a7f..c7cc4d0 100644
--- a/sc/source/filter/lotus/lotus.cxx
+++ b/sc/source/filter/lotus/lotus.cxx
@@ -27,9 +27,6 @@
#include "filtopt.hxx"
#include "ftools.hxx"
-extern FltError ScImportLotus123old( SvStream&, ScDocument*, rtl_TextEncoding eSrc );
- // alter Krempel in filter.cxx!
-
FltError ScFormatFilterPluginImpl::ScImportLotus123( SfxMedium& rMedium, ScDocument* pDocument, rtl_TextEncoding eSrc )
{
ScFilterOptions aFilterOpt;
diff --git a/sc/source/filter/lotus/memory.cxx b/sc/source/filter/lotus/memory.cxx
index dc2cf16..33b4858 100644
--- a/sc/source/filter/lotus/memory.cxx
+++ b/sc/source/filter/lotus/memory.cxx
@@ -22,6 +22,7 @@
#include "scitems.hxx"
+#include "scmem.h"
#include <svx/algitem.hxx>
#include <editeng/justifyitem.hxx>
diff --git a/sc/source/filter/oox/drawingmanager.cxx b/sc/source/filter/oox/drawingmanager.cxx
index 6b7cef6..6c25e3f 100644
--- a/sc/source/filter/oox/drawingmanager.cxx
+++ b/sc/source/filter/oox/drawingmanager.cxx
@@ -68,8 +68,6 @@ const sal_uInt8 BIFF_OBJ_LINE_THIN = 1;
const sal_uInt8 BIFF_OBJ_LINE_MEDIUM = 2;
const sal_uInt8 BIFF_OBJ_LINE_THICK = 3;
-const sal_uInt8 BIFF_OBJ_LINE_AUTO = 0x01;
-
const sal_uInt8 BIFF_OBJ_ARROW_OPEN = 1;
const sal_uInt8 BIFF_OBJ_ARROW_FILLED = 2;
const sal_uInt8 BIFF_OBJ_ARROW_OPENBOTH = 3;
@@ -86,8 +84,6 @@ const sal_uInt8 BIFF_OBJ_FILL_AUTOCOLOR = 65;
const sal_uInt8 BIFF_OBJ_PATT_NONE = 0;
const sal_uInt8 BIFF_OBJ_PATT_SOLID = 1;
-const sal_uInt8 BIFF_OBJ_FILL_AUTO = 0x01;
-
} // namespace
@@ -102,14 +98,6 @@ BiffObjLineModel::BiffObjLineModel() :
{
}
-BiffInputStream& operator>>( BiffInputStream& rStrm, BiffObjLineModel& rModel )
-{
- sal_uInt8 nFlags;
- rStrm >> rModel.mnColorIdx >> rModel.mnStyle >> rModel.mnWidth >> nFlags;
- rModel.mbAuto = getFlag( nFlags, BIFF_OBJ_LINE_AUTO );
- return rStrm;
-}
-
BiffObjFillModel::BiffObjFillModel() :
mnBackColorIdx( BIFF_OBJ_LINE_AUTOCOLOR ),
mnPattColorIdx( BIFF_OBJ_FILL_AUTOCOLOR ),
@@ -118,15 +106,6 @@ BiffObjFillModel::BiffObjFillModel() :
{
}
-BiffInputStream& operator>>( BiffInputStream& rStrm, BiffObjFillModel& rModel )
-{
- sal_uInt8 nFlags;
- rStrm >> rModel.mnBackColorIdx >> rModel.mnPattColorIdx >> rModel.mnPattern >> nFlags;
- rModel.mbAuto = getFlag( nFlags, BIFF_OBJ_FILL_AUTO );
- return rStrm;
-}
-
-
// BIFF drawing objects
diff --git a/sc/source/filter/oox/formulabuffer.cxx b/sc/source/filter/oox/formulabuffer.cxx
index 4d1bb08..4e2a0aa 100644
--- a/sc/source/filter/oox/formulabuffer.cxx
+++ b/sc/source/filter/oox/formulabuffer.cxx
@@ -314,16 +314,13 @@ void processSheetFormulaCells(
applyCellFormulaValues(rDoc, *rItem.mpCellFormulaValues);
}
-class WorkerThread : public salhelper::Thread
+class WorkerThread: public salhelper::Thread, private boost::noncopyable
{
ScDocumentImport& mrDoc;
FormulaBuffer::SheetItem& mrItem;
boost::scoped_ptr<SvNumberFormatter> mpFormatter;
const uno::Sequence<sheet::ExternalLinkInfo>& mrExternalLinks;
- WorkerThread( const WorkerThread& );
- WorkerThread& operator= ( const WorkerThread& );
-
public:
WorkerThread(
ScDocumentImport& rDoc, FormulaBuffer::SheetItem& rItem, SvNumberFormatter* pFormatter,
diff --git a/sc/source/filter/oox/formulaparser.cxx b/sc/source/filter/oox/formulaparser.cxx
index 9416b5c..6e3617a 100644
--- a/sc/source/filter/oox/formulaparser.cxx
+++ b/sc/source/filter/oox/formulaparser.cxx
@@ -478,7 +478,6 @@ protected:
size_t popOperandSize();
ApiToken& getOperandToken( size_t nOpCountFromEnd, size_t nOpIndex, size_t nTokenIndex );
- void removeOperand( size_t nOpCountFromEnd, size_t nOpIndex );
bool pushOperandToken( sal_Int32 nOpCode, const WhiteSpaceVec* pSpaces = 0 );
bool pushAnyOperandToken( const Any& rAny, sal_Int32 nOpCode, const WhiteSpaceVec* pSpaces = 0 );
@@ -532,7 +531,6 @@ private:
void initReference2d( SingleReference& orApiRef ) const;
void initReference3d( SingleReference& orApiRef, sal_Int32 nSheet, bool bSameSheet ) const;
- void convertColRow( SingleReference& orApiRef, const BinSingleRef2d& rRef, bool bRelativeAsOffset ) const;
void convertReference( SingleReference& orApiRef, const BinSingleRef2d& rRef, bool bDeleted, bool bRelativeAsOffset ) const;
void convertReference( ComplexReference& orApiRef, const BinSingleRef2d& rRef1, const BinSingleRef2d& rRef2, bool bDeleted, bool bRelativeAsOffset ) const;
void convertReference2d( SingleReference& orApiRef, const BinSingleRef2d& rRef, bool bDeleted, bool bRelativeAsOffset ) const;
diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx
index 57e6b08..213dd13 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -148,7 +148,6 @@ public:
}
ScDocument& getScDocument() { return *mpDoc; }
- const ScDocument& getScDocument() const { return *mpDoc; }
ScDocShell& getDocShell();
ScDocumentImport& getDocImport();
diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx
index 02df500..14b88cf 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -275,8 +275,6 @@ public:
/** Returns the BIFF drawing page for this sheet (BIFF2-BIFF8 only). */
inline BiffSheetDrawing& getBiffDrawing() const { return *mxBiffDrawing; }
- /** Changes the current sheet type. */
- inline void setSheetType( WorksheetType eSheetType ) { meSheetType = eSheetType; }
/** Sets a column or row page break described in the passed struct. */
void setPageBreak( const PageBreakModel& rModel, bool bRowBreak );
/** Inserts the hyperlink URL into the spreadsheet. */
diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
index 5830b1d..53afc73 100644
--- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx
+++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
@@ -49,7 +49,6 @@ class ScXMLChangeInfoContext : public SvXMLImportContext
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
sal_uInt32 nParagraphCount;
- const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
public:
@@ -71,7 +70,6 @@ class ScXMLBigRangeContext : public SvXMLImportContext
{
ScBigRange& rBigRange;
- const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
public:
@@ -108,7 +106,6 @@ class ScXMLCellContentDeletionContext : public SvXMLImportContext
sal_Bool bBigRange;
sal_Bool bContainsCell;
- const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
public:
@@ -130,7 +127,6 @@ class ScXMLDependenceContext : public SvXMLImportContext
{
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
- const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
public:
@@ -152,7 +148,6 @@ class ScXMLDependingsContext : public SvXMLImportContext
{
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
- const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
public:
@@ -174,7 +169,6 @@ class ScXMLChangeDeletionContext : public SvXMLImportContext
{
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
- const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
public:
@@ -196,7 +190,6 @@ class ScXMLDeletionsContext : public SvXMLImportContext
{
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
- const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
public:
@@ -225,7 +218,6 @@ class ScXMLChangeTextPContext : public SvXMLImportContext
SvXMLImportContext* pTextPContext;
sal_uInt16 nPrefix;
- const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
public:
@@ -263,7 +255,6 @@ class ScXMLChangeCellContext : public SvXMLImportContext
sal_Bool bString;
sal_Bool bFormula;
- const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
public:
@@ -305,7 +296,6 @@ class ScXMLPreviousContext : public SvXMLImportContext
sal_uInt16 nType;
sal_uInt8 nMatrixFlag;
- const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
public:
@@ -328,7 +318,6 @@ class ScXMLContentChangeContext : public SvXMLImportContext
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
ScBigRange aBigRange;
- const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
public:
@@ -349,7 +338,6 @@ class ScXMLInsertionContext : public SvXMLImportContext
{
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
- const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
public:
@@ -370,7 +358,6 @@ class ScXMLInsertionCutOffContext : public SvXMLImportContext
{
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
- const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
public:
@@ -391,7 +378,6 @@ class ScXMLMovementCutOffContext : public SvXMLImportContext
{
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
- const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
public:
@@ -412,7 +398,6 @@ class ScXMLCutOffsContext : public SvXMLImportContext
{
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
- const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
public:
@@ -433,7 +418,6 @@ class ScXMLDeletionContext : public SvXMLImportContext
{
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
- const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
public:
@@ -456,7 +440,6 @@ class ScXMLMovementContext : public SvXMLImportContext
ScBigRange aTargetRange;
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
- const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
public:
@@ -477,7 +460,6 @@ class ScXMLRejectionContext : public SvXMLImportContext
{
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
- const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
public:
diff --git a/sc/source/filter/xml/xmlcvali.cxx b/sc/source/filter/xml/xmlcvali.cxx
index 1f306c5..972ed33 100644
--- a/sc/source/filter/xml/xmlcvali.cxx
+++ b/sc/source/filter/xml/xmlcvali.cxx
@@ -89,7 +89,6 @@ class ScXMLHelpMessageContext : public SvXMLImportContext
ScXMLContentValidationContext* pValidationContext;
- const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
public:
@@ -120,7 +119,6 @@ class ScXMLErrorMessageContext : public SvXMLImportContext
ScXMLContentValidationContext* pValidationContext;
- const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
public:
@@ -148,7 +146,6 @@ class ScXMLErrorMacroContext : public SvXMLImportContext
ScXMLContentValidationContext* pValidationContext;
- const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
public:
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index a928a08..89badd5 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include "appluno.hxx"
#include "xmlexprt.hxx"
#include "XMLConverter.hxx"
#include "xmlstyle.hxx"
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index 10e9bce..13fd4a6 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -42,6 +42,7 @@
#include <svl/languageoptions.hxx>
#include "editeng/editstat.hxx"
+#include "appluno.hxx"
#include "xmlimprt.hxx"
#include "document.hxx"
#include "docsh.hxx"
@@ -243,7 +244,6 @@ const SvXMLTokenMap& ScXMLImport::GetTableRowCellAttrTokenMap()
class ScXMLDocContext_Impl : public virtual SvXMLImportContext
{
protected:
- const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
public:
@@ -319,8 +319,6 @@ SvXMLImportContext *ScXMLFlatDocContext_Impl::CreateChildContext(
class ScXMLBodyContext_Impl : public SvXMLImportContext
{
- const ScXMLImport& GetScImport() const
- { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
public:
diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx
index 4cb52cc..d1a0597 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -351,7 +351,6 @@ class ScXMLMapContext : public SvXMLImportContext
OUString msCondition;
OUString msBaseCell;
- const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
public:
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
index 6c2a66f..ffdff74 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
@@ -485,17 +485,6 @@ void ScNotesChildren::DataChanged(const Rectangle& rVisRect)
}
}
-struct ScChangeOffset
-{
- sal_Int32 mnDiff;
- ScChangeOffset(sal_Int32 nDiff) : mnDiff(nDiff) {}
- void operator() (const ScAccNote& rNote)
- {
- if (rNote.mpTextHelper)
- rNote.mpTextHelper->SetStartIndex(rNote.mpTextHelper->GetStartIndex() + mnDiff);
- }
-};
-
inline ScDocument* ScNotesChildren::GetDocument() const
{
ScDocument* pDoc = NULL;
diff --git a/sc/source/ui/dbgui/PivotLayoutTreeList.cxx b/sc/source/ui/dbgui/PivotLayoutTreeList.cxx
index bdfae54..32c55ce 100644
--- a/sc/source/ui/dbgui/PivotLayoutTreeList.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutTreeList.cxx
@@ -36,27 +36,6 @@ void ScPivotLayoutTreeList::Setup(ScPivotLayoutDialog* pParent, SvPivotTreeListT
meType = eType;
}
-OUString lclFunctName(const sal_uInt16 nFunctionMask)
-{
- switch (nFunctionMask)
- {
- case PIVOT_FUNC_SUM: return OUString("Sum");
- case PIVOT_FUNC_COUNT: return OUString("Count");
- case PIVOT_FUNC_AVERAGE: return OUString("Mean");
- case PIVOT_FUNC_MAX: return OUString("Max");
- case PIVOT_FUNC_MIN: return OUString("Min");
- case PIVOT_FUNC_PRODUCT: return OUString("Product");
- case PIVOT_FUNC_COUNT_NUM: return OUString("Count");
- case PIVOT_FUNC_STD_DEV: return OUString("StDev");
- case PIVOT_FUNC_STD_DEVP: return OUString("StDevP");
- case PIVOT_FUNC_STD_VAR: return OUString("Var");
- case PIVOT_FUNC_STD_VARP: return OUString("VarP");
- default:
- break;
- }
- return OUString();
-}
-
bool ScPivotLayoutTreeList::DoubleClickHdl()
{
ScItemValue* pCurrentItemValue = (ScItemValue*) GetCurEntry()->GetUserData();
diff --git a/sc/source/ui/docshell/datastream.cxx b/sc/source/ui/docshell/datastream.cxx
index 6f5fb26..3b1f426 100644
--- a/sc/source/ui/docshell/datastream.cxx
+++ b/sc/source/ui/docshell/datastream.cxx
@@ -8,6 +8,7 @@
*/
#include <datastream.hxx>
+#include <datastreamgettime.hxx>
#include <com/sun/star/frame/XLayoutManager.hpp>
#include <com/sun/star/ui/XUIElement.hpp>
@@ -38,8 +39,6 @@
namespace sc {
-extern double datastream_get_time(int nIdx);
-
enum {
DEBUG_TIME_IMPORT,
DEBUG_TIME_RECALC,
diff --git a/sc/source/ui/undo/undoolk.cxx b/sc/source/ui/undo/undoolk.cxx
index 90c6374..aaa8137 100644
--- a/sc/source/ui/undo/undoolk.cxx
+++ b/sc/source/ui/undo/undoolk.cxx
@@ -21,6 +21,7 @@
#include "document.hxx"
#include "drwlayer.hxx"
+#include "undoolk.hxx"
SdrUndoAction* GetSdrUndoAction( ScDocument* pDoc )
{
diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx
index f55c40a..1e5ce98 100644
--- a/sc/source/ui/unoobj/appluno.cxx
+++ b/sc/source/ui/unoobj/appluno.cxx
@@ -42,88 +42,6 @@
using namespace com::sun::star;
-// Calc document
-extern uno::Sequence< OUString > SAL_CALL ScDocument_getSupportedServiceNames() throw();
-extern OUString SAL_CALL ScDocument_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL ScDocument_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr, const sal_uInt64 _nCreationFlags ) throw( uno::Exception );
-
-// Calc XML import
-extern uno::Sequence< OUString > SAL_CALL ScXMLImport_getSupportedServiceNames() throw();
-extern OUString SAL_CALL ScXMLImport_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception );
-extern uno::Sequence< OUString > SAL_CALL ScXMLImport_Meta_getSupportedServiceNames() throw();
-extern OUString SAL_CALL ScXMLImport_Meta_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Meta_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception );
-extern uno::Sequence< OUString > SAL_CALL ScXMLImport_Styles_getSupportedServiceNames() throw();
-extern OUString SAL_CALL ScXMLImport_Styles_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Styles_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception );
-extern uno::Sequence< OUString > SAL_CALL ScXMLImport_Content_getSupportedServiceNames() throw();
-extern OUString SAL_CALL ScXMLImport_Content_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Content_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception );
-extern uno::Sequence< OUString > SAL_CALL ScXMLImport_Settings_getSupportedServiceNames() throw();
-extern OUString SAL_CALL ScXMLImport_Settings_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL ScXMLImport_Settings_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception );
-
-// Calc XML export
-extern uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_getSupportedServiceNames() throw();
-extern OUString SAL_CALL ScXMLOOoExport_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
- throw (uno::Exception, std::exception);
-extern uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_Meta_getSupportedServiceNames() throw();
-extern OUString SAL_CALL ScXMLOOoExport_Meta_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Meta_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
- throw (uno::Exception, std::exception);
-extern uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_Styles_getSupportedServiceNames() throw();
-extern OUString SAL_CALL ScXMLOOoExport_Styles_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Styles_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
- throw (uno::Exception, std::exception);
-extern uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_Content_getSupportedServiceNames() throw();
-extern OUString SAL_CALL ScXMLOOoExport_Content_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Content_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
- throw (uno::Exception, std::exception);
-extern uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_Settings_getSupportedServiceNames() throw();
-extern OUString SAL_CALL ScXMLOOoExport_Settings_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Settings_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
- throw( uno::Exception, std::exception );
-
-// Calc XML Oasis export
-extern uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_getSupportedServiceNames() throw();
-extern OUString SAL_CALL ScXMLOasisExport_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
- throw (uno::Exception, std::exception);
-extern uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_Meta_getSupportedServiceNames() throw();
-extern OUString SAL_CALL ScXMLOasisExport_Meta_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Meta_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
- throw (uno::Exception, std::exception);
-extern uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_Styles_getSupportedServiceNames() throw();
-extern OUString SAL_CALL ScXMLOasisExport_Styles_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Styles_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
- throw( uno::Exception, std::exception );
-extern uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_Content_getSupportedServiceNames() throw();
-extern OUString SAL_CALL ScXMLOasisExport_Content_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Content_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
- throw (uno::Exception, std::exception);
-extern uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_Settings_getSupportedServiceNames() throw();
-extern OUString SAL_CALL ScXMLOasisExport_Settings_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Settings_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
- throw (uno::Exception, std::exception);
-
// Anzahl der Funktionen, die als zuletzt benutzt gespeichert werden
//! Define mit funcpage.hxx und dwfunctr.hxx zusammenfassen !!!
#define LRU_MAX 10
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index f9c9fc9..fbde9f9 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -9517,12 +9517,6 @@ class ScUniqueFormatsEntry
public:
ScUniqueFormatsEntry() : eState( STATE_EMPTY ) {}
- ScUniqueFormatsEntry( const ScUniqueFormatsEntry& r ) :
- eState( r.eState ),
- aSingleRange( r.aSingleRange ),
- aJoinedRanges( r.aJoinedRanges ),
- aCompletedRanges( r.aCompletedRanges ),
- aReturnRanges( r.aReturnRanges ) {}
~ScUniqueFormatsEntry() {}
void Join( const ScRange& rNewRange );
diff --git a/sc/source/ui/unoobj/unodoc.cxx b/sc/source/ui/unoobj/unodoc.cxx
index a2cc0d7..db9d9a0 100644
--- a/sc/source/ui/unoobj/unodoc.cxx
+++ b/sc/source/ui/unoobj/unodoc.cxx
@@ -22,6 +22,7 @@
#include <sfx2/sfxmodelfactory.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include "appluno.hxx"
#include "scmod.hxx"
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
diff --git a/sc/source/ui/vba/vbaborders.cxx b/sc/source/ui/vba/vbaborders.cxx
index 6f07e54..2708853 100644
--- a/sc/source/ui/vba/vbaborders.cxx
+++ b/sc/source/ui/vba/vbaborders.cxx
@@ -142,7 +142,7 @@ private:
}
return true;
}
- ScVbaBorder(); // no impl
+
protected:
virtual OUString getServiceImplName() SAL_OVERRIDE
{
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 08d504f..dba86f1 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -319,7 +319,7 @@ private:
uno::Reference< XHelperInterface > mxParent;
uno::Reference< table::XCellRange > m_xRange;
uno::Reference< uno::XComponentContext > mxContext;
- SingleRangeIndexAccess(); // not defined
+
public:
SingleRangeIndexAccess( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< table::XCellRange >& xRange ):mxParent( xParent ), m_xRange( xRange ), mxContext( xContext ) {}
// XIndexAccess
@@ -603,7 +603,6 @@ public:
struct CellPos
{
- CellPos():m_nRow(-1), m_nCol(-1), m_nArea(0) {};
CellPos( sal_Int32 nRow, sal_Int32 nCol, sal_Int32 nArea ):m_nRow(nRow), m_nCol(nCol), m_nArea( nArea ) {};
sal_Int32 m_nRow;
sal_Int32 m_nCol;
diff --git a/sc/source/ui/vba/vbawindows.cxx b/sc/source/ui/vba/vbawindows.cxx
index f56bbe5..dfb12bf 100644
--- a/sc/source/ui/vba/vbawindows.cxx
+++ b/sc/source/ui/vba/vbawindows.cxx
@@ -96,7 +96,6 @@ class WindowEnumImpl : public WindowComponentEnumImpl
{
uno::Any m_aApplication;
public:
- WindowEnumImpl(const uno::Reference< uno::XComponentContext >& xContext, const Components& components, const uno::Any& aApplication ):WindowComponentEnumImpl( xContext, components ), m_aApplication( aApplication ){}
WindowEnumImpl( const uno::Reference< uno::XComponentContext >& xContext, const uno::Any& aApplication ): WindowComponentEnumImpl( xContext ), m_aApplication( aApplication ) {}
virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE
{
diff --git a/sc/source/ui/vba/vbaworkbooks.cxx b/sc/source/ui/vba/vbaworkbooks.cxx
index ff433b8..9a57a83 100644
--- a/sc/source/ui/vba/vbaworkbooks.cxx
+++ b/sc/source/ui/vba/vbaworkbooks.cxx
@@ -61,74 +61,6 @@ using namespace ::com::sun::star;
const sal_Int16 CUSTOM_CHAR = 5;
-void setUpDocumentModules( const uno::Reference< sheet::XSpreadsheetDocument >& xDoc )
-{
- uno::Reference< frame::XModel > xModel( xDoc, uno::UNO_QUERY );
- ScDocShell* pShell = excel::getDocShell( xModel );
- if ( pShell )
- {
- OUString aPrjName( "Standard" );
- pShell->GetBasicManager()->SetName( aPrjName );
-
- /* Set library container to VBA compatibility mode. This will create
- the VBA Globals object and store it in the Basic manager of the
- document. */
- uno::Reference<script::XLibraryContainer> xLibContainer = pShell->GetBasicContainer();
- uno::Reference<script::vba::XVBACompatibility> xVBACompat( xLibContainer, uno::UNO_QUERY_THROW );
- xVBACompat->setVBACompatibilityMode( sal_True );
-
- if( xLibContainer.is() )
- {
- if( !xLibContainer->hasByName( aPrjName ) )
- xLibContainer->createLibrary( aPrjName );
- uno::Any aLibAny = xLibContainer->getByName( aPrjName );
- uno::Reference< container::XNameContainer > xLib;
- aLibAny >>= xLib;
- if( xLib.is() )
- {
- uno::Reference< script::vba::XVBAModuleInfo > xVBAModuleInfo( xLib, uno::UNO_QUERY_THROW );
- uno::Reference< lang::XMultiServiceFactory> xSF( pShell->GetModel(), uno::UNO_QUERY_THROW);
- uno::Reference< container::XNameAccess > xVBACodeNamedObjectAccess( xSF->createInstance("ooo.vba.VBAObjectModuleObjectProvider"), uno::UNO_QUERY_THROW );
- // set up the module info for the workbook and sheets in the nealy created
- // spreadsheet
- ScDocument* pDoc = pShell->GetDocument();
- OUString sCodeName = pDoc->GetCodeName();
- if ( sCodeName.isEmpty() )
- {
- sCodeName = "ThisWorkbook";
- pDoc->SetCodeName( sCodeName );
- }
-
- std::vector< OUString > sDocModuleNames;
- sDocModuleNames.push_back( sCodeName );
-
- uno::Reference<container::XNameAccess > xSheets( xDoc->getSheets(), uno::UNO_QUERY_THROW );
- uno::Sequence< OUString > sSheets( xSheets->getElementNames() );
-
- for ( sal_Int32 index=0; index < sSheets.getLength() ; ++index )
- {
- sDocModuleNames.push_back( sSheets[ index ] );
- }
-
- std::vector<OUString>::iterator it_end = sDocModuleNames.end();
-
- for ( std::vector<OUString>::iterator it = sDocModuleNames.begin(); it != it_end; ++it )
- {
- script::ModuleInfo sModuleInfo;
-
- sModuleInfo.ModuleObject.set( xVBACodeNamedObjectAccess->getByName( *it ), uno::UNO_QUERY );
- sModuleInfo.ModuleType = script::ModuleType::DOCUMENT;
- xVBAModuleInfo->insertModuleInfo( *it, sModuleInfo );
- if( xLib->hasByName( *it ) )
- xLib->replaceByName( *it, uno::makeAny( OUString( "Option VBASupport 1\n") ) );
- else
- xLib->insertByName( *it, uno::makeAny( OUString( "Option VBASupport 1\n" ) ) );
- }
- }
- }
- }
-}
-
static uno::Any
getWorkbook( uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< sheet::XSpreadsheetDocument > &xDoc, const uno::Reference< XHelperInterface >& xParent )
{
diff --git a/sc/source/ui/view/drawvie3.cxx b/sc/source/ui/view/drawvie3.cxx
index 866949d..d3f127cf 100644
--- a/sc/source/ui/view/drawvie3.cxx
+++ b/sc/source/ui/view/drawvie3.cxx
@@ -24,6 +24,7 @@
#include "drawview.hxx"
#include "drwlayer.hxx"
+#include "imapwrap.hxx"
#include "viewdata.hxx"
#include "dbfunc.hxx"
#include "document.hxx"
@@ -31,12 +32,6 @@
#include "tabvwsh.hxx"
#include "docsh.hxx"
-void ScIMapDlgSet( const Graphic& rGraphic, const ImageMap* pImageMap,
- const TargetList* pTargetList, void* pEditingObj ); // imapwrap
-sal_uInt16 ScIMapChildWindowId();
-
-// STATIC DATA -----------------------------------------------------------
-
ScDrawView::ScDrawView( OutputDevice* pOut, ScViewData* pData ) :
FmFormView( pData->GetDocument()->GetDrawLayer(), pOut ),
pViewData( pData ),
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 8958b81..06b54bb 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -225,7 +225,6 @@ public:
SCCOL GetCol() const { return nCol; }
SCROW GetRow() const { return nRow; }
ScFilterBoxMode GetMode() const { return eMode; }
- sal_Bool IsDataSelect() const { return (eMode == SC_FILTERBOX_DATASELECT); }
void EndInit();
sal_Bool IsInInit() const { return bInit; }
void SetCancelled() { bCancelled = sal_True; }
diff --git a/sc/source/ui/view/imapwrap.cxx b/sc/source/ui/view/imapwrap.cxx
index e648ffa..38a0026 100644
--- a/sc/source/ui/view/imapwrap.cxx
+++ b/sc/source/ui/view/imapwrap.cxx
@@ -20,6 +20,7 @@
#include <svx/imapdlg.hxx>
#include <sfx2/viewfrm.hxx>
+#include <imapwrap.hxx>
sal_uInt16 ScIMapChildWindowId()
{
diff --git a/sc/source/ui/view/imapwrap.hxx b/sc/source/ui/view/imapwrap.hxx
new file mode 100644
index 0000000..9e195b9
--- /dev/null
+++ b/sc/source/ui/view/imapwrap.hxx
@@ -0,0 +1,46 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_SC_SOURCE_UI_VIEW_IMAPWRAP_HXX
+#define INCLUDED_SC_SOURCE_UI_VIEW_IMAPWRAP_HXX
+
+#include <sal/config.h>
+
+#include <sal/types.h>
+#include <sfx2/frame.hxx>
+
+class Graphic;
+class ImageMap;
+class SvxIMapDlg;
+
+SvxIMapDlg * ScGetIMapDlg();
+
+sal_uInt16 ScIMapChildWindowId();
+
+ImageMap const & ScIMapDlgGetMap(SvxIMapDlg * pDlg);
+
+void const * ScIMapDlgGetObj(SvxIMapDlg * pDlg);
+
+void ScIMapDlgSet(
+ Graphic const & rGraphic, ImageMap const * pImageMap,
+ TargetList const * pTargetList, void * pEditingObj);
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/view/olkact.cxx b/sc/source/ui/view/olkact.cxx
index 2f79de7..17e98b1 100644
--- a/sc/source/ui/view/olkact.cxx
+++ b/sc/source/ui/view/olkact.cxx
@@ -25,6 +25,7 @@
#include "drawview.hxx"
#include "drawpage.hxx"
#include "drwlayer.hxx"
+#include "olkact.hxx"
// STATIC DATA -----------------------------------------------------------
diff --git a/sc/source/ui/view/olkact.hxx b/sc/source/ui/view/olkact.hxx
new file mode 100644
index 0000000..3ca261e
--- /dev/null
+++ b/sc/source/ui/view/olkact.hxx
@@ -0,0 +1,33 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_SC_SOURCE_UI_VIEW_OLKACT_HXX
+#define INCLUDED_SC_SOURCE_UI_VIEW_OLKACT_HXX
+
+#include <sal/config.h>
+
+class ScViewData;
+
+void ActivateOlk(ScViewData * pViewData);
+
+void DeActivateOlk(ScViewData * pViewData);
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index c4b76cf..4b99bcb 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -141,12 +141,10 @@ public:
void SetTextToWidthOrHash( ScRefCellValue& rCell, long nWidth );
void SetAutoText( const OUString& rAutoText );
- const ScPatternAttr* GetPattern() const { return pPattern; }
SvxCellOrientation GetOrient() const { return eAttrOrient; }
SvxCellHorJustify GetHorJust() const { return eAttrHorJust; }
SvxCellVerJustify GetVerJust() const { return eAttrVerJust; }
SvxCellJustifyMethod GetHorJustMethod() const { return eAttrHorJustMethod; }
- SvxCellJustifyMethod GetVerJustMethod() const { return eAttrVerJustMethod; }
const SvxMarginItem* GetMargin() const { return pMargin; }
sal_uInt16 GetLeftTotal() const { return pMargin->GetLeftMargin() + nIndent; }
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index 4c0f374..955d9bf 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include "olkact.hxx"
#include "scitems.hxx"
#include <editeng/eeitem.hxx>
@@ -88,9 +91,6 @@
#include <com/sun/star/document/XDocumentProperties.hpp>
-void ActivateOlk( ScViewData* pViewData );
-void DeActivateOlk( ScViewData* pViewData );
-
extern SfxViewShell* pScActiveViewShell; // global.cxx
using namespace com::sun::star;
diff --git a/sc/source/ui/view/tabvwsh9.cxx b/sc/source/ui/view/tabvwsh9.cxx
index d6b7fd9..0718edd 100644
--- a/sc/source/ui/view/tabvwsh9.cxx
+++ b/sc/source/ui/view/tabvwsh9.cxx
@@ -28,6 +28,7 @@
#include <sfx2/dispatch.hxx>
#include <svl/whiter.hxx>
+#include "imapwrap.hxx"
#include "tabvwsh.hxx"
#include "viewdata.hxx"
#include "tabview.hxx"
@@ -40,11 +41,6 @@
class SvxIMapDlg;
-sal_uInt16 ScIMapChildWindowId();
-SvxIMapDlg* ScGetIMapDlg();
-const void* ScIMapDlgGetObj( SvxIMapDlg* pDlg );
-const ImageMap& ScIMapDlgGetMap( SvxIMapDlg* pDlg );
-
void ScTabViewShell::ExecChildWin(SfxRequest& rReq)
{
sal_uInt16 nSlot = rReq.GetSlot();
More information about the Libreoffice-commits
mailing list