[Libreoffice-commits] core.git: sw/inc sw/qa sw/source
Stephan Bergmann
sbergman at redhat.com
Tue Apr 15 04:57:16 PDT 2014
sw/inc/dbgoutsw.hxx | 6 +
sw/inc/doc.hxx | 4
sw/inc/fesh.hxx | 2
sw/inc/sw3convert.hxx | 33 +++++++
sw/inc/unotbl.hxx | 7 +
sw/qa/core/Test-BigPtrArray.cxx | 5 +
sw/source/core/access/accmap.cxx | 14 ---
sw/source/core/bastyp/bparr.cxx | 13 +--
sw/source/core/bastyp/init.cxx | 2
sw/source/core/crsr/paminit.cxx | 13 ---
sw/source/core/crsr/trvlreg.cxx | 1
sw/source/core/crsr/trvlreg.hxx | 33 +++++++
sw/source/core/crsr/trvltbl.cxx | 1
sw/source/core/crsr/trvltbl.hxx | 32 +++++++
sw/source/core/doc/dbgoutsw.cxx | 7 -
sw/source/core/doc/doccomp.cxx | 4
sw/source/core/doc/docedt.cxx | 1
sw/source/core/doc/docfly.cxx | 2
sw/source/core/doc/docfmt.cxx | 14 ---
sw/source/core/doc/docredln.cxx | 1
sw/source/core/doc/tblrwcl.cxx | 21 ----
sw/source/core/docnode/ndtbl.cxx | 6 -
sw/source/core/docnode/ndtbl1.cxx | 3
sw/source/core/edit/edlingu.cxx | 1
sw/source/core/edit/edtab.cxx | 3
sw/source/core/fields/expfld.cxx | 4
sw/source/core/fields/postithelper.cxx | 37 --------
sw/source/core/fields/reffld.cxx | 2
sw/source/core/frmedt/fefly1.cxx | 4
sw/source/core/frmedt/tblsel.cxx | 3
sw/source/core/graphic/ndgrf.cxx | 1
sw/source/core/inc/UndoTable.hxx | 2
sw/source/core/inc/docredln.hxx | 33 +++++++
sw/source/core/inc/unofreg.hxx | 125 +++++++++++++++++++++++++++++
sw/source/core/layout/dumpfilter.cxx | 6 -
sw/source/core/layout/flyincnt.cxx | 3
sw/source/core/layout/paintfrm.cxx | 12 --
sw/source/core/ole/ndole.cxx | 10 --
sw/source/core/sw3io/sw3convert.cxx | 1
sw/source/core/table/swtable.cxx | 1
sw/source/core/text/frmcrsr.cxx | 1
sw/source/core/text/txtfly.cxx | 1
sw/source/core/text/txtio.cxx | 35 --------
sw/source/core/tox/tox.cxx | 6 -
sw/source/core/txtnode/fntcap.cxx | 1
sw/source/core/uibase/app/docsh2.cxx | 2
sw/source/core/uibase/app/docstyle.cxx | 21 ----
sw/source/core/uibase/docvw/edtwin3.cxx | 27 ------
sw/source/core/uibase/uno/unodoc.cxx | 1
sw/source/core/uibase/uno/unofreg.cxx | 92 ---------------------
sw/source/core/uibase/uno/unomailmerge.cxx | 13 ---
sw/source/core/uibase/uno/unomod.cxx | 1
sw/source/core/uibase/uno/unomodule.cxx | 6 -
sw/source/core/uibase/uno/unotxdoc.cxx | 2
sw/source/core/uibase/wrtsh/select.cxx | 7 -
sw/source/core/undo/untbl.cxx | 7 -
sw/source/core/unocore/unochart.cxx | 6 -
sw/source/core/unocore/unodraw.cxx | 4
sw/source/core/unocore/unoflatpara.cxx | 1
sw/source/core/unocore/unoparagraph.cxx | 3
sw/source/core/view/printdata.cxx | 2
sw/source/filter/html/htmlatr.cxx | 2
sw/source/filter/html/htmlform.cxx | 1
sw/source/filter/html/htmltab.cxx | 32 -------
sw/source/filter/html/swhtml.hxx | 1
sw/source/filter/ww1/w1filter.cxx | 5 -
sw/source/filter/ww8/wrtw8sty.cxx | 6 -
sw/source/filter/ww8/wrtww8.cxx | 5 -
sw/source/filter/ww8/ww8graf.cxx | 11 --
sw/source/filter/ww8/ww8par.cxx | 7 -
sw/source/filter/ww8/ww8par2.cxx | 15 +--
sw/source/filter/ww8/ww8par6.cxx | 5 -
sw/source/filter/xml/xmlexp.cxx | 1
sw/source/filter/xml/xmlfmt.cxx | 13 ---
sw/source/filter/xml/xmlimp.cxx | 5 -
sw/source/filter/xml/xmltbli.cxx | 13 ---
sw/source/ui/chrdlg/drpcps.cxx | 1
sw/source/ui/dbui/dbinsdlg.cxx | 6 -
sw/source/ui/dialog/uiregionsw.cxx | 18 ----
sw/source/ui/index/cnttab.cxx | 2
sw/source/ui/table/tautofmt.cxx | 1
sw/source/ui/vba/vbaborders.cxx | 2
sw/source/ui/vba/vbadocumentproperties.cxx | 2
sw/source/ui/vba/vbafield.cxx | 1
84 files changed, 351 insertions(+), 516 deletions(-)
New commits:
commit 2afe4c170dca7c45ef6be1563727193f53aa60c7
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Apr 15 13:55:56 2014 +0200
Clean up function declarations and some unused functions
Change-Id: I58c425ab9d2c01f8844226aff820dd56d88ec09c
diff --git a/sw/inc/dbgoutsw.hxx b/sw/inc/dbgoutsw.hxx
index 2f9ca3b..77f0255 100644
--- a/sw/inc/dbgoutsw.hxx
+++ b/sw/inc/dbgoutsw.hxx
@@ -26,8 +26,10 @@
#include <tox.hxx>
#include <cstdio>
+class SwCntntNode;
class SwNode;
class SwTxtAttr;
+class SwTxtNode;
class SwpHints;
class SfxPoolItem;
class SfxItemSet;
@@ -54,6 +56,9 @@ SW_DLLPUBLIC const char * dbg_out(const OUString & aStr);
SW_DLLPUBLIC const char * dbg_out(const SwRect & rRect);
SW_DLLPUBLIC const char * dbg_out(const SwFrmFmt & rFrmFmt);
SW_DLLPUBLIC const char * dbg_out(const SwNode & rNode);
+SW_DLLPUBLIC const char * dbg_out(const SwNode * pNode);
+SW_DLLPUBLIC const char * dbg_out(const SwCntntNode * pNode);
+SW_DLLPUBLIC const char * dbg_out(const SwTxtNode * pNode);
SW_DLLPUBLIC const char * dbg_out(const SwTxtAttr & rAttr);
SW_DLLPUBLIC const char * dbg_out(const SwpHints &rHints);
SW_DLLPUBLIC const char * dbg_out(const SfxPoolItem & rItem);
@@ -64,6 +69,7 @@ SW_DLLPUBLIC const char * dbg_out(const SwPosition & rPos);
SW_DLLPUBLIC const char * dbg_out(const SwPaM & rPam);
SW_DLLPUBLIC const char * dbg_out(const SwNodeNum & rNum);
SW_DLLPUBLIC const char * dbg_out(const SwUndo & rUndo);
+SW_DLLPUBLIC const char * dbg_out(SwOutlineNodes & rNodes);
SW_DLLPUBLIC const char * dbg_out(const SwRewriter & rRewriter);
SW_DLLPUBLIC const char * dbg_out(const SwNumRule & rRule);
SW_DLLPUBLIC const char * dbg_out(const SwTxtFmtColl & rFmt);
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index aff1ba0..4c1495b 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -199,6 +199,7 @@ class SwRenderData;
class SwPageFrm;
class SwViewOption;
class IDocumentUndoRedo;
+class _SetGetExpFlds;
namespace sw { namespace mark {
class MarkManager;
@@ -2173,6 +2174,9 @@ namespace docfunc
*/
bool HasOutlineStyleToBeWrittenAsNormalListStyle( SwDoc& rDoc );
}
+
+bool sw_GetPostIts( IDocumentFieldsAccess* pIDFA, _SetGetExpFlds * pSrtLst );
+
#endif //_DOC_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 2c4e574..f81e6d0 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -760,6 +760,8 @@ public:
virtual void ToggleHeaderFooterEdit( );
};
+void ClearFEShellTabCols();
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/sw3convert.hxx b/sw/inc/sw3convert.hxx
new file mode 100644
index 0000000..d837db2
--- /dev/null
+++ b/sw/inc/sw3convert.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_SW_INC_SW3CONVERT_HXX
+#define INCLUDED_SW_INC_SW3CONVERT_HXX
+
+#include <sal/config.h>
+
+class SwDoc;
+
+SW_DLLPUBLIC void sw3io_ConvertFromOldField( SwDoc& rDoc, sal_uInt16& rWhich,
+ sal_uInt16& rSubType, sal_uLong &rFmt,
+ sal_uInt16 nVersion );
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx
index 7552e15..a99c48c 100644
--- a/sw/inc/unotbl.hxx
+++ b/sw/inc/unotbl.hxx
@@ -623,6 +623,13 @@ public:
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
};
+int sw_CompareCellRanges(
+ const OUString &rRange1StartCell, const OUString &rRange1EndCell,
+ const OUString &rRange2StartCell, const OUString &rRange2EndCell,
+ sal_Bool bCmpColsFirst );
+
+void sw_NormalizeRange( OUString &rCell1, OUString &rCell2 );
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/core/Test-BigPtrArray.cxx b/sw/qa/core/Test-BigPtrArray.cxx
index 3320d7d..18749d81 100644
--- a/sw/qa/core/Test-BigPtrArray.cxx
+++ b/sw/qa/core/Test-BigPtrArray.cxx
@@ -722,6 +722,7 @@ public:
CPPUNIT_TEST(test_remove_all_elements_at_once);
CPPUNIT_TEST(test_move_elements_from_lower_to_higher_pos);
CPPUNIT_TEST(test_move_elements_from_higher_to_lower_pos);
+ CPPUNIT_TEST(test_move_to_same_position);
CPPUNIT_TEST(test_replace_elements);
CPPUNIT_TEST(test_for_each);
CPPUNIT_TEST(test_for_some1);
@@ -733,6 +734,8 @@ public:
const char* START = "START: ";
const char* END = "END: ";
+#if defined TIMELOG
+
class PerformanceTracer
{
public:
@@ -825,6 +828,8 @@ private:
}
};
+#endif
+
// register test suites
CPPUNIT_TEST_SUITE_REGISTRATION(BigPtrArrayUnittest);
#ifdef TIMELOG
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 4db54c9..575002e 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -314,15 +314,13 @@ private:
EventType meType; // The event type
tAccessibleStates mnStates; // check states or update caret pos
- SwAccessibleEvent_Impl& operator==( const SwAccessibleEvent_Impl& );
-
public:
const SwFrm* mpParentFrm; // The object that fires the event
sal_Bool IsNoXaccParentFrm() const
{
return CHILD_POS_CHANGED == meType && mpParentFrm != 0;
}
- uno::WeakReference < XAccessible > GetxAcc() const { return mxAcc;}
+
public:
SwAccessibleEvent_Impl( EventType eT,
SwAccessibleContext *pA,
@@ -490,13 +488,7 @@ public:
{
return mbFiring;
}
- struct XAccisNULL
- {
- bool operator()(const SwAccessibleEvent_Impl& e)
- {
- return e.IsNoXaccParentFrm();
- }
- };
+
void MoveInvalidXAccToEnd();
};
@@ -645,8 +637,6 @@ public:
const SwRect& GetVisArea() const;
- MapMode GetMapModeForPreview( ) const;
-
/** Adjust the MapMode so that the preview page appears at the
* proper position. rPoint identifies the page for which the
* MapMode should be adjusted. If bFromPreview is true, rPoint is
diff --git a/sw/source/core/bastyp/bparr.cxx b/sw/source/core/bastyp/bparr.cxx
index 39d2896..935a35b 100644
--- a/sw/source/core/bastyp/bparr.cxx
+++ b/sw/source/core/bastyp/bparr.cxx
@@ -71,11 +71,14 @@ BigPtrArray::~BigPtrArray()
// division of this field into multiple parts.
void BigPtrArray::Move( sal_uLong from, sal_uLong to )
{
- sal_uInt16 cur = Index2Block( from );
- BlockInfo* p = ppInf[ cur ];
- ElementPtr pElem = p->pData[ from - p->nStart ];
- Insert( pElem, to ); // insert first, then delete!
- Remove( ( to < from ) ? ( from + 1 ) : from );
+ if (from != to)
+ {
+ sal_uInt16 cur = Index2Block( from );
+ BlockInfo* p = ppInf[ cur ];
+ ElementPtr pElem = p->pData[ from - p->nStart ];
+ Insert( pElem, to ); // insert first, then delete!
+ Remove( ( to < from ) ? ( from + 1 ) : from );
+ }
}
/** Apply function to every element.
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index fce0a3b..de353fa 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -23,6 +23,7 @@
#include <cellatr.hxx>
#include <checkit.hxx>
#include <cmdid.h>
+#include <fesh.hxx>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/i18n/CollatorOptions.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -132,7 +133,6 @@
using namespace ::com::sun::star;
extern void _FrmFinit();
-extern void ClearFEShellTabCols();
// some ranges for sets in collections/ nodes
diff --git a/sw/source/core/crsr/paminit.cxx b/sw/source/core/crsr/paminit.cxx
index dbaa126..4069a12 100644
--- a/sw/source/core/crsr/paminit.cxx
+++ b/sw/source/core/crsr/paminit.cxx
@@ -19,6 +19,8 @@
#include <pam.hxx>
#include <pamtyp.hxx>
+#include <trvlreg.hxx>
+#include <trvltbl.hxx>
static SwMoveFnCollection aFwrd = {
/* fnNd */ &GoNext,
@@ -62,23 +64,12 @@ SwWhichSection fnSectionNext = &GoNextSection;
SwPosSection fnSectionStart = &aFwrd;
SwPosSection fnSectionEnd = &aBwrd;
-// Travelling in tables
-sal_Bool GotoPrevTable( SwPaM&, SwPosTable, sal_Bool bInReadOnly );
-sal_Bool GotoCurrTable( SwPaM&, SwPosTable, sal_Bool bInReadOnly );
-sal_Bool GotoNextTable( SwPaM&, SwPosTable, sal_Bool bInReadOnly );
-
SwWhichTable fnTablePrev = &GotoPrevTable;
SwWhichTable fnTableCurr = &GotoCurrTable;
SwWhichTable fnTableNext = &GotoNextTable;
SwPosTable fnTableStart = &aFwrd;
SwPosTable fnTableEnd = &aBwrd;
-// Travelling in regions
-sal_Bool GotoPrevRegion( SwPaM&, SwPosRegion, sal_Bool bInReadOnly );
-sal_Bool GotoCurrRegion( SwPaM&, SwPosRegion, sal_Bool bInReadOnly );
-sal_Bool GotoCurrRegionAndSkip( SwPaM&, SwPosRegion, sal_Bool bInReadOnly );
-sal_Bool GotoNextRegion( SwPaM&, SwPosRegion, sal_Bool bInReadOnly );
-
SwWhichRegion fnRegionPrev = &GotoPrevRegion;
SwWhichRegion fnRegionCurr = &GotoCurrRegion;
SwWhichRegion fnRegionCurrAndSkip = &GotoCurrRegionAndSkip;
diff --git a/sw/source/core/crsr/trvlreg.cxx b/sw/source/core/crsr/trvlreg.cxx
index 04df75b..0850dfb 100644
--- a/sw/source/core/crsr/trvlreg.cxx
+++ b/sw/source/core/crsr/trvlreg.cxx
@@ -26,6 +26,7 @@
#include <callnk.hxx>
#include <pamtyp.hxx>
#include <section.hxx>
+#include <trvlreg.hxx>
sal_Bool GotoPrevRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
sal_Bool bInReadOnly )
diff --git a/sw/source/core/crsr/trvlreg.hxx b/sw/source/core/crsr/trvlreg.hxx
new file mode 100644
index 0000000..881ecdd
--- /dev/null
+++ b/sw/source/core/crsr/trvlreg.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_SW_SOURCE_CORE_CRSR_TRVLREG_HXX
+#define INCLUDED_SW_SOURCE_CORE_CRSR_TRVLREG_HXX
+
+#include <sal/config.h>
+
+// Travelling in regions
+sal_Bool GotoPrevRegion( SwPaM&, SwPosRegion, sal_Bool bInReadOnly );
+sal_Bool GotoCurrRegion( SwPaM&, SwPosRegion, sal_Bool bInReadOnly );
+sal_Bool GotoCurrRegionAndSkip( SwPaM&, SwPosRegion, sal_Bool bInReadOnly );
+sal_Bool GotoNextRegion( SwPaM&, SwPosRegion, sal_Bool bInReadOnly );
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/crsr/trvltbl.cxx b/sw/source/core/crsr/trvltbl.cxx
index f85cd1f..cea8ece 100644
--- a/sw/source/core/crsr/trvltbl.cxx
+++ b/sw/source/core/crsr/trvltbl.cxx
@@ -37,6 +37,7 @@
#include <cellatr.hxx>
#include <cellfrm.hxx>
#include <rowfrm.hxx>
+#include <trvltbl.hxx>
/// set cursor into next/previous cell
sal_Bool SwCrsrShell::GoNextCell( sal_Bool bAppendLine )
diff --git a/sw/source/core/crsr/trvltbl.hxx b/sw/source/core/crsr/trvltbl.hxx
new file mode 100644
index 0000000..1c686b5
--- /dev/null
+++ b/sw/source/core/crsr/trvltbl.hxx
@@ -0,0 +1,32 @@
+/* -*- 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_SW_SOURCE_CORE_CRSR_TRVLTBL_HXX
+#define INCLUDED_SW_SOURCE_CORE_CRSR_TRVLTBL_HXX
+
+#include <sal/config.h>
+
+// Travelling in tables
+sal_Bool GotoPrevTable( SwPaM&, SwPosTable, sal_Bool bInReadOnly );
+sal_Bool GotoCurrTable( SwPaM&, SwPosTable, sal_Bool bInReadOnly );
+sal_Bool GotoNextTable( SwPaM&, SwPosTable, sal_Bool bInReadOnly );
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx
index ff67c49..070aaea 100644
--- a/sw/source/core/doc/dbgoutsw.cxx
+++ b/sw/source/core/doc/dbgoutsw.cxx
@@ -51,13 +51,6 @@ static OString aDbgOutResult;
bool bDbgOutStdErr = false;
bool bDbgOutPrintAttrSet = false;
-char* db_pretty_print(const OUString* str, int flags, char* fmt)
-{
- (void) fmt;
- (void) flags;
- return const_cast<char*>(dbg_out(*str));
-}
-
template<class T>
static OUString lcl_dbg_out_SvPtrArr(const T & rArr)
{
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index 14f37d7..b54605b 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -107,7 +107,6 @@ public:
}
size_t GetLineCount() const { return aLines.size(); }
- sal_uLong GetLineOffset() const { return nSttLineNum; }
const CompareLine* GetLine( size_t nLine ) const
{ return aLines[ nLine ]; }
void InsertLine( CompareLine* pLine )
@@ -177,7 +176,6 @@ private:
static void SetDiscard( const CompareData& rData,
sal_Char* pDiscard, sal_uLong* pCounts );
static void CheckDiscard( sal_uLong nLen, sal_Char* pDiscard );
- static sal_uLong SetChangedFlag( CompareData& rData, sal_Char* pDiscard, int bFirst );
static void ShiftBoundaries( CompareData& rData1, CompareData& rData2 );
public:
@@ -1834,8 +1832,6 @@ public:
_SaveMergeRedlines( const SwNode& rDstNd,
const SwRangeRedline& rSrcRedl, Ring* pRing );
sal_uInt16 InsertRedline();
-
- SwRangeRedline* GetDestRedline() { return pDestRedl; }
};
_SaveMergeRedlines::_SaveMergeRedlines( const SwNode& rDstNd,
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 63b9a2b..4e458d2 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -1992,7 +1992,6 @@ public:
sal_uInt16* pPageCount, sal_uInt16* pPageStart );
void SetPam( SwPaM *pPam ) const;
inline void SetNode( SwNode *pNew ) { pNode = pNew; }
- inline const SwNode *GetNode() const { return pNode; }
inline void SetRange( const SwNode *pNew );
inline void NextNode() { ++nNode; }
inline sal_uInt16 *GetPageCnt() { return pPageCnt; }
diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx
index a481b89..65a91a0 100644
--- a/sw/source/core/doc/docfly.cxx
+++ b/sw/source/core/doc/docfly.cxx
@@ -66,8 +66,6 @@
#include <svx/xlnedit.hxx>
#include <svx/xflhtit.hxx>
-extern sal_uInt16 GetHtmlMode( const SwDocShell* );
-
using namespace ::com::sun::star;
sal_uInt16 SwDoc::GetFlyCount( FlyCntType eType ) const
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 3227260..c7088f7 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -116,20 +116,6 @@ struct ParaRstFmt
bInclRefToxMark( false ),
bKeepOutlineLevelAttr( false )
{}
-
- ParaRstFmt( SwHistory* pHst )
- : pFmtColl(0),
- pHistory(pHst),
- pSttNd(0),
- pEndNd(0),
- pDelSet(0),
- nWhich(0),
- bReset( false ),
- bResetListAttrs( false ), // #i62675#
- bResetAll( true ),
- bInclRefToxMark( false ),
- bKeepOutlineLevelAttr( false )
- {}
};
/** @params pArgs contains the document's ChrFmtTable
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index beb8096..8dcf9ee 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -26,6 +26,7 @@
#include <editeng/crossedoutitem.hxx>
#include <swmodule.hxx>
#include <doc.hxx>
+#include <docredln.hxx>
#include <IDocumentUndoRedo.hxx>
#include <docary.hxx>
#include <ndtxt.hxx>
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index df19168..a64c886 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -139,24 +139,6 @@ struct CR_SetBoxWidth
{
nLowerDiff = 0; nRemainWidth = 0;
}
-
- void AddBoxWidth( const SwTableBox& rBox, sal_uInt16 nWidth )
- {
- SwTableLine* p = (SwTableLine*)rBox.GetUpper();
- std::pair<SwTableLineWidthMap_t::iterator, bool> aPair =
- m_LineWidthMap.insert(std::make_pair(p,nWidth));
- if (!aPair.second)
- {
- aPair.first->second += nWidth;
- }
- }
-
- sal_uInt16 GetBoxWidth( const SwTableLine& rLn ) const
- {
- SwTableLine* p = (SwTableLine*)&rLn;
- SwTableLineWidthMap_t::const_iterator const it = m_LineWidthMap.find(p);
- return (it != m_LineWidthMap.end()) ? it->second : 0;
- }
};
static bool lcl_SetSelBoxWidth( SwTableLine* pLine, CR_SetBoxWidth& rParam,
@@ -303,7 +285,6 @@ struct _CpyPara
nCpyCnt(rPara.nCpyCnt), nInsPos(0), nLnIdx(rPara.nLnIdx), nBoxIdx(rPara.nBoxIdx),
nDelBorderFlag( rPara.nDelBorderFlag ), bCpyCntnt( rPara.bCpyCntnt )
{}
- void SetBoxWidth( SwTableBox* pBox );
};
static void lcl_CopyRow(_FndLine & rFndLine, _CpyPara *const pCpyPara);
@@ -1394,8 +1375,6 @@ struct _InsULPara
{ bUL_LR = false; bUL = true; if( pBox ) pInsBox = pBox; }
void SetRight( SwTableBox* pBox=0 )
{ bUL_LR = false; bUL = false; if( pBox ) pInsBox = pBox; }
- void SetUpper( SwTableLine* pLine=0 )
- { bUL_LR = true; bUL = true; if( pLine ) pInsLine = pLine; }
void SetLower( SwTableLine* pLine=0 )
{ bUL_LR = true; bUL = false; if( pLine ) pInsLine = pLine; }
};
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 9091b66..7aafb95 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -18,6 +18,7 @@
*/
#include <com/sun/star/chart2/XChartDocument.hpp>
+#include <fesh.hxx>
#include <hintids.hxx>
#include <editeng/lrspitem.hxx>
#include <editeng/formatbreakitem.hxx>
@@ -98,11 +99,6 @@ using namespace ::com::sun::star;
const sal_Unicode T2T_PARA = 0x0a;
-extern void ClearFEShellTabCols();
-
-// Located in gctable.cxx
-extern sal_Bool sw_GC_Line_Border( const SwTableLine*& , void* pPara );
-
static void lcl_SetDfltBoxAttr( SwFrmFmt& rFmt, sal_uInt8 nId )
{
sal_Bool bTop = false, bBottom = false, bLeft = false, bRight = false;
diff --git a/sw/source/core/docnode/ndtbl1.cxx b/sw/source/core/docnode/ndtbl1.cxx
index 744dafe..2fa8089 100644
--- a/sw/source/core/docnode/ndtbl1.cxx
+++ b/sw/source/core/docnode/ndtbl1.cxx
@@ -22,6 +22,7 @@
#include <editeng/boxitem.hxx>
#include <editeng/brushitem.hxx>
#include <editeng/frmdiritem.hxx>
+#include <fesh.hxx>
#include <fmtornt.hxx>
#include <fmtfsize.hxx>
#include <fmtlsplt.hxx>
@@ -52,8 +53,6 @@
using ::editeng::SvxBorderLine;
using namespace ::com::sun::star;
-extern void ClearFEShellTabCols();
-
// See swtable.cxx too
#define COLFUZZY 20L
diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx
index d0c84bd..f9f5b94 100644
--- a/sw/source/core/edit/edlingu.cxx
+++ b/sw/source/core/edit/edlingu.cxx
@@ -74,7 +74,6 @@ public:
SwLinguIter();
inline SwEditShell *GetSh() { return pSh; }
- inline const SwEditShell *GetSh() const { return pSh; }
inline const SwPosition *GetEnd() const { return pEnd; }
inline void SetEnd( SwPosition* pNew ){ delete pEnd; pEnd = pNew; }
diff --git a/sw/source/core/edit/edtab.cxx b/sw/source/core/edit/edtab.cxx
index 15852ae..e650d51 100644
--- a/sw/source/core/edit/edtab.cxx
+++ b/sw/source/core/edit/edtab.cxx
@@ -18,6 +18,7 @@
*/
#include <com/sun/star/chart2/XChartDocument.hpp>
+#include <fesh.hxx>
#include <hintids.hxx>
#include <hints.hxx>
@@ -49,8 +50,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-extern void ClearFEShellTabCols();
-
//Added for bug #i119954# Application crashed if undo/redo covert nest table to text
sal_Bool ConvertTableToText( const SwTableNode *pTableNode, sal_Unicode cCh );
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index f1f9548..7ddaac8 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <UndoTable.hxx>
#include <hintids.hxx>
#include <unotools/collatorwrapper.hxx>
#include <unotools/charclass.hxx>
@@ -536,7 +539,6 @@ sal_uInt16 SwSetExpFieldType::SetSeqRefNo( SwSetExpField& rFld )
if( !GetDepends() || !(nsSwGetSetExpType::GSE_SEQ & nType) )
return USHRT_MAX;
-extern void InsertSort( std::vector<sal_uInt16>& rArr, sal_uInt16 nIdx, sal_uInt16* pInsPos = 0 );
std::vector<sal_uInt16> aArr;
sal_uInt16 n;
diff --git a/sw/source/core/fields/postithelper.cxx b/sw/source/core/fields/postithelper.cxx
index e259a18..66d354d 100644
--- a/sw/source/core/fields/postithelper.cxx
+++ b/sw/source/core/fields/postithelper.cxx
@@ -38,43 +38,6 @@
class Point;
-namespace {
-
-struct LayoutInfoOrder
-{
- bool operator()( const SwLayoutInfo& rLayoutInfo,
- const SwLayoutInfo& rNewLayoutInfo )
- {
- if ( rLayoutInfo.mnPageNumber != rNewLayoutInfo.mnPageNumber )
- {
- // corresponding <SwFrm> instances are on different pages
- return rLayoutInfo.mnPageNumber < rNewLayoutInfo.mnPageNumber;
- }
- else
- {
- // corresponding <SwFrm> instances are in different repeating table header rows
- OSL_ENSURE( rLayoutInfo.mpAnchorFrm->FindTabFrm(),
- "<LayoutInfoOrder::operator()> - table frame not found" );
- OSL_ENSURE( rNewLayoutInfo.mpAnchorFrm->FindTabFrm(),
- "<LayoutInfoOrder::operator()> - table frame not found" );
- const SwTabFrm* pLayoutInfoTabFrm( rLayoutInfo.mpAnchorFrm->FindTabFrm() );
- const SwTabFrm* pNewLayoutInfoTabFrm( rNewLayoutInfo.mpAnchorFrm->FindTabFrm() );
- const SwTabFrm* pTmpTabFrm( pNewLayoutInfoTabFrm );
- while ( pTmpTabFrm && pTmpTabFrm->GetFollow() )
- {
- pTmpTabFrm = static_cast<const SwTabFrm*>(pTmpTabFrm->GetFollow()->GetFrm());
- if ( pTmpTabFrm == pLayoutInfoTabFrm )
- {
- return false;
- }
- }
- return true;
- }
- }
-};
-
-} // eof anonymous namespace
-
SwPostItHelper::SwLayoutStatus SwPostItHelper::getLayoutInfos(
SwLayoutInfo& o_rInfo,
const SwPosition& rAnchorPos,
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index 6198522..b9faba3 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -66,8 +66,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::text;
using namespace ::com::sun::star::lang;
-extern void InsertSort( std::vector<sal_uInt16>& rArr, sal_uInt16 nIdx, sal_uInt16* pInsPos = 0 );
-
static void lcl_GetLayTree( const SwFrm* pFrm, std::vector<const SwFrm*>& rArr )
{
while( pFrm )
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index 1ceadbf..e7cda7a 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -70,10 +70,6 @@
using namespace ::com::sun::star;
-// To register Flys in Flys in ...
-// as defined in layout/frmtool.cxx
-void RegistFlys( SwPageFrm*, const SwLayoutFrm* );
-
/***********************************************************************
#* Class : SwDoc
#* Methode : UseSpzLayoutFmt
diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx
index e822758..98d0ff6 100644
--- a/sw/source/core/frmedt/tblsel.cxx
+++ b/sw/source/core/frmedt/tblsel.cxx
@@ -72,9 +72,6 @@ struct _CmpLPt
_CmpLPt( const Point& rPt, const SwTableBox* pBox, bool bVertical );
- bool operator==( const _CmpLPt& rCmp ) const
- { return X() == rCmp.X() && Y() == rCmp.Y(); }
-
bool operator<( const _CmpLPt& rCmp ) const
{
if ( bVert )
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 578b6f8a..a2e56de 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -18,6 +18,7 @@
*/
#include <hintids.hxx>
+#include <mdiexp.hxx>
#include <tools/helpers.hxx>
#include <tools/urlobj.hxx>
#include <svl/undo.hxx>
diff --git a/sw/source/core/inc/UndoTable.hxx b/sw/source/core/inc/UndoTable.hxx
index 5eff209..867381c 100644
--- a/sw/source/core/inc/UndoTable.hxx
+++ b/sw/source/core/inc/UndoTable.hxx
@@ -374,6 +374,8 @@ public:
virtual void RepeatImpl( ::sw::RepeatContext & ) SAL_OVERRIDE;
};
+void InsertSort( std::vector<sal_uInt16>& rArr, sal_uInt16 nIdx, sal_uInt16* pInsPos = 0 );
+
#endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOTABLE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/docredln.hxx b/sw/source/core/inc/docredln.hxx
new file mode 100644
index 0000000..e1b4f79
--- /dev/null
+++ b/sw/source/core/inc/docredln.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_SW_SOURCE_CORE_INC_DOCREDLN_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_DOCREDLN_HXX
+
+#include <sal/config.h>
+
+#if defined DBG_UTIL
+
+void sw_DebugRedline( const SwDoc* pDoc );
+
+#endif
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/unofreg.hxx b/sw/source/core/inc/unofreg.hxx
new file mode 100644
index 0000000..fb17207
--- /dev/null
+++ b/sw/source/core/inc/unofreg.hxx
@@ -0,0 +1,125 @@
+/* -*- 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_SW_SOURCE_CORE_INC_UNOFREG_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNOFREG_HXX
+
+#include <sal/config.h>
+
+#include <com/sun/star/uno/Exception.hpp>
+
+namespace com { namespace sun { namespace star { namespace lang {
+ class XMultiServiceFactory;
+} } } }
+
+// module
+css::uno::Sequence< OUString > SAL_CALL SwUnoModule_getSupportedServiceNames() throw();
+OUString SAL_CALL SwUnoModule_getImplementationName() throw();
+css::uno::Reference< css::uno::XInterface > SAL_CALL SwUnoModule_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > &rSMgr ) throw( css::uno::Exception );
+
+// writer documents
+css::uno::Sequence< OUString > SAL_CALL SwTextDocument_getSupportedServiceNames() throw();
+OUString SAL_CALL SwTextDocument_getImplementationName() throw();
+css::uno::Reference< css::uno::XInterface > SAL_CALL SwTextDocument_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > &rSMgr, const sal_uInt64 _nCreationFlags ) throw( css::uno::Exception );
+css::uno::Sequence< OUString > SAL_CALL SwWebDocument_getSupportedServiceNames() throw();
+OUString SAL_CALL SwWebDocument_getImplementationName() throw();
+css::uno::Reference< css::uno::XInterface > SAL_CALL SwWebDocument_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > &rSMgr ) throw( css::uno::Exception );
+css::uno::Sequence< OUString > SAL_CALL SwGlobalDocument_getSupportedServiceNames() throw();
+OUString SAL_CALL SwGlobalDocument_getImplementationName() throw();
+css::uno::Reference< css::uno::XInterface > SAL_CALL SwGlobalDocument_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > &rSMgr ) throw( css::uno::Exception );
+
+// xml import
+css::uno::Sequence< OUString > SAL_CALL SwXMLImport_getSupportedServiceNames() throw();
+OUString SAL_CALL SwXMLImport_getImplementationName() throw();
+css::uno::Reference< css::uno::XInterface > SAL_CALL SwXMLImport_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr) throw( css::uno::Exception );
+css::uno::Sequence< OUString > SAL_CALL SwXMLImportStyles_getSupportedServiceNames() throw();
+OUString SAL_CALL SwXMLImportStyles_getImplementationName() throw();
+css::uno::Reference< css::uno::XInterface > SAL_CALL SwXMLImportStyles_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr) throw( css::uno::Exception );
+css::uno::Sequence< OUString > SAL_CALL SwXMLImportContent_getSupportedServiceNames() throw();
+OUString SAL_CALL SwXMLImportContent_getImplementationName() throw();
+css::uno::Reference< css::uno::XInterface > SAL_CALL SwXMLImportContent_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr) throw( css::uno::Exception );
+
+css::uno::Sequence< OUString > SAL_CALL SwXMLImportMeta_getSupportedServiceNames() throw();
+OUString SAL_CALL SwXMLImportMeta_getImplementationName() throw();
+css::uno::Reference< css::uno::XInterface > SAL_CALL SwXMLImportMeta_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr) throw( css::uno::Exception );
+
+css::uno::Sequence< OUString > SAL_CALL SwXMLImportSettings_getSupportedServiceNames() throw();
+OUString SAL_CALL SwXMLImportSettings_getImplementationName() throw();
+css::uno::Reference< css::uno::XInterface > SAL_CALL SwXMLImportSettings_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr) throw( css::uno::Exception );
+
+// xml export (OOo)
+css::uno::Sequence< OUString > SAL_CALL SwXMLExportOOO_getSupportedServiceNames() throw();
+OUString SAL_CALL SwXMLExportOOO_getImplementationName() throw();
+css::uno::Reference< css::uno::XInterface > SAL_CALL SwXMLExportOOO_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr) throw( css::uno::Exception );
+css::uno::Sequence< OUString > SAL_CALL SwXMLExportContentOOO_getSupportedServiceNames() throw();
+OUString SAL_CALL SwXMLExportContentOOO_getImplementationName() throw();
+css::uno::Reference< css::uno::XInterface > SAL_CALL SwXMLExportContentOOO_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr) throw( css::uno::Exception );
+css::uno::Sequence< OUString > SAL_CALL SwXMLExportStylesOOO_getSupportedServiceNames() throw();
+OUString SAL_CALL SwXMLExportStylesOOO_getImplementationName() throw();
+css::uno::Reference< css::uno::XInterface > SAL_CALL SwXMLExportStylesOOO_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr) throw( css::uno::Exception );
+css::uno::Sequence< OUString > SAL_CALL SwXMLExportMetaOOO_getSupportedServiceNames() throw();
+OUString SAL_CALL SwXMLExportMetaOOO_getImplementationName() throw();
+css::uno::Reference< css::uno::XInterface > SAL_CALL SwXMLExportMetaOOO_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr) throw( css::uno::Exception );
+css::uno::Sequence< OUString > SAL_CALL SwXMLExportSettingsOOO_getSupportedServiceNames() throw();
+OUString SAL_CALL SwXMLExportSettingsOOO_getImplementationName() throw();
+css::uno::Reference< css::uno::XInterface > SAL_CALL SwXMLExportSettingsOOO_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr) throw( css::uno::Exception );
+
+// xml export (OASIS)
+css::uno::Sequence< OUString > SAL_CALL SwXMLExport_getSupportedServiceNames() throw();
+OUString SAL_CALL SwXMLExport_getImplementationName() throw();
+css::uno::Reference< css::uno::XInterface > SAL_CALL SwXMLExport_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr) throw( css::uno::Exception );
+css::uno::Sequence< OUString > SAL_CALL SwXMLExportContent_getSupportedServiceNames() throw();
+OUString SAL_CALL SwXMLExportContent_getImplementationName() throw();
+css::uno::Reference< css::uno::XInterface > SAL_CALL SwXMLExportContent_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr) throw( css::uno::Exception );
+css::uno::Sequence< OUString > SAL_CALL SwXMLExportStyles_getSupportedServiceNames() throw();
+OUString SAL_CALL SwXMLExportStyles_getImplementationName() throw();
+css::uno::Reference< css::uno::XInterface > SAL_CALL SwXMLExportStyles_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr) throw( css::uno::Exception );
+css::uno::Sequence< OUString > SAL_CALL SwXMLExportMeta_getSupportedServiceNames() throw();
+OUString SAL_CALL SwXMLExportMeta_getImplementationName() throw();
+css::uno::Reference< css::uno::XInterface > SAL_CALL SwXMLExportMeta_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr) throw( css::uno::Exception );
+css::uno::Sequence< OUString > SAL_CALL SwXMLExportSettings_getSupportedServiceNames() throw();
+OUString SAL_CALL SwXMLExportSettings_getImplementationName() throw();
+css::uno::Reference< css::uno::XInterface > SAL_CALL SwXMLExportSettings_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr) throw( css::uno::Exception );
+
+//API objects
+css::uno::Sequence< OUString > SAL_CALL SwXAutoTextContainer_getSupportedServiceNames() throw();
+OUString SAL_CALL SwXAutoTextContainer_getImplementationName() throw();
+css::uno::Reference< css::uno::XInterface > SAL_CALL SwXAutoTextContainer_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr) throw( css::uno::Exception );
+
+css::uno::Sequence< OUString > SAL_CALL SwXModule_getSupportedServiceNames() throw();
+OUString SAL_CALL SwXModule_getImplementationName() throw();
+css::uno::Reference< css::uno::XInterface > SAL_CALL SwXModule_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr) throw( css::uno::Exception );
+
+css::uno::Sequence< OUString > SAL_CALL SwXMailMerge_getSupportedServiceNames() throw();
+OUString SAL_CALL SwXMailMerge_getImplementationName() throw();
+css::uno::Reference< css::uno::XInterface > SAL_CALL SwXMailMerge_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr) throw( css::uno::Exception );
+
+css::uno::Sequence< OUString > SAL_CALL SwXMailMerge_getSupportedServiceNames() throw();
+OUString SAL_CALL SwXMailMerge_getImplementationName() throw();
+css::uno::Reference< css::uno::XInterface > SAL_CALL SwXMailMerge_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr) throw( css::uno::Exception );
+
+// Layout dump filter
+css::uno::Sequence< OUString > SAL_CALL LayoutDumpFilter_getSupportedServiceNames() throw();
+OUString SAL_CALL LayoutDumpFilter_getImplementationName() throw();
+css::uno::Reference< css::uno::XInterface > SAL_CALL LayoutDumpFilter_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > &rSMgr ) throw( css::uno::Exception );
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/dumpfilter.cxx b/sw/source/core/layout/dumpfilter.cxx
index 580fe2c..83d2f64 100644
--- a/sw/source/core/layout/dumpfilter.cxx
+++ b/sw/source/core/layout/dumpfilter.cxx
@@ -8,6 +8,7 @@
*/
#include "dumpfilter.hxx"
+#include "unofreg.hxx"
#include <wrtsh.hxx>
#include <cppuhelper/supportsservice.hxx>
@@ -21,12 +22,12 @@
using namespace ::com::sun::star;
-OUString SAL_CALL LayoutDumpFilter_getImplementationName() throw( uno::RuntimeException )
+OUString SAL_CALL LayoutDumpFilter_getImplementationName() throw()
{
return OUString( "com.sun.star.comp.Writer.LayoutDump" );
}
-uno::Sequence< OUString > SAL_CALL LayoutDumpFilter_getSupportedServiceNames() throw( uno::RuntimeException )
+uno::Sequence< OUString > SAL_CALL LayoutDumpFilter_getSupportedServiceNames() throw()
{
uno::Sequence< OUString > aSeq( 1 );
aSeq[0] = "com.sun.star.document.ExportFilter";
@@ -35,6 +36,7 @@ uno::Sequence< OUString > SAL_CALL LayoutDumpFilter_getSupportedServiceNames() t
uno::Reference< uno::XInterface > SAL_CALL LayoutDumpFilter_createInstance(
const uno::Reference< lang::XMultiServiceFactory > & )
+ throw (css::uno::Exception)
{
return static_cast< cppu::OWeakObject* >( new sw::LayoutDumpFilter( ) );
}
diff --git a/sw/source/core/layout/flyincnt.cxx b/sw/source/core/layout/flyincnt.cxx
index 0fa9b59..0cafd37 100644
--- a/sw/source/core/layout/flyincnt.cxx
+++ b/sw/source/core/layout/flyincnt.cxx
@@ -26,9 +26,6 @@
// OD 2004-01-19 #110582#
#include <dflyobj.hxx>
-//from FlyCnt.cxx
-void DeepCalc( const SwFrm *pFrm );
-
SwFlyInCntFrm::SwFlyInCntFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm *pAnch ) :
SwFlyFrm( pFmt, pSib, pAnch )
{
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 8ccbe50..eb3133a 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -182,8 +182,6 @@ class SwSubsRects : public SwLineRects
void RemoveSuperfluousSubsidiaryLines( const SwLineRects &rRects );
public:
void PaintSubsidiary( OutputDevice *pOut, const SwLineRects *pRects );
-
- inline void Ins( const SwRect &rRect, const sal_uInt8 nSCol );
};
class BorderLines
@@ -821,16 +819,6 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut )
}
}
-inline void SwSubsRects::Ins( const SwRect &rRect, const sal_uInt8 nSCol )
-{
- // Lines that are shorted than the largest line width won't be inserted
- if ( rRect.Height() > DEF_LINE_WIDTH_4 || rRect.Width() > DEF_LINE_WIDTH_4 )
- {
- this->push_back(
- SwLineRect(rRect, 0, table::BorderLineStyle::SOLID, 0, nSCol));
- }
-}
-
void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const SwLineRects &rRects )
{
// All help lines that are covered by any border will be removed or split
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index 84144f2..ab74b74 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -78,16 +78,6 @@ public:
void InsertObj( SwOLEObj& rObj );
void RemoveObj( SwOLEObj& rObj );
-
- void RemovePtr( SwOLEObj* pObj )
- {
- OleObjects_t::iterator const it =
- std::find(m_OleObjects.begin(), m_OleObjects.end(), pObj);
- if (it != m_OleObjects.end())
- {
- m_OleObjects.erase(it);
- }
- }
};
SwOLELRUCache* pOLELRU_Cache = 0;
diff --git a/sw/source/core/sw3io/sw3convert.cxx b/sw/source/core/sw3io/sw3convert.cxx
index ad53dc4..9056381 100644
--- a/sw/source/core/sw3io/sw3convert.cxx
+++ b/sw/source/core/sw3io/sw3convert.cxx
@@ -18,6 +18,7 @@
*/
#include "hintids.hxx"
+#include "sw3convert.hxx"
#include <tools/resid.hxx>
#include <svl/macitem.hxx>
#include <svl/zforlist.hxx>
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index 19f1c61..77bd9e6 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -2639,7 +2639,6 @@ public:
if (m_pTabFrm->IsFollow())
m_pTabFrm = m_pTabFrm->FindMaster(true);
}
- const SwTable * getTable() const { return m_pTable; }
const SwCellFrm * getCellFrm() const { return m_pCellFrm; }
diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx
index b85e4c0..b7040f9 100644
--- a/sw/source/core/text/frmcrsr.cxx
+++ b/sw/source/core/text/frmcrsr.cxx
@@ -544,7 +544,6 @@ struct SwFillData
long Left() const { return aFrm.Left(); }
long Right() const { return aFrm.Right(); }
long Bottom() const { return aFrm.Bottom(); }
- SwRect& Frm() { return aFrm; }
SwFillCrsrPos &Fill() const { return *pCMS->pFill; }
void SetTab( MSHORT nNew ) { pCMS->pFill->nTabCnt = nNew; }
void SetSpace( MSHORT nNew ) { pCMS->pFill->nSpaceCnt = nNew; }
diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx
index ab556af..6eb433e 100644
--- a/sw/source/core/text/txtfly.cxx
+++ b/sw/source/core/text/txtfly.cxx
@@ -20,6 +20,7 @@
#include <vcl/outdev.hxx>
#include <vcl/virdev.hxx>
+#include "dcontact.hxx"
#include "pagefrm.hxx"
#include "rootfrm.hxx"
#include "pam.hxx"
diff --git a/sw/source/core/text/txtio.cxx b/sw/source/core/text/txtio.cxx
index 8a63de8..1fdb8c8 100644
--- a/sw/source/core/text/txtio.cxx
+++ b/sw/source/core/text/txtio.cxx
@@ -100,16 +100,6 @@ IMPL_OUTOP( SwArrowPortion )
IMPL_OUTOP( SwMultiPortion )
IMPL_OUTOP( SwCombinedPortion )
-const char *GetPortionName( const MSHORT )
-{
- return 0;
-}
-
-const char *GetPrepName( const PrepareHint )
-{
- return 0;
-}
-
#else
#include <limits.h>
#include <stdlib.h>
@@ -120,10 +110,6 @@ const char *GetPrepName( const PrepareHint )
CONSTCHAR( pClose, "} " );
-/*************************************************************************
- * GetPortionName()
- *************************************************************************/
-
CONSTCHAR( pPOR_LIN, "LIN" );
CONSTCHAR( pPOR_TXT, "TXT" );
CONSTCHAR( pPOR_SHADOW, "SHADOW" );
@@ -164,11 +150,6 @@ CONSTCHAR( pPOR_BULLET, "BULLET" );
CONSTCHAR( pPOR_UNKW, "UNKW" );
CONSTCHAR( pPOR_PAR, "PAR" );
-const char *GetPortionName( const MSHORT /*nType*/ )
-{
- return 0;
-}
-
CONSTCHAR( pPREP_CLEAR, "CLEAR" );
CONSTCHAR( pPREP_WIDOWS_ORPHANS, "WIDOWS_ORPHANS" );
CONSTCHAR( pPREP_FIXSIZE_CHG, "FIXSIZE_CHG" );
@@ -188,22 +169,6 @@ CONSTCHAR( pPREP_WIDOWS, "ORPHANS" );
CONSTCHAR( pPREP_QUOVADIS, "QUOVADIS" );
CONSTCHAR( pPREP_PAGE, "PAGE" );
-const char *GetPrepName( const PrepareHint ePrep )
-{
- // Kurz und schmerzlos:
- const char *ppNameArr[PREP_END] =
- {
- pPREP_CLEAR, pPREP_WIDOWS_ORPHANS, pPREP_FIXSIZE_CHG,
- pPREP_FOLLOW_FOLLOWS, pPREP_ADJUST_FRM, pPREP_FREE_SPACE,
- pPREP_FLY_CHGD, pPREP_FLY_ATTR_CHG, pPREP_FLY_ARRIVE,
- pPREP_FLY_LEAVE, pPREP_VIEWOPT, pPREP_FTN, pPREP_POS_CHGD,
- pPREP_UL_SPACE, pPREP_MUST_FIT, pPREP_WIDOWS, pPREP_QUOVADIS,
- pPREP_PAGE
- };
- OSL_ENSURE( ePrep < PREP_END, "GetPrepName: unknown PrepareHint" );
- return( ppNameArr[ePrep] );
-}
-
SvStream &SwLinePortion::operator<<( SvStream &rOs ) const //$ ostream
{
rOs << " {";
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index 00a38b5..3c4ced3 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -400,12 +400,6 @@ sal_uInt16 SwForm::GetFormMaxLevel( TOXTypes eTOXType )
return nRet;
}
-// #i21237#
-bool operator == (const SwFormToken & rToken, FormTokenType eType)
-{
- return rToken.eTokenType == eType;
-}
-
void SwForm::AdjustTabStops( SwDoc& rDoc ) // #i21237#
{
for(sal_uInt16 nLevel = 1; nLevel < GetFormMax(); nLevel++)
diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx
index 9da547b..9ec2924 100644
--- a/sw/source/core/txtnode/fntcap.cxx
+++ b/sw/source/core/txtnode/fntcap.cxx
@@ -372,7 +372,6 @@ public:
virtual void Init( SwFntObj *pUpperFont, SwFntObj *pLowerFont ) SAL_OVERRIDE;
virtual void Do() SAL_OVERRIDE;
- void DrawSpace( const Point &rPos );
inline sal_Int32 GetCrsr(){ return nCrsr; }
};
diff --git a/sw/source/core/uibase/app/docsh2.cxx b/sw/source/core/uibase/app/docsh2.cxx
index 8c0cfbd..3f4ff81 100644
--- a/sw/source/core/uibase/app/docsh2.cxx
+++ b/sw/source/core/uibase/app/docsh2.cxx
@@ -121,8 +121,6 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star;
using namespace ::sfx2;
-extern bool FindPhyStyle( SwDoc& , const OUString& , SfxStyleFamily );
-
// create DocInfo (virtual)
SfxDocumentInfoDialog* SwDocShell::CreateDocumentInfoDialog(
Window *pParent, const SfxItemSet &rSet)
diff --git a/sw/source/core/uibase/app/docstyle.cxx b/sw/source/core/uibase/app/docstyle.cxx
index fb91ee4..db739ce 100644
--- a/sw/source/core/uibase/app/docstyle.cxx
+++ b/sw/source/core/uibase/app/docstyle.cxx
@@ -78,8 +78,6 @@ class SwImplShellAction
public:
SwImplShellAction( SwDoc& rDoc );
~SwImplShellAction();
-
- SwWrtShell* GetSh() { return pSh; }
};
SwImplShellAction::SwImplShellAction( SwDoc& rDoc )
@@ -322,25 +320,6 @@ static sal_uInt16 lcl_FindName(const SwPoolFmtList& rLst, SfxStyleFamily eFam,
return USHRT_MAX;
}
-bool FindPhyStyle( SwDoc& rDoc, const OUString& rName, SfxStyleFamily eFam )
-{
- switch( eFam )
- {
- case SFX_STYLE_FAMILY_CHAR :
- return 0 != lcl_FindCharFmt( rDoc, rName, 0, false );
- case SFX_STYLE_FAMILY_PARA :
- return 0 != lcl_FindParaFmt( rDoc, rName, 0, false );
- case SFX_STYLE_FAMILY_FRAME:
- return 0 != lcl_FindFrmFmt( rDoc, rName, 0, false );
- case SFX_STYLE_FAMILY_PAGE :
- return 0 != lcl_FindPageDesc( rDoc, rName, 0, false );
- case SFX_STYLE_FAMILY_PSEUDO:
- return 0 != lcl_FindNumRule( rDoc, rName, 0, false );
- default:; //prevent warning
- }
- return false;
-}
-
// Add Strings to the list of templates
void SwPoolFmtList::Append( char cChar, const OUString& rStr )
{
diff --git a/sw/source/core/uibase/docvw/edtwin3.cxx b/sw/source/core/uibase/docvw/edtwin3.cxx
index a860d48..edd9567 100644
--- a/sw/source/core/uibase/docvw/edtwin3.cxx
+++ b/sw/source/core/uibase/docvw/edtwin3.cxx
@@ -101,33 +101,6 @@ sal_Bool SwEditWin::RulerMarginDrag( const MouseEvent& rMEvt,
return !rRuler.StartDocDrag( rMEvt, RULER_TYPE_INDENT);
}
-void SwAccessibilityScrollMDI(SwViewShell* pVwSh, const SwRect& rRect , sal_uInt16 nRangeX, sal_uInt16 nRangeY, sal_Bool isLeftTop)
-{
- SfxViewShell *pSfxVwSh = pVwSh->GetSfxViewShell();
- if (pSfxVwSh && pSfxVwSh->ISA(SwView))
- {
- SwView* pView = (SwView *)pSfxVwSh;
-
- Size aSz( rRect.Left(), rRect.Top());
- aSz = pView->GetEditWin().PixelToLogic( aSz );
-
- Point aTopLeft( aSz.Width(), aSz.Height() );
- Point aPoint;
- Rectangle aRect(aTopLeft,aPoint);
-
- sal_Bool bIsCrsrAtTop = pView->IsCrsrAtTop();
- sal_Bool bIsCrsrAtCenter = pView->IsCrsrAtCenter();
- if(isLeftTop)
- pView->SetCrsrAtTop(sal_True);
-
- pView->Scroll( aRect, nRangeX, nRangeY );
-
- if(isLeftTop)
- pView->SetCrsrAtTop(bIsCrsrAtTop, bIsCrsrAtCenter);
- }
-
-}
-
TblChgMode GetTblChgDefaultMode()
{
SwModuleOptions* pOpt = SW_MOD()->GetModuleConfig();
diff --git a/sw/source/core/uibase/uno/unodoc.cxx b/sw/source/core/uibase/uno/unodoc.cxx
index 94c2f85..41189d2 100644
--- a/sw/source/core/uibase/uno/unodoc.cxx
+++ b/sw/source/core/uibase/uno/unodoc.cxx
@@ -20,6 +20,7 @@
#include <sfx2/docfac.hxx>
#include <sfx2/sfxmodelfactory.hxx>
#include "swdll.hxx"
+#include "unofreg.hxx"
#include "docsh.hxx"
#include "globdoc.hxx"
#include "wdocsh.hxx"
diff --git a/sw/source/core/uibase/uno/unofreg.cxx b/sw/source/core/uibase/uno/unofreg.cxx
index c8b3252..239c513 100644
--- a/sw/source/core/uibase/uno/unofreg.cxx
+++ b/sw/source/core/uibase/uno/unofreg.cxx
@@ -18,6 +18,7 @@
*/
#include "SwXFilterOptions.hxx"
+#include "unofreg.hxx"
#include "sal/types.h"
#include <osl/diagnose.h>
#include <cppuhelper/factory.hxx>
@@ -28,97 +29,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
-// module
-extern uno::Sequence< OUString > SAL_CALL SwUnoModule_getSupportedServiceNames() throw();
-extern OUString SAL_CALL SwUnoModule_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL SwUnoModule_createInstance( const uno::Reference< XMultiServiceFactory > &rSMgr ) throw( uno::Exception );
-
-// writer documents
-extern uno::Sequence< OUString > SAL_CALL SwTextDocument_getSupportedServiceNames() throw();
-extern OUString SAL_CALL SwTextDocument_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL SwTextDocument_createInstance( const uno::Reference< XMultiServiceFactory > &rSMgr, const sal_uInt64 _nCreationFlags ) throw( uno::Exception );
-extern uno::Sequence< OUString > SAL_CALL SwWebDocument_getSupportedServiceNames() throw();
-extern OUString SAL_CALL SwWebDocument_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL SwWebDocument_createInstance( const uno::Reference< XMultiServiceFactory > &rSMgr ) throw( uno::Exception );
-extern uno::Sequence< OUString > SAL_CALL SwGlobalDocument_getSupportedServiceNames() throw();
-extern OUString SAL_CALL SwGlobalDocument_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL SwGlobalDocument_createInstance( const uno::Reference< XMultiServiceFactory > &rSMgr ) throw( uno::Exception );
-
-// xml import
-extern uno::Sequence< OUString > SAL_CALL SwXMLImport_getSupportedServiceNames() throw();
-extern OUString SAL_CALL SwXMLImport_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL SwXMLImport_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
-extern uno::Sequence< OUString > SAL_CALL SwXMLImportStyles_getSupportedServiceNames() throw();
-extern OUString SAL_CALL SwXMLImportStyles_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL SwXMLImportStyles_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
-extern uno::Sequence< OUString > SAL_CALL SwXMLImportContent_getSupportedServiceNames() throw();
-extern OUString SAL_CALL SwXMLImportContent_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL SwXMLImportContent_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
-
-extern uno::Sequence< OUString > SAL_CALL SwXMLImportMeta_getSupportedServiceNames() throw();
-extern OUString SAL_CALL SwXMLImportMeta_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL SwXMLImportMeta_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
-
-extern uno::Sequence< OUString > SAL_CALL SwXMLImportSettings_getSupportedServiceNames() throw();
-extern OUString SAL_CALL SwXMLImportSettings_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL SwXMLImportSettings_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
-
-// xml export (OOo)
-extern uno::Sequence< OUString > SAL_CALL SwXMLExportOOO_getSupportedServiceNames() throw();
-extern OUString SAL_CALL SwXMLExportOOO_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExportOOO_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
-extern uno::Sequence< OUString > SAL_CALL SwXMLExportContentOOO_getSupportedServiceNames() throw();
-extern OUString SAL_CALL SwXMLExportContentOOO_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExportContentOOO_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
-extern uno::Sequence< OUString > SAL_CALL SwXMLExportStylesOOO_getSupportedServiceNames() throw();
-extern OUString SAL_CALL SwXMLExportStylesOOO_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExportStylesOOO_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
-extern uno::Sequence< OUString > SAL_CALL SwXMLExportMetaOOO_getSupportedServiceNames() throw();
-extern OUString SAL_CALL SwXMLExportMetaOOO_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExportMetaOOO_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
-extern uno::Sequence< OUString > SAL_CALL SwXMLExportSettingsOOO_getSupportedServiceNames() throw();
-extern OUString SAL_CALL SwXMLExportSettingsOOO_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExportSettingsOOO_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
-
-// xml export (OASIS)
-extern uno::Sequence< OUString > SAL_CALL SwXMLExport_getSupportedServiceNames() throw();
-extern OUString SAL_CALL SwXMLExport_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExport_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
-extern uno::Sequence< OUString > SAL_CALL SwXMLExportContent_getSupportedServiceNames() throw();
-extern OUString SAL_CALL SwXMLExportContent_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExportContent_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
-extern uno::Sequence< OUString > SAL_CALL SwXMLExportStyles_getSupportedServiceNames() throw();
-extern OUString SAL_CALL SwXMLExportStyles_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExportStyles_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
-extern uno::Sequence< OUString > SAL_CALL SwXMLExportMeta_getSupportedServiceNames() throw();
-extern OUString SAL_CALL SwXMLExportMeta_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExportMeta_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
-extern uno::Sequence< OUString > SAL_CALL SwXMLExportSettings_getSupportedServiceNames() throw();
-extern OUString SAL_CALL SwXMLExportSettings_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL SwXMLExportSettings_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
-
-//API objects
-extern uno::Sequence< OUString > SAL_CALL SwXAutoTextContainer_getSupportedServiceNames() throw();
-extern OUString SAL_CALL SwXAutoTextContainer_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL SwXAutoTextContainer_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
-
-extern uno::Sequence< OUString > SAL_CALL SwXModule_getSupportedServiceNames() throw();
-extern OUString SAL_CALL SwXModule_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL SwXModule_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
-
-extern uno::Sequence< OUString > SAL_CALL SwXMailMerge_getSupportedServiceNames() throw();
-extern OUString SAL_CALL SwXMailMerge_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL SwXMailMerge_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
-
-extern uno::Sequence< OUString > SAL_CALL SwXMailMerge_getSupportedServiceNames() throw();
-extern OUString SAL_CALL SwXMailMerge_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL SwXMailMerge_createInstance(const uno::Reference< XMultiServiceFactory > & rSMgr) throw( uno::Exception );
-
-// Layout dump filter
-extern uno::Sequence< OUString > SAL_CALL LayoutDumpFilter_getSupportedServiceNames() throw();
-extern OUString SAL_CALL LayoutDumpFilter_getImplementationName() throw();
-extern uno::Reference< uno::XInterface > SAL_CALL LayoutDumpFilter_createInstance( const uno::Reference< XMultiServiceFactory > &rSMgr ) throw( uno::Exception );
-
// #i73788#
#include "cppuhelper/implementationentry.hxx"
namespace comp_FinalThreadManager {
diff --git a/sw/source/core/uibase/uno/unomailmerge.cxx b/sw/source/core/uibase/uno/unomailmerge.cxx
index 3131aa0..f1cc896 100644
--- a/sw/source/core/uibase/uno/unomailmerge.cxx
+++ b/sw/source/core/uibase/uno/unomailmerge.cxx
@@ -70,6 +70,7 @@
#include <unomid.h>
+#include <boost/noncopyable.hpp>
#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star;
@@ -184,7 +185,8 @@ static bool LoadFromURL_impl(
namespace
{
- class DelayedFileDeletion : public ::cppu::WeakImplHelper1< util::XCloseListener >
+ class DelayedFileDeletion : public ::cppu::WeakImplHelper1< util::XCloseListener >,
+ private boost::noncopyable
{
protected:
::osl::Mutex m_aMutex;
@@ -210,10 +212,6 @@ namespace
private:
void implTakeOwnership( );
DECL_LINK( OnTryDeleteFile, void* );
-
- private:
- DelayedFileDeletion( const DelayedFileDeletion& ); // never implemented
- DelayedFileDeletion& operator=( const DelayedFileDeletion& ); // never implemented
};
DelayedFileDeletion::DelayedFileDeletion( const Reference< XModel >& _rxModel, const OUString& _rTemporaryFile )
@@ -413,7 +411,7 @@ SwXMailMerge::~SwXMailMerge()
}
// Guarantee object consistence in case of an exception
-class MailMergeExecuteFinalizer {
+class MailMergeExecuteFinalizer: private boost::noncopyable {
public:
MailMergeExecuteFinalizer(SwXMailMerge *mailmerge)
: m_pMailMerge(mailmerge)
@@ -427,9 +425,6 @@ public:
}
private:
- // Disallow copy
- MailMergeExecuteFinalizer(const MailMergeExecuteFinalizer&) {}
-
SwXMailMerge *m_pMailMerge;
};
diff --git a/sw/source/core/uibase/uno/unomod.cxx b/sw/source/core/uibase/uno/unomod.cxx
index 6f33409..15457df 100644
--- a/sw/source/core/uibase/uno/unomod.cxx
+++ b/sw/source/core/uibase/uno/unomod.cxx
@@ -19,6 +19,7 @@
#include <swtypes.hxx>
#include <osl/diagnose.h>
+#include <unofreg.hxx>
#include <unomod.hxx>
#include <unomid.h>
#include <unoprnms.hxx>
diff --git a/sw/source/core/uibase/uno/unomodule.cxx b/sw/source/core/uibase/uno/unomodule.cxx
index 4acb8e8..a4d2652 100644
--- a/sw/source/core/uibase/uno/unomodule.cxx
+++ b/sw/source/core/uibase/uno/unomodule.cxx
@@ -22,6 +22,7 @@
#include "swmodule.hxx"
#include "swdll.hxx"
+#include "unofreg.hxx"
#include "unomodule.hxx"
#include <cppuhelper/supportsservice.hxx>
#include <sfx2/objface.hxx>
@@ -32,12 +33,12 @@
using namespace css;
-OUString SAL_CALL SwUnoModule_getImplementationName() throw( uno::RuntimeException )
+OUString SAL_CALL SwUnoModule_getImplementationName() throw()
{
return OUString( "com.sun.star.comp.Writer.WriterModule" );
}
-uno::Sequence< OUString > SAL_CALL SwUnoModule_getSupportedServiceNames() throw( uno::RuntimeException )
+uno::Sequence< OUString > SAL_CALL SwUnoModule_getSupportedServiceNames() throw()
{
uno::Sequence< OUString > aSeq( 1 );
aSeq[0] = "com.sun.star.text.ModuleDispatcher";
@@ -46,6 +47,7 @@ uno::Sequence< OUString > SAL_CALL SwUnoModule_getSupportedServiceNames() throw(
uno::Reference< uno::XInterface > SAL_CALL SwUnoModule_createInstance(
const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
+ throw (css::uno::Exception)
{
SolarMutexGuard aGuard;
return uno::Reference< uno::XInterface >( dynamic_cast< frame::XDispatch * >(new SwUnoModule( rSMgr )), uno::UNO_QUERY );
diff --git a/sw/source/core/uibase/uno/unotxdoc.cxx b/sw/source/core/uibase/uno/unotxdoc.cxx
index 651b1d1..ead50e9 100644
--- a/sw/source/core/uibase/uno/unotxdoc.cxx
+++ b/sw/source/core/uibase/uno/unotxdoc.cxx
@@ -151,8 +151,6 @@ using ::osl::FileBase;
#define SW_CREATE_MARKER_TABLE 0x06
#define SW_CREATE_DRAW_DEFAULTS 0x07
-extern bool sw_GetPostIts( IDocumentFieldsAccess* pIDFA, _SetGetExpFlds * pSrtLst );
-
static SwPrintUIOptions * lcl_GetPrintUIOptions(
SwDocShell * pDocShell,
const SfxViewShell * pView )
diff --git a/sw/source/core/uibase/wrtsh/select.cxx b/sw/source/core/uibase/wrtsh/select.cxx
index 6a7157c..24c4142 100644
--- a/sw/source/core/uibase/wrtsh/select.cxx
+++ b/sw/source/core/uibase/wrtsh/select.cxx
@@ -402,13 +402,6 @@ void SwWrtShell::EndSelect()
pWrdCnt->UpdateCounts();
}
-// Methode to enhance a selecton word by word or line by line.
-
-inline bool operator<(const Point &rP1,const Point &rP2)
-{
- return rP1.Y() < rP2.Y() || (rP1.Y() == rP2.Y() && rP1.X() < rP2.X());
-}
-
long SwWrtShell::ExtSelWrd(const Point *pPt, sal_Bool )
{
SwMvContext aMvContext(this);
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index 1c5501f..4c05672 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -26,12 +26,14 @@
#include <UndoDelete.hxx>
#include <UndoSplitMove.hxx>
#include <UndoCore.hxx>
+#include <fesh.hxx>
#include <hintids.hxx>
#include <hints.hxx>
#include <editeng/formatbreakitem.hxx>
#include <fmtornt.hxx>
#include <fmtpdsc.hxx>
#include <doc.hxx>
+#include <docredln.hxx>
#include <IDocumentUndoRedo.hxx>
#include <editsh.hxx>
#include <docary.hxx>
@@ -69,14 +71,11 @@
#endif
#ifdef DBG_UTIL
- void sw_DebugRedline( const SwDoc* pDoc ); // docredln.cxx
#define _DEBUG_REDLINE( pDoc ) sw_DebugRedline( pDoc );
#else
#define _DEBUG_REDLINE( pDoc )
#endif
-extern void ClearFEShellTabCols();
-
typedef std::vector<boost::shared_ptr<SfxItemSet> > SfxItemSets;
class SwUndoSaveSections : public boost::ptr_vector<SwUndoSaveSection> {
@@ -182,8 +181,6 @@ public:
void CreateNew( SwTable& rTbl, SwTableLine& rParent, _SaveTable& rSTbl );
};
-void InsertSort( std::vector<sal_uInt16>& rArr, sal_uInt16 nIdx, sal_uInt16* pInsPos = 0 );
-
#if OSL_DEBUG_LEVEL > 0
#include "shellio.hxx"
void CheckTable( const SwTable& );
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index 4c6ab39..e6c090a 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -53,12 +53,6 @@ using namespace ::com::sun::star;
extern void sw_GetCellPosition( const OUString &rCellName, sal_Int32 &rColumn, sal_Int32 &rRow);
extern OUString sw_GetCellName( sal_Int32 nColumn, sal_Int32 nRow );
extern int sw_CompareCellsByColFirst( const OUString &rCellName1, const OUString &rCellName2 );
-extern int sw_CompareCellsByRowFirst( const OUString &rCellName1, const OUString &rCellName2 );
-extern int sw_CompareCellRanges(
- const OUString &rRange1StartCell, const OUString &rRange1EndCell,
- const OUString &rRange2StartCell, const OUString &rRange2EndCell,
- sal_Bool bCmpColsFirst );
-extern void sw_NormalizeRange( OUString &rCell1, OUString &rCell2 );
//static
void SwChartHelper::DoUpdateAllCharts( SwDoc* pDoc )
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index f08e7f7..04a27f3 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -216,10 +216,6 @@ public:
}
}
}
- void RemovePositionLayoutDir()
- {
- mnPositionLayoutDir = text::PositionLayoutDir::PositionInLayoutDirOfAnchor;
- }
// #i28701#
inline SwFmtWrapInfluenceOnObjPos* GetWrapInfluenceOnObjPos(
diff --git a/sw/source/core/unocore/unoflatpara.cxx b/sw/source/core/unocore/unoflatpara.cxx
index f495655..c5c1267 100644
--- a/sw/source/core/unocore/unoflatpara.cxx
+++ b/sw/source/core/unocore/unoflatpara.cxx
@@ -20,6 +20,7 @@
#include <editeng/unolingu.hxx>
#include <unobaseclass.hxx>
+#include <unocrsrhelper.hxx>
#include <unoflatpara.hxx>
#include <osl/mutex.hxx>
diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx
index 76a35f5..3bd5a5b 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -131,9 +131,6 @@ public:
{
}
- const SwTxtNode * GetTxtNode() const {
- return static_cast<const SwTxtNode*>(GetRegisteredIn());
- }
SwTxtNode * GetTxtNode() {
return static_cast<SwTxtNode*>(GetRegisteredInNonConst());
}
diff --git a/sw/source/core/view/printdata.cxx b/sw/source/core/view/printdata.cxx
index 39a5ff8..473940d 100644
--- a/sw/source/core/view/printdata.cxx
+++ b/sw/source/core/view/printdata.cxx
@@ -32,8 +32,6 @@
#include <unotools/moduleoptions.hxx>
#include <vcl/outdev.hxx>
-extern bool sw_GetPostIts( IDocumentFieldsAccess* pIDFA, _SetGetExpFlds * pSrtLst );
-
using namespace ::com::sun::star;
// SwRenderData
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index aba262d..216a925 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -1164,8 +1164,6 @@ public:
void OutEndAttrs( SwHTMLWriter& rHWrt, sal_Int32 nPos,
HTMLOutContext *pContext = 0 );
- sal_uInt16 Count() const { return aEndLst.size(); }
-
sal_Bool IsHTMLMode( sal_uLong nMode ) const { return (nHTMLMode & nMode) != 0; }
};
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx
index 6744184..ba35b9e 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -236,7 +236,6 @@ public:
const uno::Reference< drawing::XShape >& GetShape() const { return xShape; }
void SetShape( const uno::Reference< drawing::XShape >& r ) { xShape = r; }
- void ReleaseShape() { xShape = 0; }
OUString& GetText() { return sText; }
void EraseText() { sText = aEmptyOUStr; }
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index d117be3..b8b96a6 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -236,7 +236,6 @@ public:
// Set/Get cell content
void SetContents( HTMLTableCnts *pCnts ) { pContents = pCnts; }
- const HTMLTableCnts *GetContents() const { return pContents; }
HTMLTableCnts *GetContents() { return pContents; }
// Set/Get cell ROWSPAN/COLSPAN
@@ -272,7 +271,6 @@ class HTMLTableRow
HTMLTableCells *pCells; // cells of the row
sal_Bool bIsEndOfGroup : 1;
- sal_Bool bSplitable : 1;
sal_uInt16 nHeight; // options of <TR>/<TD>
sal_uInt16 nEmptyRows; // number of empty rows are following
@@ -293,7 +291,6 @@ public:
sal_uInt16 GetHeight() const { return nHeight; }
inline HTMLTableCell *GetCell( sal_uInt16 nCell ) const;
- inline const HTMLTableCells *GetCells() const { return pCells; }
inline void SetAdjust( SvxAdjust eAdj ) { eAdjust = eAdj; }
inline SvxAdjust GetAdjust() const { return eAdjust; }
@@ -315,9 +312,6 @@ public:
// Shrink row by deleting empty cells
void Shrink( sal_uInt16 nCells );
-
- void SetSplitable( sal_Bool bSet ) { bSplitable = bSet; }
- sal_Bool IsSplitable() const { return bSplitable; }
};
// Column of a HTML table
@@ -432,7 +426,6 @@ class HTMLTable
sal_uInt32 nHeadlineRepeat; // repeating rows
sal_Bool bIsParentHead;
sal_Bool bHasParentSection;
- sal_Bool bMakeTopSubTable;
sal_Bool bHasToFly;
sal_Bool bFixedCols;
bool bColSpec; // Gab es COL(GROUP)-Elemente?
@@ -531,7 +524,7 @@ public:
HTMLTable( SwHTMLParser* pPars, HTMLTable *pTopTab,
sal_Bool bParHead, sal_Bool bHasParentSec,
- sal_Bool bTopTbl, sal_Bool bHasToFly,
+ sal_Bool bHasToFly,
const HTMLTableOptions *pOptions );
~HTMLTable();
@@ -548,20 +541,10 @@ public:
{
return (bTableAdjustOfTag || bAny) ? eTableAdjust : SVX_ADJUST_END;
}
- sal_Int16 GetVertOri() const { return eVertOri; }
sal_uInt16 GetHSpace() const { return nHSpace; }
sal_uInt16 GetVSpace() const { return nVSpace; }
- sal_Bool HasPrcWidth() const { return bPrcWidth; }
- sal_uInt8 GetPrcWidth() const { return bPrcWidth ? (sal_uInt8)nWidth : 0; }
-
- sal_uInt16 GetMinWidth() const
- {
- sal_uInt32 nMin = pLayoutInfo->GetMin();
- return nMin < USHRT_MAX ? (sal_uInt16)nMin : USHRT_MAX;
- }
-
// von Zeilen oder Spalten geerbtes drawing::Alignment holen
SvxAdjust GetInheritedAdjust() const;
sal_Int16 GetInheritedVertOri() const;
@@ -610,8 +593,6 @@ public:
sal_Bool GetIsParentHeader() const { return bIsParentHead; }
- sal_Bool IsMakeTopSubTable() const { return bMakeTopSubTable; }
- void SetHasToFly() { bHasToFly=sal_True; }
sal_Bool HasToFly() const { return bHasToFly; }
void SetTable( const SwStartNode *pStNd, _HTMLTableContext *pCntxt,
@@ -795,7 +776,6 @@ SwHTMLTableLayoutCell *HTMLTableCell::CreateLayoutInfo()
HTMLTableRow::HTMLTableRow( sal_uInt16 nCells ):
pCells(new HTMLTableCells),
bIsEndOfGroup(sal_False),
- bSplitable( sal_False ),
nHeight(0),
nEmptyRows(0),
eAdjust(SVX_ADJUST_END),
@@ -1073,7 +1053,7 @@ void HTMLTable::InitCtor( const HTMLTableOptions *pOptions )
HTMLTable::HTMLTable( SwHTMLParser* pPars, HTMLTable *pTopTab,
sal_Bool bParHead,
- sal_Bool bHasParentSec, sal_Bool bTopTbl, sal_Bool bHasToFlw,
+ sal_Bool bHasParentSec, sal_Bool bHasToFlw,
const HTMLTableOptions *pOptions ) :
nCols( pOptions->nCols ),
nFilledCols( 0 ),
@@ -1084,7 +1064,6 @@ HTMLTable::HTMLTable( SwHTMLParser* pPars, HTMLTable *pTopTab,
bTableAdjustOfTag( pTopTab ? sal_False : pOptions->bTableAdjust ),
bIsParentHead( bParHead ),
bHasParentSection( bHasParentSec ),
- bMakeTopSubTable( bTopTbl ),
bHasToFly( bHasToFlw ),
bFixedCols( pOptions->nCols>0 ),
bPrcWidth( pOptions->bPrcWidth ),
@@ -3126,7 +3105,6 @@ public:
void ClearIsInSection() { pCurrCnts = 0; }
sal_Bool IsInSection() const { return pCurrCnts!=0; }
- HTMLTableCnts *GetCurrContents() const { return pCurrCnts; }
void InsertCell( SwHTMLParser& rParser, HTMLTable *pCurTable );
@@ -3964,7 +3942,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, sal_Bool bReadOptions,
HTMLTable *pSubTable = BuildTable( eTabAdjust,
bHead,
pSaveStruct->IsInSection(),
- bTopTable, bHasToFly );
+ bHasToFly );
if( SVPAR_PENDING != GetStatus() )
{
// nur wenn die Tabelle wirklich zu Ende ist!
@@ -4892,7 +4870,7 @@ void SwHTMLParser::BuildTableCaption( HTMLTable *pCurTable )
pSaveStruct->pTable = pTable;
sal_Bool bHasToFly = pSaveStruct->pTable!=pCurTable;
BuildTable( pCurTable->GetTableAdjust( sal_True ),
- sal_False, sal_True, sal_True, bHasToFly );
+ sal_False, sal_True, bHasToFly );
}
else
{
@@ -5181,7 +5159,6 @@ HTMLTableOptions::HTMLTableOptions( const HTMLOptions& rOptions,
HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
sal_Bool bIsParentHead,
sal_Bool bHasParentSection,
- sal_Bool bMakeTopSubTable,
sal_Bool bHasToFly )
{
if( !IsParserWorking() && !pPendStack )
@@ -5215,7 +5192,6 @@ HTMLTable *SwHTMLParser::BuildTable( SvxAdjust eParentAdjust,
HTMLTable *pCurTable = new HTMLTable( this, pTable,
bIsParentHead,
bHasParentSection,
- bMakeTopSubTable,
bHasToFly,
pTblOptions );
if( !pTable )
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 86e39fb..4ff86f4 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -836,7 +836,6 @@ private:
HTMLTable *BuildTable( SvxAdjust eCellAdjust,
sal_Bool bIsParentHead = sal_False,
sal_Bool bHasParentSection=sal_True,
- sal_Bool bIsInMulticol = sal_False,
sal_Bool bHasToFlow = sal_False );
// misc ...
diff --git a/sw/source/filter/ww1/w1filter.cxx b/sw/source/filter/ww1/w1filter.cxx
index 2d77563..c7efecb 100644
--- a/sw/source/filter/ww1/w1filter.cxx
+++ b/sw/source/filter/ww1/w1filter.cxx
@@ -18,6 +18,7 @@
*/
#include <hintids.hxx>
+#include <sw3convert.hxx>
#include <tools/solar.h>
#include <comphelper/string.hxx>
#include <editeng/paperinf.hxx>
@@ -513,10 +514,6 @@ static WWDateTime GetTimeDatePara( const OUString& rForm,
return eDT;
}
-extern void sw3io_ConvertFromOldField( SwDoc& rDoc, sal_uInt16& rWhich,
- sal_uInt16& rSubType, sal_uLong &rFmt,
- sal_uInt16 nVersion );
-
void Ww1Fields::Out(Ww1Shell& rOut, Ww1Manager& rMan, sal_uInt16 nDepth)
{
OUString sType; // the type as string
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index 9932c6e..d16314d 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -20,6 +20,7 @@
#include <algorithm>
#include <functional>
+#include <boost/noncopyable.hpp>
#include <boost/scoped_array.hpp>
#include <boost/unordered_set.hpp>
@@ -97,15 +98,12 @@ struct WW8_SED
// class WW8_WrPlc0 is only used for header and footer positioning
// ie there is no content support structure
-class WW8_WrPlc0
+class WW8_WrPlc0: private boost::noncopyable
{
private:
std::vector<sal_uLong> aPos; // PTRARR of CPs / FCs
sal_uLong nOfs;
- //No copying
- WW8_WrPlc0(const WW8_WrPlc0&);
- WW8_WrPlc0 &operator=(const WW8_WrPlc0&);
public:
WW8_WrPlc0( sal_uLong nOffset );
sal_uInt16 Count() const { return aPos.size(); }
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index c05aa512..0d1e9c8 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -19,6 +19,7 @@
#include <iostream>
+#include <boost/noncopyable.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
#include <com/sun/star/embed/XStorage.hpp>
#include <unotools/ucbstreamhelper.hxx>
@@ -179,13 +180,11 @@ typedef std::pair<long,BKMK> BKMKCP;
typedef std::multimap<long,BKMKCP*> BKMKCPs;
typedef BKMKCPs::iterator CPItr;
-class WW8_WrtBookmarks
+class WW8_WrtBookmarks: private boost::noncopyable
{
private:
BKMKCPs aSttCps,aEndCps;
BKMKNames maSwBkmkNms;
- WW8_WrtBookmarks(const WW8_WrtBookmarks&);
- WW8_WrtBookmarks& operator=(const WW8_WrtBookmarks&);
public:
WW8_WrtBookmarks();
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 84c51d1..292c6cd 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -567,16 +567,7 @@ private:
public:
explicit Chunk(long nStart, const OUString &rURL)
: msURL(rURL), mnStartPos(nStart), mnEndPos(0) {}
- Chunk(const Chunk &rChunk)
- : msURL(rChunk.msURL), mnStartPos(rChunk.mnStartPos),
- mnEndPos(rChunk.mnEndPos) {}
- Chunk& operator=(const Chunk &rChunk)
- {
- msURL = rChunk.msURL;
- mnStartPos = rChunk.mnStartPos;
- mnEndPos = rChunk.mnEndPos;
- return *this;
- }
+
void SetEndPos(long nEnd) { mnEndPos = nEnd; }
long GetStartPos() const {return mnStartPos;}
long GetEndPos() const {return mnEndPos;}
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index aa3c81a..3d5425c 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.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 <com/sun/star/embed/ElementModes.hpp>
#include <i18nlangtag/languagetag.hxx>
@@ -422,7 +425,7 @@ OUString BasicProjImportHelper::getProjectName()
return sProjName;
}
-class Sttb : TBBase
+class Sttb : TBBase, private boost::noncopyable
{
struct SBBItem
{
@@ -436,8 +439,6 @@ struct SBBItem
std::vector< SBBItem > dataItems;
- Sttb(const Sttb&);
- Sttb& operator = ( const Sttb&);
public:
Sttb();
virtual ~Sttb();
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 16aabb6..5bcc3e0 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.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 <boost/scoped_ptr.hpp>
#include <comphelper/string.hxx>
#include <tools/solar.h>
@@ -71,11 +74,8 @@
using namespace ::com::sun::star;
class WW8SelBoxInfo
- : public std::vector<SwTableBox*>
+ : public std::vector<SwTableBox*>, private boost::noncopyable
{
-private:
- WW8SelBoxInfo(const WW8SelBoxInfo&);
- WW8SelBoxInfo& operator=(const WW8SelBoxInfo&);
public:
short nGroupXStart;
short nGroupWidth;
@@ -102,7 +102,7 @@ WW8TabBandDesc::~WW8TabBandDesc()
delete[] pNewSHDs;
}
-class WW8TabDesc
+class WW8TabDesc: private boost::noncopyable
{
std::vector<OUString> aNumRuleNames;
sw::util::RedlineStack *mpOldRedlineStack;
@@ -166,9 +166,7 @@ class WW8TabDesc
WW8SelBoxInfo* pActGroup, SwTableBox* pActBox, sal_uInt16 nCol );
void StartMiserableHackForUnsupportedDirection(short nWwCol);
void EndMiserableHackForUnsupportedDirection(short nWwCol);
- //No copying
- WW8TabDesc(const WW8TabDesc&);
- WW8TabDesc &operator=(const WW8TabDesc&);
+
public:
const SwTable* pTable; // table
SwPosition* pParentPos;
@@ -189,7 +187,6 @@ public:
void MergeCells();
short GetMinLeft() const { return nConvertedLeft; }
~WW8TabDesc();
- SwPosition *GetPos() { return pTmpPos; }
const WW8_TCell* GetAktWWCell() const { return pAktWWCell; }
short GetAktCol() const { return nAktCol; }
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index d466e84..492568a 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -5011,11 +5011,6 @@ struct SprmReadInfo
FNReadRecord pReadFnc;
};
-bool operator==(const SprmReadInfo &rFirst, const SprmReadInfo &rSecond)
-{
- return (rFirst.nId == rSecond.nId);
-}
-
bool operator<(const SprmReadInfo &rFirst, const SprmReadInfo &rSecond)
{
return (rFirst.nId < rSecond.nId);
diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx
index 8cba8e5..57589d8 100644
--- a/sw/source/filter/xml/xmlexp.cxx
+++ b/sw/source/filter/xml/xmlexp.cxx
@@ -40,6 +40,7 @@
#include <xmloff/xmluconv.hxx>
#include <xmloff/xformsexport.hxx>
#include <pam.hxx>
+#include <unofreg.hxx>
#include <doc.hxx>
#include <swmodule.hxx>
#include <docsh.hxx>
diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index c81f619..de072d4 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -193,8 +193,6 @@ class SwXMLConditionContext_Impl : public SvXMLImportContext
OUString sApplyStyle;
- void ParseCondition( const OUString& rCond );
-
public:
SwXMLConditionContext_Impl(
@@ -442,8 +440,6 @@ protected:
const OUString& rLocalName,
const OUString& rValue ) SAL_OVERRIDE;
- const SwXMLImport& GetSwImport() const
- { return (const SwXMLImport&)GetImport(); }
SwXMLImport& GetSwImport() { return (SwXMLImport&)GetImport(); }
public:
@@ -467,7 +463,6 @@ public:
// The item set may be empty!
SfxItemSet *GetItemSet() { return pItemSet; }
- const SfxItemSet *GetItemSet() const { return pItemSet; }
const OUString& GetMasterPageName() const { return sMasterPageName; }
bool HasMasterPageName() const { return bHasMasterPageName; }
@@ -713,8 +708,6 @@ bool SwXMLItemSetStyleContext_Impl::ResolveDataStyleName()
class SwXMLStylesContext_Impl : public SvXMLStylesContext
{
- SwXMLItemSetStyleContext_Impl *GetSwStyle( sal_uInt16 i ) const;
-
SwXMLImport& GetSwImport() { return (SwXMLImport&)GetImport(); }
const SwXMLImport& GetSwImport() const
{ return (const SwXMLImport&)GetImport(); }
@@ -754,12 +747,6 @@ public:
TYPEINIT1( SwXMLStylesContext_Impl, SvXMLStylesContext );
-inline SwXMLItemSetStyleContext_Impl *SwXMLStylesContext_Impl::GetSwStyle(
- sal_uInt16 i ) const
-{
- return PTR_CAST( SwXMLItemSetStyleContext_Impl, GetStyle( i ) );
-}
-
SvXMLStyleContext *SwXMLStylesContext_Impl::CreateStyleStyleChildContext(
sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList > & xAttrList )
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 8046bce..ad404c8 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -34,6 +34,7 @@
#include <xmloff/XMLFontStylesContext.hxx>
#include <xmloff/ProgressBarHelper.hxx>
#include <doc.hxx>
+#include <unofreg.hxx>
#include <TextCursorHelper.hxx>
#include <unotext.hxx>
#include <unotextrange.hxx>
@@ -107,8 +108,6 @@ static SvXMLTokenMapEntry aDocTokenMap[] =
class SwXMLBodyContext_Impl : public SvXMLImportContext
{
- const SwXMLImport& GetSwImport() const
- { return (const SwXMLImport&)GetImport(); }
SwXMLImport& GetSwImport() { return (SwXMLImport&)GetImport(); }
public:
@@ -154,8 +153,6 @@ class SwXMLDocContext_Impl : public virtual SvXMLImportContext
{
protected: // #i69629#
- const SwXMLImport& GetSwImport() const
- { return (const SwXMLImport&)GetImport(); }
SwXMLImport& GetSwImport() { return (SwXMLImport&)GetImport(); }
public:
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index d45b107..4f06033 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -215,7 +215,6 @@ public:
OUString const* GetStringValue() const {
return (m_bHasStringValue) ? &m_StringValue : 0;
}
- const OUString& GetXmlId() const { return mXmlId; }
const SwStartNode *GetStartNode() const { return pStartNode; }
inline void SetStartNode( const SwStartNode *pSttNd );
@@ -300,7 +299,6 @@ public:
const OUString& i_rXmlId = OUString() );
~SwXMLTableRow_Impl() {}
- inline const SwXMLTableCell_Impl *GetCell( sal_uInt32 nCol ) const;
inline SwXMLTableCell_Impl *GetCell( sal_uInt32 nCol );
inline void Set( const OUString& rStyleName,
@@ -314,7 +312,6 @@ public:
const OUString& GetStyleName() const { return aStyleName; }
const OUString& GetDefaultCellStyleName() const { return aDfltCellStyleName; }
- const OUString& GetXmlId() const { return mXmlId; }
void Dispose();
};
@@ -340,16 +337,6 @@ SwXMLTableRow_Impl::SwXMLTableRow_Impl( const OUString& rStyleName,
}
}
-inline const SwXMLTableCell_Impl *SwXMLTableRow_Impl::GetCell( sal_uInt32 nCol ) const
-{
- OSL_ENSURE( nCol < USHRT_MAX,
- "SwXMLTableRow_Impl::GetCell: column number is to big" );
- // #i95726# - some fault tolerance
- OSL_ENSURE( nCol < aCells.size(),
- "SwXMLTableRow_Impl::GetCell: column number is out of bound" );
- return nCol < aCells.size() ? &aCells[(sal_uInt16)nCol] : 0;
-}
-
inline SwXMLTableCell_Impl *SwXMLTableRow_Impl::GetCell( sal_uInt32 nCol )
{
OSL_ENSURE( nCol < USHRT_MAX,
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index a32b7af..513b8d9 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -84,7 +84,6 @@ class SwDropCapsPict : public Control
sal_Int32 changePos; ///< Character position where the script changes.
_ScriptInfo(sal_uLong txtWidth, sal_uInt16 scrptType, sal_Int32 position)
: textWidth(txtWidth), scriptType(scrptType), changePos(position) {}
- bool operator<(_ScriptInfo other) { return changePos < other.changePos; }
};
std::vector<_ScriptInfo> maScriptChanges;
SvxFont maFont;
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index c727762..9b20eaf 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -90,6 +90,7 @@
#include <unomid.h>
#include <IDocumentMarkAccess.hxx>
+#include <boost/noncopyable.hpp>
#include <boost/scoped_ptr.hpp>
namespace swui
@@ -158,7 +159,7 @@ struct _DB_Column
}
};
-struct _DB_ColumnConfigData
+struct _DB_ColumnConfigData: private boost::noncopyable
{
SwInsDBColumns aDBColumns;
OUString sSource, sTable, sEdit, sTblList, sTmplNm, sTAutoFmtNm;
@@ -174,9 +175,6 @@ struct _DB_ColumnConfigData
}
~_DB_ColumnConfigData();
-private:
- _DB_ColumnConfigData( const _DB_ColumnConfigData& );
- _DB_ColumnConfigData& operator =( const _DB_ColumnConfigData& );
};
bool SwInsDBColumn::operator<( const SwInsDBColumn& rCmp ) const
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 01f85cd..0c19e69 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -150,14 +150,11 @@ private:
public:
SectRepr(sal_uInt16 nPos, SwSection& rSect);
- bool operator==(const SectRepr& rSectRef) const
- { return m_nArrPos == rSectRef.GetArrPos(); }
bool operator< (const SectRepr& rSectRef) const
{ return m_nArrPos < rSectRef.GetArrPos(); }
SwSectionData & GetSectionData() { return m_SectionData; }
- SwSectionData const&GetSectionData() const { return m_SectionData; }
SwFmtCol& GetCol() { return m_Col; }
SvxBrushItem& GetBackground() { return m_Brush; }
SwFmtFtnAtTxtEnd& GetFtnNtAtEnd() { return m_FtnNtAtEnd; }
@@ -1832,21 +1829,6 @@ IMPL_LINK( SwInsertSectionTabPage, DlgClosedHdl, sfx2::FileDialogHelper *, _pFil
return 0;
}
-// numbering format conversion:
-// ListBox - format - enum-value
-// 0 - A, B, C, ... - 0
-// 1 - a, b, c, ... - 1
-// 2 - I, II, III, ... - 2
-// 3 - i, ii, iii, ... - 3
-// 4 - 1, 2, 3, ... - 4
-// 5 - A, .., AA, .., - 9
-// 6 - a, .., aa, .., - 10
-
-inline SvxExtNumType GetNumType( sal_uInt16 n )
-{
- return (SvxExtNumType)(4 < n ? n + 4 : n );
-}
-
SwSectionFtnEndTabPage::SwSectionFtnEndTabPage( Window *pParent,
const SfxItemSet &rAttrSet)
: SfxTabPage( pParent, "FootnotesEndnotesTabPage", "modules/swriter/ui/footnotesendnotestabpage.ui", rAttrSet )
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index e62e1a9..ff0857b 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -1613,10 +1613,8 @@ public:
break;
}
}
- sal_uInt16 GetChapterInfo() const{ return aFormToken.nChapterFormat;}
void SetOutlineLevel( sal_uInt16 nSet ) { aFormToken.nOutlineLevel = nSet;}//i53420
- sal_uInt16 GetOutlineLevel() const{ return aFormToken.nOutlineLevel;}
void SetLinkEnd()
{
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index 624be1e..75ddf16 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -94,7 +94,6 @@ private:
void DrawBackground();
void MakeFonts ( sal_uInt8 nIndex, Font& rFont, Font& rCJKFont, Font& rCTLFont );
- OUString MakeNumberString( const OUString& cellString, sal_Bool bAddDec );
};
class SwStringInputDlg : public ModalDialog
diff --git a/sw/source/ui/vba/vbaborders.cxx b/sw/source/ui/vba/vbaborders.cxx
index b8eeb81..d52141b 100644
--- a/sw/source/ui/vba/vbaborders.cxx
+++ b/sw/source/ui/vba/vbaborders.cxx
@@ -132,7 +132,7 @@ private:
}
return true;
}
- SwVbaBorder(); // no impl
+
protected:
virtual OUString getServiceImplName() SAL_OVERRIDE
{
diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx
index 107f452..9dddd94 100644
--- a/sw/source/ui/vba/vbadocumentproperties.cxx
+++ b/sw/source/ui/vba/vbadocumentproperties.cxx
@@ -398,7 +398,7 @@ typedef boost::unordered_map< sal_Int32, DocPropInfo > MSOIndexToOODocPropInfo;
class BuiltInIndexHelper
{
MSOIndexToOODocPropInfo m_docPropInfoMap;
- BuiltInIndexHelper();
+
public:
BuiltInIndexHelper( const uno::Reference< frame::XModel >& xModel )
{
diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx
index 858cdc2..0fdcb3a 100644
--- a/sw/source/ui/vba/vbafield.cxx
+++ b/sw/source/ui/vba/vbafield.cxx
@@ -81,7 +81,6 @@ public:
~SwVbaReadFieldParams();
long SkipToNextToken();
- sal_Int32 GetTokenSttPtr() const { return nFnd; }
sal_Int32 FindNextStringPiece( sal_Int32 _nStart = -1 );
More information about the Libreoffice-commits
mailing list