summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sw/inc/SidebarWin.hxx3
-rw-r--r--sw/inc/docstyle.hxx1
-rw-r--r--sw/inc/ndgrf.hxx3
-rw-r--r--sw/inc/printdata.hxx1
-rw-r--r--sw/inc/shellio.hxx8
-rw-r--r--sw/inc/swabstdlg.hxx3
-rw-r--r--sw/inc/swbaslnk.hxx2
-rw-r--r--sw/inc/unochart.hxx4
-rw-r--r--sw/inc/unotxdoc.hxx13
-rw-r--r--sw/inc/view.hxx21
-rw-r--r--sw/source/core/inc/SwXMLBlockImport.hxx9
-rw-r--r--sw/source/core/inc/SwXMLTextBlocks.hxx1
-rw-r--r--sw/source/core/inc/UndoNumbering.hxx1
-rw-r--r--sw/source/core/inc/UndoRedline.hxx1
-rw-r--r--sw/source/core/inc/flyfrms.hxx12
-rw-r--r--sw/source/core/inc/mvsave.hxx9
-rw-r--r--sw/source/core/inc/notxtfrm.hxx1
-rw-r--r--sw/source/core/inc/objectformatter.hxx21
-rw-r--r--sw/source/core/inc/swblocks.hxx1
-rw-r--r--sw/source/core/swg/SwXMLBlockImport.cxx2
-rw-r--r--sw/source/core/swg/SwXMLTextBlocks.cxx5
-rw-r--r--sw/source/core/swg/SwXMLTextBlocks1.cxx7
-rw-r--r--sw/source/core/text/atrhndl.hxx11
-rw-r--r--sw/source/core/text/inftxt.cxx4
-rw-r--r--sw/source/core/text/inftxt.hxx22
-rw-r--r--sw/source/core/text/itratr.hxx2
-rw-r--r--sw/source/core/text/itrform2.hxx1
-rw-r--r--sw/source/core/text/itrtxt.hxx2
-rw-r--r--sw/source/core/text/porexp.hxx3
-rw-r--r--sw/source/core/text/porfld.hxx2
-rw-r--r--sw/source/core/text/porlay.hxx29
-rw-r--r--sw/source/core/text/porlin.hxx7
-rw-r--r--sw/source/core/text/pormulti.hxx6
-rw-r--r--sw/source/core/text/txtcache.hxx7
-rw-r--r--sw/source/core/text/txtpaint.hxx1
-rw-r--r--sw/source/core/text/widorp.hxx6
-rw-r--r--sw/source/filter/html/htmlfly.hxx2
-rw-r--r--sw/source/filter/html/htmlnum.hxx2
-rw-r--r--sw/source/filter/html/htmlvsh.hxx6
-rw-r--r--sw/source/filter/html/parcss1.hxx3
-rw-r--r--sw/source/filter/html/svxcss1.hxx3
-rw-r--r--sw/source/filter/html/swcss1.hxx3
-rw-r--r--sw/source/filter/html/swhtml.hxx12
-rw-r--r--sw/source/filter/inc/fltshell.hxx3
-rw-r--r--sw/source/filter/inc/msfilter.hxx1
-rw-r--r--sw/source/filter/inc/rtf.hxx2
-rw-r--r--sw/source/filter/inc/wrtswtbl.hxx2
-rw-r--r--sw/source/filter/ww8/WW8FFData.hxx33
-rw-r--r--sw/source/filter/ww8/WW8Sttbf.hxx5
-rw-r--r--sw/source/filter/ww8/WW8TableInfo.cxx5
-rw-r--r--sw/source/filter/ww8/WW8TableInfo.hxx6
-rw-r--r--sw/source/filter/ww8/attributeoutputbase.hxx5
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx5
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.hxx1
-rw-r--r--sw/source/filter/ww8/rtfattributeoutput.cxx5
-rw-r--r--sw/source/filter/ww8/rtfattributeoutput.hxx1
-rw-r--r--sw/source/filter/ww8/wrtw8nds.cxx29
-rw-r--r--sw/source/filter/ww8/wrtww8.hxx12
-rw-r--r--sw/source/filter/ww8/ww8attributeoutput.hxx2
-rw-r--r--sw/source/filter/ww8/ww8par.hxx5
-rw-r--r--sw/source/filter/ww8/ww8scan.hxx3
-rw-r--r--sw/source/filter/ww8/ww8struc.hxx1
-rw-r--r--sw/source/filter/ww8/ww8toolbar.cxx10
-rw-r--r--sw/source/filter/ww8/ww8toolbar.hxx4
-rw-r--r--sw/source/filter/xml/XMLRedlineImportHelper.hxx9
-rw-r--r--sw/source/filter/xml/xmlexp.hxx4
-rw-r--r--sw/source/filter/xml/xmlimp.hxx10
-rw-r--r--sw/source/ui/dbui/createaddresslistdialog.hxx4
-rw-r--r--sw/source/ui/dialog/swdlgfact.cxx24
-rw-r--r--sw/source/ui/dialog/swdlgfact.hxx4
-rw-r--r--sw/source/ui/vba/vbadocument.cxx2
-rw-r--r--sw/source/ui/vba/vbaheaderfooterhelper.hxx2
-rw-r--r--sw/source/ui/vba/vbaparagraph.cxx2
-rw-r--r--sw/source/ui/vba/vbarange.cxx6
-rw-r--r--sw/source/ui/vba/vbarange.hxx14
-rw-r--r--sw/source/ui/vba/vbatable.hxx1
-rw-r--r--sw/source/ui/vba/vbaview.hxx5
-rw-r--r--sw/source/uibase/docvw/ShadowOverlayObject.hxx7
-rw-r--r--sw/source/uibase/inc/FrameControl.hxx2
-rw-r--r--sw/source/uibase/inc/actctrl.hxx1
-rw-r--r--sw/source/uibase/inc/basesh.hxx1
-rw-r--r--sw/source/uibase/inc/caption.hxx2
-rw-r--r--sw/source/uibase/inc/cfgitems.hxx25
-rw-r--r--sw/source/uibase/inc/colmgr.hxx16
-rw-r--r--sw/source/uibase/inc/column.hxx3
-rw-r--r--sw/source/uibase/inc/conttree.hxx8
-rw-r--r--sw/source/uibase/inc/cption.hxx1
-rw-r--r--sw/source/uibase/inc/drpcps.hxx3
-rw-r--r--sw/source/uibase/inc/drwbassh.hxx8
-rw-r--r--sw/source/uibase/inc/drwtxtsh.hxx3
-rw-r--r--sw/source/uibase/inc/edtwin.hxx2
-rw-r--r--sw/source/uibase/inc/formedt.hxx18
-rw-r--r--sw/source/uibase/inc/frmmgr.hxx16
-rw-r--r--sw/source/uibase/inc/frmsh.hxx2
-rw-r--r--sw/source/uibase/inc/glosdoc.hxx2
-rw-r--r--sw/source/uibase/inc/gloshdl.hxx12
-rw-r--r--sw/source/uibase/inc/glossary.hxx5
-rw-r--r--sw/source/uibase/inc/glshell.hxx2
-rw-r--r--sw/source/uibase/inc/inputwin.hxx15
-rw-r--r--sw/source/uibase/inc/insfnote.hxx4
-rw-r--r--sw/source/uibase/inc/linenum.hxx1
-rw-r--r--sw/source/uibase/inc/mmconfigitem.hxx6
-rw-r--r--sw/source/uibase/inc/navicfg.hxx9
-rw-r--r--sw/source/uibase/inc/navipi.hxx4
-rw-r--r--sw/source/uibase/inc/numpara.hxx1
-rw-r--r--sw/source/uibase/inc/optpage.hxx1
-rw-r--r--sw/source/uibase/inc/popbox.hxx9
-rw-r--r--sw/source/uibase/inc/prcntfld.hxx6
-rw-r--r--sw/source/uibase/inc/pview.hxx25
-rw-r--r--sw/source/uibase/inc/scroll.hxx2
-rw-r--r--sw/source/uibase/inc/shdwcrsr.hxx4
-rw-r--r--sw/source/uibase/inc/srcedtw.hxx2
-rw-r--r--sw/source/uibase/inc/srcview.hxx1
-rw-r--r--sw/source/uibase/inc/swlbox.hxx1
-rw-r--r--sw/source/uibase/inc/swuicnttab.hxx4
-rw-r--r--sw/source/uibase/inc/swuiidxmrk.hxx2
-rw-r--r--sw/source/uibase/inc/tablemgr.hxx4
-rw-r--r--sw/source/uibase/inc/textsh.hxx1
-rw-r--r--sw/source/uibase/inc/tmpdlg.hxx4
-rw-r--r--sw/source/uibase/inc/toxmgr.hxx1
-rw-r--r--sw/source/uibase/inc/uiitems.hxx3
-rw-r--r--sw/source/uibase/inc/uivwimp.hxx2
-rw-r--r--sw/source/uibase/inc/unotools.hxx1
-rw-r--r--sw/source/uibase/inc/usrpref.hxx9
-rw-r--r--sw/source/uibase/inc/workctrl.hxx2
-rw-r--r--sw/source/uibase/inc/wrap.hxx3
-rw-r--r--sw/source/uibase/ribbar/inputwin.cxx5
-rw-r--r--sw/source/uibase/shells/drwbassh.cxx2
-rw-r--r--sw/source/uibase/sidebar/StylePresetsPanel.hxx5
-rw-r--r--sw/source/uibase/sidebar/ThemePanel.hxx5
-rw-r--r--sw/source/uibase/uno/unodefaults.hxx2
131 files changed, 60 insertions, 715 deletions
diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx
index 21d7dc754d7d..7bbbb2ecffb1 100644
--- a/sw/inc/SidebarWin.hxx
+++ b/sw/inc/SidebarWin.hxx
@@ -108,7 +108,6 @@ class SwSidebarWin : public vcl::Window
void ExecuteCommand(sal_uInt16 nSlot);
void InitControls();
- void HidePostIt();
void DoResize();
void ResizeIfNecessary(long aOldHeight, long aNewHeight);
void SetScrollbar();
@@ -125,7 +124,7 @@ class SwSidebarWin : public vcl::Window
void SetSidebarPosition(sw::sidebarwindows::SidebarPosition eSidebarPosition);
void SetReadonly(bool bSet);
- bool IsReadOnly()
+ bool IsReadOnly()
{
return mbReadonly;
}
diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx
index 05076412653c..f874ac57c457 100644
--- a/sw/inc/docstyle.hxx
+++ b/sw/inc/docstyle.hxx
@@ -209,7 +209,6 @@ public:
virtual void Remove( SfxStyleSheetBase* pStyle) SAL_OVERRIDE;
- void SetOrganizerMode( bool bMode ) { bOrganizer = bMode; }
bool IsOrganizerMode() const { return bOrganizer; }
virtual SfxStyleSheetIteratorPtr CreateIterator( SfxStyleFamily, sal_uInt16 nMask ) SAL_OVERRIDE;
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index 668c5f5ecc61..59bd4457f1e3 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -71,10 +71,7 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTextNode
void InsertLink( const OUString& rGrfName, const OUString& rFltName );
bool ImportGraphic( SvStream& rStrm );
- /** adjust return type and rename method to
- indicate that its an private one. */
- void DelStreamName();
DECL_LINK( SwapGraphic, GraphicObject* );
/** helper method to determine stream for the embedded graphic.
diff --git a/sw/inc/printdata.hxx b/sw/inc/printdata.hxx
index 54f008454af2..e7fdfefcad90 100644
--- a/sw/inc/printdata.hxx
+++ b/sw/inc/printdata.hxx
@@ -135,7 +135,6 @@ public:
/** Note: in the context where this class is used the pointers should always be valid
during the lifetime of this object */
- const SwPrintUIOptions & GetPrintUIOptions() const { return *m_pPrintUIOptions; }
const SwRenderData & GetRenderData() const { return *m_pRenderData; }
void SetPrintUIOptions( const SwPrintUIOptions *pOpt ) { m_pPrintUIOptions = pOpt; }
void SetRenderData( const SwRenderData *pData ) { m_pRenderData = pData; }
diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index 0e1eb957723f..6db4171cf202 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -280,8 +280,6 @@ class SW_DLLPUBLIC StgReader : public Reader
{
OUString aFltName;
-protected:
- sal_uLong OpenMainStream( tools::SvRef<SotStorageStream>& rRef, sal_uInt16& rBuffSize );
public:
virtual int GetReaderType() SAL_OVERRIDE;
OUString GetFltName() { return aFltName; }
@@ -312,7 +310,6 @@ public:
void SetBaseURL( const OUString& rURL );
bool IsOld() const;
- sal_uLong ConvertToNew(); // Convert text modules.
sal_uInt16 GetCount() const; // Get count text modules.
sal_uInt16 GetIndex( const OUString& ) const; // Get index of short names.
@@ -423,8 +420,6 @@ public:
void SetShowProgress( bool bFlag = false ) { bShowProgress = bFlag; }
- const OUString* GetOrigFileName() const { return pOrigFileName; }
-
const SwAsciiOptions& GetAsciiOptions() const { return aAscOpts; }
void SetAsciiOptions( const SwAsciiOptions& rOpt ) { aAscOpts = rOpt; }
@@ -450,9 +445,6 @@ public:
static SvStream& OutLong( SvStream& rStrm, long nVal );
static SvStream& OutULong( SvStream& rStrm, sal_uLong nVal );
- inline SvStream& OutLong( long nVal ) { return OutLong( Strm(), nVal ); }
- inline SvStream& OutULong( sal_uLong nVal ) { return OutULong( Strm(), nVal ); }
-
void SetStream(SvStream *const pStream);
SvStream& Strm();
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index cb5ec2feb3f5..4accac06eaff 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -166,7 +166,6 @@ public:
class AbstractMultiTOXTabDialog : public VclAbstractDialog
{
public:
- virtual SwForm* GetForm(CurTOXType eType) = 0;
virtual CurTOXType GetCurrentTOXType() const = 0;
virtual SwTOXDescription& GetTOXDescription(CurTOXType eTOXTypes) = 0;
//from SfxTabDialog
@@ -312,7 +311,6 @@ class SwMailMergeConfigItem;
class AbstractMailMergeWizard : public VclAbstractDialog2
{
public:
- virtual void SetReloadDocument(const OUString& rURL) = 0;
virtual OUString GetReloadDocument() const = 0;
virtual bool ShowPage( sal_uInt16 nLevel ) = 0;
virtual sal_uInt16 GetRestartPage() const = 0;
@@ -462,7 +460,6 @@ public:
// for tabpage
virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId ) = 0;
- virtual GetTabPageRanges GetTabPageRangesFunc( sal_uInt16 nId ) = 0;
protected:
~SwAbstractDialogFactory() {}
diff --git a/sw/inc/swbaslnk.hxx b/sw/inc/swbaslnk.hxx
index 3a09b6c91b2b..f8c4a54b5c95 100644
--- a/sw/inc/swbaslnk.hxx
+++ b/sw/inc/swbaslnk.hxx
@@ -56,8 +56,6 @@ public:
virtual const SwNode* GetAnchor() const;
- SwContentNode *GetContentNode() { return pContentNode; }
-
// For graphics only.
bool SwapIn( bool bWaitForData = false, bool bNativFormat = false );
diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx
index 3f59dd3627f6..678d29456359 100644
--- a/sw/inc/unochart.hxx
+++ b/sw/inc/unochart.hxx
@@ -191,14 +191,12 @@ public:
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- SwFrameFormat* GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); }
-
void AddDataSequence( const SwTable &rTable, ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > &rxDataSequence );
void RemoveDataSequence( const SwTable &rTable, ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > &rxDataSequence );
// will send modifdied events for all data-sequences of the table
void InvalidateTable( const SwTable *pTable );
- bool DeleteBox( const SwTable *pTable, const SwTableBox &rBox );
+ bool DeleteBox( const SwTable *pTable, const SwTableBox &rBox );
void DisposeAllDataSequences( const SwTable *pTable );
// functionality needed to get notified about new added rows/cols
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index 21907d4aa483..562752342036 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -156,7 +156,7 @@ private:
css::uno::Reference< css::container::XIndexAccess > * pxXEndnotes;
css::uno::Reference< css::beans::XPropertySet > * pxXEndnoteSettings;
css::uno::Reference< css::container::XNameAccess > * pxXReferenceMarks;
- css::uno::Reference< css::container::XEnumerationAccess > * pxXTextFieldTypes;
+ css::uno::Reference< css::container::XEnumerationAccess > * pxXTextFieldTypes;
css::uno::Reference< css::container::XNameAccess > * pxXTextFieldMasters;
css::uno::Reference< css::container::XNameAccess > * pxXTextSections;
css::uno::Reference< css::container::XNameAccess > * pxXBookmarks;
@@ -165,12 +165,12 @@ private:
css::uno::Reference< css::container::XNameAccess > * pxXGraphicObjects;
css::uno::Reference< css::container::XNameAccess > * pxXEmbeddedObjects;
css::uno::Reference< css::container::XNameAccess > * pxXStyleFamilies;
- mutable css::uno::Reference< css::style::XAutoStyles > * pxXAutoStyles;
- css::uno::Reference< css::container::XIndexReplace > * pxXChapterNumbering;
+ mutable css::uno::Reference< css::style::XAutoStyles > * pxXAutoStyles;
+ css::uno::Reference< css::container::XIndexReplace > * pxXChapterNumbering;
css::uno::Reference< css::container::XIndexAccess > * pxXDocumentIndexes;
- css::uno::Reference< css::beans::XPropertySet > * pxXLineNumberingProperties;
- css::uno::Reference< css::container::XNameAccess > * pxLinkTargetSupplier;
+ css::uno::Reference< css::beans::XPropertySet > * pxXLineNumberingProperties;
+ css::uno::Reference< css::container::XNameAccess > * pxLinkTargetSupplier;
css::uno::Reference< css::container::XEnumerationAccess >* pxXRedlines;
css::uno::Reference< css::container::XNameContainer> xXFormsContainer;
@@ -180,9 +180,8 @@ private:
SwXDocumentPropertyHelper* pPropertyHelper;
SwPrintUIOptions * m_pPrintUIOptions;
- SwRenderData * m_pRenderData;
+ SwRenderData * m_pRenderData;
- void GetBodyText();
void GetNumberFormatter();
css::uno::Reference<css::uno::XInterface> create(
diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx
index 1c09a8b8a909..4e07635a2082 100644
--- a/sw/inc/view.hxx
+++ b/sw/inc/view.hxx
@@ -268,12 +268,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
SAL_DLLPRIVATE bool IsTextTool() const;
- // create control elements
- SAL_DLLPRIVATE void CreateBtns();
- DECL_DLLPRIVATE_LINK( BtnPage, Button * );
-
DECL_DLLPRIVATE_LINK_TYPED( TimeoutHdl, Timer*, void );
- DECL_DLLPRIVATE_LINK( UpdatePercentHdl, GraphicFilter* );
DECL_DLLPRIVATE_LINK( FieldPopupModeEndHdl, void* );
@@ -302,8 +297,6 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
DECL_DLLPRIVATE_LINK( WindowChildEventListener, VclSimpleEvent* );
SAL_DLLPRIVATE void CalcVisArea( const Size &rPixelSz );
- SAL_DLLPRIVATE void CreatePageButtons(bool bShow);
-
// linguistics functions
SAL_DLLPRIVATE void HyphenateDocument();
SAL_DLLPRIVATE bool IsDrawTextHyphenate();
@@ -319,7 +312,6 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
SAL_DLLPRIVATE void SpellEnd( SwConversionArgs *pConvArgs = 0 );
SAL_DLLPRIVATE void HyphStart( SvxSpellArea eSpell );
- SAL_DLLPRIVATE bool CheckSpecialContent();
SAL_DLLPRIVATE void SpellKontext(bool bOn = true)
{ m_bCenterCrsr = bOn; m_bAlwaysShowSel = bOn; }
@@ -341,8 +333,6 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
SAL_DLLPRIVATE virtual void Move() SAL_OVERRIDE;
- SAL_DLLPRIVATE void DocumentStatsChanged();
-
public: // #i123922# Needs to be called from a 2nd place now as a helper method
SAL_DLLPRIVATE bool InsertGraphicDlg( SfxRequest& );
@@ -366,8 +356,6 @@ protected:
virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ) SAL_OVERRIDE;
virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ) SAL_OVERRIDE;
- void SetImageButtonColor(Color& rColor);
-
const SwFrameFormat* GetLastTableFrameFormat() const {return m_pLastTableFormat;}
void SetLastTableFrameFormat(const SwFrameFormat* pSet) {m_pLastTableFormat = pSet;}
@@ -453,12 +441,8 @@ public:
void SetTabRowFromDoc( bool b ) { m_bTabRowFromDoc = b; }
bool IsTabRowFromDoc() const { return m_bTabRowFromDoc; }
- // -> #i23726#
void SetNumRuleNodeFromDoc( SwTextNode * pNumRuleNode )
{ m_pNumRuleNodeFromDoc = pNumRuleNode; }
- void SetNumIndentFromDoc(bool b) { m_bNumIndentFromDoc = b; }
- bool IsNumIndentFromDoc() const { return NULL != m_pNumRuleNodeFromDoc; }
- // <- #i23726#
void DocSzChgd( const Size& rNewSize );
const Size& GetDocSz() const { return m_aDocSz; }
@@ -502,7 +486,6 @@ public:
void ChangeVRulerMetric(FieldUnit eUnit);
void GetVRulerMetric(FieldUnit& rToFill) const;
- bool StatTab() const { return m_pHRuler->IsVisible(); }
SvxRuler& GetHRuler() { return *m_pHRuler; }
SvxRuler& GetVRuler() { return *m_pVRuler; }
void InvalidateRulerPos();
@@ -511,13 +494,9 @@ public:
// Handler
void Execute(SfxRequest&);
- void ExecPageMove(SfxRequest&);
- void ExecStyle(SfxRequest&);
void ExecLingu(SfxRequest&);
- void ExecDataBase(SfxRequest&);
void ExecDlg(SfxRequest&);
void ExecDlgExt(SfxRequest&);
- void ExecDBDlg(SfxRequest &);
void ExecColl(SfxRequest&);
void ExecutePrint(SfxRequest&);
void ExecDraw(SfxRequest&);
diff --git a/sw/source/core/inc/SwXMLBlockImport.hxx b/sw/source/core/inc/SwXMLBlockImport.hxx
index 636fe29d6985..f6044938adb4 100644
--- a/sw/source/core/inc/SwXMLBlockImport.hxx
+++ b/sw/source/core/inc/SwXMLBlockImport.hxx
@@ -58,9 +58,6 @@ public:
class SwXMLTextBlockImport : public SvXMLImport
{
-private:
- SwXMLTextBlocks &rBlockList;
-
protected:
// This method is called after the namespace map has been updated, but
// before a context for the current element has been pushed.
@@ -72,12 +69,8 @@ public:
OUString &m_rText;
SwXMLTextBlockImport(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext,
- SwXMLTextBlocks &rBlocks, OUString &rNewText, bool bNewTextOnly );
+ OUString &rNewText, bool bNewTextOnly );
- SwXMLTextBlocks& getBlockList()
- {
- return rBlockList;
- }
virtual ~SwXMLTextBlockImport()
throw();
virtual void SAL_CALL endDocument()
diff --git a/sw/source/core/inc/SwXMLTextBlocks.hxx b/sw/source/core/inc/SwXMLTextBlocks.hxx
index 070335b41f15..110dca125389 100644
--- a/sw/source/core/inc/SwXMLTextBlocks.hxx
+++ b/sw/source/core/inc/SwXMLTextBlocks.hxx
@@ -63,7 +63,6 @@ public:
virtual sal_uLong GetDoc( sal_uInt16 ) SAL_OVERRIDE;
virtual sal_uLong BeginPutDoc( const OUString&, const OUString& ) SAL_OVERRIDE;
virtual sal_uLong PutDoc() SAL_OVERRIDE;
- virtual sal_uLong GetText( sal_uInt16, OUString& ) SAL_OVERRIDE;
virtual sal_uLong PutText( const OUString&, const OUString&, const OUString& ) SAL_OVERRIDE;
virtual sal_uLong MakeBlockList() SAL_OVERRIDE;
diff --git a/sw/source/core/inc/UndoNumbering.hxx b/sw/source/core/inc/UndoNumbering.hxx
index 7e3164a76768..8406fd47c896 100644
--- a/sw/source/core/inc/UndoNumbering.hxx
+++ b/sw/source/core/inc/UndoNumbering.hxx
@@ -51,7 +51,6 @@ public:
virtual SwRewriter GetRewriter() const SAL_OVERRIDE;
SwHistory* GetHistory(); // will be created if necessary
- void SetSttNum( sal_uLong nNdIdx ) { nSttSet = nNdIdx; }
void SaveOldNumRule( const SwNumRule& rOld );
void SetLRSpaceEndPos();
diff --git a/sw/source/core/inc/UndoRedline.hxx b/sw/source/core/inc/UndoRedline.hxx
index 72684ff50420..9fd448f51e3b 100644
--- a/sw/source/core/inc/UndoRedline.hxx
+++ b/sw/source/core/inc/UndoRedline.hxx
@@ -46,7 +46,6 @@ public:
virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
- SwUndoId GetUserId() const { return mnUserId; }
sal_uInt16 GetRedlSaveCount() const;
};
diff --git a/sw/source/core/inc/flyfrms.hxx b/sw/source/core/inc/flyfrms.hxx
index c096a4bd803e..01c3cb6a7e9d 100644
--- a/sw/source/core/inc/flyfrms.hxx
+++ b/sw/source/core/inc/flyfrms.hxx
@@ -204,11 +204,7 @@ public:
inline void InvalidateLayout() const;
inline void InvalidateContent() const;
- inline void ValidateLayout() const;
- inline void ValidateContent() const;
bool IsInvalid() const { return (bInvalidLayout || bInvalidContent); }
- bool IsInvalidLayout() const { return bInvalidLayout; }
- bool IsInvalidContent() const { return bInvalidContent; }
// (26.11.93, see tabfrm.hxx, but might also be valid for others)
// For creation of a Fly after a FlyCnt was created _and_ inserted.
@@ -237,14 +233,6 @@ inline void SwFlyInCntFrm::InvalidateContent() const
const_cast<SwFlyInCntFrm*>(this)->bInvalidContent = true;
}
-inline void SwFlyInCntFrm::ValidateLayout() const
-{
- const_cast<SwFlyInCntFrm*>(this)->bInvalidLayout = false;
-}
-inline void SwFlyInCntFrm::ValidateContent() const
-{
- const_cast<SwFlyInCntFrm*>(this)->bInvalidContent = false;
-}
#endif
diff --git a/sw/source/core/inc/mvsave.hxx b/sw/source/core/inc/mvsave.hxx
index 09d09ec1f737..508fe87e0c3a 100644
--- a/sw/source/core/inc/mvsave.hxx
+++ b/sw/source/core/inc/mvsave.hxx
@@ -45,7 +45,7 @@ namespace sw { namespace mark
class SaveBookmark
{
- public:
+ public:
SaveBookmark(bool bSavePos,
bool bSaveOtherPos,
const ::sw::mark::IMark& rBkmk,
@@ -54,10 +54,8 @@ namespace sw { namespace mark
void SetInDoc(SwDoc* pDoc,
const SwNodeIndex&,
const SwIndex* pIdx =0);
- IDocumentMarkAccess::MarkType GetOriginalBkmType() const
- { return m_eOrigBkmType; }
- private:
+ private:
OUString m_aName;
OUString m_aShortName;
vcl::KeyCode m_aCode;
@@ -74,7 +72,7 @@ namespace sw { namespace mark
/// Takes care of storing relevant attributes of an SwTextNode before split, then restore them on the new node.
class ContentIdxStore
{
- public:
+ public:
virtual void Clear() =0;
virtual bool Empty() =0;
virtual void Save(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nContent, bool bSaveFlySplit=false) =0;
@@ -128,7 +126,6 @@ public:
SwDataChanged( SwDoc* pDoc, const SwPosition& rPos );
~SwDataChanged();
- sal_uLong GetNode() const { return nNode; }
sal_Int32 GetContent() const { return nContent; }
};
diff --git a/sw/source/core/inc/notxtfrm.hxx b/sw/source/core/inc/notxtfrm.hxx
index 73a516a7fedb..f4241e096e6f 100644
--- a/sw/source/core/inc/notxtfrm.hxx
+++ b/sw/source/core/inc/notxtfrm.hxx
@@ -53,7 +53,6 @@ public:
virtual bool GetCrsrOfst(SwPosition* pPos, Point& aPoint,
SwCrsrMoveState* = 0, bool bTestBackground = false) const SAL_OVERRIDE;
- const Size &GetGrfSize() const { return GetSize(); }
void GetGrfArea( SwRect &rRect, SwRect * = 0, bool bMirror = true ) const;
bool IsTransparent() const;
diff --git a/sw/source/core/inc/objectformatter.hxx b/sw/source/core/inc/objectformatter.hxx
index 8580719d1ca4..8fbce7a5b35f 100644
--- a/sw/source/core/inc/objectformatter.hxx
+++ b/sw/source/core/inc/objectformatter.hxx
@@ -101,30 +101,19 @@ class SwObjectFormatter
return mpLayAction;
}
- /** method to restrict the format of floating screen objects to
- as-character anchored ones
- */
- inline void SetFormatOnlyAsCharAnchored()
- {
- mbFormatOnlyAsCharAnchored = true;
- }
-
inline bool FormatOnlyAsCharAnchored() const
{
return mbFormatOnlyAsCharAnchored;
}
/** performs the intrinsic format of a given floating screen object and its content.
-
- #i28701#
*/
void _FormatObj( SwAnchoredObject& _rAnchoredObj );
/** invokes the intrinsic format method for all floating screen objects,
anchored at anchor frame on the given page frame
- #i28701#
- #i26945# - for format of floating screen objects for
+ for format of floating screen objects for
follow text frames, the 'master' text frame is passed to the method.
Thus, the objects, whose anchor character is inside the follow text
frame can be formatted.
@@ -135,26 +124,18 @@ class SwObjectFormatter
bool _FormatObjsAtFrm( SwTextFrm* _pMasterTextFrm = 0L );
/** accessor to collected anchored object
-
- #i28701#
*/
SwAnchoredObject* GetCollectedObj( const sal_uInt32 _nIndex );
/** accessor to 'anchor' page number of collected anchored object
-
- #i28701#
*/
sal_uInt32 GetPgNumOfCollected( const sal_uInt32 _nIndex );
/** accessor to 'anchor' type of collected anchored object
-
- #i26945#
*/
bool IsCollectedAnchoredAtMaster( const sal_uInt32 _nIndex );
/** accessor to total number of collected anchored objects
-
- #i28701#
*/
sal_uInt32 CountOfCollected();
diff --git a/sw/source/core/inc/swblocks.hxx b/sw/source/core/inc/swblocks.hxx
index 6c186abae8a8..f309519554e5 100644
--- a/sw/source/core/inc/swblocks.hxx
+++ b/sw/source/core/inc/swblocks.hxx
@@ -109,7 +109,6 @@ public:
virtual sal_uLong GetDoc( sal_uInt16 ) = 0;
virtual sal_uLong BeginPutDoc( const OUString&, const OUString& ) = 0;
virtual sal_uLong PutDoc() = 0;
- virtual sal_uLong GetText( sal_uInt16, OUString& ) = 0;
virtual sal_uLong PutText( const OUString&, const OUString&, const OUString& ) = 0;
virtual sal_uLong MakeBlockList() = 0;
diff --git a/sw/source/core/swg/SwXMLBlockImport.cxx b/sw/source/core/swg/SwXMLBlockImport.cxx
index e71e3790c79b..8c715df865bd 100644
--- a/sw/source/core/swg/SwXMLBlockImport.cxx
+++ b/sw/source/core/swg/SwXMLBlockImport.cxx
@@ -370,11 +370,9 @@ SvXMLImportContext* SwXMLBlockListImport::CreateFastContext( sal_Int32 Element,
SwXMLTextBlockImport::SwXMLTextBlockImport(
const uno::Reference< uno::XComponentContext >& rContext,
- SwXMLTextBlocks &rBlocks,
OUString & rNewText,
bool bNewTextOnly )
: SvXMLImport(rContext, "", SvXMLImportFlags::ALL ),
- rBlockList ( rBlocks ),
bTextOnly ( bNewTextOnly ),
m_rText ( rNewText )
{
diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx
index a9fec82f46a7..b7e0d256cc57 100644
--- a/sw/source/core/swg/SwXMLTextBlocks.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks.cxx
@@ -408,11 +408,6 @@ sal_uLong SwXMLTextBlocks::PutDoc()
return nErr;
}
-sal_uLong SwXMLTextBlocks::GetText( sal_uInt16 nIdx, OUString& rText )
-{
- return GetBlockText( aNames[ nIdx ]->aShort, rText );
-}
-
sal_uLong SwXMLTextBlocks::GetText( const OUString& rShort, OUString& rText )
{
return GetBlockText( rShort, rText );
diff --git a/sw/source/core/swg/SwXMLTextBlocks1.cxx b/sw/source/core/swg/SwXMLTextBlocks1.cxx
index 17f0cbf0e04e..cd52f44b1707 100644
--- a/sw/source/core/swg/SwXMLTextBlocks1.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks1.cxx
@@ -106,8 +106,7 @@ sal_uLong SwXMLTextBlocks::GetDoc( sal_uInt16 nIdx )
aParserInput.aInputStream = xStream->getInputStream();
// get filter
- // uno::Reference< xml::sax::XDocumentHandler > xFilter = new SwXMLTextBlockImport( *this, aCur, sal_True );
- uno::Reference< xml::sax::XFastDocumentHandler > xFilter = new SwXMLTextBlockImport( xContext, *this, aCur, true );
+ uno::Reference< xml::sax::XFastDocumentHandler > xFilter = new SwXMLTextBlockImport( xContext, aCur, true );
uno::Reference< xml::sax::XFastTokenHandler > xTokenHandler = new SwXMLTextBlockTokenHandler();
// connect parser and filter
@@ -300,9 +299,7 @@ sal_uLong SwXMLTextBlocks::GetBlockText( const OUString& rShort, OUString& rText
aParserInput.aInputStream = xContents->getInputStream();
// get filter
- // #110680#
- // uno::Reference< xml::sax::XDocumentHandler > xFilter = new SwXMLTextBlockImport( *this, rText, bTextOnly );
- uno::Reference< xml::sax::XFastDocumentHandler > xFilter = new SwXMLTextBlockImport( xContext, *this, rText, bTextOnly );
+ uno::Reference< xml::sax::XFastDocumentHandler > xFilter = new SwXMLTextBlockImport( xContext, rText, bTextOnly );
uno::Reference< xml::sax::XFastTokenHandler > xTokenHandler = new SwXMLTextBlockTokenHandler();
// connect parser and filter
diff --git a/sw/source/core/text/atrhndl.hxx b/sw/source/core/text/atrhndl.hxx
index f0c7a6b206fb..76072e73cba0 100644
--- a/sw/source/core/text/atrhndl.hxx
+++ b/sw/source/core/text/atrhndl.hxx
@@ -127,8 +127,6 @@ public:
// apply script dependent attributes
// void ChangeScript( SwFont& rFnt, const sal_uInt8 nScr );
- // returns the default value for stack nStack
- inline const SfxPoolItem& GetDefault( const sal_uInt16 nAttribID ) const;
// do not call these if you only used the small init function
inline void ResetFont( SwFont& rFnt ) const;
inline const SwFont* GetFont() const;
@@ -139,15 +137,6 @@ public:
sal_uInt16& nHeight) const;
};
-inline const SfxPoolItem& SwAttrHandler::GetDefault( const sal_uInt16 nAttribID ) const
-{
- OSL_ENSURE( nAttribID < RES_TXTATR_END,
- "this attrib does not ex."
- );
- OSL_ENSURE( pDefaultArray[ StackPos[ nAttribID ] ], "array not initialized" );
- return *pDefaultArray[ StackPos[ nAttribID ] ];
-}
-
inline void SwAttrHandler::ResetFont( SwFont& rFnt ) const
{
OSL_ENSURE( pFnt, "ResetFont without a font" );
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 089318b71eff..4325b500143f 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -86,10 +86,6 @@ using namespace ::com::sun::star::beans;
#define DRAW_SPECIAL_OPTIONS_CENTER 1
#define DRAW_SPECIAL_OPTIONS_ROTATE 2
-#ifdef DBG_UTIL
-bool SwTextSizeInfo::IsOptDbg() const { return GetOpt().IsTest4(); }
-#endif
-
SwLineInfo::SwLineInfo()
: pRuler( 0 ),
pSpace( 0 ),
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index c6684f7301a7..cb5aa94c9165 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -215,7 +215,6 @@ public:
inline bool NotEOL() const { return m_bNotEOL; }
inline void SetNotEOL( const bool bNew ) { m_bNotEOL = bNew; }
inline bool URLNotify() const { return m_bURLNotify; }
- inline void SetURLNotify( const bool bNew ) { m_bURLNotify = bNew; }
inline bool StopUnderflow() const { return m_bStopUnderflow; }
inline void SetStopUnderflow( const bool bNew ) { m_bStopUnderflow = bNew; }
inline bool IsFootnoteInside() const { return m_bFootnoteInside; }
@@ -357,10 +356,6 @@ public:
{
m_pCachedVclData = pCachedVclData;
}
-
-#ifdef DBG_UTIL
- bool IsOptDbg() const;
-#endif
};
class SwTextPaintInfo : public SwTextSizeInfo
@@ -405,8 +400,6 @@ public:
void CtorInitTextPaintInfo( OutputDevice* pRenderContext, SwTextFrm *pFrame, const SwRect &rPaint );
- void SetBack( const SvxBrushItem *pItem,
- const SwRect &rRect ) { pBrushItem = pItem; aItemRect = rRect;}
const SvxBrushItem *GetBrushItem() const { return pBrushItem; }
const SwRect &GetBrushRect() const { return aItemRect; }
@@ -471,7 +464,6 @@ public:
inline void SetPos( const Point &rNew ) { aPos = rNew; }
inline const SwRect &GetPaintRect() const { return aPaintRect; }
- inline void SetPaintRect( const SwRect &rNew ) { aPaintRect = rNew; }
friend SvStream & WriteSwTextPaintInfo( SvStream &rOS, const SwTextPaintInfo &rInf );
@@ -603,8 +595,6 @@ public:
inline void SetFull( const bool bNew ) { bFull = bNew; }
inline bool IsHyphForbud() const
{ return pFly ? bNoMidHyph : bNoEndHyph; }
- inline void SetHyphForbud( const bool bNew )
- { if ( pFly ) bNoMidHyph = bNew; else bNoEndHyph = bNew; }
inline void ChkNoHyph( const sal_uInt8 bEnd, const sal_uInt8 bMid )
{ bNoEndHyph = (nMaxHyph && bEnd >= nMaxHyph);
bNoMidHyph = (nMaxHyph && bMid >= nMaxHyph); }
@@ -621,7 +611,6 @@ public:
inline bool IsShift() const { return bShift; }
inline void SetShift( const bool bNew ) { bShift = bNew; }
inline bool IsInterHyph() const { return bInterHyph; }
- inline bool IsAutoHyph() const { return bAutoHyph; }
inline bool IsUnderflow() const { return bUnderflow; }
inline void ClrUnderflow() { bUnderflow = false; }
inline bool IsDropInit() const { return bDropInit; }
@@ -659,10 +648,6 @@ public:
inline sal_Unicode GetTabDecimal() const { return cTabDecimal; }
inline void SetTabDecimal( const sal_Unicode cNew ) { cTabDecimal = cNew;}
- // Last*
- inline SwFieldPortion *GetLastField() { return pLastField; }
- inline void SetLastField( SwFieldPortion *pNew ) { pLastField = pNew; }
-
inline void ClearHookChar() { cHookChar = 0; }
inline void SetHookChar( const sal_Unicode cNew ) { cHookChar = cNew; }
inline sal_Unicode GetHookChar() const { return cHookChar; }
@@ -678,7 +663,6 @@ public:
inline void SetArrowDone( const bool bNew ) { bArrowDone = bNew; }
// For SwTextPortion::Hyphenate
- inline bool IsSoftHyph( const sal_Int32 nPos ) const;
bool ChgHyph( const bool bNew );
// Should the hyphenate helper be discarded?
@@ -739,7 +723,6 @@ public:
SwTextSlot( const SwTextSizeInfo *pNew, const SwLinePortion *pPor, bool bTextLen,
bool bExgLists, OUString const & rCh = OUString() );
~SwTextSlot();
- bool IsOn() const { return bOn; }
};
class SwFontSave
@@ -829,11 +812,6 @@ inline void SwTextFormatInfo::SetParaFootnote()
GetTextFrm()->SetFootnote( true );
}
-inline bool SwTextFormatInfo::IsSoftHyph( const sal_Int32 nPos ) const
-{
- return CHAR_SOFTHYPHEN == GetTextFrm()->GetTextNode()->GetText()[nPos];
-}
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/itratr.hxx b/sw/source/core/text/itratr.hxx
index a8cc2e89a4b3..2627367e76e3 100644
--- a/sw/source/core/text/itratr.hxx
+++ b/sw/source/core/text/itratr.hxx
@@ -113,8 +113,6 @@ public:
// Returns the attribute for a position
SwTextAttr *GetAttr( const sal_Int32 nPos ) const;
- const SwAttrSet* GetAttrSet() const { return pAttrSet; }
-
const SwpHints *GetHints() const { return pHints; }
SwFont *GetFnt() { return pFnt; }
diff --git a/sw/source/core/text/itrform2.hxx b/sw/source/core/text/itrform2.hxx
index ed4a48296527..920d17fd9bb4 100644
--- a/sw/source/core/text/itrform2.hxx
+++ b/sw/source/core/text/itrform2.hxx
@@ -203,7 +203,6 @@ public:
bool IsOnceMore() const { return bOnceMore; }
void SetOnceMore( bool bNew ) { bOnceMore = bNew; }
- bool HasChanges() const { return bChanges; }
void SetChanges() { bChanges = true; }
bool HasTruncLines() const { return bTruncLines; }
diff --git a/sw/source/core/text/itrtxt.hxx b/sw/source/core/text/itrtxt.hxx
index fdaec18f7907..84454abb88ea 100644
--- a/sw/source/core/text/itrtxt.hxx
+++ b/sw/source/core/text/itrtxt.hxx
@@ -156,8 +156,6 @@ private:
protected:
// For FormatQuoVadis
inline void Right( const SwTwips nNew ) { nRight = nNew; }
- // For CalcFlyAdjust
- inline void SetDropLeft( const sal_uInt16 nNew ) { nDropLeft = nNew; }
void CtorInitTextMargin( SwTextFrm *pFrm, SwTextSizeInfo *pInf );
explicit SwTextMargin(SwTextNode* pTextNode)
diff --git a/sw/source/core/text/porexp.hxx b/sw/source/core/text/porexp.hxx
index 365364f503d1..c9f9c7b24556 100644
--- a/sw/source/core/text/porexp.hxx
+++ b/sw/source/core/text/porexp.hxx
@@ -47,9 +47,6 @@ public:
: cChar( cCh ), bMulti( bMult )
{ cChar = cCh; SetLen(1); SetWhichPor( POR_BLANK ); }
- bool IsMulti() const { return bMulti; }
- void SetMulti( bool bNew ) { bMulti = bNew; }
-
virtual SwLinePortion *Compress() SAL_OVERRIDE;
virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const SAL_OVERRIDE;
virtual void FormatEOL( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx
index 1e0d5d74f3ef..3f574987786f 100644
--- a/sw/source/core/text/porfld.hxx
+++ b/sw/source/core/text/porfld.hxx
@@ -93,7 +93,6 @@ public:
inline void SetNextOffset( sal_Int32 nNew ) { nNextOffset = nNew; }
inline sal_Int32 GetNextScriptChg() const { return nNextScriptChg; }
- inline void SetNextScriptChg( sal_Int32 nNew ) { nNextScriptChg = nNew; }
// Field cloner for SplitGlue
virtual SwFieldPortion *Clone( const OUString &rExpand ) const;
@@ -197,7 +196,6 @@ public:
{ const_cast<SwGrfNumPortion*>(this)->nId = nNew; }
inline SwTwips GetRelPos() const { return nYPos; }
inline SwTwips GetGrfHeight() const { return nGrfHeight; }
- inline SwTwips GetId() const { return nId; }
inline sal_Int16 GetOrient() const { return eOrient; }
OUTPUT_OPERATOR_OVERRIDE
diff --git a/sw/source/core/text/porlay.hxx b/sw/source/core/text/porlay.hxx
index e42aa5c8031c..777f6f1d7e30 100644
--- a/sw/source/core/text/porlay.hxx
+++ b/sw/source/core/text/porlay.hxx
@@ -44,8 +44,6 @@ public:
inline const sal_Int32 &Start() const { return nStart; }
inline void LeftMove( sal_Int32 nNew )
{ if ( nNew < nStart ) { nLen += nStart-nNew; nStart = nNew; } }
- inline sal_Int32 End() const
- { return nStart + nLen; }
inline sal_Int32 &Len() { return nLen; }
inline const sal_Int32 &Len() const { return nLen; }
inline bool operator<(const SwCharRange &rRange) const
@@ -111,14 +109,10 @@ public:
inline void ResetFlags();
inline void SetFormatAdj( const bool bNew ) { bFormatAdj = bNew; }
inline bool IsFormatAdj() const { return bFormatAdj; }
- inline void SetFntChg( const bool bNew ) { bFntChg = bNew; }
- inline bool IsFntChg() const { return bFntChg; }
inline void SetEndHyph( const bool bNew ) { bEndHyph = bNew; }
inline bool IsEndHyph() const { return bEndHyph; }
inline void SetMidHyph( const bool bNew ) { bMidHyph = bNew; }
inline bool IsMidHyph() const { return bMidHyph; }
- inline void SetTab( const bool bNew ) { bTab = bNew; }
- inline bool IsTab() const { return bTab; }
inline void SetFly( const bool bNew ) { bFly = bNew; }
inline bool IsFly() const { return bFly; }
inline void SetRest( const bool bNew ) { bRest = bNew; }
@@ -132,7 +126,6 @@ public:
inline void SetForcedLeftMargin( const bool bNew = true ) { bForcedLeftMargin = bNew; }
inline bool HasForcedLeftMargin() const { return bForcedLeftMargin; }
inline void SetHanging( const bool bNew = true ) { bHanging = bNew; }
- inline bool IsHanging() const { return bHanging; }
inline void SetUnderscore( const bool bNew = true ) { bUnderscore = bNew; }
inline bool HasUnderscore() const { return bUnderscore; }
@@ -313,34 +306,12 @@ public:
inline bool IsFootnoteNum() const { return bFootnoteNum; }
inline void SetMargin( const bool bNew = true ) { bMargin = bNew; }
inline bool IsMargin() const { return bMargin; }
- inline void SetFlag00( const bool bNew = true ) { bFlag00 = bNew; }
- inline bool IsFlag00() const { return bFlag00; }
- inline void SetFlag11( const bool bNew = true ) { bFlag11 = bNew; }
- inline bool IsFlag11() const { return bFlag11; }
- inline void SetFlag12( const bool bNew = true ) { bFlag12 = bNew; }
- inline bool IsFlag12() const { return bFlag12; }
- inline void SetFlag13( const bool bNew = true ) { bFlag13 = bNew; }
- inline bool IsFlag13() const { return bFlag13; }
- inline void SetFlag14( const bool bNew = true ) { bFlag14 = bNew; }
- inline bool IsFlag14() const { return bFlag14; }
- inline void SetFlag15( const bool bNew = true ) { bFlag15 = bNew; }
- inline bool IsFlag15() const { return bFlag15; }
- inline void SetFlag16( const bool bNew = true ) { bFlag16 = bNew; }
- inline bool IsFlag16() const { return bFlag16; }
-
- // Read/Write methods for the SWG filter
- SvStream &ReadSwg ( SvStream& rStream ); //$ istream
- SvStream &WriteSwg( SvStream& rStream ); //$ ostream
// Set nErgo in the QuoVadisPortion
void SetErgoSumNum( const OUString &rErgo );
const SwDropPortion *FindDropPortion() const;
-#ifdef DBG_UTIL
- void dumpAsXml( xmlTextWriter* writer, SwTextFrm* pTextFrm );
-#endif
-
OUTPUT_OPERATOR_OVERRIDE
DECL_FIXEDMEMPOOL_NEWDEL(SwParaPortion)
};
diff --git a/sw/source/core/text/porlin.hxx b/sw/source/core/text/porlin.hxx
index d6efaabb72dc..6f42c7b9e952 100644
--- a/sw/source/core/text/porlin.hxx
+++ b/sw/source/core/text/porlin.hxx
@@ -92,8 +92,6 @@ public:
inline void AddPrtWidth( const sal_uInt16 nNew ) { Width( Width() + nNew ); }
inline void SubPrtWidth( const sal_uInt16 nNew ) { Width( Width() - nNew ); }
- inline const SwPosSize &PrtSize() const { return *this; }
-
// Insert methods
virtual SwLinePortion *Insert( SwLinePortion *pPortion );
virtual SwLinePortion *Append( SwLinePortion *pPortion );
@@ -117,7 +115,6 @@ public:
inline bool InToxRefGrp() const { return (nWhichPor & PORGRP_TOXREF) != 0; }
inline bool InToxRefOrFieldGrp() const { return (nWhichPor & ( PORGRP_FLD | PORGRP_TOXREF )) != 0; }
inline bool InExpGrp() const { return (nWhichPor & PORGRP_EXP) != 0; }
- inline bool InTabnLftGrp() const { return (nWhichPor & PORGRP_TABNOTLFT) != 0; }
inline bool InFixMargGrp() const { return (nWhichPor & PORGRP_FIXMARG) != 0; }
inline bool InSpaceGrp() const { return InTextGrp() || IsMultiPortion(); }
// Individual queries
@@ -127,12 +124,9 @@ public:
inline bool IsBreakPortion() const { return nWhichPor == POR_BRK; }
inline bool IsErgoSumPortion() const { return nWhichPor == POR_ERGOSUM; }
inline bool IsQuoVadisPortion() const { return nWhichPor == POR_QUOVADIS; }
- inline bool IsTabCntPortion() const { return nWhichPor == POR_TABCENTER; }
- inline bool IsTabDecimalPortion() const { return nWhichPor == POR_TABDECIMAL; }
inline bool IsTabLeftPortion() const { return nWhichPor == POR_TABLEFT; }
inline bool IsFootnoteNumPortion() const { return nWhichPor == POR_FTNNUM; }
inline bool IsFootnotePortion() const { return nWhichPor == POR_FTN; }
- inline bool IsTmpEndPortion() const { return nWhichPor == POR_TMPEND; }
inline bool IsDropPortion() const { return nWhichPor == POR_DROP; }
inline bool IsLayPortion() const { return nWhichPor == POR_LAY; }
inline bool IsParaPortion() const { return nWhichPor == POR_PARA; }
@@ -143,7 +137,6 @@ public:
inline bool IsPostItsPortion() const { return nWhichPor == POR_POSTITS; }
inline bool IsCombinedPortion() const { return nWhichPor == POR_COMBINED; }
inline bool IsTextPortion() const { return nWhichPor == POR_TXT; }
- inline bool IsURLPortion() const { return nWhichPor == POR_URL; }
inline bool IsHangingPortion() const { return nWhichPor == POR_HNG; }
inline bool IsKernPortion() const { return nWhichPor == POR_KERN; }
inline bool IsArrowPortion() const { return nWhichPor == POR_ARROW; }
diff --git a/sw/source/core/text/pormulti.hxx b/sw/source/core/text/pormulti.hxx
index f78baddd1ffa..8e323aa2a3a2 100644
--- a/sw/source/core/text/pormulti.hxx
+++ b/sw/source/core/text/pormulti.hxx
@@ -114,8 +114,6 @@ public:
virtual ~SwMultiPortion();
const SwLineLayout& GetRoot() const { return aRoot; }
SwLineLayout& GetRoot() { return aRoot; }
- SwFieldPortion* GetFieldRest() { return pFieldRest; }
- void SetFieldRest( SwFieldPortion* pNew ) { pFieldRest = pNew; }
inline bool HasTabulator() const { return bTab1 || bTab2; }
inline bool IsFormatted() const { return bFormatted; }
@@ -141,8 +139,6 @@ public:
inline bool HasRotation() const { return 0 != (1 & nDirection); }
inline bool IsRevers() const { return 0 != (2 & nDirection); }
inline sal_uInt8 GetDirection() const { return nDirection; }
- inline sal_uInt16 GetFontRotation() const
- { return ( HasRotation() ? ( IsRevers() ? 2700 : 900 ) : 0 ); }
// Accessibility: pass information about this portion to the PortionHandler
virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE;
@@ -178,8 +174,6 @@ public:
{ return ( nLineDiff < 0 ) ? nBlank2 : nBlank1; }
inline sal_Int32 GetSmallerSpaceCnt() const
{ return ( nLineDiff < 0 ) ? nBlank1 : nBlank2; }
- inline sal_Int32 GetBlank1() const { return nBlank1; }
- inline sal_Int32 GetBlank2() const { return nBlank2; }
virtual long CalcSpacing( long nSpaceAdd, const SwTextSizeInfo &rInf ) const SAL_OVERRIDE;
virtual bool ChgSpaceAdd( SwLineLayout* pCurr, long nSpaceAdd ) const SAL_OVERRIDE;
diff --git a/sw/source/core/text/txtcache.hxx b/sw/source/core/text/txtcache.hxx
index 593ec7312c53..c3bdd80391b3 100644
--- a/sw/source/core/text/txtcache.hxx
+++ b/sw/source/core/text/txtcache.hxx
@@ -53,16 +53,9 @@ public:
SwParaPortion *GetPara();
- inline SwTextLine &GetTextLine();
-
virtual bool IsAvailable() const SAL_OVERRIDE;
};
-inline SwTextLine &SwTextLineAccess::GetTextLine()
-{
- return *static_cast<SwTextLine*>(Get());
-}
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/txtpaint.hxx b/sw/source/core/text/txtpaint.hxx
index bb51338aedb5..98c2ba61b230 100644
--- a/sw/source/core/text/txtpaint.hxx
+++ b/sw/source/core/text/txtpaint.hxx
@@ -47,7 +47,6 @@ public:
void Reset();
inline bool IsOn() const { return bOn; }
inline bool IsChg() const { return bChg; }
- inline OutputDevice *GetOut() { return pOut; }
};
inline SwSaveClip::~SwSaveClip()
diff --git a/sw/source/core/text/widorp.hxx b/sw/source/core/text/widorp.hxx
index 3d8ee94e9af0..18e80f1abe95 100644
--- a/sw/source/core/text/widorp.hxx
+++ b/sw/source/core/text/widorp.hxx
@@ -35,13 +35,8 @@ protected:
public:
SwTextFrmBreak( SwTextFrm *pFrm, const SwTwips nRst = 0 );
bool IsBreakNow( SwTextMargin &rLine );
-
- bool IsBroken() const { return bBreak; }
bool IsKeepAlways() const { return bKeep; }
- void Keep() { bKeep = true; }
- void Break() { bKeep = false; bBreak = true; }
- inline bool GetKeep() const { return bKeep; }
inline void SetKeep( const bool bNew ) { bKeep = bNew; }
bool IsInside( SwTextMargin &rLine ) const;
@@ -53,7 +48,6 @@ public:
// OD 2004-02-27 #106629# - no longer inline
void SetRstHeight( const SwTextMargin &rLine );
- SwTwips GetRstHeight() const { return nRstHeight; }
};
class WidowsAndOrphans : public SwTextFrmBreak
diff --git a/sw/source/filter/html/htmlfly.hxx b/sw/source/filter/html/htmlfly.hxx
index d3bce6bbaa46..265305385b62 100644
--- a/sw/source/filter/html/htmlfly.hxx
+++ b/sw/source/filter/html/htmlfly.hxx
@@ -109,12 +109,10 @@ public:
sal_uInt8 GetOutMode() const { return nOutputMode; }
static sal_uInt8 GetOutFn( sal_uInt8 nMode ) { return nMode & HTML_OUT_MASK; }
- static sal_uInt8 GetOutPos( sal_uInt8 nMode ) { return nMode & HTML_POS_MASK; }
static sal_uInt8 GetOutCntnr( sal_uInt8 nMode ) { return nMode & HTML_CNTNR_MASK; }
sal_uInt8 GetOutFn() const { return nOutputMode & HTML_OUT_MASK; }
sal_uInt8 GetOutPos() const { return nOutputMode & HTML_POS_MASK; }
- sal_uInt8 GetOutCntnr() const { return nOutputMode & HTML_CNTNR_MASK; }
};
class SwHTMLPosFlyFrms
diff --git a/sw/source/filter/html/htmlnum.hxx b/sw/source/filter/html/htmlnum.hxx
index 13121c943218..555a644afdb2 100644
--- a/sw/source/filter/html/htmlnum.hxx
+++ b/sw/source/filter/html/htmlnum.hxx
@@ -75,10 +75,8 @@ public:
sal_uInt16 DecDepth() { return nDeep==0 ? 0 : --nDeep; }
inline sal_uInt8 GetLevel() const;
- void SetRestart( bool bSet ) { bRestart = bSet; }
bool IsRestart() const { return bRestart; }
- void SetNumbered( bool bSet ) { bNumbered = bSet; }
bool IsNumbered() const { return bNumbered; }
inline void SetNodeStartValue( sal_uInt8 nLvl, sal_uInt16 nVal=USHRT_MAX );
diff --git a/sw/source/filter/html/htmlvsh.hxx b/sw/source/filter/html/htmlvsh.hxx
index 0642261e0def..da9abc0e7162 100644
--- a/sw/source/filter/html/htmlvsh.hxx
+++ b/sw/source/filter/html/htmlvsh.hxx
@@ -29,15 +29,9 @@ protected:
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE;
public:
-
explicit SwHTMLViewShellClient( SwViewShell *pVSh );
virtual ~SwHTMLViewShellClient();
-
- void Register( SwViewShell *pVsh );
- void DeRegister();
-
- SwViewShell *GetViewShell();
};
#endif
diff --git a/sw/source/filter/html/parcss1.hxx b/sw/source/filter/html/parcss1.hxx
index b7e64dda0b2a..cbe524c44b70 100644
--- a/sw/source/filter/html/parcss1.hxx
+++ b/sw/source/filter/html/parcss1.hxx
@@ -260,9 +260,6 @@ protected:
public:
CSS1Parser();
virtual ~CSS1Parser();
-
- inline sal_uInt32 GetLineNr() const { return nlLineNr; }
- inline sal_uInt32 GetLinePos() const { return nlLinePos; }
};
inline sal_uInt32 CSS1Parser::SetLinePos( sal_uInt32 nlPos )
diff --git a/sw/source/filter/html/svxcss1.hxx b/sw/source/filter/html/svxcss1.hxx
index 626d7328ac17..09414ede0dbb 100644
--- a/sw/source/filter/html/svxcss1.hxx
+++ b/sw/source/filter/html/svxcss1.hxx
@@ -171,9 +171,6 @@ public:
const SvxCSS1PropertyInfo& GetPropertyInfo() const { return aPropInfo; }
SvxCSS1PropertyInfo& GetPropertyInfo() { return aPropInfo; }
- const OUString& GetKey() const { return aKey; }
- void SetKey( const OUString& rKey ) { aKey = rKey.toAsciiUpperCase(); }
-
friend bool operator==( const SvxCSS1MapEntry& rE1,
const SvxCSS1MapEntry& rE2 );
friend bool operator<( const SvxCSS1MapEntry& rE1,
diff --git a/sw/source/filter/html/swcss1.hxx b/sw/source/filter/html/swcss1.hxx
index 9beac833570d..b7cd01e827c3 100644
--- a/sw/source/filter/html/swcss1.hxx
+++ b/sw/source/filter/html/swcss1.hxx
@@ -59,9 +59,6 @@ class SwCSS1Parser : public SvxCSS1Parser
bool bLinkCharFormatsSet : 1;
- // die Vorlagen fuer DL anlegen
- SwTextFormatColl* GetDefListTextFormatColl( sal_uInt16 nCollId, sal_uInt16 nDeep );
-
const SwPageDesc* GetPageDesc( sal_uInt16 nPoolId, bool bCreate );
void SetTableTextColl( bool bHeader );
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 4b9701d4b171..1f7c49ea1d33 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -130,7 +130,6 @@ public:
// sind. Sie werden deshalb einfach invalidiert und erst beim naechsten
// _SetAttr() geloescht.
void Invalidate() { bValid = false; }
- bool IsValid() const { return bValid; }
};
// Tabelle der Attribute: Hier ist die Reihenfolge wichtig: Die Attribute
@@ -566,7 +565,6 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
// wird er entfernt
_HTMLAttrContext *PopContext( sal_uInt16 nToken=0, sal_uInt16 nLimit=0,
bool bRemove=true );
- inline const _HTMLAttrContext *GetTopContext() const;
bool GetMarginsFromContext( sal_uInt16 &nLeft, sal_uInt16 &nRight, short& nIndent,
bool bIgnoreCurrent=false ) const;
@@ -605,7 +603,6 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
// <MULTICOL>
void NewMultiCol( sal_uInt16 columnsFromCss=0 );
- void EndMultiCol();
// <MARQUEE>
void NewMarquee( HTMLTable *pCurTable=0 );
@@ -751,9 +748,6 @@ private:
void InsertBasicDocEvent( const OUString& aEventName, const OUString& rName,
ScriptType eScrType, const OUString& rScrType );
- // ein Event an ein VC-Control anhaengen (htmlform.cxx)
- void InsertBasicCtrlEvent( sal_uInt16 nEvent, const OUString& rName );
-
// Inserting styles
// <STYLE>
@@ -981,12 +975,6 @@ inline bool SwHTMLParser::HasStyleOptions( const OUString &rStyle,
(pLang && !pLang->isEmpty()) || (pDir && !pDir->isEmpty());
}
-inline const _HTMLAttrContext *SwHTMLParser::GetTopContext() const
-{
- return aContexts.size() > nContextStMin
- ? aContexts.back() : 0;
-}
-
inline void SwHTMLParser::PushContext( _HTMLAttrContext *pCntxt )
{
aContexts.push_back( pCntxt );
diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx
index 57fd9f5df436..a406e7c1bf7f 100644
--- a/sw/source/filter/inc/fltshell.hxx
+++ b/sw/source/filter/inc/fltshell.hxx
@@ -115,7 +115,6 @@ public:
SW_DLLPUBLIC SwFltStackEntry(const SwPosition & rStartPos, SfxPoolItem* pHt );
SW_DLLPUBLIC ~SwFltStackEntry();
- void SetStartPos(const SwPosition & rStartPos);
SW_DLLPUBLIC void SetEndPos( const SwPosition & rEndPos);
SW_DLLPUBLIC bool MakeRegion(SwDoc* pDoc, SwPaM& rRegion, bool bCheck) const;
SW_DLLPUBLIC static bool MakeRegion(SwDoc* pDoc, SwPaM& rRegion,
@@ -126,7 +125,6 @@ public:
void SetEndCP(sal_Int32 nCP) {mnEndCP = nCP;}
sal_Int32 GetStartCP() const {return mnStartCP;}
sal_Int32 GetEndCP() const {return mnEndCP;}
- bool IsAbleMakeRegion();
bool IsParaEnd(){ return bIsParaEnd;}
void SetIsParaEnd(bool bArg){ bIsParaEnd = bArg;}
};
@@ -306,7 +304,6 @@ public:
virtual bool operator==(const SfxPoolItem&) const SAL_OVERRIDE;
virtual SfxPoolItem* Clone(SfxItemPool* = 0) const SAL_OVERRIDE;
SwTOXBase* GetBase() { return pTOXBase; }
- sal_uInt16 GetCols() const { return nCols; }
void SetHadBreakItem( bool bVal ) { bHadBreakItem = bVal; }
void SetHadPageDescItem( bool bVal ) { bHadPageDescItem = bVal; }
bool HadBreakItem() const { return bHadBreakItem; }
diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx
index 9b1c2551e271..1b3ff701b744 100644
--- a/sw/source/filter/inc/msfilter.hxx
+++ b/sw/source/filter/inc/msfilter.hxx
@@ -404,7 +404,6 @@ namespace sw
protected:
std::vector<OUString> maAuthors; // Array of Sw - Bookmarknames
- sal_uInt16 GetPos( const OUString& rNm );
public:
WrtRedlineAuthor() {}
virtual ~WrtRedlineAuthor() {}
diff --git a/sw/source/filter/inc/rtf.hxx b/sw/source/filter/inc/rtf.hxx
index ec655d720436..a0288fdd61e2 100644
--- a/sw/source/filter/inc/rtf.hxx
+++ b/sw/source/filter/inc/rtf.hxx
@@ -40,8 +40,6 @@ public:
Value.Flags.nJunk = 0;
}
- sal_uInt8 GetOrder() const { return (sal_uInt8)Value.Flags.nOrder; }
- bool GetGoldCut() const { return Value.Flags.nGoldCut; }
sal_uInt16 GetValue() const { return Value.nVal; }
};
diff --git a/sw/source/filter/inc/wrtswtbl.hxx b/sw/source/filter/inc/wrtswtbl.hxx
index 6af8e2edf6ed..8c7569197f24 100644
--- a/sw/source/filter/inc/wrtswtbl.hxx
+++ b/sw/source/filter/inc/wrtswtbl.hxx
@@ -133,7 +133,6 @@ public:
bool HasTopBorder() const { return bTopBorder; }
bool HasBottomBorder() const { return bBottomBorder; }
- long GetPos() const { return nPos; }
const SwWriteTableCells& GetCells() const { return aCells; }
inline bool operator==( const SwWriteTableRow& rRow ) const;
@@ -309,7 +308,6 @@ public:
SwWriteTable(const SwTable* pTable, const SwHTMLTableLayout *pLayoutInfo);
virtual ~SwWriteTable();
- const SwWriteTableCols& GetCols() const { return aCols; }
const SwWriteTableRows& GetRows() const { return aRows; }
const SwTable* GetTable() const { return m_pTable; }
diff --git a/sw/source/filter/ww8/WW8FFData.hxx b/sw/source/filter/ww8/WW8FFData.hxx
index 81e3e672da40..f861a07753c2 100644
--- a/sw/source/filter/ww8/WW8FFData.hxx
+++ b/sw/source/filter/ww8/WW8FFData.hxx
@@ -70,39 +70,18 @@ public:
~WW8FFData();
void setType(sal_uInt8 nType) { mnType = nType; }
- sal_uInt8 getType() const { return mnType; }
+
void setResult(sal_uInt8 nResult) { mnResult = nResult; }
- sal_uInt8 getResult() const { return mnResult; }
- void setProptexted(bool bProtected) { mbProtected = bProtected; }
- bool getProtected() const { return mbProtected; }
- void setSize(bool bSize) { mbSize = bSize; }
- bool getSize() const { return mbSize; }
- void setTextType(sal_uInt8 nTextType) { mnTextType = nTextType; }
- sal_uInt8 getTextType() const { return mnTextType; }
- void setRecalc(bool bRecalc) { mbRecalc = bRecalc; }
- bool getRecalc() const { return mbRecalc; }
- void setListBox(bool bListBox) { mbListBox = bListBox; }
- bool getListBox() const { return mbListBox; }
- void setMaxLen(sal_uInt16 nMaxLen) { mnMaxLen = nMaxLen; }
- sal_uInt16 getMaxLen() const { return mnMaxLen; }
+
void setCheckboxHeight(sal_uInt16 nCheckboxHeight) { mnCheckboxHeight = nCheckboxHeight; }
- sal_uInt16 getCheckboxHeight() const { return mnCheckboxHeight; }
+
void setName(const OUString & rName) { msName = rName; }
- const OUString & getName() const { return msName; }
- void setDefaultString(const OUString & rDefault) { msDefault = rDefault; }
- const OUString & getDefaultString() const { return msDefault; }
+
void setDefaultResult(sal_uInt16 nDefault) { mnDefault = nDefault; }
- sal_uInt16 getDefaultResult() const { return mnDefault; }
- void setFormat(const OUString & rFormat) { msFormat = rFormat; }
- const OUString & getFormat() const { return msFormat; }
+
void setHelp(const OUString & rHelp);
- const OUString getHelp() const { return msHelp; }
+
void setStatus(const OUString & rStatus);
- const OUString & getStatus() const { return msStatus; }
- void setMacroEnter(const OUString & rMacroEnter) { msMacroEnter = rMacroEnter; }
- const OUString & getMacroEnter() const { return msMacroEnter; }
- void setMacroExit(const OUString & rMacroExit) { msMacroExit = rMacroExit; }
- const OUString & getMacroExit() const { return msMacroExit; }
void addListboxEntry(const OUString & rEntry);
diff --git a/sw/source/filter/ww8/WW8Sttbf.hxx b/sw/source/filter/ww8/WW8Sttbf.hxx
index 9a6d8fcb7752..8c9466b1c568 100644
--- a/sw/source/filter/ww8/WW8Sttbf.hxx
+++ b/sw/source/filter/ww8/WW8Sttbf.hxx
@@ -48,12 +48,7 @@ class WW8Struct : public ::sw::ExternalData
sal_uInt16 getU16(sal_uInt32 nOffset)
{ return getU8(nOffset) + (getU8(nOffset + 1) << 8); }
- sal_uInt32 getU32(sal_uInt32 nOffset)
- { return getU16(nOffset) + (getU16(nOffset + 1) << 16); }
-
OUString getUString(sal_uInt32 nOffset, sal_uInt32 nCount);
-
- OUString getString(sal_uInt32 nOffset, sal_uInt32 nCount);
};
typedef ::std::vector<OUString> StringVector_t;
diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx b/sw/source/filter/ww8/WW8TableInfo.cxx
index 91244f3a216b..3f4b08b04063 100644
--- a/sw/source/filter/ww8/WW8TableInfo.cxx
+++ b/sw/source/filter/ww8/WW8TableInfo.cxx
@@ -547,11 +547,6 @@ sal_uInt32 WW8TableNodeInfo::getRow() const
return getInnerForDepth(mnDepth)->getRow();
}
-bool WW8TableNodeInfo::isEndOfLine() const
-{
- return getInnerForDepth(mnDepth)->isEndOfLine();
-}
-
const WW8TableNodeInfoInner::Pointer_t WW8TableNodeInfo::getFirstInner() const
{
WW8TableNodeInfoInner::Pointer_t pResult;
diff --git a/sw/source/filter/ww8/WW8TableInfo.hxx b/sw/source/filter/ww8/WW8TableInfo.hxx
index 442f11d724b3..5cfc82c94f62 100644
--- a/sw/source/filter/ww8/WW8TableInfo.hxx
+++ b/sw/source/filter/ww8/WW8TableInfo.hxx
@@ -95,7 +95,6 @@ public:
bool isEndOfLine() const { return mbEndOfLine;}
bool isFinalEndOfLine() const { return mbFinalEndOfLine;}
bool isFirstInTable() const { return mbFirstInTable;}
- bool isVertMerge() const;
const SwTableBox * getTableBox() const { return mpTableBox;}
const SwTable * getTable() const { return mpTable;}
const SwRect & getRect() const { return maRect;}
@@ -201,14 +200,10 @@ public:
WW8TableInfo * getParent() const { return mpParent;}
sal_uInt32 getDepth() const;
- bool isEndOfLine() const;
- bool isEndOfCell() const;
- bool isFirstInTable() const;
const SwNode * getNode() const { return mpNode;}
const SwTableBox * getTableBox() const;
WW8TableNodeInfo * getNext() const { return mpNext;}
const SwNode * getNextNode() const { return mpNextNode;}
- const SwRect & getRect() const;
const Inners_t & getInners() const { return mInners;}
const WW8TableNodeInfoInner::Pointer_t getFirstInner() const;
@@ -351,7 +346,6 @@ public:
WW8TableNodeInfo * processSwTableByLayout(const SwTable * pTable, RowEndInners_t &rLastRowEnds);
WW8TableNodeInfo::Pointer_t getTableNodeInfo(const SwNode * pNode);
const SwNode * getNextNode(const SwNode * pNode);
- const WW8TableNodeInfo * getFirstTableNodeInfo() const;
WW8TableNodeInfo * reorderByLayout(const SwTable * pTable, RowEndInners_t &rLastRowEnds);
};
diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx b/sw/source/filter/ww8/attributeoutputbase.hxx
index 2fb5186b33ea..457839c60526 100644
--- a/sw/source/filter/ww8/attributeoutputbase.hxx
+++ b/sw/source/filter/ww8/attributeoutputbase.hxx
@@ -251,8 +251,6 @@ public:
virtual void TableVerticalCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) = 0;
- virtual void TableNodeInfo( ww8::WW8TableNodeInfo::Pointer_t pNodeInfo ) = 0;
-
virtual void TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer_t pNodeInfoInner ) = 0;
virtual void TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) = 0;
@@ -334,9 +332,6 @@ public:
/// The type of breaking.
virtual void SectionType( sal_uInt8 nBreakCode ) = 0;
- /// Special header/footer flags, needed for old versions only.
- virtual void SectionWW6HeaderFooterFlags( sal_uInt8 /*nHeadFootFlags*/ ) {}
-
/// Definition of a numbering instance.
virtual void NumberingDefinition( sal_uInt16 nId, const SwNumRule &rRule ) = 0;
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 423604399e58..e838e44e58df 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3687,11 +3687,6 @@ void DocxAttributeOutput::TableVerticalCell( ww8::WW8TableNodeInfoInner::Pointer
}
}
-void DocxAttributeOutput::TableNodeInfo( ww8::WW8TableNodeInfo::Pointer_t /*pNodeInfo*/ )
-{
- OSL_TRACE( "TODO: DocxAttributeOutput::TableNodeInfo( ww8::WW8TableNodeInfo::Pointer_t pNodeInfo )" );
-}
-
void DocxAttributeOutput::TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer_t pNodeInfoInner )
{
// This is called when the nested table ends in a cell, and there's no
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index 6c2a63cf1b85..b730c9fe375b 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -239,7 +239,6 @@ public:
virtual void TableCanSplit( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE;
virtual void TableBidi( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE;
virtual void TableVerticalCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE;
- virtual void TableNodeInfo( ww8::WW8TableNodeInfo::Pointer_t pNodeInfo ) SAL_OVERRIDE;
virtual void TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer_t pNodeInfoInner ) SAL_OVERRIDE;
virtual void TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE;
virtual void TableSpacing( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE;
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 7ba1699d4798..f2416b47948d 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -782,11 +782,6 @@ void RtfAttributeOutput::TableVerticalCell(ww8::WW8TableNodeInfoInner::Pointer_t
}
}
-void RtfAttributeOutput::TableNodeInfo(ww8::WW8TableNodeInfo::Pointer_t /*pNodeInfo*/)
-{
- /* noop */
-}
-
void RtfAttributeOutput::TableNodeInfoInner(ww8::WW8TableNodeInfoInner::Pointer_t pNodeInfoInner)
{
// This is called when the nested table ends in a cell, and there's no
diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx b/sw/source/filter/ww8/rtfattributeoutput.hxx
index 076fdaf9d7ac..9407fefb573c 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.hxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.hxx
@@ -121,7 +121,6 @@ public:
virtual void TableCanSplit(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) SAL_OVERRIDE;
virtual void TableBidi(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) SAL_OVERRIDE;
virtual void TableVerticalCell(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) SAL_OVERRIDE;
- virtual void TableNodeInfo(ww8::WW8TableNodeInfo::Pointer_t pNodeInfo) SAL_OVERRIDE;
virtual void TableNodeInfoInner(ww8::WW8TableNodeInfoInner::Pointer_t pNodeInfoInner) SAL_OVERRIDE;
virtual void TableOrientation(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) SAL_OVERRIDE;
virtual void TableSpacing(ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner) SAL_OVERRIDE;
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index b3162aa9b628..1fe29a663787 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2791,35 +2791,6 @@ void MSWordExportBase::OutputTextNode( const SwTextNode& rNode )
SAL_INFO( "sw.ww8", "</OutWW8_SwTextNode>" );
}
-void WW8AttributeOutput::TableNodeInfo( ww8::WW8TableNodeInfo::Pointer_t pNodeInfo )
-{
- SVBT16 nSty;
- ShortToSVBT16( GetExport().m_nStyleBeforeFly, nSty );
-
- ww8::WW8TableNodeInfo::Inners_t::const_iterator aIt( pNodeInfo->getInners().begin() );
- ww8::WW8TableNodeInfo::Inners_t::const_iterator aItEnd( pNodeInfo->getInners().end() );
-
- while (aIt != aItEnd)
- {
- ww8::WW8TableNodeInfoInner::Pointer_t pInner = aIt->second;
- if ( pInner->isEndOfCell() )
- {
- TableRowEnd( pInner->getDepth() );
-
- m_rWW8Export.pO->insert( m_rWW8Export.pO->end(), nSty, nSty+2); // Style #
- TableInfoRow( pInner );
- m_rWW8Export.m_pPapPlc->AppendFkpEntry( m_rWW8Export.Strm().Tell(), m_rWW8Export.pO->size(), m_rWW8Export.pO->data());
- m_rWW8Export.pO->clear();
- }
-
- if ( pInner->isEndOfLine() )
- {
- }
-
- ++aIt;
- }
-}
-
// Tables
void WW8AttributeOutput::EmptyParagraph()
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 34f04129be47..f81136d715f6 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -190,7 +190,6 @@ protected:
std::vector<WW8_SepInfo> aSects;
void CheckForFacinPg( WW8Export& rWrt ) const;
- void WriteOlst( WW8Export& rWrt, const WW8_SepInfo& rSectionInfo );
void NeedsDocumentProtected(const WW8_SepInfo &rInfo);
//No copy, no assign
@@ -993,8 +992,6 @@ private:
void RestoreMacroCmds();
- void InitFontTable();
-
void DoComboBox(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> xPropSet);
void DoCheckBox(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> xPropSet);
@@ -1090,16 +1087,12 @@ public:
void SetHdFtIndex(unsigned int nHdFtIndex) { m_nHdFtIndex = nHdFtIndex; }
void IncrementHdFtIndex() { ++m_nHdFtIndex; }
- static long GetDTTM( const DateTime& rDT );
-
/// Convert the SVX numbering type to id
static sal_uInt8 GetNumId( sal_uInt16 eNumType );
/// Guess the script (asian/western).
virtual bool CollapseScriptsforWordOk( sal_uInt16 nScript, sal_uInt16 nWhich ) SAL_OVERRIDE;
- sal_uInt16 DupNumRuleWithLvlStart(const SwNumRule *pRule,sal_uInt8 nLvl,sal_uInt16 nVal);
-
SwTwips CurrentPageWidth(SwTwips &rLeft, SwTwips &rRight) const;
/// Nasty swap for bidi if necessary
@@ -1108,8 +1101,6 @@ public:
void InsUInt16( sal_uInt16 n ) { SwWW8Writer::InsUInt16( *pO, n ); }
void InsUInt32( sal_uInt32 n ) { SwWW8Writer::InsUInt32( *pO, n ); }
- void InsAsString16( const OUString& rStr )
- { SwWW8Writer::InsAsString16( *pO, rStr ); }
void WriteStringAsPara( const OUString& rText, sal_uInt16 nStyleId = 0 );
/// Setup the exporter.
@@ -1440,7 +1431,6 @@ public:
void OutAttr( sal_Int32 nSwPos );
virtual const SfxPoolItem* HasTextItem( sal_uInt16 nWhich ) const SAL_OVERRIDE;
virtual const SfxPoolItem& GetItem( sal_uInt16 nWhich ) const SAL_OVERRIDE;
- bool OutAttrWithRange(sal_Int32 nPos);
sal_Int32 WhereNext() const { return nAktSwPos; }
rtl_TextEncoding GetNextCharSet() const;
rtl_TextEncoding GetNodeCharSet() const { return eNdChrSet; }
@@ -1478,7 +1468,6 @@ private:
sw::FrameIter maFlyIter;
sal_Int32 SearchNext( sal_Int32 nStartPos );
- void FieldVanish( const OUString& rText );
void OutSwFormatRefMark(const SwFormatRefMark& rAttr, bool bStart);
@@ -1594,7 +1583,6 @@ public:
void Write(WW8Export & rExport);
void setCvFore(sal_uInt32 cvFore) { m_cvFore = cvFore; }
void setCvBack(sal_uInt32 cvBack) { m_cvBack = cvBack; }
- void setIPat(sal_uInt16 ipat) { m_ipat = ipat; }
};
#endif // INCLUDED_SW_SOURCE_FILTER_WW8_WRTWW8_HXX
diff --git a/sw/source/filter/ww8/ww8attributeoutput.hxx b/sw/source/filter/ww8/ww8attributeoutput.hxx
index 761755c7d9f6..0b8765e2809f 100644
--- a/sw/source/filter/ww8/ww8attributeoutput.hxx
+++ b/sw/source/filter/ww8/ww8attributeoutput.hxx
@@ -108,7 +108,6 @@ public:
virtual void TableCanSplit( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) SAL_OVERRIDE;
virtual void TableBidi( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) SAL_OVERRIDE;
virtual void TableVerticalCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ) SAL_OVERRIDE;
- virtual void TableNodeInfo( ww8::WW8TableNodeInfo::Pointer_t pNodeInfo ) SAL_OVERRIDE;
virtual void TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer_t pNodeInfoInner ) SAL_OVERRIDE;
virtual void TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE;
virtual void TableSpacing( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) SAL_OVERRIDE;
@@ -471,7 +470,6 @@ public:
/// Return the right export class.
virtual WW8Export& GetExport() SAL_OVERRIDE { return m_rWW8Export; }
- const WW8Export& GetExport() const { return m_rWW8Export; }
protected:
/// Output the bold etc. attributes
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 78be5eb3056d..62df5d70dd00 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -804,10 +804,7 @@ public:
sal_uInt8 mnBorders;
bool mbHasFootnote;
void SetDirection();
- void SetLinkId(short sLinkId) { mLinkId = sLinkId; }
- bool DoesContainFootnote() const { return mbHasFootnote; }
bool IsContinuous() const { return maSep.bkc == 0; }
- bool IsLinked() const { return mLinkId != 0; }
bool IsNotProtected() const { return maSep.fUnlocked != 0; }
bool IsVertical() const;
sal_Int16 NoCols() const { return maSep.ccolM1 + 1; }
@@ -902,7 +899,6 @@ public:
sal_uInt32 GetPageRight() const;
sal_uInt32 GetPageWidth() const;
sal_uInt32 GetWWPageTopMargin() const;
- bool empty() const { return maSegments.empty(); }
sal_uInt32 GetTextAreaWidth() const;
};
@@ -1753,7 +1749,6 @@ public: // eigentlich private, geht aber leider nur public
void Read_KeepLines( sal_uInt16, const sal_uInt8* pData, short nLen );
void Read_KeepParas( sal_uInt16, const sal_uInt8* pData, short nLen );
void Read_BreakBefore( sal_uInt16, const sal_uInt8* pData, short nLen );
- void Read_Apo(sal_uInt16 nId, const sal_uInt8* pData, short nLen);
void Read_ApoPPC(sal_uInt16, const sal_uInt8* pData, short);
void Read_BoolItem( sal_uInt16 nId, const sal_uInt8*, short nLen );
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index 569a7be877b3..cc2d0f6b22db 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -649,7 +649,6 @@ public:
virtual ~WW8PLCFx_SEPX();
virtual sal_uInt32 GetIdx() const SAL_OVERRIDE;
virtual void SetIdx( sal_uLong nIdx ) SAL_OVERRIDE;
- long GetIMax() const { return ( pPLCF ) ? pPLCF->GetIMax() : 0; }
virtual bool SeekPos(WW8_CP nCpPos) SAL_OVERRIDE;
virtual WW8_FC Where() SAL_OVERRIDE;
virtual void GetSprms( WW8PLCFxDesc* p ) SAL_OVERRIDE;
@@ -687,8 +686,6 @@ public:
return pRef ? pRef->GetData( -1L == nIdx ? pRef->GetIdx() : nIdx ) : 0;
}
- //liefert Angabe, wo Kopf und Fusszeilen-Text zu finden ist
- bool Get(long& rStart, void*& rpValue) const;
virtual void GetSprms(WW8PLCFxDesc* p) SAL_OVERRIDE;
virtual void advance() SAL_OVERRIDE;
long Count() const { return ( pRef ) ? pRef->GetIMax() : 0; }
diff --git a/sw/source/filter/ww8/ww8struc.hxx b/sw/source/filter/ww8/ww8struc.hxx
index b0bd95bcb318..8838536d4548 100644
--- a/sw/source/filter/ww8/ww8struc.hxx
+++ b/sw/source/filter/ww8/ww8struc.hxx
@@ -600,7 +600,6 @@ public:
sal_uInt16 GetValue() const { return maBits; }
- void SetValue(sal_uInt16 nVal) { maBits = nVal; }
void SetWWValue(SVBT16 const nVal) { maBits = SVBT16ToShort(nVal); }
void SetFore(sal_uInt8 nVal)
diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx
index bb0a00c3f48c..429d3b5196b6 100644
--- a/sw/source/filter/ww8/ww8toolbar.cxx
+++ b/sw/source/filter/ww8/ww8toolbar.cxx
@@ -419,21 +419,11 @@ TBDelta::TBDelta()
{
}
-bool TBDelta::ControlIsModified()
-{
- return ( ( doprfatendFlags & 0x3 ) == 0x2 );
-}
-
bool TBDelta::ControlIsInserted()
{
return ( ( doprfatendFlags & 0x3 ) == 0x1 );
}
-bool TBDelta::ControlIsChanged()
-{
- return ( ( doprfatendFlags & 0x3 ) == 0x1 );
-}
-
bool TBDelta::ControlDropsToolBar()
{
return !( CiTBDE & 0x8000 );
diff --git a/sw/source/filter/ww8/ww8toolbar.hxx b/sw/source/filter/ww8/ww8toolbar.hxx
index f108ee6b6178..e52b92739ec1 100644
--- a/sw/source/filter/ww8/ww8toolbar.hxx
+++ b/sw/source/filter/ww8/ww8toolbar.hxx
@@ -89,13 +89,10 @@ public:
#if OSL_DEBUG_LEVEL > 1
virtual void Print( FILE* ) SAL_OVERRIDE;
#endif
- bool ControlIsModified();
bool ControlIsInserted();
- bool ControlIsChanged();
bool ControlDropsToolBar();
sal_Int32 TBCStreamOffset() { return fc;}
sal_Int16 CustomizationIndex();
-
};
class Tcg255SubStruct : public TBBase
@@ -129,7 +126,6 @@ class Customization : public TBBase
std::shared_ptr< SwCTB > customizationDataCTB;
std::vector< TBDelta > customizationDataTBDelta;
bool bIsDroppedMenuTB;
- bool ImportMenu( SwCTBWrapper&, const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper& );
public:
explicit Customization( SwCTBWrapper* rapper );
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.hxx b/sw/source/filter/xml/XMLRedlineImportHelper.hxx
index 72517d141a4c..bd73f09c6cab 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.hxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.hxx
@@ -140,15 +140,6 @@ private:
SwRedlineData* ConvertRedline(
RedlineInfo* pRedline, // RedlineInfo to be converted
SwDoc* pDoc); // document needed for Author-ID conversion
-
- // save the redline mode (if rPropertySet is non-null)
- void SaveRedlineMode(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertySet> & rPropertySet);
-
- // don't restore the saved redline mode
- void DontRestoreRedlineMode();
-
};
#endif
diff --git a/sw/source/filter/xml/xmlexp.hxx b/sw/source/filter/xml/xmlexp.hxx
index 108d00b1bcfa..5deea5bd7d07 100644
--- a/sw/source/filter/xml/xmlexp.hxx
+++ b/sw/source/filter/xml/xmlexp.hxx
@@ -129,10 +129,6 @@ public:
void ExportTable( const SwTableNode& rTableNd );
SvXMLExportItemMapper& GetTableItemMapper() { return *pTableItemMapper; }
- const rtl::Reference < XMLPropertySetMapper >& GetParaPropMapper()
- {
- return xParaPropMapper;
- }
bool IsShowProgress() const { return bShowProgress; }
void SetShowProgress( bool b ) { bShowProgress = b; }
diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx
index 7fae001383c5..a95134420d72 100644
--- a/sw/source/filter/xml/xmlimp.hxx
+++ b/sw/source/filter/xml/xmlimp.hxx
@@ -182,10 +182,6 @@ public:
virtual void SetDocumentSpecificSettings(const OUString& _rSettingsGroupName,
const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& _rSettings) SAL_OVERRIDE;
- SotStorage *GetPackage() { return &xPackage; }
-
- void SetProgressValue( sal_Int32 nValue );
-
// initialize XForms
virtual void initXForms() SAL_OVERRIDE;
@@ -215,12 +211,6 @@ inline SvXMLImportItemMapper& SwXMLImport::GetTableItemMapper()
return *pTableItemMapper;
}
-inline void SwXMLImport::SetProgressValue( sal_Int32 nValue )
-{
- if ( bShowProgress )
- GetProgressBarHelper()->SetValue(nValue);
-}
-
#endif // _XMLIMP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dbui/createaddresslistdialog.hxx b/sw/source/ui/dbui/createaddresslistdialog.hxx
index ac6ed41cfab2..26b7a3ecbe95 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.hxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.hxx
@@ -106,10 +106,6 @@ public:
{
return *m_pFindOnlyLB;
}
- OUString GetFindString() const
- {
- return m_pFindED->GetText();
- }
};
#endif
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index c379cebc17ae..6415789f4b9e 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -527,11 +527,6 @@ bool AbstractMailMergeFieldConnectionsDlg_Impl::IsUseExistingConnections() const
return pDlg->IsUseExistingConnections();
}
-SwForm* AbstractMultiTOXTabDialog_Impl::GetForm(CurTOXType eType)
-{
- return pDlg->GetForm(eType);
-}
-
CurTOXType AbstractMultiTOXTabDialog_Impl::GetCurrentTOXType() const
{
return pDlg->GetCurrentTOXType();
@@ -621,11 +616,6 @@ IMPL_LINK( AbstractMailMergeWizard_Impl, EndDialogHdl, SwMailMergeWizard*, pDial
return 0L;
}
-void AbstractMailMergeWizard_Impl::SetReloadDocument(const OUString& rURL)
-{
- pDlg->SetReloadDocument(rURL);
-}
-
OUString AbstractMailMergeWizard_Impl::GetReloadDocument() const
{
return pDlg->GetReloadDocument();
@@ -1207,18 +1197,4 @@ CreateTabPage SwAbstractDialogFactory_Impl::GetTabPageCreatorFunc( sal_uInt16 nI
return pRet;
}
-GetTabPageRanges SwAbstractDialogFactory_Impl::GetTabPageRangesFunc( sal_uInt16 nId )
-{
- switch ( nId )
- {
- case 1 : //RID_SVXPAGE_TEXTANIMATION :
- //return SvxTextAnimationPage::GetRanges;
- break;
- default:
- break;
- }
-
- return 0;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index c794b3dc6bb8..c0a2a0a4e00d 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -309,7 +309,6 @@ class SwMultiTOXTabDialog;
class AbstractMultiTOXTabDialog_Impl : public AbstractMultiTOXTabDialog
{
DECL_ABSTDLG_BASE(AbstractMultiTOXTabDialog_Impl,SwMultiTOXTabDialog)
- virtual SwForm* GetForm(CurTOXType eType) SAL_OVERRIDE;
virtual CurTOXType GetCurrentTOXType() const SAL_OVERRIDE ;
virtual SwTOXDescription& GetTOXDescription(CurTOXType eTOXTypes) SAL_OVERRIDE;
//from SfxTabDialog
@@ -361,7 +360,6 @@ public:
virtual void StartExecuteModal( const Link<>& rEndDialogHdl ) SAL_OVERRIDE;
virtual long GetResult() SAL_OVERRIDE;
- virtual void SetReloadDocument(const OUString& rURL) SAL_OVERRIDE;
virtual OUString GetReloadDocument() const SAL_OVERRIDE;
virtual bool ShowPage( sal_uInt16 nLevel ) SAL_OVERRIDE;
virtual sal_uInt16 GetRestartPage() const SAL_OVERRIDE;
@@ -505,8 +503,6 @@ public:
// For TabPage
virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId ) SAL_OVERRIDE;
- virtual GetTabPageRanges GetTabPageRangesFunc( sal_uInt16 nId ) SAL_OVERRIDE;
-
};
#endif
diff --git a/sw/source/ui/vba/vbadocument.cxx b/sw/source/ui/vba/vbadocument.cxx
index c22bb07efa3a..318a23c03f6d 100644
--- a/sw/source/ui/vba/vbadocument.cxx
+++ b/sw/source/ui/vba/vbadocument.cxx
@@ -76,7 +76,7 @@ SwVbaDocument::getContent() throw ( uno::RuntimeException, std::exception )
{
uno::Reference< text::XTextRange > xStart = mxTextDocument->getText()->getStart();
uno::Reference< text::XTextRange > xEnd;
- return uno::Reference< word::XRange >( new SwVbaRange( this, mxContext, mxTextDocument, xStart, xEnd, true ) );
+ return uno::Reference< word::XRange >( new SwVbaRange( this, mxContext, mxTextDocument, xStart, xEnd ) );
}
uno::Reference< word::XRange > SAL_CALL
diff --git a/sw/source/ui/vba/vbaheaderfooterhelper.hxx b/sw/source/ui/vba/vbaheaderfooterhelper.hxx
index 28a12b4d4b71..0cbf54867bb1 100644
--- a/sw/source/ui/vba/vbaheaderfooterhelper.hxx
+++ b/sw/source/ui/vba/vbaheaderfooterhelper.hxx
@@ -36,8 +36,6 @@ public:
static bool isFooter( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
static bool isFirstPageFooter( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
static bool isEvenPagesFooter( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
- static bool isPrimaryHeader( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
- static bool isPrimaryFooter( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException);
};
#endif
diff --git a/sw/source/ui/vba/vbaparagraph.cxx b/sw/source/ui/vba/vbaparagraph.cxx
index 12fdf269cd07..280120058071 100644
--- a/sw/source/ui/vba/vbaparagraph.cxx
+++ b/sw/source/ui/vba/vbaparagraph.cxx
@@ -38,7 +38,7 @@ SwVbaParagraph::~SwVbaParagraph()
uno::Reference< word::XRange > SAL_CALL
SwVbaParagraph::getRange( ) throw ( uno::RuntimeException, std::exception )
{
- return uno::Reference< word::XRange >( new SwVbaRange( this, mxContext, mxTextDocument, mxTextRange->getStart(), mxTextRange->getEnd(), mxTextRange->getText(), true ) );
+ return uno::Reference< word::XRange >( new SwVbaRange( this, mxContext, mxTextDocument, mxTextRange->getStart(), mxTextRange->getEnd(), mxTextRange->getText() ) );
}
uno::Any SAL_CALL
diff --git a/sw/source/ui/vba/vbarange.cxx b/sw/source/ui/vba/vbarange.cxx
index 6bc033e394e7..1f4e9fa0154c 100644
--- a/sw/source/ui/vba/vbarange.cxx
+++ b/sw/source/ui/vba/vbarange.cxx
@@ -43,18 +43,18 @@
using namespace ::ooo::vba;
using namespace ::com::sun::star;
-SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart, bool _bMaySpanEndOfDocument ) throw (script::BasicErrorException, uno::RuntimeException) : SwVbaRange_BASE( rParent, rContext ), mxTextDocument( rTextDocument ), mbMaySpanEndOfDocument( _bMaySpanEndOfDocument )
+SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart ) throw (script::BasicErrorException, uno::RuntimeException) : SwVbaRange_BASE( rParent, rContext ), mxTextDocument( rTextDocument )
{
uno::Reference< text::XTextRange > xEnd;
initialize( rStart, xEnd );
}
-SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart, const uno::Reference< text::XTextRange >& rEnd, bool _bMaySpanEndOfDocument ) throw (script::BasicErrorException, uno::RuntimeException) : SwVbaRange_BASE( rParent, rContext ), mxTextDocument( rTextDocument ), mbMaySpanEndOfDocument( _bMaySpanEndOfDocument )
+SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart, const uno::Reference< text::XTextRange >& rEnd ) throw (script::BasicErrorException, uno::RuntimeException) : SwVbaRange_BASE( rParent, rContext ), mxTextDocument( rTextDocument )
{
initialize( rStart, rEnd );
}
-SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart, const uno::Reference< text::XTextRange >& rEnd, const uno::Reference< text::XText >& rText, bool _bMaySpanEndOfDocument ) throw (script::BasicErrorException, uno::RuntimeException) : SwVbaRange_BASE( rParent, rContext ),mxTextDocument( rTextDocument ), mxText( rText ), mbMaySpanEndOfDocument( _bMaySpanEndOfDocument )
+SwVbaRange::SwVbaRange( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< text::XTextRange >& rStart, const uno::Reference< text::XTextRange >& rEnd, const uno::Reference< text::XText >& rText ) throw (script::BasicErrorException, uno::RuntimeException) : SwVbaRange_BASE( rParent, rContext ),mxTextDocument( rTextDocument ), mxText( rText )
{
initialize( rStart, rEnd );
}
diff --git a/sw/source/ui/vba/vbarange.hxx b/sw/source/ui/vba/vbarange.hxx
index 59bbad254ed4..e1e2344a8feb 100644
--- a/sw/source/ui/vba/vbarange.hxx
+++ b/sw/source/ui/vba/vbarange.hxx
@@ -36,24 +36,22 @@ class SwVbaRange : public SwVbaRange_BASE
{
private:
css::uno::Reference< css::text::XTextDocument > mxTextDocument;
- css::uno::Reference< css::text::XTextCursor > mxTextCursor;
- css::uno::Reference< css::text::XText > mxText;
- bool mbMaySpanEndOfDocument;
+ css::uno::Reference< css::text::XTextCursor > mxTextCursor;
+ css::uno::Reference< css::text::XText > mxText;
private:
void initialize( const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
void GetStyleInfo(OUString& aStyleName, OUString& aStyleType ) throw ( css::uno::RuntimeException );
public:
- SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, bool _bMaySpanEndOfDocument = false ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
- SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd, bool _bMaySpanEndOfDocument = false ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
- SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd, const css::uno::Reference< css::text::XText >& rText, bool _bMaySpanEndOfDocument = false ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+ SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+ SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
+ SwVbaRange( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::text::XTextRange >& rStart, const css::uno::Reference< css::text::XTextRange >& rEnd, const css::uno::Reference< css::text::XText >& rText) throw (css::script::BasicErrorException, css::uno::RuntimeException);
virtual ~SwVbaRange();
- css::uno::Reference< css::text::XTextDocument > getDocument() const { return mxTextDocument; }
+ css::uno::Reference< css::text::XTextDocument > getDocument() const { return mxTextDocument; }
virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getXTextRange() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
css::uno::Reference< css::text::XText > getXText() const { return mxText; }
void setXTextCursor( const css::uno::Reference< css::text::XTextCursor >& xTextCursor ) { mxTextCursor = xTextCursor; }
- void Move( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend, ooo::vba::word::E_DIRECTION eDirection ) throw (css::uno::RuntimeException);
// Attribute
virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/sw/source/ui/vba/vbatable.hxx b/sw/source/ui/vba/vbatable.hxx
index 5886dc33fd20..ed2d6d2ac59c 100644
--- a/sw/source/ui/vba/vbatable.hxx
+++ b/sw/source/ui/vba/vbatable.hxx
@@ -33,7 +33,6 @@ class SwVbaTable : public SwVbaTable_BASE
css::uno::Reference< css::text::XTextTable > mxTextTable;
public:
SwVbaTable( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rDocument, const css::uno::Reference< css::text::XTextTable >& xTextTable) throw ( css::uno::RuntimeException);
- css::uno::Reference< css::text::XTextDocument > getDocument() const { return mxTextDocument; };
virtual css::uno::Reference< ::ooo::vba::word::XRange > SAL_CALL Range( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL Select( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/sw/source/ui/vba/vbaview.hxx b/sw/source/ui/vba/vbaview.hxx
index 4a1ec3f45e73..91ab688b6517 100644
--- a/sw/source/ui/vba/vbaview.hxx
+++ b/sw/source/ui/vba/vbaview.hxx
@@ -31,12 +31,11 @@ typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XView > SwVbaView_BASE;
class SwVbaView : public SwVbaView_BASE
{
private:
- css::uno::Reference< css::frame::XModel > mxModel;
+ css::uno::Reference< css::frame::XModel > mxModel;
css::uno::Reference< css::text::XTextViewCursor > mxViewCursor;
- css::uno::Reference< css::beans::XPropertySet > mxViewSettings;
+ css::uno::Reference< css::beans::XPropertySet > mxViewSettings;
css::uno::Reference< css::text::XTextRange > getHFTextRange( sal_Int32 nType ) throw (css::uno::RuntimeException, css::script::BasicErrorException, std::exception);
- css::uno::Reference< css::text::XTextRange > getFirstObjectPosition( const css::uno::Reference< css::text::XText >& xText ) throw (css::uno::RuntimeException);
public:
SwVbaView( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext,
diff --git a/sw/source/uibase/docvw/ShadowOverlayObject.hxx b/sw/source/uibase/docvw/ShadowOverlayObject.hxx
index 82ba7081bb38..08d5314f9551 100644
--- a/sw/source/uibase/docvw/ShadowOverlayObject.hxx
+++ b/sw/source/uibase/docvw/ShadowOverlayObject.hxx
@@ -35,11 +35,11 @@ enum ShadowState
class ShadowOverlayObject: public sdr::overlay::OverlayObjectWithBasePosition
{
- protected:
+protected:
// geometry creation for OverlayObject
virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE;
- private:
+private:
basegfx::B2DPoint maSecondPosition;
ShadowState mShadowState;
@@ -49,12 +49,11 @@ class ShadowOverlayObject: public sdr::overlay::OverlayObjectWithBasePosition
ShadowState aState );
virtual ~ShadowOverlayObject();
- public:
+public:
void SetShadowState(ShadowState aState);
inline ShadowState GetShadowState() {return mShadowState;}
inline const basegfx::B2DPoint& GetSecondPosition() const { return maSecondPosition; }
- void SetSecondPosition( const basegfx::B2DPoint& rNew );
void SetPosition( const basegfx::B2DPoint& rPoint1,
const basegfx::B2DPoint& rPoint2 );
diff --git a/sw/source/uibase/inc/FrameControl.hxx b/sw/source/uibase/inc/FrameControl.hxx
index 653c6e127862..d0fc11e435ac 100644
--- a/sw/source/uibase/inc/FrameControl.hxx
+++ b/sw/source/uibase/inc/FrameControl.hxx
@@ -37,8 +37,6 @@ public:
SwFrameControl( const VclPtr<vcl::Window> &pWindow );
virtual ~SwFrameControl();
- const SwFrm* GetFrame() { return mpIFace->GetFrame(); }
- SwEditWin* GetEditWin() { return mpIFace->GetEditWin(); }
vcl::Window* GetWindow() { return mxWindow.get(); }
void SetReadonly( bool bReadonly ) { mpIFace->SetReadonly( bReadonly ); }
diff --git a/sw/source/uibase/inc/actctrl.hxx b/sw/source/uibase/inc/actctrl.hxx
index 361e5a743c3c..5412103316e2 100644
--- a/sw/source/uibase/inc/actctrl.hxx
+++ b/sw/source/uibase/inc/actctrl.hxx
@@ -35,7 +35,6 @@ public:
NumericField(pParent, rResId) {}
void SetActionHdl( const Link<>& rLink ) { aActionLink = rLink;}
- const Link<>& GetActionHdl() const { return aActionLink; }
};
// call a link when KEY_RETURN is pressed
diff --git a/sw/source/uibase/inc/basesh.hxx b/sw/source/uibase/inc/basesh.hxx
index 280f3607e269..8d4737e7c6f9 100644
--- a/sw/source/uibase/inc/basesh.hxx
+++ b/sw/source/uibase/inc/basesh.hxx
@@ -93,7 +93,6 @@ public:
void ExecDlg(SfxRequest &);
- void StateStatusLine(SfxItemSet &rSet);
void ExecTextCtrl(SfxRequest& rReq);
void GetTextFontCtrlState(SfxItemSet& rSet);
void GetTextCtrlState(SfxItemSet& rSet);
diff --git a/sw/source/uibase/inc/caption.hxx b/sw/source/uibase/inc/caption.hxx
index ff2760f14bce..9fcb72bc816e 100644
--- a/sw/source/uibase/inc/caption.hxx
+++ b/sw/source/uibase/inc/caption.hxx
@@ -51,10 +51,8 @@ public:
inline bool UseCaption() const { return bUseCaption; }
inline SwCapObjType GetObjType() const { return eObjType; }
- inline void SetObjType(const SwCapObjType eType) { eObjType = eType; }
inline const SvGlobalName& GetOleId() const { return aOleId; }
- inline void SetOleId(const SvGlobalName &rId) { aOleId = rId; }
inline const OUString& GetCategory() const { return sCategory; }
inline void SetCategory(const OUString& rCat) { sCategory = rCat; }
diff --git a/sw/source/uibase/inc/cfgitems.hxx b/sw/source/uibase/inc/cfgitems.hxx
index 3aee28d4de77..2c9abc256412 100644
--- a/sw/source/uibase/inc/cfgitems.hxx
+++ b/sw/source/uibase/inc/cfgitems.hxx
@@ -129,33 +129,8 @@ public:
virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
const OUString &GetFax() const { return sFaxName; }
- void SetFax( const OUString& rFax) { sFaxName = rFax; }
-
- bool IsPrintProspect() const { return bPrintProspect; }
- bool IsPrintProspectRTL() const { return bPrintProspectRTL; }
- void SetPrintProspect(bool bFlag ){ bPrintProspect = bFlag; }
- void SetPrintProspectRTL(bool bFlag ){ bPrintProspectRTL = bFlag; }
- bool IsPrintGraphic () const { return bPrintGraphic; }
- bool IsPrintTable () const { return bPrintTable; }
- bool IsPrintDraw () const { return bPrintDraw; }
- bool IsPrintControl () const { return bPrintControl; }
- bool IsPrintLeftPage () const { return bPrintLeftPages; }
- bool IsPrintRightPage() const { return bPrintRightPages; }
- bool IsPrintReverse () const { return bPrintReverse; }
- bool IsPaperFromSetup() const { return bPaperFromSetup; }
- bool IsPrintEmptyPages() const { return bPrintEmptyPages; }
- bool IsPrintPageBackground() const { return bPrintPageBackground; }
- bool IsPrintBlackFont() const { return bPrintBlackFont; }
- //#i81434# - printing of hidden text
- bool IsPrintHiddenText() const { return bPrintHiddenText; }
- bool IsPrintTextPlaceholder() const { return bPrintTextPlaceholder; }
-
- bool IsPrintSingleJobs() const { return bPrintSingleJobs; }
- SwPostItMode GetPrintPostIts () const { return nPrintPostIts; }
-
};
-// OS 12.01.95
// Item for settings dialog, ShadowCursorPage
class SW_DLLPUBLIC SwShadowCursorItem : public SfxPoolItem
{
diff --git a/sw/source/uibase/inc/colmgr.hxx b/sw/source/uibase/inc/colmgr.hxx
index fc52425801f7..c23e5b4b7e0c 100644
--- a/sw/source/uibase/inc/colmgr.hxx
+++ b/sw/source/uibase/inc/colmgr.hxx
@@ -31,12 +31,12 @@ public:
SwColMgr(const SfxItemSet &rSet, sal_uInt16 nActWidth = USHRT_MAX);
~SwColMgr();
- inline sal_uInt16 GetCount() const;
+ inline sal_uInt16 GetCount() const;
void SetCount(sal_uInt16 nCount, sal_uInt16 nGutterWidth);
- sal_uInt16 GetGutterWidth(sal_uInt16 nPos = USHRT_MAX) const;
+ sal_uInt16 GetGutterWidth(sal_uInt16 nPos = USHRT_MAX) const;
void SetGutterWidth(sal_uInt16 nWidth, sal_uInt16 nPos = USHRT_MAX);
- sal_uInt16 GetColWidth(sal_uInt16 nIdx) const;
+ sal_uInt16 GetColWidth(sal_uInt16 nIdx) const;
void SetColWidth(sal_uInt16 nIdx, sal_uInt16 nWidth);
inline bool IsAutoWidth() const;
@@ -47,7 +47,7 @@ public:
void SetLineWidthAndColor(::editeng::SvxBorderStyle eStyle, sal_uLong nWidth, const Color& rCol);
inline ::editeng::SvxBorderStyle GetLineStyle() const;
- inline sal_uLong GetLineWidth() const;
+ inline sal_uLong GetLineWidth() const;
inline const Color& GetLineColor() const;
inline SwColLineAdj GetAdjust() const;
@@ -57,16 +57,14 @@ public:
void SetLineHeightPercent(short nPercent);
inline void NoCols();
- void Update();
- const SwFormatCol& GetColumns() const { return aFormatCol; }
+ const SwFormatCol& GetColumns() const { return aFormatCol; }
void SetActualWidth(sal_uInt16 nW);
- sal_uInt16 GetActualSize() const { return nWidth; }
+ sal_uInt16 GetActualSize() const { return nWidth; }
private:
-
- SwFormatCol aFormatCol;
+ SwFormatCol aFormatCol;
sal_uInt16 nWidth;
};
diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx
index 94a3d964dc40..3150b3fc8e74 100644
--- a/sw/source/uibase/inc/column.hxx
+++ b/sw/source/uibase/inc/column.hxx
@@ -67,8 +67,6 @@ public:
SwColumnDlg(vcl::Window* pParent, SwWrtShell& rSh);
virtual ~SwColumnDlg();
virtual void dispose() SAL_OVERRIDE;
-
- SwWrtShell& GetWrtShell() { return rWrtShell; }
};
class ColumnValueSet : public ValueSet
@@ -149,7 +147,6 @@ class SwColumnPage : public SfxTabPage
DECL_LINK(Up, void *);
DECL_LINK(Down, void *);
DECL_LINK( UpdateColMgr, void* );
- void Apply(Button *);
void Timeout();
void Update(MetricField *pInteractiveField);
diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx
index 8082a86c85b3..a305c3569572 100644
--- a/sw/source/uibase/inc/conttree.hxx
+++ b/sw/source/uibase/inc/conttree.hxx
@@ -150,8 +150,6 @@ public:
SdrObject* GetDrawingObjectsByContent(const SwContent *pCnt);
bool ToggleToRoot();
- bool IsRoot() const {return bIsRoot;}
- sal_uInt16 GetRootType() const {return nRootType;}
void SetRootType(sal_uInt16 nType);
void Display( bool bActiveView );
void Clear();
@@ -167,11 +165,8 @@ public:
pHiddenShell;}
static bool IsInDrag() {return bIsInDrag;}
- bool IsInternalDrag() const {return bIsInternalDrag;}
- sal_Int32 GetActiveBlock() const {return nActiveBlock;}
-
- sal_uInt8 GetOutlineLevel()const {return nOutlineLevel;}
+ sal_uInt8 GetOutlineLevel()const {return nOutlineLevel;}
void SetOutlineLevel(sal_uInt8 nSet);
virtual bool Expand( SvTreeListEntry* pParent ) SAL_OVERRIDE;
@@ -296,7 +291,6 @@ protected:
DECL_LINK_TYPED( Timeout, Timer*, void );
DECL_LINK( DoubleClickHdl, void* );
- bool IsInternalDrag() const {return bIsInternalDrag;}
SwNavigationPI* GetParentWindow();
void OpenDoc(const SwGlblDocContent*);
diff --git a/sw/source/uibase/inc/cption.hxx b/sw/source/uibase/inc/cption.hxx
index e152912e40e7..541bf43ee551 100644
--- a/sw/source/uibase/inc/cption.hxx
+++ b/sw/source/uibase/inc/cption.hxx
@@ -102,7 +102,6 @@ class SwCaptionDialog : public SvxStandardDialog
virtual void Apply() SAL_OVERRIDE;
void DrawSample();
- void CheckButtonWidth();
void ApplyCaptionOrder(); //#i61007# order of captions
static OUString our_aSepTextSave; // Save caption separator text
diff --git a/sw/source/uibase/inc/drpcps.hxx b/sw/source/uibase/inc/drpcps.hxx
index c54fdf8c48a7..75b395717459 100644
--- a/sw/source/uibase/inc/drpcps.hxx
+++ b/sw/source/uibase/inc/drpcps.hxx
@@ -92,9 +92,6 @@ public:
virtual void Reset (const SfxItemSet *rSet) SAL_OVERRIDE;
void SetFormat(bool bSet){bFormat = bSet;}
-protected:
- void aSwitchText(bool bChecked);
- //void SW_RES(int arg1);
};
#endif
diff --git a/sw/source/uibase/inc/drwbassh.hxx b/sw/source/uibase/inc/drwbassh.hxx
index 77ed33b9d113..01dbb555aba8 100644
--- a/sw/source/uibase/inc/drwbassh.hxx
+++ b/sw/source/uibase/inc/drwbassh.hxx
@@ -30,10 +30,6 @@ struct SvxSwFrameValidation;
class SwDrawBaseShell: public SwBaseShell
{
- SwDrawBase* pDrawActual;
-
- sal_uInt16 eDrawMode;
-
DECL_LINK( CheckGroupShapeNameHdl, AbstractSvxNameDialog* );
DECL_LINK(ValidatePosition, SvxSwFrameValidation* );
public:
@@ -52,9 +48,7 @@ public:
void GetState(SfxItemSet &);
void GetDrawAttrStateForIFBX( SfxItemSet& rSet );
void DisableState(SfxItemSet &rSet) { Disable(rSet);}
- bool Disable(SfxItemSet& rSet, sal_uInt16 nWhich = 0);
-
- void StateStatusline(SfxItemSet &rSet);
+ bool Disable(SfxItemSet& rSet, sal_uInt16 nWhich = 0);
};
#endif
diff --git a/sw/source/uibase/inc/drwtxtsh.hxx b/sw/source/uibase/inc/drwtxtsh.hxx
index a74868be1aba..a4e2ff6a608a 100644
--- a/sw/source/uibase/inc/drwtxtsh.hxx
+++ b/sw/source/uibase/inc/drwtxtsh.hxx
@@ -75,10 +75,9 @@ public:
void StateClpbrd(SfxItemSet &rSet);
void StateInsert(SfxItemSet &rSet);
void ExecTransliteration(SfxRequest &);
- void ExecRotateTransliteration(SfxRequest &);
+ void ExecRotateTransliteration(SfxRequest &);
void Init();
- void StateStatusline(SfxItemSet &rSet);
};
#endif
diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx
index 44eead671837..9263e84a6bf4 100644
--- a/sw/source/uibase/inc/edtwin.hxx
+++ b/sw/source/uibase/inc/edtwin.hxx
@@ -249,8 +249,6 @@ public:
void StartExecuteDrag();
void DragFinished();
- sal_uInt16 GetDropAction() const { return m_nDropAction; }
- SotClipboardFormatId GetDropFormat() const { return m_nDropFormat; }
static Color GetWaterCanTextColor() { return m_aWaterCanTextColor; }
diff --git a/sw/source/uibase/inc/formedt.hxx b/sw/source/uibase/inc/formedt.hxx
index 32f6d8e7de8d..1e938e22b925 100644
--- a/sw/source/uibase/inc/formedt.hxx
+++ b/sw/source/uibase/inc/formedt.hxx
@@ -37,17 +37,6 @@ class SwForm;
// insert marker for index entry
class SwIdxFormDlg : public SvxStandardDialog
{
- DECL_LINK( EntryHdl, Button * );
- DECL_LINK( PageHdl, Button * );
- DECL_LINK( TabHdl, Button * );
- DECL_LINK( JumpHdl, Button * );
- DECL_LINK( StdHdl, Button * );
- DECL_LINK( SelectHdl, ListBox * );
- DECL_LINK( EnableSelectHdl, ListBox * );
- DECL_LINK( DoubleClickHdl, Button * );
- DECL_LINK( ModifyHdl, Edit * );
- DECL_LINK( AssignHdl, Button * );
- void UpdatePattern();
void Apply() SAL_OVERRIDE;
VclPtr<ListBox> aEntryLB;
@@ -77,15 +66,8 @@ public:
SwIdxFormDlg( vcl::Window* pParent, SwWrtShell &rShell, const SwForm& rForm );
virtual ~SwIdxFormDlg();
virtual void dispose() SAL_OVERRIDE;
-
- const SwForm& GetTOXForm();
};
-inline const SwForm& SwIdxFormDlg::GetTOXForm()
-{
- return *pForm;
-}
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/frmmgr.hxx b/sw/source/uibase/inc/frmmgr.hxx
index f4b9ac13c659..6ee012fd3727 100644
--- a/sw/source/uibase/inc/frmmgr.hxx
+++ b/sw/source/uibase/inc/frmmgr.hxx
@@ -71,8 +71,6 @@ public:
//CopyCtor for dialogs to check the metrics
SwFlyFrmAttrMgr( bool bNew, SwWrtShell *pSh, const SfxItemSet &rSet );
- inline SwWrtShell* GetShell() { return m_pOwnSh; }
-
void SetAnchor(RndStdIds eId);
inline RndStdIds GetAnchor() const;
@@ -90,8 +88,6 @@ public:
void SetSize(const Size& rLSize);
inline const Size& GetSize() const;
- inline sal_uInt16 GetHeightPercent() const;
-
void SetHeightSizeType(SwFrmSize eType);
// space to content
@@ -129,7 +125,6 @@ public:
inline const SwFormatHoriOrient &GetHoriOrient() const;
inline const SvxShadowItem &GetShadow() const;
inline const SvxBoxItem &GetBox() const;
- inline const SwFormatSurround &GetSurround() const;
inline const SwFormatFrmSize &GetFrmSize() const;
long CalcWidthBorder() { return CalcLeftSpace()+CalcRightSpace(); }
@@ -161,26 +156,15 @@ inline const SvxBoxItem &SwFlyFrmAttrMgr::GetBox() const
{
return static_cast<const SvxBoxItem&>(m_aSet.Get(RES_BOX));
}
-inline const SwFormatSurround &SwFlyFrmAttrMgr::GetSurround() const
-{
- return static_cast<const SwFormatSurround&>(m_aSet.Get(RES_SURROUND));
-}
-
inline Point SwFlyFrmAttrMgr::GetPos() const
{
return Point( GetHoriOrient().GetPos(), GetVertOrient().GetPos() );
}
-
inline RndStdIds SwFlyFrmAttrMgr::GetAnchor() const
{
return static_cast<const SwFormatAnchor&>(m_aSet.Get(RES_ANCHOR)).GetAnchorId();
}
-inline sal_uInt16 SwFlyFrmAttrMgr::GetHeightPercent() const
-{
- return GetFrmSize().GetHeightPercent();
-}
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/frmsh.hxx b/sw/source/uibase/inc/frmsh.hxx
index 97ced56dff37..6037fc4913a6 100644
--- a/sw/source/uibase/inc/frmsh.hxx
+++ b/sw/source/uibase/inc/frmsh.hxx
@@ -40,8 +40,6 @@ public:
void GetLineStyleState(SfxItemSet &rSet);
void StateInsert(SfxItemSet &rSet);
- void StateStatusline(SfxItemSet &rSet);
-
//UUUU
void GetDrawAttrStateTextFrame(SfxItemSet &rSet);
void ExecDrawAttrArgsTextFrame(SfxRequest& rReq);
diff --git a/sw/source/uibase/inc/glosdoc.hxx b/sw/source/uibase/inc/glosdoc.hxx
index c043f3684d09..2844073e4ecd 100644
--- a/sw/source/uibase/inc/glosdoc.hxx
+++ b/sw/source/uibase/inc/glosdoc.hxx
@@ -111,7 +111,6 @@ public:
SwTextBlocks* GetGroupDoc(const OUString &rName,
bool bCreate = false);
- SwTextBlocks* GetDefGroupDoc() { return GetGroupDoc(GetDefName()); }
static OUString GetDefName();
static OUString GetExtension();
@@ -121,7 +120,6 @@ public:
bool RenameGroupDoc(const OUString& sOldGroup, OUString& sNewGroup, const OUString& rNewTitle);
bool DelGroupDoc(const OUString &);
SwDocShellRef EditGroupDoc(const OUString &rGrpName, const OUString& rShortName, bool bShow = true );
- void SaveGroupDoc(const OUString &rGrpName, const OUString& rLongName );
void UpdateGlosPath(bool bFull);
void ShowError();
bool IsGlosPathErr() { return m_bError; }
diff --git a/sw/source/uibase/inc/gloshdl.hxx b/sw/source/uibase/inc/gloshdl.hxx
index d257f5143ca4..1a70091903e2 100644
--- a/sw/source/uibase/inc/gloshdl.hxx
+++ b/sw/source/uibase/inc/gloshdl.hxx
@@ -37,10 +37,6 @@ class SW_DLLPUBLIC SwGlossaryHdl
SwWrtShell* pWrtShell;
SwTextBlocks* pCurGrp;
- SAL_DLLPRIVATE void _SetMacros(const OUString &rName,
- const SvxMacro *pStart,
- const SvxMacro *pEnd);
-
SAL_DLLPRIVATE bool Expand( const OUString& rShortName,
SwGlossaries* pGlossaries,
SwTextBlocks *pGlossary );
@@ -55,12 +51,10 @@ public:
bool RenameGroup(const OUString& rOld, OUString& rNew, const OUString& rNewTitle);
void SetCurGroup(const OUString &aGrp, bool bApi = false, bool bAlwaysCreateNew = false);
- OUString GetCurGroup() const { return aCurGrp; }
-
sal_uInt16 GetGlossaryCnt();
- OUString GetGlossaryName(sal_uInt16);
- OUString GetGlossaryShortName(const OUString &rName);
- OUString GetGlossaryShortName(sal_uInt16);
+ OUString GetGlossaryName(sal_uInt16);
+ OUString GetGlossaryShortName(const OUString &rName);
+ OUString GetGlossaryShortName(sal_uInt16);
bool Rename( const OUString& rOldShortName, const OUString& rNewShortName,
const OUString& rNewName);
diff --git a/sw/source/uibase/inc/glossary.hxx b/sw/source/uibase/inc/glossary.hxx
index 56fd84460843..d71b7922953b 100644
--- a/sw/source/uibase/inc/glossary.hxx
+++ b/sw/source/uibase/inc/glossary.hxx
@@ -151,17 +151,12 @@ public:
virtual ~SwGlossaryDlg();
virtual void dispose() SAL_OVERRIDE;
OUString GetCurrGrpName() const;
- OUString GetCurrLongName() const
- {
- return m_pNameED->GetText();
- }
OUString GetCurrShortName() const
{
return m_pShortNameEdit->GetText();
}
static OUString GetCurrGroup();
static void SetActGroup(const OUString& rNewGroup);
- static OUString GetExtension();
};
#endif
diff --git a/sw/source/uibase/inc/glshell.hxx b/sw/source/uibase/inc/glshell.hxx
index b3023eb263b2..17ac5fdcb1bf 100644
--- a/sw/source/uibase/inc/glshell.hxx
+++ b/sw/source/uibase/inc/glshell.hxx
@@ -49,7 +49,6 @@ public:
{ aShortName = rShortName; }
void SetGroupName( const OUString& rGroupName )
{ aGroupName = rGroupName; }
- const OUString& GetShortName(){return aShortName;}
};
class SwWebGlosDocShell : public SwWebDocShell
@@ -81,7 +80,6 @@ public:
{ aShortName = rShortName; }
void SetGroupName( const OUString& rGroupName )
{ aGroupName = rGroupName; }
- const OUString& GetShortName(){return aShortName;}
};
#endif
diff --git a/sw/source/uibase/inc/inputwin.hxx b/sw/source/uibase/inc/inputwin.hxx
index 3d5dba6ed3e1..13154efc3c5a 100644
--- a/sw/source/uibase/inc/inputwin.hxx
+++ b/sw/source/uibase/inc/inputwin.hxx
@@ -53,13 +53,12 @@ friend class InputEdit;
SwFieldMgr* pMgr;
SwWrtShell* pWrtShell;
SwView* pView;
- SfxBindings* pBindings;
OUString aAktTableName, sOldFormula;
- bool bFirst : 1; // initialisations at first call
- bool bActive : 1; // for hide/show when switching documents
- bool bIsTable : 1;
- bool bDelSel : 1;
+ bool bFirst : 1; // initialisations at first call
+ bool bActive : 1; // for hide/show when switching documents
+ bool bIsTable : 1;
+ bool bDelSel : 1;
bool m_bDoesUndo : 1;
bool m_bResetUndo : 1;
bool m_bCallUndo : 1;
@@ -80,18 +79,14 @@ protected:
void CancelFormula();
public:
- SwInputWindow( vcl::Window* pParent, SfxBindings* pBindings );
+ SwInputWindow( vcl::Window* pParent );
virtual ~SwInputWindow();
virtual void dispose() SAL_OVERRIDE;
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
- void SelectHdl( ToolBox*);
-
void ShowWin();
- bool IsActive(){ return bActive; };
-
DECL_LINK( SelTableCellsNotify, SwWrtShell * );
void SetFormula( const OUString& rFormula, bool bDelSel = true );
diff --git a/sw/source/uibase/inc/insfnote.hxx b/sw/source/uibase/inc/insfnote.hxx
index b49a2477319d..4ae31b247d34 100644
--- a/sw/source/uibase/inc/insfnote.hxx
+++ b/sw/source/uibase/inc/insfnote.hxx
@@ -69,10 +69,8 @@ public:
virtual ~SwInsFootNoteDlg();
virtual void dispose() SAL_OVERRIDE;
- rtl_TextEncoding GetCharSet() { return eCharSet; }
- bool IsExtCharAvailable() { return bExtCharAvailable; }
OUString GetFontName() { return m_aFontName; }
- bool IsEndNote() { return m_pEndNoteBtn->IsChecked(); }
+ bool IsEndNote() { return m_pEndNoteBtn->IsChecked(); }
OUString GetStr()
{
if ( m_pNumberCharBtn->IsChecked() )
diff --git a/sw/source/uibase/inc/linenum.hxx b/sw/source/uibase/inc/linenum.hxx
index ef0cb2b8dbdd..d73af8c83916 100644
--- a/sw/source/uibase/inc/linenum.hxx
+++ b/sw/source/uibase/inc/linenum.hxx
@@ -53,7 +53,6 @@ private:
DECL_LINK(ModifyHdl, void * = 0);
public:
- SwWrtShell* GetWrtShell() const { return pSh; }
SwLineNumberingDlg(SwView *pVw);
virtual ~SwLineNumberingDlg();
virtual void dispose() SAL_OVERRIDE;
diff --git a/sw/source/uibase/inc/mmconfigitem.hxx b/sw/source/uibase/inc/mmconfigitem.hxx
index 682aff5212bd..1f7207cdcca1 100644
--- a/sw/source/uibase/inc/mmconfigitem.hxx
+++ b/sw/source/uibase/inc/mmconfigitem.hxx
@@ -100,8 +100,6 @@ public:
OUString& GetFilter() const;
void SetFilter(OUString&);
- void SetSelection(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rSelection);
-
void SetCurrentDBData( const SwDBData& rDBData);
const SwDBData& GetCurrentDBData() const;
@@ -245,10 +243,6 @@ public:
void SetPrintRange( sal_uInt16 nStartDocument, sal_uInt16 nEndDocument)
{ m_nStartPrint = nStartDocument; m_nEndPrint = nEndDocument; }
- sal_uInt16 GetPrintRangeStart() const
- { return m_nStartPrint; }
- sal_uInt16 GetPrintRangeEnd() const
- { return m_nEndPrint; }
const OUString& GetSelectedPrinter() const
{ return m_sSelectedPrinter; }
diff --git a/sw/source/uibase/inc/navicfg.hxx b/sw/source/uibase/inc/navicfg.hxx
index 33576e803ffe..f012bcb0685d 100644
--- a/sw/source/uibase/inc/navicfg.hxx
+++ b/sw/source/uibase/inc/navicfg.hxx
@@ -50,15 +50,6 @@ public:
}
}
- sal_Int32 GetSelectedPos()const {return nSelectedPos;}
- void SetSelectedPos(sal_Int32 nSet){
- if(nSelectedPos != nSet)
- {
- SetModified();
- nSelectedPos = nSet;
- }
- }
-
sal_Int32 GetOutlineLevel()const {return nOutlineLevel;}
void SetOutlineLevel(sal_Int32 nSet){
if(nOutlineLevel != nSet)
diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx
index 4a3352308a54..3848662dcf86 100644
--- a/sw/source/uibase/inc/navipi.hxx
+++ b/sw/source/uibase/inc/navipi.hxx
@@ -114,7 +114,6 @@ class SwNavigationPI : public vcl::Window,
DECL_LINK_TYPED( ClosePopupWindow, SfxPopupWindow *, void );
void UsePage(SwWrtShell *);
- void MakeVisible();
void InitImageList();
void SetPopupWindow( SfxPopupWindow* );
@@ -141,7 +140,6 @@ public:
void GotoPage(); // jump to page; bindable function
- void Update() { FillBox(); }
void UpdateListBox();
void MoveOutline(sal_uInt16 nSource, sal_uInt16 nTarget, bool bWithCilds);
@@ -151,7 +149,7 @@ public:
static OUString CreateDropFileName( TransferableDataHelper& rData );
static OUString CleanEntry(const OUString& rEntry);
- sal_uInt16 GetRegionDropMode() const {return nRegionMode;}
+ sal_uInt16 GetRegionDropMode() const {return nRegionMode;}
void SetRegionDropMode(sal_uInt16 nNewMode);
sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
diff --git a/sw/source/uibase/inc/numpara.hxx b/sw/source/uibase/inc/numpara.hxx
index 033d12db3236..2ca04b2b582b 100644
--- a/sw/source/uibase/inc/numpara.hxx
+++ b/sw/source/uibase/inc/numpara.hxx
@@ -62,7 +62,6 @@ class SwParagraphNumTabPage : public SfxTabPage
static const sal_uInt16 aPageRg[];
protected:
- void aCountParaFL();
static bool ExecuteEditNumStyle_Impl( sal_uInt16 nId, const OUString& rStr, const OUString& rRefStr,
sal_uInt16 nFamily, sal_uInt16 nMask = 0,
const sal_uInt16* pModifier = NULL );
diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx
index bcc3650c11bf..f9b75075e091 100644
--- a/sw/source/uibase/inc/optpage.hxx
+++ b/sw/source/uibase/inc/optpage.hxx
@@ -123,7 +123,6 @@ public:
virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE;
virtual void Reset(const SfxItemSet* rSet) SAL_OVERRIDE;
void SetFax(const std::vector<OUString>& );
- void SelectFax(const OUString& rString);
void SetPreview(bool bPrev);
virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE;
};
diff --git a/sw/source/uibase/inc/popbox.hxx b/sw/source/uibase/inc/popbox.hxx
index dfff3adc1c10..bfe10e8ea280 100644
--- a/sw/source/uibase/inc/popbox.hxx
+++ b/sw/source/uibase/inc/popbox.hxx
@@ -39,17 +39,8 @@ protected:
public:
SwHelpToolBox(SwNavigationPI* pParent, const ResId &);
virtual ~SwHelpToolBox();
- void SetDoubleClickLink(const Link<> &); // inline
- void SetRightClickLink(const Link<> &); // inline
};
-inline void SwHelpToolBox::SetDoubleClickLink(const Link<> &rLink) {
- aDoubleClickLink = rLink;
-}
-
-inline void SwHelpToolBox::SetRightClickLink(const Link<> &rLink) {
- aRightClickLink = rLink;
-}
#endif
diff --git a/sw/source/uibase/inc/prcntfld.hxx b/sw/source/uibase/inc/prcntfld.hxx
index b18bbdce2a09..d37c6b4e53c6 100644
--- a/sw/source/uibase/inc/prcntfld.hxx
+++ b/sw/source/uibase/inc/prcntfld.hxx
@@ -84,26 +84,20 @@ public:
void SetMin(sal_Int64 nNewMin, FieldUnit eInUnit = FUNIT_NONE);
sal_Int64 GetMin() const { return m_pField->GetMin(); }
- sal_Int64 GetMax() const { return m_pField->GetMax(); }
sal_Int64 NormalizePercent(sal_Int64 nValue);
sal_Int64 DenormalizePercent(sal_Int64 nValue);
sal_Int64 Normalize( sal_Int64 nValue ) const { return m_pField->Normalize(nValue); }
- sal_Int64 Denormalize( sal_Int64 nValue ) const { return m_pField->Denormalize(nValue); }
void SetRefValue(sal_Int64 nValue);
- sal_Int64 GetRefValue() const { return nRefValue; }
sal_Int64 GetRealValue(FieldUnit eOutUnit = FUNIT_NONE);
sal_Int64 Convert(sal_Int64 nValue, FieldUnit eInUnit, FieldUnit eOutUnit);
void ShowPercent(bool bPercent);
- sal_uInt16 GetOldDigits() const {return nOldDigits;}
-
void LockAutoCalculation(bool bLock) {bLockAutoCalculation = bLock;}
- bool IsAutoCalculationLocked() const {return bLockAutoCalculation;}
};
#endif // INCLUDED_SW_SOURCE_UIBASE_INC_PRCNTFLD_HXX
diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx
index ff4732ea996b..0e63261101f9 100644
--- a/sw/source/uibase/inc/pview.hxx
+++ b/sw/source/uibase/inc/pview.hxx
@@ -83,21 +83,10 @@ public:
return mnRow;
}
- void SetRow(sal_uInt8 n)
- {
- if(n)
- mnRow = n;
- }
-
sal_uInt8 GetCol() const
{
return mnCol;
}
- void SetCol(sal_uInt8 n)
- {
- if(n)
- mnCol = n;
- }
sal_uInt16 GetSttPage() const
{
@@ -127,7 +116,6 @@ public:
void CalcWish( sal_uInt8 nNewRow, sal_uInt8 nNewCol );
- const Size& GetWinSize() const { return maPxWinSize; }
void SetWinSize( const Size& rNewSize );
// Add <MV_SELPAGE>, <MV_SCROLL>
@@ -210,7 +198,6 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell
SAL_DLLPRIVATE int _CreateScrollbar( bool bHori);
DECL_DLLPRIVATE_LINK(ScrollHdl, SwScrollbar*);
DECL_DLLPRIVATE_LINK(EndScrollHdl, SwScrollbar*);
- DECL_DLLPRIVATE_LINK(BtnPage, Button*);
SAL_DLLPRIVATE bool ChgPage( int eMvMode, bool bUpdateScrollbar = true );
SAL_DLLPRIVATE virtual SfxPrinter* GetPrinter( bool bCreate = false ) SAL_OVERRIDE;
@@ -252,21 +239,13 @@ public:
{ return GetViewFrame()->GetWindow(); }
inline SwViewShell* GetViewShell() const
{ return pViewWin->GetViewShell(); }
- inline const Rectangle& GetVisArea() const
- { return aVisArea; }
- inline void GrabFocusViewWin()
- { pViewWin->GrabFocus(); }
inline void RepaintCoreRect( const SwRect& rRect )
{ pViewWin->RepaintCoreRect( rRect ); }
void DocSzChgd(const Size& rNewSize);
- const Size& GetDocSz() const
- { return aDocSz; }
void SetVisArea( const Rectangle&, bool bUpdateScrollbar = true);
- inline void AdjustEditWin();
-
void ScrollViewSzChg();
void ScrollDocSzChg();
void ShowHScrollbar(bool bShow);
@@ -323,10 +302,6 @@ public:
virtual ~SwPagePreview();
};
-inline void SwPagePreview::AdjustEditWin()
-{
- OuterResizePixel( Point(), GetFrameWindow().GetOutputSizePixel() );
-}
#endif
diff --git a/sw/source/uibase/inc/scroll.hxx b/sw/source/uibase/inc/scroll.hxx
index cbaacccb45a1..1c43a34e1e2d 100644
--- a/sw/source/uibase/inc/scroll.hxx
+++ b/sw/source/uibase/inc/scroll.hxx
@@ -34,9 +34,7 @@ class SwScrollbar: public ScrollBar
using Window::IsVisible;
public:
-
void ExtendedShow( bool bVisible = true );
- void Hide() { Show( false ); }
void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) SAL_OVERRIDE;
bool IsVisible(bool bReal) const { return bReal ? ScrollBar::IsVisible() : bVisible; }
diff --git a/sw/source/uibase/inc/shdwcrsr.hxx b/sw/source/uibase/inc/shdwcrsr.hxx
index dcb38480dd16..96002be9516d 100644
--- a/sw/source/uibase/inc/shdwcrsr.hxx
+++ b/sw/source/uibase/inc/shdwcrsr.hxx
@@ -45,10 +45,6 @@ public:
void Paint();
- const Point& GetPoint() const { return aOldPt; }
- long GetHeight() const { return nOldHeight; }
- sal_uInt16 GetMode() const { return nOldMode; }
-
Rectangle GetRect() const;
};
diff --git a/sw/source/uibase/inc/srcedtw.hxx b/sw/source/uibase/inc/srcedtw.hxx
index f52c4b4f5205..e6c2ab5c73be 100644
--- a/sw/source/uibase/inc/srcedtw.hxx
+++ b/sw/source/uibase/inc/srcedtw.hxx
@@ -96,7 +96,6 @@ private:
void SetFont();
DECL_LINK_TYPED( SyntaxTimerHdl, Idle *, void );
- DECL_LINK( TimeoutHdl, Timer * );
using Window::Notify;
using Window::Invalidate;
@@ -139,7 +138,6 @@ public:
{ pTextEngine->SetModified(false); }
bool IsModified() const
{ return pTextEngine->IsModified();}
- void CreateScrollbars();
void SetReadonly(bool bSet){bReadonly = bSet;}
bool IsReadonly(){return bReadonly;}
diff --git a/sw/source/uibase/inc/srcview.hxx b/sw/source/uibase/inc/srcview.hxx
index 5e0c4e5a5839..3999908a9090 100644
--- a/sw/source/uibase/inc/srcview.hxx
+++ b/sw/source/uibase/inc/srcview.hxx
@@ -64,7 +64,6 @@ public:
virtual ~SwSrcView();
SwDocShell* GetDocShell();
- SwSrcEditWindow& GetEditWin() { return *aEditWin.get(); }
void SaveContent(const OUString& rTmpFile);
void SaveContentTo(SfxMedium& rMed);
diff --git a/sw/source/uibase/inc/swlbox.hxx b/sw/source/uibase/inc/swlbox.hxx
index f571e08e57fb..a845479402e9 100644
--- a/sw/source/uibase/inc/swlbox.hxx
+++ b/sw/source/uibase/inc/swlbox.hxx
@@ -54,7 +54,6 @@ class SW_DLLPUBLIC SwComboBox : public ComboBox
SwEntryLst aDelEntryLst;
SwBoxEntry aDefault;
- SAL_DLLPRIVATE void InitComboBox();
SAL_DLLPRIVATE void InsertSorted(SwBoxEntry* pEntry);
SAL_DLLPRIVATE void Init();
diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx
index 7a35d4744fbb..3a82b385040b 100644
--- a/sw/source/uibase/inc/swuicnttab.hxx
+++ b/sw/source/uibase/inc/swuicnttab.hxx
@@ -114,7 +114,6 @@ public:
eCurrentTOXType = eSet;
}
- void UpdateExample();
bool IsTOXEditMode() const { return bEditTOX;}
SwWrtShell& GetWrtShell() {return rSh;}
@@ -311,8 +310,6 @@ public:
bool Contains(FormTokenType) const;
- bool DetermineLinkStart();
-
//helper for pattern buttons and edits
bool CreateQuickHelp(Control* pCtrl,
const SwFormToken& rToken, const HelpEvent& );
@@ -429,7 +426,6 @@ class SwTOXEntryTabPage : public SfxTabPage
DECL_LINK(AllLevelsHdl, void *);
- void EnableButtons();
void WriteBackLevel();
void UpdateDescriptor();
DECL_LINK(ModifyHdl, void*);
diff --git a/sw/source/uibase/inc/swuiidxmrk.hxx b/sw/source/uibase/inc/swuiidxmrk.hxx
index 040c97d7628a..e93076147b77 100644
--- a/sw/source/uibase/inc/swuiidxmrk.hxx
+++ b/sw/source/uibase/inc/swuiidxmrk.hxx
@@ -168,7 +168,6 @@ public:
SwIndexMarkModalDlg(vcl::Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark);
virtual void Apply() SAL_OVERRIDE;
- void ReInitDlg(SwWrtShell& rWrtShell);
};
class SwAuthMarkModalDlg;
@@ -244,7 +243,6 @@ public:
SwAuthMarkModalDlg(vcl::Window *pParent, SwWrtShell& rSh);
virtual void Apply() SAL_OVERRIDE;
- void ReInitDlg(SwWrtShell& rWrtShell);
};
#endif // INCLUDED_SW_SOURCE_UIBASE_INC_SWUIIDXMRK_HXX
diff --git a/sw/source/uibase/inc/tablemgr.hxx b/sw/source/uibase/inc/tablemgr.hxx
index 6be1fbe54d29..bfb09c38d7b6 100644
--- a/sw/source/uibase/inc/tablemgr.hxx
+++ b/sw/source/uibase/inc/tablemgr.hxx
@@ -62,10 +62,6 @@ public:
sal_uInt16 GetColCount() const;
sal_uInt16 GetCurColNum() const;
- bool IsTableSelected() const { return pFormat != 0; }
-
- const SwFrameFormat *GetTableFormat() const { return pFormat; }
-
SwWrtShell* GetShell() const { return pSh; }
// @deprecated
diff --git a/sw/source/uibase/inc/textsh.hxx b/sw/source/uibase/inc/textsh.hxx
index 7c192aadb049..baab15af578d 100644
--- a/sw/source/uibase/inc/textsh.hxx
+++ b/sw/source/uibase/inc/textsh.hxx
@@ -72,7 +72,6 @@ public:
void ExecCharAttrArgs(SfxRequest &);
void ExecParaAttr(SfxRequest &);
void ExecParaAttrArgs(SfxRequest &);
- void ExecAttr(SfxRequest &);
void ExecDB(SfxRequest &);
void ExecTransliteration(SfxRequest &);
void ExecRotateTransliteration(SfxRequest &);
diff --git a/sw/source/uibase/inc/tmpdlg.hxx b/sw/source/uibase/inc/tmpdlg.hxx
index c92bde4fd143..dd60e200787a 100644
--- a/sw/source/uibase/inc/tmpdlg.hxx
+++ b/sw/source/uibase/inc/tmpdlg.hxx
@@ -31,9 +31,7 @@ class SwTemplateDlg: public SfxStyleDialog
sal_uInt16 nType;
sal_uInt16 nHtmlMode;
SwWrtShell* pWrtShell;
- bool bNewStyle;
-
- DECL_LINK( NumOptionsHdl, PushButton* );
+ bool bNewStyle;
sal_uInt16 m_nIndentsId;
sal_uInt16 m_nAlignId;
diff --git a/sw/source/uibase/inc/toxmgr.hxx b/sw/source/uibase/inc/toxmgr.hxx
index 5dcd3c24879f..f81b1a8f737e 100644
--- a/sw/source/uibase/inc/toxmgr.hxx
+++ b/sw/source/uibase/inc/toxmgr.hxx
@@ -91,7 +91,6 @@ public:
delete pTOUName;
}
- void SetTOXType(TOXTypes eSet) { eTOXType = eSet;}
TOXTypes GetTOXType() const { return eTOXType;}
const OUString& GetStyleNames(sal_uInt16 nLvl) const
diff --git a/sw/source/uibase/inc/uiitems.hxx b/sw/source/uibase/inc/uiitems.hxx
index 4bf83b29e1af..6e5ae4299e51 100644
--- a/sw/source/uibase/inc/uiitems.hxx
+++ b/sw/source/uibase/inc/uiitems.hxx
@@ -52,7 +52,6 @@ public:
SwPageFootnoteInfo& GetPageFootnoteInfo() { return aFootnoteInfo; }
const SwPageFootnoteInfo& GetPageFootnoteInfo() const { return aFootnoteInfo; }
- void SetPageFootnoteInfo(SwPageFootnoteInfo& rInf) { aFootnoteInfo = rInf; }
};
class SW_DLLPUBLIC SwPtrItem : public SfxPoolItem
@@ -66,7 +65,6 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
- void SetValue(void * pPtr) { pMisc= pPtr; }
void* GetValue() const { return pMisc; }
};
@@ -108,7 +106,6 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
- void SetValue(SwPaM * pPaM) { m_pPaM= pPaM; }
SwPaM* GetValue() const { return m_pPaM; }
};
diff --git a/sw/source/uibase/inc/uivwimp.hxx b/sw/source/uibase/inc/uivwimp.hxx
index 16969ef70b51..2a88b7229a5d 100644
--- a/sw/source/uibase/inc/uivwimp.hxx
+++ b/sw/source/uibase/inc/uivwimp.hxx
@@ -136,8 +136,6 @@ public:
void AddClipboardListener();
- SfxObjectShellLock& GetTmpSelectionDoc() { return xTmpSelDocSh; }
-
void AddTransferable(SwTransferable& rTransferable);
#if HAVE_FEATURE_DBCONNECTIVITY
diff --git a/sw/source/uibase/inc/unotools.hxx b/sw/source/uibase/inc/unotools.hxx
index 3dd20868ef67..775aeefcecd1 100644
--- a/sw/source/uibase/inc/unotools.hxx
+++ b/sw/source/uibase/inc/unotools.hxx
@@ -102,7 +102,6 @@ public:
const OUString* pURL = 0);
~SwOneExampleFrame();
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > & GetControl() {return _xControl; }
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & GetModel() {return _xModel;}
::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > & GetController() {return _xController;}
::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > & GetTextCursor() {return _xCursor;}
diff --git a/sw/source/uibase/inc/usrpref.hxx b/sw/source/uibase/inc/usrpref.hxx
index ee90ed801585..560fafab46e9 100644
--- a/sw/source/uibase/inc/usrpref.hxx
+++ b/sw/source/uibase/inc/usrpref.hxx
@@ -153,15 +153,6 @@ public:
void SetUsrPref(const SwViewOption &rCopy);
- void Commit()
- {
- aContentConfig.Commit();
- aLayoutConfig.Commit();
- aGridConfig.Commit();
- aCursorConfig.Commit();
- if(pWebColorConfig)
- pWebColorConfig->Commit();
- }
void SetModified()
{
aContentConfig.SetModified();
diff --git a/sw/source/uibase/inc/workctrl.hxx b/sw/source/uibase/inc/workctrl.hxx
index 4ebe14fa4c96..eb526aa3c41d 100644
--- a/sw/source/uibase/inc/workctrl.hxx
+++ b/sw/source/uibase/inc/workctrl.hxx
@@ -83,8 +83,6 @@ public:
virtual void StateChanged( sal_uInt16 nSID,
SfxItemState eState,
const SfxPoolItem* pState ) SAL_OVERRIDE;
-
- DECL_LINK(PopupHdl, PopupMenu*);
};
class SwScrollNaviPopup;
diff --git a/sw/source/uibase/inc/wrap.hxx b/sw/source/uibase/inc/wrap.hxx
index f9ca099713e6..9b19cf1092b7 100644
--- a/sw/source/uibase/inc/wrap.hxx
+++ b/sw/source/uibase/inc/wrap.hxx
@@ -35,8 +35,6 @@ class SwWrapDlg : public SfxSingleTabDialog
public:
SwWrapDlg(vcl::Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bDrawMode);
-
- SwWrtShell* GetWrtShell() { return pWrtShell; }
};
// circulation TabPage
@@ -83,7 +81,6 @@ class SwWrapTabPage: public SfxTabPage
virtual void dispose() SAL_OVERRIDE;
void ApplyImageList();
- void EnableModes(const SfxItemSet& rSet);
virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
diff --git a/sw/source/uibase/ribbar/inputwin.cxx b/sw/source/uibase/ribbar/inputwin.cxx
index 7415b8b17aa2..c9c4f45d5bce 100644
--- a/sw/source/uibase/ribbar/inputwin.cxx
+++ b/sw/source/uibase/ribbar/inputwin.cxx
@@ -56,7 +56,7 @@
SFX_IMPL_POS_CHILDWINDOW_WITHID( SwInputChild, FN_EDIT_FORMULA, SFX_OBJECTBAR_OBJECT )
-SwInputWindow::SwInputWindow( vcl::Window* pParent, SfxBindings* pBind )
+SwInputWindow::SwInputWindow( vcl::Window* pParent )
: ToolBox( pParent , SW_RES( RID_TBX_FORMULA )),
aPos( VclPtr<Edit>::Create(this, SW_RES(ED_POS))),
aEdit( VclPtr<InputEdit>::Create(this, WB_3DLOOK|WB_TABSTOP|WB_BORDER|WB_NOHIDESELECTION)),
@@ -64,7 +64,6 @@ SwInputWindow::SwInputWindow( vcl::Window* pParent, SfxBindings* pBind )
pMgr(0),
pWrtShell(0),
pView(0),
- pBindings(pBind),
aAktTableName(aEmptyOUStr)
, m_bDoesUndo(true)
, m_bResetUndo(false)
@@ -623,7 +622,7 @@ SwInputChild::SwInputChild(vcl::Window* _pParent,
SfxChildWindow( _pParent, nId )
{
pDispatch = pBindings->GetDispatcher();
- pWindow = VclPtr<SwInputWindow>::Create( _pParent, pBindings );
+ pWindow = VclPtr<SwInputWindow>::Create( _pParent );
static_cast<SwInputWindow*>(pWindow.get())->ShowWin();
eChildAlignment = SfxChildAlignment::LOWESTTOP;
}
diff --git a/sw/source/uibase/shells/drwbassh.cxx b/sw/source/uibase/shells/drwbassh.cxx
index ce7a272302c7..f2312c3da747 100644
--- a/sw/source/uibase/shells/drwbassh.cxx
+++ b/sw/source/uibase/shells/drwbassh.cxx
@@ -76,8 +76,6 @@ TYPEINIT1(SwDrawBaseShell,SwBaseShell)
SwDrawBaseShell::SwDrawBaseShell(SwView &_rView)
: SwBaseShell(_rView)
- , pDrawActual(0)
- , eDrawMode(0)
{
GetShell().NoEdit(true);
diff --git a/sw/source/uibase/sidebar/StylePresetsPanel.hxx b/sw/source/uibase/sidebar/StylePresetsPanel.hxx
index 5f0b97d8e7f7..dd2a7c7be8b6 100644
--- a/sw/source/uibase/sidebar/StylePresetsPanel.hxx
+++ b/sw/source/uibase/sidebar/StylePresetsPanel.hxx
@@ -52,11 +52,6 @@ public:
const SfxPoolItem* pState,
const bool bIsEnabled) SAL_OVERRIDE;
- SfxBindings* GetBindings() const
- {
- return mpBindings;
- }
-
private:
struct TemplateEntry
{
diff --git a/sw/source/uibase/sidebar/ThemePanel.hxx b/sw/source/uibase/sidebar/ThemePanel.hxx
index fa958cc82c5a..d4f9faff7094 100644
--- a/sw/source/uibase/sidebar/ThemePanel.hxx
+++ b/sw/source/uibase/sidebar/ThemePanel.hxx
@@ -52,11 +52,6 @@ public:
const SfxPoolItem* pState,
const bool bIsEnabled) SAL_OVERRIDE;
- SfxBindings* GetBindings() const
- {
- return mpBindings;
- }
-
private:
ThemePanel(vcl::Window* pParent,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
diff --git a/sw/source/uibase/uno/unodefaults.hxx b/sw/source/uibase/uno/unodefaults.hxx
index 274e6247db2a..465226a109ff 100644
--- a/sw/source/uibase/uno/unodefaults.hxx
+++ b/sw/source/uibase/uno/unodefaults.hxx
@@ -31,8 +31,6 @@ public:
virtual ~SwSvxUnoDrawPool() throw();
virtual SfxItemPool* getModelPool( bool bReadOnly ) throw() SAL_OVERRIDE;
-
- void Invalidate() {m_pDoc = 0;}
};
#endif