[Libreoffice-commits] core.git: cui/source include/sfx2 include/svx include/vcl sc/inc sc/source sd/inc sd/source sfx2/source starmath/inc starmath/source svx/source sw/source vcl/source writerfilter/source xmloff/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Sat Jun 8 15:18:38 UTC 2019
cui/source/inc/about.hxx | 1
cui/source/inc/thesdlg.hxx | 2
include/sfx2/dinfdlg.hxx | 2
include/sfx2/templatelocalview.hxx | 4
include/sfx2/thumbnailview.hxx | 2
include/svx/contdlg.hxx | 4
include/svx/fntctrl.hxx | 2
include/svx/langbox.hxx | 3
include/vcl/bitmap.hxx | 2
include/vcl/layout.hxx | 4
include/vcl/tabdlg.hxx | 2
include/vcl/toolbox.hxx | 1
sc/inc/column.hxx | 1
sc/source/core/data/column.cxx | 126 -------------
sc/source/ui/inc/condformatdlgentry.hxx | 1
sc/source/ui/inc/inputwin.hxx | 1
sd/inc/sdabstdlg.hxx | 1
sd/source/ui/dlg/sddlgfact.cxx | 5
sd/source/ui/dlg/sddlgfact.hxx | 1
sfx2/source/control/templatelocalview.cxx | 14 -
sfx2/source/control/thumbnailview.cxx | 39 ----
sfx2/source/dialog/dinfdlg.cxx | 12 -
starmath/inc/AccessibleSmElement.hxx | 2
starmath/inc/AccessibleSmElementsControl.hxx | 4
starmath/inc/ElementsDockingWindow.hxx | 1
starmath/inc/document.hxx | 2
starmath/source/document.cxx | 8
svx/source/dialog/fntctrl.cxx | 239 -------------------------
svx/source/dialog/imapwnd.cxx | 83 --------
svx/source/dialog/imapwnd.hxx | 4
svx/source/dialog/langbox.cxx | 35 ---
sw/source/filter/ww8/rtfattributeoutput.hxx | 1
sw/source/uibase/dochdl/gloshdl.cxx | 22 --
sw/source/uibase/inc/gloshdl.hxx | 2
vcl/source/window/layout.cxx | 6
writerfilter/source/rtftok/rtfcontrolwords.cxx | 5
writerfilter/source/rtftok/rtfcontrolwords.hxx | 2
xmloff/source/text/txtparaimphint.hxx | 1
38 files changed, 647 deletions(-)
New commits:
commit 53312ca4ee722a6d5ba22d1f578c6de5fbc37207
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Sat Jun 8 08:51:44 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sat Jun 8 17:17:36 2019 +0200
loplugin:unusedmethods
Change-Id: I52efd8d843d0e4cc7a6adefb0eb95aa50469af38
Reviewed-on: https://gerrit.libreoffice.org/73693
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx
index cabfc3eb652f..7ef833a8b483 100644
--- a/cui/source/inc/about.hxx
+++ b/cui/source/inc/about.hxx
@@ -39,7 +39,6 @@ private:
weld::Button* m_pCloseButton;
void SetBuildIdLink();
- void StyleControls();
void SetLogo();
static OUString GetBuildId();
diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx
index ae44cd6ad34b..4172164f70ea 100644
--- a/cui/source/inc/thesdlg.hxx
+++ b/cui/source/inc/thesdlg.hxx
@@ -48,8 +48,6 @@ class SvxThesaurusDialog : public SfxDialogController
public:
virtual ~SvxThesaurusDialog() override;
- bool WordFound() const { return m_bWordFound; }
-
// Handler
DECL_LINK( ReplaceBtnHdl_Impl, weld::Button&, void );
DECL_LINK( LeftBtnHdl_Impl, weld::Button&, void );
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index b03a7a242a92..b6e815dfd591 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -390,7 +390,6 @@ public:
sal_uInt16 GetExistingLineCount() const { return m_aCustomPropertiesLines.size(); }
sal_uInt16 GetTotalLineCount() const { return m_aCustomProperties.size(); }
- sal_uInt16 GetVisibleLineCount() const;
void SetVisibleLineCount(sal_uInt32 nCount);
sal_Int32 GetHeight() const { return m_nHeight; }
void SetHeight(int nHeight) { m_nHeight = nHeight; }
@@ -519,7 +518,6 @@ struct CmisPropertyLine
std::vector< std::unique_ptr<CmisValue> > m_aValues;
std::vector< std::unique_ptr<CmisDateTime> > m_aDateTimes;
std::vector< std::unique_ptr<CmisYesNo> > m_aYesNos;
- long getItemHeight() const;
CmisPropertyLine(weld::Widget* pParent);
~CmisPropertyLine();
};
diff --git a/include/sfx2/templatelocalview.hxx b/include/sfx2/templatelocalview.hxx
index def518dca0e0..9161252957c8 100644
--- a/include/sfx2/templatelocalview.hxx
+++ b/include/sfx2/templatelocalview.hxx
@@ -88,10 +88,6 @@ public:
DECL_LINK(ContextMenuSelectHdl, Menu*, bool);
- TemplateContainerItem* getRegion(OUString const & sStr);
-
- OUString getRegionName(const sal_uInt16 nRegionId) const;
-
virtual bool renameItem(ThumbnailViewItem* pItem, const OUString& sNewTitle) override;
virtual void MouseButtonDown( const MouseEvent& rMEvt ) override;
diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx
index dd9c860afbcc..95216f3eb758 100644
--- a/include/sfx2/thumbnailview.hxx
+++ b/include/sfx2/thumbnailview.hxx
@@ -192,8 +192,6 @@ public:
void AppendItem(std::unique_ptr<ThumbnailViewItem> pItem);
- void RemoveItem(sal_uInt16 nItemId);
-
virtual void Clear();
// Change current thumbnail item list with new one (invalidates all pointers to a thumbnail item)
diff --git a/include/svx/contdlg.hxx b/include/svx/contdlg.hxx
index 4a488543622f..62a430390465 100644
--- a/include/svx/contdlg.hxx
+++ b/include/svx/contdlg.hxx
@@ -54,10 +54,6 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxContourDlg : public SfxModelessDialogCont
{
std::unique_ptr<SvxSuperContourDlg> m_xImpl;
-protected:
-
- void SetSuperClass( SvxSuperContourDlg& rSuperClass );
-
public:
SvxContourDlg(SfxBindings *pBindings, SfxChildWindow *pCW, weld::Window* pParent);
diff --git a/include/svx/fntctrl.hxx b/include/svx/fntctrl.hxx
index df12355ef42a..90cc67fbfad8 100644
--- a/include/svx/fntctrl.hxx
+++ b/include/svx/fntctrl.hxx
@@ -52,8 +52,6 @@ public:
virtual void StateChanged( StateChangedType nStateChange ) override;
virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
- void Init( const SfxItemSet& rSet );
-
// for reasons of efficiency not const
SvxFont& GetFont();
const SvxFont& GetFont() const;
diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx
index 48efdc26db81..63210359b2e0 100644
--- a/include/svx/langbox.hxx
+++ b/include/svx/langbox.hxx
@@ -66,11 +66,8 @@ public:
sal_Int32 InsertLanguage( const LanguageType eLangType );
void InsertDefaultLanguage( sal_Int16 nType );
void InsertSystemLanguage();
- void InsertLanguage( const LanguageType eLangType,
- bool bCheckEntry );
void SelectLanguage( const LanguageType eLangType );
LanguageType GetSelectedLanguage() const;
- bool IsLanguageSelected( const LanguageType eLangType ) const;
protected:
Image m_aNotCheckedImage;
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index 71007c86b33d..dcc862ed7779 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -116,8 +116,6 @@ public:
inline bool operator!() const;
bool operator==( const Bitmap& rBitmap ) const;
bool operator!=( const Bitmap& rBitmap ) const { return !operator==(rBitmap); }
- // only compares if we are using the same internal copy-on-write SalBitmap class
- bool ShallowEquals( const Bitmap& rBitmap ) const { return mxSalBmp == rBitmap.mxSalBmp; }
inline bool IsEmpty() const;
void SetEmpty();
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index cb031a0efe3b..fa8765277488 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -810,10 +810,6 @@ inline bool isContainerWindow(const vcl::Window *pWindow)
return pWindow && isContainerWindow(*pWindow);
}
-//Returns true if the containing dialog is doing its initial
-//layout and isn't visible yet
-VCL_DLLPUBLIC bool isInitialLayout(const vcl::Window *pWindow);
-
// retro-fitting utilities
//Get a Size which is large enough to contain all children with
diff --git a/include/vcl/tabdlg.hxx b/include/vcl/tabdlg.hxx
index 7c6c18b473d3..d42382a0a347 100644
--- a/include/vcl/tabdlg.hxx
+++ b/include/vcl/tabdlg.hxx
@@ -45,9 +45,7 @@ public:
virtual void StateChanged( StateChangedType nStateChange ) override;
- void SetViewWindow( vcl::Window* pWindow ) { mpViewWindow = pWindow; }
vcl::Window* GetViewWindow() const { return mpViewWindow; }
- void SetViewAlign( WindowAlign eAlign ) { meViewAlign = eAlign; }
// Screenshot interface
virtual std::vector<OString> getAllPageUIXMLDescriptions() const override;
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index 8b43fa65d75b..1908a2bb296a 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -368,7 +368,6 @@ public:
sal_uInt16 GetCurItemId() const { return mnCurItemId; }
sal_uInt16 GetDownItemId() const { return mnDownItemId; }
sal_uInt16 GetModifier() const { return mnMouseModifier; }
- sal_uInt16 GetKeyModifier() const { return mnKeyModifier; }
void SetItemBits( sal_uInt16 nItemId, ToolBoxItemBits nBits );
ToolBoxItemBits GetItemBits( sal_uInt16 nItemId ) const;
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index e7e40fd528bf..78272c7f4f3b 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -555,7 +555,6 @@ public:
void StartListeners( sc::StartListeningContext& rCxt, bool bAll );
void SetDirtyIfPostponed();
void BroadcastRecalcOnRefMove();
- void TransferListeners( ScColumn& rDestCol, SCROW nRow1, SCROW nRow2, SCROW nRowDelta );
void CollectListeners( std::vector<SvtListener*>& rListeners, SCROW nRow1, SCROW nRow2 );
void CollectFormulaCells( std::vector<ScFormulaCell*>& rCells, SCROW nRow1, SCROW nRow2 );
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 18132d2fc454..76fc911a82a6 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -3358,132 +3358,6 @@ void ScColumn::BroadcastRecalcOnRefMove()
BroadcastCells(aFunc.getDirtyRows(), SfxHintId::ScDataChanged);
}
-namespace {
-
-class TransferListenersHandler
-{
-public:
- struct Entry
- {
- size_t mnRow;
- std::vector<SvtListener*> maListeners;
- };
- typedef std::vector<Entry> ListenerListType;
-
- void swapListeners( std::vector<Entry>& rListenerList )
- {
- maListenerList.swap(rListenerList);
- }
-
- void operator() ( size_t nRow, SvtBroadcaster* pBroadcaster )
- {
- assert(pBroadcaster);
-
- // It's important to make a copy of the broadcasters listener list here
- Entry aEntry { nRow, pBroadcaster->GetAllListeners() };
- if (aEntry.maListeners.empty())
- // No listeners to transfer.
- return;
-
- for (SvtListener* pLis : aEntry.maListeners)
- pLis->EndListening(*pBroadcaster);
-
- maListenerList.push_back(aEntry);
-
- // At this point, the source broadcaster should have no more listeners.
- assert(!pBroadcaster->HasListeners());
- }
-
-private:
- ListenerListType maListenerList;
-};
-
-class RemoveEmptyBroadcasterHandler
-{
- sc::ColumnSpanSet maSet;
- ScDocument& mrDoc;
- SCCOL const mnCol;
- SCTAB const mnTab;
-
-public:
- RemoveEmptyBroadcasterHandler( ScDocument& rDoc, SCCOL nCol, SCTAB nTab ) :
- maSet(false), mrDoc(rDoc), mnCol(nCol), mnTab(nTab) {}
-
- void operator() ( size_t nRow, const SvtBroadcaster* pBroadcaster )
- {
- if (!pBroadcaster->HasListeners())
- maSet.set(mnTab, mnCol, nRow, true);
- }
-
- void purge()
- {
- sc::PurgeListenerAction aAction(mrDoc);
- maSet.executeAction(aAction);
- }
-};
-
-}
-
-void ScColumn::TransferListeners(
- ScColumn& rDestCol, SCROW nRow1, SCROW nRow2, SCROW nRowDelta )
-{
- if (nRow2 < nRow1)
- return;
-
- if (!ValidRow(nRow1) || !ValidRow(nRow2))
- return;
-
- if (nRowDelta <= 0 && !ValidRow(nRow1+nRowDelta))
- return;
-
- if (nRowDelta >= 0 && !ValidRow(nRow2+nRowDelta))
- return;
-
- // Collect all listeners from the source broadcasters. The listeners will
- // be removed from their broadcasters as they are collected.
- TransferListenersHandler aFunc;
- sc::ProcessBroadcaster(maBroadcasters.begin(), maBroadcasters, nRow1, nRow2, aFunc);
-
- TransferListenersHandler::ListenerListType aListenerList;
- aFunc.swapListeners(aListenerList);
-
- // Re-register listeners with their destination broadcasters.
- sc::BroadcasterStoreType::iterator itDestPos = rDestCol.maBroadcasters.begin();
- for (TransferListenersHandler::Entry& rEntry : aListenerList)
- {
- SCROW nDestRow = rEntry.mnRow + nRowDelta;
-
- sc::BroadcasterStoreType::position_type aPos =
- rDestCol.maBroadcasters.position(itDestPos, nDestRow);
-
- itDestPos = aPos.first;
- SvtBroadcaster* pDestBrd = nullptr;
- if (aPos.first->type == sc::element_type_broadcaster)
- {
- // Existing broadcaster.
- pDestBrd = sc::broadcaster_block::at(*aPos.first->data, aPos.second);
- }
- else
- {
- // No existing broadcaster. Create a new one.
- assert(aPos.first->type == sc::element_type_empty);
- pDestBrd = new SvtBroadcaster;
- itDestPos = rDestCol.maBroadcasters.set(itDestPos, nDestRow, pDestBrd);
- }
-
- // Transfer all listeners from the source to the destination.
- for (SvtListener* pLis : rEntry.maListeners)
- {
- pLis->StartListening(*pDestBrd);
- }
- }
-
- // Remove any broadcasters that have no listeners.
- RemoveEmptyBroadcasterHandler aFuncRemoveEmpty(*GetDoc(), nCol, nTab);
- sc::ProcessBroadcaster(maBroadcasters.begin(), maBroadcasters, nRow1, nRow2, aFuncRemoveEmpty);
- aFuncRemoveEmpty.purge();
-}
-
void ScColumn::CalcAll()
{
CalcAllHandler aFunc;
diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx
index abda9c3528c8..ed987a03c7ae 100644
--- a/sc/source/ui/inc/condformatdlgentry.hxx
+++ b/sc/source/ui/inc/condformatdlgentry.hxx
@@ -79,7 +79,6 @@ public:
virtual ~ScCondFrmtEntry();
void Show() { mxGrid->show(); }
- void Hide() { mxGrid->hide(); }
void set_grid_top_attach(int nAttach) { mxBorder->set_grid_top_attach(nAttach); }
int get_grid_top_attach() const { return mxBorder->get_grid_top_attach(); }
diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
index cdf3048519be..ebcd6656bb4a 100644
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@@ -234,7 +234,6 @@ public:
void SetFormulaMode(bool bSet) override;
void MakeDialogEditView() override;
bool IsInputActive() override;
- ScrollBar& GetScrollBar() { return maTextWndGroup->GetScrollBar(); }
void IncrementVerticalSize();
void DecrementVerticalSize();
long GetNumLines() { return maTextWndGroup->GetNumLines(); }
diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx
index 44e69fbb29be..99d042898df8 100644
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
@@ -182,7 +182,6 @@ public:
virtual VclPtr<AbstractSdInsertLayerDlg> CreateSdInsertLayerDlg(weld::Window* pParent, const SfxItemSet& rInAttrs, bool bDeletable, const OUString& rStr) = 0;
virtual VclPtr<AbstractSdInsertPagesObjsDlg> CreateSdInsertPagesObjsDlg(weld::Window* pParent, const SdDrawDocument* pDoc, SfxMedium* pSfxMedium, const OUString& rFileName) = 0;
virtual VclPtr<AbstractMorphDlg> CreateMorphDlg(weld::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2) = 0;
- virtual VclPtr<SfxAbstractTabDialog> CreateSdOutlineBulletTabDlg(weld::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView) = 0;
virtual VclPtr<SfxAbstractTabDialog> CreateSdParagraphTabDlg(weld::Window* pWindow, const SfxItemSet* pAttr) = 0;
virtual VclPtr<AbstractSdStartPresDlg> CreateSdStartPresentationDlg(weld::Window* pWindow, const SfxItemSet& rInAttrs,
const std::vector<OUString> &rPageNames, SdCustomShowList* pCSList ) = 0;
diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx
index 6c80853da1dd..956386e1b83b 100644
--- a/sd/source/ui/dlg/sddlgfact.cxx
+++ b/sd/source/ui/dlg/sddlgfact.cxx
@@ -453,11 +453,6 @@ VclPtr<AbstractMorphDlg> SdAbstractDialogFactory_Impl::CreateMorphDlg(weld::Wind
return VclPtr<AbstractMorphDlg_Impl>::Create(std::make_unique<::sd::MorphDlg>(pParent, pObj1, pObj2));
}
-VclPtr<SfxAbstractTabDialog> SdAbstractDialogFactory_Impl::CreateSdOutlineBulletTabDlg(weld::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView)
-{
- return VclPtr<AbstractBulletDialog_Impl>::Create(std::make_unique<::sd::OutlineBulletDlg>(pParent, pAttr, pView));
-}
-
VclPtr<SfxAbstractTabDialog> SdAbstractDialogFactory_Impl::CreateSdParagraphTabDlg(weld::Window* pParent, const SfxItemSet* pAttr )
{
return VclPtr<SdAbstractTabController_Impl>::Create(std::make_unique<SdParagraphDlg>(pParent, pAttr));
diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx
index ea5f5587df87..782c20e56adf 100644
--- a/sd/source/ui/dlg/sddlgfact.hxx
+++ b/sd/source/ui/dlg/sddlgfact.hxx
@@ -382,7 +382,6 @@ public:
virtual VclPtr<AbstractSdInsertLayerDlg> CreateSdInsertLayerDlg(weld::Window* pParent, const SfxItemSet& rInAttrs, bool bDeletable, const OUString& aStr) override;
virtual VclPtr<AbstractSdInsertPagesObjsDlg> CreateSdInsertPagesObjsDlg(weld::Window* pParent, const SdDrawDocument* pDoc, SfxMedium* pSfxMedium, const OUString& rFileName ) override;
virtual VclPtr<AbstractMorphDlg> CreateMorphDlg(weld::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2) override;
- virtual VclPtr<SfxAbstractTabDialog> CreateSdOutlineBulletTabDlg(weld::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView) override;
virtual VclPtr<SfxAbstractTabDialog> CreateSdParagraphTabDlg(weld::Window* pParent, const SfxItemSet* pAttr) override;
virtual VclPtr<AbstractSdStartPresDlg> CreateSdStartPresentationDlg(weld::Window* pWindow, const SfxItemSet& rInAttrs,
const std::vector<OUString> &rPageNames, SdCustomShowList* pCSList ) override;
diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx
index 4cf0d8ad084c..019eb06d3558 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -191,15 +191,6 @@ void TemplateLocalView::showRegion(TemplateContainerItem const *pItem)
insertItems(pItem->maTemplates);
}
-TemplateContainerItem* TemplateLocalView::getRegion(OUString const & rName)
-{
- for (auto const & pRegion : maRegions)
- if (pRegion->maTitle == rName)
- return pRegion.get();
-
- return nullptr;
-}
-
IMPL_LINK(TemplateLocalView, ContextMenuSelectHdl, Menu*, pMenu, bool)
{
sal_uInt16 nMenuId = pMenu->GetCurItemId();
@@ -246,11 +237,6 @@ IMPL_LINK(TemplateLocalView, ContextMenuSelectHdl, Menu*, pMenu, bool)
return false;
}
-OUString TemplateLocalView::getRegionName(const sal_uInt16 nRegionId) const
-{
- return mpDocTemplates->GetRegionName(nRegionId);
-}
-
bool TemplateLocalView::renameItem(ThumbnailViewItem* pItem, const OUString& sNewTitle)
{
sal_uInt16 nRegionId = 0;
diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx
index 6f5dea4a9249..e669a26148b9 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -932,45 +932,6 @@ void ThumbnailView::DataChanged( const DataChangedEvent& rDCEvt )
}
}
-void ThumbnailView::RemoveItem( sal_uInt16 nItemId )
-{
- size_t nPos = GetItemPos( nItemId );
-
- if ( nPos == THUMBNAILVIEW_ITEM_NOTFOUND )
- return;
-
- if ( nPos < mFilteredItemList.size() ) {
-
- // delete item from the thumbnail list
- for (size_t i = 0, n = mItemList.size(); i < n; ++i)
- {
- if (mItemList[i]->mnId == nItemId)
- {
- mItemList.erase(mItemList.begin()+i);
- break;
- }
- }
-
- // delete item from the filter item list
- ThumbnailValueItemList::iterator it = mFilteredItemList.begin();
- ::std::advance( it, nPos );
-
- if ((*it)->isSelected())
- {
- (*it)->setSelection(false);
- }
-
- delete *it;
- mFilteredItemList.erase( it );
- mpStartSelRange = mFilteredItemList.end();
- }
-
- CalculateItemPositions();
-
- if ( IsReallyVisible() && IsUpdateMode() )
- Invalidate();
-}
-
void ThumbnailView::Clear()
{
ImplDeleteItems();
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index fb712abc60fd..a84390fc8332 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1465,13 +1465,6 @@ void CustomPropertiesWindow::ValidateLine( CustomPropertyLine* pLine, bool bIsFr
}
}
-sal_uInt16 CustomPropertiesWindow::GetVisibleLineCount() const
-{
- sal_Int32 nScrollOffset = GetLineHeight();
- sal_uInt16 nCount = ceil(static_cast<double>(GetHeight()) / nScrollOffset);
- return nCount;
-}
-
void CustomPropertiesWindow::SetVisibleLineCount(sal_uInt32 nCount)
{
while (GetExistingLineCount() < nCount)
@@ -2023,11 +2016,6 @@ CmisPropertyLine::~CmisPropertyLine( )
{
}
-long CmisPropertyLine::getItemHeight() const
-{
- return m_xFrame->get_preferred_size().Height();
-}
-
// class CmisPropertiesWindow -----------------------------------------
CmisPropertiesWindow::CmisPropertiesWindow(std::unique_ptr<weld::Container> xParent)
diff --git a/starmath/inc/AccessibleSmElement.hxx b/starmath/inc/AccessibleSmElement.hxx
index 9b168bbee4cb..9f63d1607ef7 100644
--- a/starmath/inc/AccessibleSmElement.hxx
+++ b/starmath/inc/AccessibleSmElement.hxx
@@ -57,8 +57,6 @@ public:
sal_Int32 nIndexInParent);
void SetFocus(bool _bFocus);
- bool HasFocus() const { return m_bHasFocus; }
- void ReleaseSmElementsControl() { m_pSmElementsControl = nullptr; }
sal_uInt16 itemId() const { return m_nItemId; }
DECLARE_XINTERFACE()
diff --git a/starmath/inc/AccessibleSmElementsControl.hxx b/starmath/inc/AccessibleSmElementsControl.hxx
index d38d57dc92c2..8afea99bf18a 100644
--- a/starmath/inc/AccessibleSmElementsControl.hxx
+++ b/starmath/inc/AccessibleSmElementsControl.hxx
@@ -40,10 +40,6 @@ class AccessibleSmElementsControl final : public comphelper::OAccessibleComponen
std::vector<rtl::Reference<AccessibleSmElement>> m_aAccessibleChildren;
VclPtr<SmElementsControl> m_pControl;
- AccessibleSmElement* GetItem_Impl(sal_uInt16 _nPos);
- void ReleaseFocus_Impl(sal_uInt16 _nPos);
- sal_Int32 implGetAccessibleChildCount();
- void ReleaseItems(bool bNotifyRemoval);
void UpdateFocus(sal_uInt16);
inline void TestControl();
diff --git a/starmath/inc/ElementsDockingWindow.hxx b/starmath/inc/ElementsDockingWindow.hxx
index fe86ebd422f6..2cf3a33e482c 100644
--- a/starmath/inc/ElementsDockingWindow.hxx
+++ b/starmath/inc/ElementsDockingWindow.hxx
@@ -140,7 +140,6 @@ public:
sal_uInt16 itemCount() const;
sal_uInt16 itemHighlighted() const;
- sal_uInt16 itemFocused() const;
sal_uInt16 itemAtPos(const Point& rPos) const;
tools::Rectangle itemPosRect(sal_uInt16) const;
bool itemIsSeparator(sal_uInt16) const;
diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index 2e2c7fab4211..6041e304e2ad 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -182,8 +182,6 @@ public:
OUString const & GetAccessibleText();
EditEngine & GetEditEngine();
- SfxItemPool & GetEditEngineItemPool();
- const SvtLinguOptions & GetLinguOptions() const { return maLinguOptions; }
void DrawFormula(OutputDevice &rDev, Point &rPosition, bool bDrawSelection = false);
Size GetSize();
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index bec09afd3163..da0411cbd974 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -377,14 +377,6 @@ EditEngine& SmDocShell::GetEditEngine()
}
-SfxItemPool& SmDocShell::GetEditEngineItemPool()
-{
- if (!mpEditEngineItemPool)
- GetEditEngine();
- assert(mpEditEngineItemPool && "EditEngineItemPool missing");
- return *mpEditEngineItemPool;
-}
-
void SmDocShell::DrawFormula(OutputDevice &rDev, Point &rPosition, bool bDrawSelection)
{
if (!mpTree)
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index df17f406d294..3a187016fb39 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -911,245 +911,6 @@ static void SetPrevFontEscapement(SvxFont& rFont, sal_uInt8 nProp, sal_uInt8 nEs
rFont.SetEscapement(nEsc);
}
-void SvxFontPrevWindow::Init(const SfxItemSet& rSet)
-{
- SvxFont& rFont = GetFont();
- SvxFont& rCJKFont = GetCJKFont();
- SvxFont& rCTLFont = GetCTLFont();
-
- initFont(rFont);
- initFont(rCJKFont);
- initFont(rCTLFont);
- ResetSettings(true, true);
-
- sal_uInt16 nWhich;
- nWhich = rSet.GetPool()->GetWhich( SID_CHAR_DLG_PREVIEW_STRING );
- if (ISITEMSET)
- {
- const SfxStringItem& rItem = static_cast<const SfxStringItem&>( rSet.Get( nWhich ) );
- const OUString& aString = rItem.GetValue();
- if( !aString.isEmpty() )
- SetPreviewText( aString );
- else
- SetFontNameAsPreviewText();
- }
-
- // Underline
- FontLineStyle eUnderline;
- nWhich = rSet.GetPool()->GetWhich( SID_ATTR_CHAR_UNDERLINE );
- if( ISITEMSET )
- {
- const SvxUnderlineItem& rItem = static_cast<const SvxUnderlineItem&>( rSet.Get( nWhich ) );
- eUnderline = rItem.GetValue();
- SetTextLineColor( rItem.GetColor() );
- }
- else
- eUnderline = LINESTYLE_NONE;
-
- rFont.SetUnderline( eUnderline );
- rCJKFont.SetUnderline( eUnderline );
- rCTLFont.SetUnderline( eUnderline );
-
- // Overline
- FontLineStyle eOverline;
- nWhich = rSet.GetPool()->GetWhich( SID_ATTR_CHAR_OVERLINE );
- if( ISITEMSET )
- {
- const SvxOverlineItem& rItem = static_cast<const SvxOverlineItem&>( rSet.Get( nWhich ) );
- eOverline = rItem.GetValue();
- SetOverlineColor( rItem.GetColor() );
- }
- else
- eOverline = LINESTYLE_NONE;
-
- rFont.SetOverline( eOverline );
- rCJKFont.SetOverline( eOverline );
- rCTLFont.SetOverline( eOverline );
-
- // Strikeout
- FontStrikeout eStrikeout;
- nWhich = rSet.GetPool()->GetWhich( SID_ATTR_CHAR_STRIKEOUT );
- if( ISITEMSET )
- {
- const SvxCrossedOutItem& rItem = static_cast<const SvxCrossedOutItem&>( rSet.Get( nWhich ) );
- eStrikeout = rItem.GetValue();
- }
- else
- eStrikeout = STRIKEOUT_NONE;
-
- rFont.SetStrikeout( eStrikeout );
- rCJKFont.SetStrikeout( eStrikeout );
- rCTLFont.SetStrikeout( eStrikeout );
-
- // WordLineMode
- nWhich = rSet.GetPool()->GetWhich( SID_ATTR_CHAR_WORDLINEMODE );
- if( ISITEMSET )
- {
- const SvxWordLineModeItem& rItem = static_cast<const SvxWordLineModeItem&>( rSet.Get( nWhich ) );
- rFont.SetWordLineMode( rItem.GetValue() );
- rCJKFont.SetWordLineMode( rItem.GetValue() );
- rCTLFont.SetWordLineMode( rItem.GetValue() );
- }
-
- // Emphasis
- nWhich = rSet.GetPool()->GetWhich( SID_ATTR_CHAR_EMPHASISMARK );
- if( ISITEMSET )
- {
- const SvxEmphasisMarkItem& rItem = static_cast<const SvxEmphasisMarkItem&>( rSet.Get( nWhich ) );
- FontEmphasisMark eMark = rItem.GetEmphasisMark();
- rFont.SetEmphasisMark( eMark );
- rCJKFont.SetEmphasisMark( eMark );
- rCTLFont.SetEmphasisMark( eMark );
- }
-
- // Relief
- nWhich = rSet.GetPool()->GetWhich( SID_ATTR_CHAR_RELIEF );
- if( ISITEMSET )
- {
- const SvxCharReliefItem& rItem = static_cast<const SvxCharReliefItem&>( rSet.Get( nWhich ) );
- FontRelief eFontRelief = rItem.GetValue();
- rFont.SetRelief( eFontRelief );
- rCJKFont.SetRelief( eFontRelief );
- rCTLFont.SetRelief( eFontRelief );
- }
-
- // Effects
- nWhich = rSet.GetPool()->GetWhich( SID_ATTR_CHAR_CASEMAP );
- if( ISITEMSET )
- {
- const SvxCaseMapItem& rItem = static_cast<const SvxCaseMapItem&>( rSet.Get( nWhich ) );
- SvxCaseMap eCaseMap = rItem.GetValue();
- rFont.SetCaseMap( eCaseMap );
- rCJKFont.SetCaseMap( eCaseMap );
- // #i78474# small caps do not exist in CTL fonts
- rCTLFont.SetCaseMap( eCaseMap == SvxCaseMap::SmallCaps ? SvxCaseMap::NotMapped : eCaseMap );
- }
-
- // Outline
- nWhich = rSet.GetPool()->GetWhich( SID_ATTR_CHAR_CONTOUR );
- if( ISITEMSET )
- {
- const SvxContourItem& rItem = static_cast<const SvxContourItem&>( rSet.Get( nWhich ) );
- bool bOutline = rItem.GetValue();
- rFont.SetOutline( bOutline );
- rCJKFont.SetOutline( bOutline );
- rCTLFont.SetOutline( bOutline );
- }
-
- // Shadow
- nWhich = rSet.GetPool()->GetWhich( SID_ATTR_CHAR_SHADOWED );
- if( ISITEMSET )
- {
- const SvxShadowedItem& rItem = static_cast<const SvxShadowedItem&>( rSet.Get( nWhich ) );
- bool bShadow = rItem.GetValue();
- rFont.SetShadow( bShadow );
- rCJKFont.SetShadow( bShadow );
- rCTLFont.SetShadow( bShadow );
- }
-
- // Background
- bool bTransparent;
- nWhich = SID_ATTR_BRUSH_CHAR;
- if (ISITEMSET)
- {
- const SvxBrushItem& rBrush = static_cast<const SvxBrushItem&>( rSet.Get( nWhich ) );
- const Color& rColor = rBrush.GetColor();
- bTransparent = rColor.GetTransparency() > 0;
- rFont.SetFillColor(rColor);
- rCJKFont.SetFillColor(rColor);
- rCTLFont.SetFillColor(rColor);
- }
- else
- bTransparent = true;
-
- rFont.SetTransparent( bTransparent );
- rCJKFont.SetTransparent( bTransparent );
- rCTLFont.SetTransparent( bTransparent );
-
- Color aBackCol( COL_TRANSPARENT );
- nWhich = rSet.GetPool()->GetWhich( SID_ATTR_BRUSH );
- if (ISITEMSET)
- {
- const SvxBrushItem& rBrush = static_cast<const SvxBrushItem&>(rSet.Get(nWhich));
- if (GPOS_NONE == rBrush.GetGraphicPos())
- aBackCol = rBrush.GetColor();
- }
- SetBackColor(aBackCol);
-
- // Font
- SetFont(rSet, SID_ATTR_CHAR_FONT, rFont);
- SetFont(rSet, SID_ATTR_CHAR_CJK_FONT, rCJKFont);
- SetFont(rSet, SID_ATTR_CHAR_CTL_FONT, rCTLFont);
-
- // Style
- SetFontStyle(rSet, SID_ATTR_CHAR_POSTURE, SID_ATTR_CHAR_WEIGHT, rFont);
- SetFontStyle(rSet, SID_ATTR_CHAR_CJK_POSTURE, SID_ATTR_CHAR_CJK_WEIGHT, rCJKFont);
- SetFontStyle(rSet, SID_ATTR_CHAR_CTL_POSTURE, SID_ATTR_CHAR_CTL_WEIGHT, rCTLFont);
-
- // Size
- SetFontSize(rSet, SID_ATTR_CHAR_FONTHEIGHT, rFont);
- SetFontSize(rSet, SID_ATTR_CHAR_CJK_FONTHEIGHT, rCJKFont);
- SetFontSize(rSet, SID_ATTR_CHAR_CTL_FONTHEIGHT, rCTLFont);
-
- // Language
- SetFontLang( rSet, SID_ATTR_CHAR_LANGUAGE, rFont );
- SetFontLang( rSet, SID_ATTR_CHAR_CJK_LANGUAGE, rCJKFont );
- SetFontLang( rSet, SID_ATTR_CHAR_CTL_LANGUAGE, rCTLFont );
-
- // Color
- nWhich = rSet.GetPool()->GetWhich( SID_ATTR_CHAR_COLOR );
- if( ISITEMSET )
- {
- const SvxColorItem& rItem = static_cast<const SvxColorItem&>( rSet.Get( nWhich ) );
- Color aCol( rItem.GetValue() );
- rFont.SetColor( aCol );
- rCJKFont.SetColor( aCol );
- rCTLFont.SetColor( aCol );
-
- AutoCorrectFontColor(); // handle color COL_AUTO
- }
-
- // Kerning
- nWhich = rSet.GetPool()->GetWhich( SID_ATTR_CHAR_KERNING );
- if( ISITEMSET )
- {
- const SvxKerningItem& rItem = static_cast<const SvxKerningItem&>( rSet.Get( nWhich ) );
- short nKern = static_cast<short>(LogicToLogic( rItem.GetValue(), rSet.GetPool()->GetMetric( nWhich ), MapUnit::MapTwip ));
- rFont.SetFixKerning( nKern );
- rCJKFont.SetFixKerning( nKern );
- rCTLFont.SetFixKerning( nKern );
- }
-
- // Escapement
- nWhich = rSet.GetPool()->GetWhich( SID_ATTR_CHAR_ESCAPEMENT );
- const sal_uInt8 nProp = 100;
- short nEsc;
- sal_uInt8 nEscProp;
- if( ISITEMSET )
- {
- const SvxEscapementItem& rItem = static_cast<const SvxEscapementItem&>( rSet.Get( nWhich ) );
- nEsc = rItem.GetEsc();
- nEscProp = rItem.GetProportionalHeight();
-
- if( nEsc == DFLT_ESC_AUTO_SUPER )
- nEsc = DFLT_ESC_SUPER;
- else if( nEsc == DFLT_ESC_AUTO_SUB )
- nEsc = DFLT_ESC_SUB;
- }
- else
- {
- nEsc = 0;
- nEscProp = 100;
- }
-
- SetFontEscapement( nProp, nEscProp, nEsc );
-
- // Font width scale
- SetFontWidthScale( rSet );
-
- Invalidate();
-}
-
void SvxFontPrevWindow::SetFont( const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont )
{
sal_uInt16 nWhich = rSet.GetPool()->GetWhich( nSlot );
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index 38d089bf4cc3..544becb46d82 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -753,87 +753,4 @@ void IMapWindow::MenuSelectHdl(const OString& rId)
pView->DeleteMarked();
}
-void IMapWindow::CreateDefaultObject()
-{
- SdrPageView* pPageView = pView->GetSdrPageView();
-
- if(!pPageView)
- return;
-
- // calc position and size
- Point aPagePos(0, 0); // = pPageView->GetOffset();
- Size aPageSize = pPageView->GetPage()->GetSize();
- sal_uInt32 nDefaultObjectSizeWidth = aPageSize.Width() / 4;
- sal_uInt32 nDefaultObjectSizeHeight = aPageSize.Height() / 4;
- aPagePos.AdjustX((aPageSize.Width() / 2) - (nDefaultObjectSizeWidth / 2) );
- aPagePos.AdjustY((aPageSize.Height() / 2) - (nDefaultObjectSizeHeight / 2) );
- tools::Rectangle aNewObjectRectangle(aPagePos, Size(nDefaultObjectSizeWidth, nDefaultObjectSizeHeight));
-
- SdrObject* pObj = SdrObjFactory::MakeNewObject(
- *pModel,
- pView->GetCurrentObjInventor(),
- pView->GetCurrentObjIdentifier());
- pObj->SetLogicRect(aNewObjectRectangle);
-
- switch( pObj->GetObjIdentifier() )
- {
- case OBJ_POLY:
- case OBJ_PATHPOLY:
- {
- basegfx::B2DPolygon aInnerPoly;
- aInnerPoly.append(basegfx::B2DPoint(aNewObjectRectangle.BottomLeft().X(), aNewObjectRectangle.BottomLeft().Y()));
- aInnerPoly.append(basegfx::B2DPoint(aNewObjectRectangle.TopLeft().X(), aNewObjectRectangle.TopLeft().Y()));
- aInnerPoly.append(basegfx::B2DPoint(aNewObjectRectangle.TopCenter().X(), aNewObjectRectangle.TopCenter().Y()));
- aInnerPoly.append(basegfx::B2DPoint(aNewObjectRectangle.Center().X(), aNewObjectRectangle.Center().Y()));
- aInnerPoly.append(basegfx::B2DPoint(aNewObjectRectangle.RightCenter().X(), aNewObjectRectangle.RightCenter().Y()));
- aInnerPoly.append(basegfx::B2DPoint(aNewObjectRectangle.BottomRight().X(), aNewObjectRectangle.BottomRight().Y()));
- aInnerPoly.setClosed(true);
- static_cast<SdrPathObj*>(pObj)->SetPathPoly(basegfx::B2DPolyPolygon(aInnerPoly));
- break;
- }
- case OBJ_FREEFILL:
- case OBJ_PATHFILL:
- {
- sal_Int32 nWdt(aNewObjectRectangle.GetWidth() / 2);
- sal_Int32 nHgt(aNewObjectRectangle.GetHeight() / 2);
- basegfx::B2DPolygon aInnerPoly(XPolygon(aNewObjectRectangle.Center(), nWdt, nHgt).getB2DPolygon());
- static_cast<SdrPathObj*>(pObj)->SetPathPoly(basegfx::B2DPolyPolygon(aInnerPoly));
- break;
- }
-
- }
-
- pView->InsertObjectAtView(pObj, *pPageView);
- SdrObjCreated( *pObj );
- SetCurrentObjState( true );
- pView->MarkObj( pObj, pPageView );
-}
-
-void IMapWindow::SelectFirstObject()
-{
- SdrPage* pPage = pModel->GetPage( 0 );
- if( pPage->GetObjCount() != 0 )
- {
- GrabFocus();
- pView->UnmarkAllObj();
- pView->MarkNextObj(true);
- }
-}
-
-void IMapWindow::StartPolyEdit()
-{
- GrabFocus();
-
- if( !pView->AreObjectsMarked() )
- pView->MarkNextObj(true);
-
- const SdrHdlList& rHdlList = pView->GetHdlList();
- SdrHdl* pHdl = rHdlList.GetFocusHdl();
-
- if(!pHdl)
- {
- const_cast<SdrHdlList&>(rHdlList).TravelFocusHdl(true);
- }
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx
index c790c3d5c66b..464a6e6d3894 100644
--- a/svx/source/dialog/imapwnd.hxx
+++ b/svx/source/dialog/imapwnd.hxx
@@ -133,10 +133,6 @@ public:
void SetTargetList( TargetList& rTargetList );
const NotifyInfo& GetInfo() const { return aInfo; }
-
- void CreateDefaultObject();
- void SelectFirstObject();
- void StartPolyEdit();
};
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index ca7fd0da4dfc..5b190ed7c6ab 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -371,27 +371,6 @@ void SvxLanguageBoxBase::InsertSystemLanguage()
}
-void SvxLanguageBoxBase::InsertLanguage( const LanguageType nLangType,
- bool bCheckEntry )
-{
- LanguageType nLang = MsLangId::getReplacementForObsoleteLanguage( nLangType);
- // For obsolete and to be replaced languages check whether an entry of the
- // replacement already exists and if so don't add an entry with identical
- // string as would be returned by SvtLanguageTable::GetString().
- if (nLang != nLangType)
- {
- sal_Int32 nAt = ImplTypeToPos( nLang );
- if ( nAt != LISTBOX_ENTRY_NOTFOUND )
- return;
- }
-
- OUString aStrEntry = SvtLanguageTable::GetLanguageString( nLang );
-
- sal_Int32 nAt = ImplInsertImgEntry( aStrEntry, LISTBOX_APPEND, bCheckEntry );
- ImplSetEntryData( nAt, reinterpret_cast<void*>(static_cast<sal_uInt16>(nLang)) );
-}
-
-
LanguageType SvxLanguageBoxBase::GetSelectedLanguage() const
{
sal_Int32 nPos = ImplGetSelectedEntryPos();
@@ -419,20 +398,6 @@ void SvxLanguageBoxBase::SelectLanguage( const LanguageType eLangType )
}
-bool SvxLanguageBoxBase::IsLanguageSelected( const LanguageType eLangType ) const
-{
- // Same here, work on the replacement if applicable.
- LanguageType nLang = MsLangId::getReplacementForObsoleteLanguage( eLangType);
-
- sal_Int32 nAt = ImplTypeToPos( nLang );
-
- if ( nAt != LISTBOX_ENTRY_NOTFOUND )
- return ImplIsEntryPosSelected( nAt );
- else
- return false;
-}
-
-
sal_Int32 SvxLanguageBoxBase::ImplTypeToPos( LanguageType eType ) const
{
return ImplGetEntryPos( reinterpret_cast<void*>(static_cast<sal_uInt16>(eType)) );
diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx b/sw/source/filter/ww8/rtfattributeoutput.hxx
index 4a6b90607af5..66e902a770fc 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.hxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.hxx
@@ -83,7 +83,6 @@ public:
// Access to (anyway) private buffers, used by the sdr exporter
OStringBuffer& RunText();
- OStringBuffer& Styles() { return m_aStyles; }
OString MoveCharacterProperties(bool aAutoWriteRtlLtr = false);
/// Output text (without markup).
diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx
index fc1f13dae296..2409f7b6511f 100644
--- a/sw/source/uibase/dochdl/gloshdl.cxx
+++ b/sw/source/uibase/dochdl/gloshdl.cxx
@@ -202,28 +202,6 @@ void SwGlossaryHdl::RenameGroup(const OUString& rOld, OUString& rNew, const OUSt
}
}
-bool SwGlossaryHdl::CopyOrMove( const OUString& rSourceGroupName, OUString& rSourceShortName,
- const OUString& rDestGroupName, const OUString& rLongName, bool bMove )
-{
- std::unique_ptr<SwTextBlocks> pSourceGroup = rStatGlossaries.GetGroupDoc(rSourceGroupName);
- std::unique_ptr<SwTextBlocks> pDestGroup = rStatGlossaries.GetGroupDoc(rDestGroupName);
- if (pDestGroup->IsReadOnly() || (bMove && pSourceGroup->IsReadOnly()) )
- {
- return false;
- }
-
- //The index must be determined here because rSourceShortName maybe changed in CopyBlock
- sal_uInt16 nDeleteIdx = pSourceGroup->GetIndex( rSourceShortName );
- OSL_ENSURE(USHRT_MAX != nDeleteIdx, "entry not found");
- ErrCode nRet = pSourceGroup->CopyBlock( *pDestGroup, rSourceShortName, rLongName );
- if(!nRet && bMove)
- {
- // the index must be existing
- nRet = pSourceGroup->Delete( nDeleteIdx ) ? ERRCODE_NONE : ErrCode(1);
- }
- return !nRet;
-}
-
// delete a autotext-file-group
bool SwGlossaryHdl::DelGroup(const OUString &rGrpName)
{
diff --git a/sw/source/uibase/inc/gloshdl.hxx b/sw/source/uibase/inc/gloshdl.hxx
index d065aa9302a5..c57a762bbf6e 100644
--- a/sw/source/uibase/inc/gloshdl.hxx
+++ b/sw/source/uibase/inc/gloshdl.hxx
@@ -60,8 +60,6 @@ public:
bool Rename( const OUString& rOldShortName, const OUString& rNewShortName,
const OUString& rNewName);
- bool CopyOrMove( const OUString& rSourceGroupName, OUString& rSourceShortName,
- const OUString& rDestGroupName, const OUString& rLongName, bool bMove );
bool HasShortName(const OUString &rShortName) const;
// when NewGlossary is called from Basic then the previously set group should
// be newly created if applicable.
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 33f70be753c9..58ac1c5cd482 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -2669,10 +2669,4 @@ bool isLayoutEnabled(const vcl::Window *pWindow)
return pChild && isContainerWindow(*pChild) && !pChild->GetWindow(GetWindowType::Next);
}
-bool isInitialLayout(const vcl::Window *pWindow)
-{
- Dialog *pParentDialog = pWindow ? pWindow->GetParentDialog() : nullptr;
- return pParentDialog && pParentDialog->isCalculatingInitialLayoutSize();
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfcontrolwords.cxx b/writerfilter/source/rtftok/rtfcontrolwords.cxx
index 6672efc686c9..8fa04faa0d3a 100644
--- a/writerfilter/source/rtftok/rtfcontrolwords.cxx
+++ b/writerfilter/source/rtftok/rtfcontrolwords.cxx
@@ -1843,11 +1843,6 @@ RTFSymbol const aRTFControlWords[] = {
};
int nRTFControlWords = SAL_N_ELEMENTS(aRTFControlWords);
-bool RTFSymbol::operator<(const RTFSymbol& rOther) const
-{
- return std::strcmp(m_sKeyword, rOther.m_sKeyword) < 0;
-}
-
RTFMathSymbol const aRTFMathControlWords[] = {
// eKeyword nToken eDestination
{ RTF_MOMATH, M_TOKEN(oMath), Destination::MOMATH },
diff --git a/writerfilter/source/rtftok/rtfcontrolwords.hxx b/writerfilter/source/rtftok/rtfcontrolwords.hxx
index 67c6e5e67fe7..392b30068449 100644
--- a/writerfilter/source/rtftok/rtfcontrolwords.hxx
+++ b/writerfilter/source/rtftok/rtfcontrolwords.hxx
@@ -2016,8 +2016,6 @@ public:
RTFKeyword GetIndex() const { return m_nIndex; }
int GetDefValue() const { return m_nDefValue; }
-
- bool operator<(const RTFSymbol& rOther) const;
};
extern RTFSymbol const aRTFControlWords[];
diff --git a/xmloff/source/text/txtparaimphint.hxx b/xmloff/source/text/txtparaimphint.hxx
index 84d4c30eb3ed..10771f6c7489 100644
--- a/xmloff/source/text/txtparaimphint.hxx
+++ b/xmloff/source/text/txtparaimphint.hxx
@@ -61,7 +61,6 @@ public:
// because this seems to be to expensive if compared to inline methods.
sal_uInt8 GetType() const { return nType; }
bool IsReference() { return XML_HINT_REFERENCE==nType; }
- bool IsIndexMark() { return XML_HINT_INDEX_MARK==nType; }
};
class XMLStyleHint_Impl : public XMLHint_Impl
More information about the Libreoffice-commits
mailing list